]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-3.19.6-201504302119.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-3.19.6-201504302119.patch
CommitLineData
b357e36a
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 a311db8..415b28c 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@@ -642,7 +643,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@@ -665,7 +688,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@@ -693,7 +716,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@@ -724,7 +747,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 176d4fe..6eabd3c 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1191,6 +1191,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@@ -2283,6 +2290,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@@ -2584,6 +2595,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 65c7c87..abe7f93 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 = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -std=gnu89 -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@@ -879,7 +947,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@@ -926,6 +994,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@@ -935,7 +1005,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@@ -978,10 +1048,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@@ -1095,6 +1168,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@@ -1110,7 +1185,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@@ -1176,7 +1251,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
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
547+ signing_key.x509.signer \
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@@ -1215,7 +1293,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@@ -1381,6 +1459,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@@ -1521,17 +1601,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@@ -1543,11 +1627,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 d8f9b7e..f6222fa 100644
698--- a/arch/alpha/include/asm/pgtable.h
699+++ b/arch/alpha/include/asm/pgtable.h
700@@ -102,6 +102,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 97d07ed..2931f2b 100644
948--- a/arch/arm/Kconfig
949+++ b/arch/arm/Kconfig
950@@ -1727,7 +1727,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@@ -1991,6 +1991,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 afb9caf..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 (2 * TASK_SIZE / 3)
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 891a56b..48f337e 100644
1839--- a/arch/arm/include/asm/outercache.h
1840+++ b/arch/arm/include/asm/outercache.h
1841@@ -36,7 +36,7 @@ struct outer_cache_fns {
1842
1843 /* This is an ARM L2C thing */
1844 void (*write_sec)(unsigned long, unsigned);
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 f027941..f36ce30 100644
1954--- a/arch/arm/include/asm/pgtable-2level.h
1955+++ b/arch/arm/include/asm/pgtable-2level.h
1956@@ -126,6 +126,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 a31ecdad..95e98d4 100644
1968--- a/arch/arm/include/asm/pgtable-3level.h
1969+++ b/arch/arm/include/asm/pgtable-3level.h
1970@@ -81,6 +81,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@@ -92,10 +93,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 d5cac54..906ea3e 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 d890e41..3921292 100644
2112--- a/arch/arm/include/asm/thread_info.h
2113+++ b/arch/arm/include/asm/thread_info.h
2114@@ -78,9 +78,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 .restart_block = { \
2125 .fn = do_no_restart_syscall, \
2126 }, \
2127@@ -159,7 +159,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@@ -173,10 +177,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 4767eb9..bf00668 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 2f5555d..d493c91 100644
2408--- a/arch/arm/kernel/entry-armv.S
2409+++ b/arch/arm/kernel/entry-armv.S
2410@@ -47,6 +47,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@@ -89,11 +170,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@@ -149,7 +234,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@@ -164,7 +253,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@@ -368,6 +462,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@@ -478,7 +575,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@@ -512,11 +611,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@@ -546,7 +649,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@@ -766,7 +870,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@@ -775,7 +879,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 664eee8..f470938 100644
2772--- a/arch/arm/kernel/head.S
2773+++ b/arch/arm/kernel/head.S
2774@@ -437,7 +437,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 bea7db9..a210d10 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, NUMA_NO_NODE,
2798+ GFP_KERNEL, prot, 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 5038960..4aa71d8 100644
2831--- a/arch/arm/kernel/patch.c
2832+++ b/arch/arm/kernel/patch.c
2833@@ -67,6 +67,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@@ -98,6 +99,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 fdfa3a7..5d208b8 100644
2851--- a/arch/arm/kernel/process.c
2852+++ b/arch/arm/kernel/process.c
2853@@ -207,6 +207,7 @@ void machine_power_off(void)
2854
2855 if (pm_power_off)
2856 pm_power_off();
2857+ BUG();
2858 }
2859
2860 /*
2861@@ -220,7 +221,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@@ -246,8 +247,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@@ -424,12 +425,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@@ -445,7 +440,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@@ -474,81 +469,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 e55408e..14d9998 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@@ -253,9 +255,13 @@ static int __get_cpu_architecture(void)
3058 asm("mrc p15, 0, %0, c0, c1, 4"
3059 : "=r" (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 8aa6f1b..0899e08 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 0b0d58a..988cb45 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@@ -351,7 +351,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@@ -384,7 +384,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@@ -401,7 +401,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@@ -1038,7 +1038,7 @@ static void check_kvm_target_cpu(void *ret)
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-at91/setup.c b/arch/arm/mach-at91/setup.c
3438index ce25e85..3dd7850 100644
3439--- a/arch/arm/mach-at91/setup.c
3440+++ b/arch/arm/mach-at91/setup.c
3441@@ -57,7 +57,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3442
3443 desc->pfn = __phys_to_pfn(base);
3444 desc->length = length;
3445- desc->type = MT_MEMORY_RWX_NONCACHED;
3446+ desc->type = MT_MEMORY_RW_NONCACHED;
3447
3448 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3449 base, length, desc->virtual);
3450diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3451index f8e7dcd..17ee921 100644
3452--- a/arch/arm/mach-exynos/suspend.c
3453+++ b/arch/arm/mach-exynos/suspend.c
3454@@ -18,6 +18,7 @@
3455 #include <linux/syscore_ops.h>
3456 #include <linux/cpu_pm.h>
3457 #include <linux/io.h>
3458+#include <linux/irq.h>
3459 #include <linux/irqchip/arm-gic.h>
3460 #include <linux/err.h>
3461 #include <linux/regulator/machine.h>
3462@@ -558,8 +559,10 @@ void __init exynos_pm_init(void)
3463 tmp |= pm_data->wake_disable_mask;
3464 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3465
3466- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3467- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3468+ pax_open_kernel();
3469+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3470+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3471+ pax_close_kernel();
3472
3473 register_syscore_ops(&exynos_pm_syscore_ops);
3474 suspend_set_ops(&exynos_suspend_ops);
3475diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3476index 7f352de..6dc0929 100644
3477--- a/arch/arm/mach-keystone/keystone.c
3478+++ b/arch/arm/mach-keystone/keystone.c
3479@@ -27,7 +27,7 @@
3480
3481 #include "keystone.h"
3482
3483-static struct notifier_block platform_nb;
3484+static notifier_block_no_const platform_nb;
3485 static unsigned long keystone_dma_pfn_offset __read_mostly;
3486
3487 static int keystone_platform_notifier(struct notifier_block *nb,
3488diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3489index ccef880..5dfad80 100644
3490--- a/arch/arm/mach-mvebu/coherency.c
3491+++ b/arch/arm/mach-mvebu/coherency.c
3492@@ -164,7 +164,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3493
3494 /*
3495 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3496- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3497+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3498 * is needed as a workaround for a deadlock issue between the PCIe
3499 * interface and the cache controller.
3500 */
3501@@ -177,7 +177,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3502 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3503
3504 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3505- mtype = MT_UNCACHED;
3506+ mtype = MT_UNCACHED_RW;
3507
3508 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3509 }
3510diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3511index b6443a4..20a0b74 100644
3512--- a/arch/arm/mach-omap2/board-n8x0.c
3513+++ b/arch/arm/mach-omap2/board-n8x0.c
3514@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3515 }
3516 #endif
3517
3518-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3519+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3520 .late_init = n8x0_menelaus_late_init,
3521 };
3522
3523diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3524index 79f49d9..70bf184 100644
3525--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3526+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3527@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3528 void (*resume)(void);
3529 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3530 void (*hotplug_restart)(void);
3531-};
3532+} __no_const;
3533
3534 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3535 static struct powerdomain *mpuss_pd;
3536@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3537 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3538 {}
3539
3540-struct cpu_pm_ops omap_pm_ops = {
3541+static struct cpu_pm_ops omap_pm_ops __read_only = {
3542 .finish_suspend = default_finish_suspend,
3543 .resume = dummy_cpu_resume,
3544 .scu_prepare = dummy_scu_prepare,
3545diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3546index 5305ec7..6d74045 100644
3547--- a/arch/arm/mach-omap2/omap-smp.c
3548+++ b/arch/arm/mach-omap2/omap-smp.c
3549@@ -19,6 +19,7 @@
3550 #include <linux/device.h>
3551 #include <linux/smp.h>
3552 #include <linux/io.h>
3553+#include <linux/irq.h>
3554 #include <linux/irqchip/arm-gic.h>
3555
3556 #include <asm/smp_scu.h>
3557diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3558index f961c46..4a453dc 100644
3559--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3560+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3561@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3562 return NOTIFY_OK;
3563 }
3564
3565-static struct notifier_block __refdata irq_hotplug_notifier = {
3566+static struct notifier_block irq_hotplug_notifier = {
3567 .notifier_call = irq_cpu_hotplug_notify,
3568 };
3569
3570diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3571index be9541e..821805f 100644
3572--- a/arch/arm/mach-omap2/omap_device.c
3573+++ b/arch/arm/mach-omap2/omap_device.c
3574@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3575 struct platform_device __init *omap_device_build(const char *pdev_name,
3576 int pdev_id,
3577 struct omap_hwmod *oh,
3578- void *pdata, int pdata_len)
3579+ const void *pdata, int pdata_len)
3580 {
3581 struct omap_hwmod *ohs[] = { oh };
3582
3583@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3584 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3585 int pdev_id,
3586 struct omap_hwmod **ohs,
3587- int oh_cnt, void *pdata,
3588+ int oh_cnt, const void *pdata,
3589 int pdata_len)
3590 {
3591 int ret = -ENOMEM;
3592diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3593index 78c02b3..c94109a 100644
3594--- a/arch/arm/mach-omap2/omap_device.h
3595+++ b/arch/arm/mach-omap2/omap_device.h
3596@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3597 /* Core code interface */
3598
3599 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3600- struct omap_hwmod *oh, void *pdata,
3601+ struct omap_hwmod *oh, const void *pdata,
3602 int pdata_len);
3603
3604 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3605 struct omap_hwmod **oh, int oh_cnt,
3606- void *pdata, int pdata_len);
3607+ const void *pdata, int pdata_len);
3608
3609 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3610 struct omap_hwmod **ohs, int oh_cnt);
3611diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3612index 9025fff..3555702 100644
3613--- a/arch/arm/mach-omap2/omap_hwmod.c
3614+++ b/arch/arm/mach-omap2/omap_hwmod.c
3615@@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
3616 int (*init_clkdm)(struct omap_hwmod *oh);
3617 void (*update_context_lost)(struct omap_hwmod *oh);
3618 int (*get_context_lost)(struct omap_hwmod *oh);
3619-};
3620+} __no_const;
3621
3622 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3623-static struct omap_hwmod_soc_ops soc_ops;
3624+static struct omap_hwmod_soc_ops soc_ops __read_only;
3625
3626 /* omap_hwmod_list contains all registered struct omap_hwmods */
3627 static LIST_HEAD(omap_hwmod_list);
3628diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3629index 95fee54..cfa9cf1 100644
3630--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3631+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3632@@ -10,6 +10,7 @@
3633
3634 #include <linux/kernel.h>
3635 #include <linux/init.h>
3636+#include <asm/pgtable.h>
3637
3638 #include "powerdomain.h"
3639
3640@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3641
3642 void __init am43xx_powerdomains_init(void)
3643 {
3644- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3645+ pax_open_kernel();
3646+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3647+ pax_close_kernel();
3648 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3649 pwrdm_register_pwrdms(powerdomains_am43xx);
3650 pwrdm_complete_init();
3651diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3652index ff0a68c..b312aa0 100644
3653--- a/arch/arm/mach-omap2/wd_timer.c
3654+++ b/arch/arm/mach-omap2/wd_timer.c
3655@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3656 struct omap_hwmod *oh;
3657 char *oh_name = "wd_timer2";
3658 char *dev_name = "omap_wdt";
3659- struct omap_wd_timer_platform_data pdata;
3660+ static struct omap_wd_timer_platform_data pdata = {
3661+ .read_reset_sources = prm_read_reset_sources
3662+ };
3663
3664 if (!cpu_class_is_omap2() || of_have_populated_dt())
3665 return 0;
3666@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3667 return -EINVAL;
3668 }
3669
3670- pdata.read_reset_sources = prm_read_reset_sources;
3671-
3672 pdev = omap_device_build(dev_name, id, oh, &pdata,
3673 sizeof(struct omap_wd_timer_platform_data));
3674 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3675diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3676index 4f25a7c..a81be85 100644
3677--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3678+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3679@@ -179,7 +179,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3680 bool entered_lp2 = false;
3681
3682 if (tegra_pending_sgi())
3683- ACCESS_ONCE(abort_flag) = true;
3684+ ACCESS_ONCE_RW(abort_flag) = true;
3685
3686 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3687
3688diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3689index ab95f53..4b977a7 100644
3690--- a/arch/arm/mach-tegra/irq.c
3691+++ b/arch/arm/mach-tegra/irq.c
3692@@ -20,6 +20,7 @@
3693 #include <linux/cpu_pm.h>
3694 #include <linux/interrupt.h>
3695 #include <linux/io.h>
3696+#include <linux/irq.h>
3697 #include <linux/irqchip/arm-gic.h>
3698 #include <linux/irq.h>
3699 #include <linux/kernel.h>
3700diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3701index 2cb587b..6ddfebf 100644
3702--- a/arch/arm/mach-ux500/pm.c
3703+++ b/arch/arm/mach-ux500/pm.c
3704@@ -10,6 +10,7 @@
3705 */
3706
3707 #include <linux/kernel.h>
3708+#include <linux/irq.h>
3709 #include <linux/irqchip/arm-gic.h>
3710 #include <linux/delay.h>
3711 #include <linux/io.h>
3712diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3713index 2dea8b5..6499da2 100644
3714--- a/arch/arm/mach-ux500/setup.h
3715+++ b/arch/arm/mach-ux500/setup.h
3716@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3717 .type = MT_DEVICE, \
3718 }
3719
3720-#define __MEM_DEV_DESC(x, sz) { \
3721- .virtual = IO_ADDRESS(x), \
3722- .pfn = __phys_to_pfn(x), \
3723- .length = sz, \
3724- .type = MT_MEMORY_RWX, \
3725-}
3726-
3727 extern struct smp_operations ux500_smp_ops;
3728 extern void ux500_cpu_die(unsigned int cpu);
3729
3730diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3731index 52d768f..5f93180 100644
3732--- a/arch/arm/mach-zynq/platsmp.c
3733+++ b/arch/arm/mach-zynq/platsmp.c
3734@@ -24,6 +24,7 @@
3735 #include <linux/io.h>
3736 #include <asm/cacheflush.h>
3737 #include <asm/smp_scu.h>
3738+#include <linux/irq.h>
3739 #include <linux/irqchip/arm-gic.h>
3740 #include "common.h"
3741
3742diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3743index c43c714..4f8f7b9 100644
3744--- a/arch/arm/mm/Kconfig
3745+++ b/arch/arm/mm/Kconfig
3746@@ -446,6 +446,7 @@ config CPU_32v5
3747
3748 config CPU_32v6
3749 bool
3750+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3751 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3752
3753 config CPU_32v6K
3754@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3755
3756 config CPU_USE_DOMAINS
3757 bool
3758+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3759 help
3760 This option enables or disables the use of domain switching
3761 via the set_fs() function.
3762@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3763
3764 config KUSER_HELPERS
3765 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3766- depends on MMU
3767+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3768 default y
3769 help
3770 Warning: disabling this option may break user programs.
3771@@ -812,7 +814,7 @@ config KUSER_HELPERS
3772 See Documentation/arm/kernel_user_helpers.txt for details.
3773
3774 However, the fixed address nature of these helpers can be used
3775- by ROP (return orientated programming) authors when creating
3776+ by ROP (Return Oriented Programming) authors when creating
3777 exploits.
3778
3779 If all of the binaries and libraries which run on your platform
3780diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3781index 2c0c541..4585df9 100644
3782--- a/arch/arm/mm/alignment.c
3783+++ b/arch/arm/mm/alignment.c
3784@@ -216,10 +216,12 @@ union offset_union {
3785 #define __get16_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) ? 8 : 0); \
3791 __get8_unaligned_check(ins,v,a,err); \
3792 val |= v << ((BE) ? 0 : 8); \
3793+ pax_close_userland(); \
3794 if (err) \
3795 goto fault; \
3796 } while (0)
3797@@ -233,6 +235,7 @@ union offset_union {
3798 #define __get32_unaligned_check(ins,val,addr) \
3799 do { \
3800 unsigned int err = 0, v, a = addr; \
3801+ pax_open_userland(); \
3802 __get8_unaligned_check(ins,v,a,err); \
3803 val = v << ((BE) ? 24 : 0); \
3804 __get8_unaligned_check(ins,v,a,err); \
3805@@ -241,6 +244,7 @@ union offset_union {
3806 val |= v << ((BE) ? 8 : 16); \
3807 __get8_unaligned_check(ins,v,a,err); \
3808 val |= v << ((BE) ? 0 : 24); \
3809+ pax_close_userland(); \
3810 if (err) \
3811 goto fault; \
3812 } while (0)
3813@@ -254,6 +258,7 @@ union offset_union {
3814 #define __put16_unaligned_check(ins,val,addr) \
3815 do { \
3816 unsigned int err = 0, v = val, a = addr; \
3817+ pax_open_userland(); \
3818 __asm__( FIRST_BYTE_16 \
3819 ARM( "1: "ins" %1, [%2], #1\n" ) \
3820 THUMB( "1: "ins" %1, [%2]\n" ) \
3821@@ -273,6 +278,7 @@ union offset_union {
3822 " .popsection\n" \
3823 : "=r" (err), "=&r" (v), "=&r" (a) \
3824 : "0" (err), "1" (v), "2" (a)); \
3825+ pax_close_userland(); \
3826 if (err) \
3827 goto fault; \
3828 } while (0)
3829@@ -286,6 +292,7 @@ union offset_union {
3830 #define __put32_unaligned_check(ins,val,addr) \
3831 do { \
3832 unsigned int err = 0, v = val, a = addr; \
3833+ pax_open_userland(); \
3834 __asm__( FIRST_BYTE_32 \
3835 ARM( "1: "ins" %1, [%2], #1\n" ) \
3836 THUMB( "1: "ins" %1, [%2]\n" ) \
3837@@ -315,6 +322,7 @@ union offset_union {
3838 " .popsection\n" \
3839 : "=r" (err), "=&r" (v), "=&r" (a) \
3840 : "0" (err), "1" (v), "2" (a)); \
3841+ pax_close_userland(); \
3842 if (err) \
3843 goto fault; \
3844 } while (0)
3845diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3846index 5e65ca8..879e7b3 100644
3847--- a/arch/arm/mm/cache-l2x0.c
3848+++ b/arch/arm/mm/cache-l2x0.c
3849@@ -42,7 +42,7 @@ struct l2c_init_data {
3850 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3851 void (*save)(void __iomem *);
3852 struct outer_cache_fns outer_cache;
3853-};
3854+} __do_const;
3855
3856 #define CACHE_LINE_SIZE 32
3857
3858diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3859index 845769e..4278fd7 100644
3860--- a/arch/arm/mm/context.c
3861+++ b/arch/arm/mm/context.c
3862@@ -43,7 +43,7 @@
3863 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3864
3865 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3866-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3867+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3868 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3869
3870 static DEFINE_PER_CPU(atomic64_t, active_asids);
3871@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3872 {
3873 static u32 cur_idx = 1;
3874 u64 asid = atomic64_read(&mm->context.id);
3875- u64 generation = atomic64_read(&asid_generation);
3876+ u64 generation = atomic64_read_unchecked(&asid_generation);
3877
3878 if (asid != 0) {
3879 /*
3880@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3881 */
3882 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3883 if (asid == NUM_USER_ASIDS) {
3884- generation = atomic64_add_return(ASID_FIRST_VERSION,
3885+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3886 &asid_generation);
3887 flush_context(cpu);
3888 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3889@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3890 cpu_set_reserved_ttbr0();
3891
3892 asid = atomic64_read(&mm->context.id);
3893- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3894+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3895 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3896 goto switch_mm_fastpath;
3897
3898 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3899 /* Check that our ASID belongs to the current generation. */
3900 asid = atomic64_read(&mm->context.id);
3901- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3902+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3903 asid = new_context(mm, cpu);
3904 atomic64_set(&mm->context.id, asid);
3905 }
3906diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3907index a982dc3..2d9f5f7 100644
3908--- a/arch/arm/mm/fault.c
3909+++ b/arch/arm/mm/fault.c
3910@@ -25,6 +25,7 @@
3911 #include <asm/system_misc.h>
3912 #include <asm/system_info.h>
3913 #include <asm/tlbflush.h>
3914+#include <asm/sections.h>
3915
3916 #include "fault.h"
3917
3918@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3919 if (fixup_exception(regs))
3920 return;
3921
3922+#ifdef CONFIG_PAX_MEMORY_UDEREF
3923+ if (addr < TASK_SIZE) {
3924+ if (current->signal->curr_ip)
3925+ 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),
3926+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3927+ else
3928+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3929+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3930+ }
3931+#endif
3932+
3933+#ifdef CONFIG_PAX_KERNEXEC
3934+ if ((fsr & FSR_WRITE) &&
3935+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3936+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3937+ {
3938+ if (current->signal->curr_ip)
3939+ 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),
3940+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3941+ else
3942+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3943+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3944+ }
3945+#endif
3946+
3947 /*
3948 * No handler, we'll have to terminate things with extreme prejudice.
3949 */
3950@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3951 }
3952 #endif
3953
3954+#ifdef CONFIG_PAX_PAGEEXEC
3955+ if (fsr & FSR_LNX_PF) {
3956+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3957+ do_group_exit(SIGKILL);
3958+ }
3959+#endif
3960+
3961 tsk->thread.address = addr;
3962 tsk->thread.error_code = fsr;
3963 tsk->thread.trap_no = 14;
3964@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3965 }
3966 #endif /* CONFIG_MMU */
3967
3968+#ifdef CONFIG_PAX_PAGEEXEC
3969+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3970+{
3971+ long i;
3972+
3973+ printk(KERN_ERR "PAX: bytes at PC: ");
3974+ for (i = 0; i < 20; i++) {
3975+ unsigned char c;
3976+ if (get_user(c, (__force unsigned char __user *)pc+i))
3977+ printk(KERN_CONT "?? ");
3978+ else
3979+ printk(KERN_CONT "%02x ", c);
3980+ }
3981+ printk("\n");
3982+
3983+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3984+ for (i = -1; i < 20; i++) {
3985+ unsigned long c;
3986+ if (get_user(c, (__force unsigned long __user *)sp+i))
3987+ printk(KERN_CONT "???????? ");
3988+ else
3989+ printk(KERN_CONT "%08lx ", c);
3990+ }
3991+ printk("\n");
3992+}
3993+#endif
3994+
3995 /*
3996 * First Level Translation Fault Handler
3997 *
3998@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3999 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4000 struct siginfo info;
4001
4002+#ifdef CONFIG_PAX_MEMORY_UDEREF
4003+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4004+ if (current->signal->curr_ip)
4005+ 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),
4006+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4007+ else
4008+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4009+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4010+ goto die;
4011+ }
4012+#endif
4013+
4014 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4015 return;
4016
4017+die:
4018 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4019 inf->name, fsr, addr);
4020
4021@@ -573,15 +646,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4022 ifsr_info[nr].name = name;
4023 }
4024
4025+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4026+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4027+
4028 asmlinkage void __exception
4029 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4030 {
4031 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4032 struct siginfo info;
4033+ unsigned long pc = instruction_pointer(regs);
4034+
4035+ if (user_mode(regs)) {
4036+ unsigned long sigpage = current->mm->context.sigpage;
4037+
4038+ if (sigpage <= pc && pc < sigpage + 7*4) {
4039+ if (pc < sigpage + 3*4)
4040+ sys_sigreturn(regs);
4041+ else
4042+ sys_rt_sigreturn(regs);
4043+ return;
4044+ }
4045+ if (pc == 0xffff0f60UL) {
4046+ /*
4047+ * PaX: __kuser_cmpxchg64 emulation
4048+ */
4049+ // TODO
4050+ //regs->ARM_pc = regs->ARM_lr;
4051+ //return;
4052+ }
4053+ if (pc == 0xffff0fa0UL) {
4054+ /*
4055+ * PaX: __kuser_memory_barrier emulation
4056+ */
4057+ // dmb(); implied by the exception
4058+ regs->ARM_pc = regs->ARM_lr;
4059+ return;
4060+ }
4061+ if (pc == 0xffff0fc0UL) {
4062+ /*
4063+ * PaX: __kuser_cmpxchg emulation
4064+ */
4065+ // TODO
4066+ //long new;
4067+ //int op;
4068+
4069+ //op = FUTEX_OP_SET << 28;
4070+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4071+ //regs->ARM_r0 = old != new;
4072+ //regs->ARM_pc = regs->ARM_lr;
4073+ //return;
4074+ }
4075+ if (pc == 0xffff0fe0UL) {
4076+ /*
4077+ * PaX: __kuser_get_tls emulation
4078+ */
4079+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4080+ regs->ARM_pc = regs->ARM_lr;
4081+ return;
4082+ }
4083+ }
4084+
4085+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4086+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4087+ if (current->signal->curr_ip)
4088+ 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),
4089+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4090+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4091+ else
4092+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4093+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4094+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4095+ goto die;
4096+ }
4097+#endif
4098+
4099+#ifdef CONFIG_PAX_REFCOUNT
4100+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4101+#ifdef CONFIG_THUMB2_KERNEL
4102+ unsigned short bkpt;
4103+
4104+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4105+#else
4106+ unsigned int bkpt;
4107+
4108+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4109+#endif
4110+ current->thread.error_code = ifsr;
4111+ current->thread.trap_no = 0;
4112+ pax_report_refcount_overflow(regs);
4113+ fixup_exception(regs);
4114+ return;
4115+ }
4116+ }
4117+#endif
4118
4119 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4120 return;
4121
4122+die:
4123 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4124 inf->name, ifsr, addr);
4125
4126diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4127index cf08bdf..772656c 100644
4128--- a/arch/arm/mm/fault.h
4129+++ b/arch/arm/mm/fault.h
4130@@ -3,6 +3,7 @@
4131
4132 /*
4133 * Fault status register encodings. We steal bit 31 for our own purposes.
4134+ * Set when the FSR value is from an instruction fault.
4135 */
4136 #define FSR_LNX_PF (1 << 31)
4137 #define FSR_WRITE (1 << 11)
4138@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4139 }
4140 #endif
4141
4142+/* valid for LPAE and !LPAE */
4143+static inline int is_xn_fault(unsigned int fsr)
4144+{
4145+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4146+}
4147+
4148+static inline int is_domain_fault(unsigned int fsr)
4149+{
4150+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4151+}
4152+
4153 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4154 unsigned long search_exception_table(unsigned long addr);
4155
4156diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4157index 2495c8c..415b7fc 100644
4158--- a/arch/arm/mm/init.c
4159+++ b/arch/arm/mm/init.c
4160@@ -758,7 +758,46 @@ void free_tcmmem(void)
4161 {
4162 #ifdef CONFIG_HAVE_TCM
4163 extern char __tcm_start, __tcm_end;
4164+#endif
4165
4166+#ifdef CONFIG_PAX_KERNEXEC
4167+ unsigned long addr;
4168+ pgd_t *pgd;
4169+ pud_t *pud;
4170+ pmd_t *pmd;
4171+ int cpu_arch = cpu_architecture();
4172+ unsigned int cr = get_cr();
4173+
4174+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4175+ /* make pages tables, etc before .text NX */
4176+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4177+ pgd = pgd_offset_k(addr);
4178+ pud = pud_offset(pgd, addr);
4179+ pmd = pmd_offset(pud, addr);
4180+ __section_update(pmd, addr, PMD_SECT_XN);
4181+ }
4182+ /* make init NX */
4183+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4184+ pgd = pgd_offset_k(addr);
4185+ pud = pud_offset(pgd, addr);
4186+ pmd = pmd_offset(pud, addr);
4187+ __section_update(pmd, addr, PMD_SECT_XN);
4188+ }
4189+ /* make kernel code/rodata RX */
4190+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4191+ pgd = pgd_offset_k(addr);
4192+ pud = pud_offset(pgd, addr);
4193+ pmd = pmd_offset(pud, addr);
4194+#ifdef CONFIG_ARM_LPAE
4195+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4196+#else
4197+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4198+#endif
4199+ }
4200+ }
4201+#endif
4202+
4203+#ifdef CONFIG_HAVE_TCM
4204 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4205 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4206 #endif
4207diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4208index d1e5ad7..84dcbf2 100644
4209--- a/arch/arm/mm/ioremap.c
4210+++ b/arch/arm/mm/ioremap.c
4211@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4212 unsigned int mtype;
4213
4214 if (cached)
4215- mtype = MT_MEMORY_RWX;
4216+ mtype = MT_MEMORY_RX;
4217 else
4218- mtype = MT_MEMORY_RWX_NONCACHED;
4219+ mtype = MT_MEMORY_RX_NONCACHED;
4220
4221 return __arm_ioremap_caller(phys_addr, size, mtype,
4222 __builtin_return_address(0));
4223diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4224index 5e85ed3..b10a7ed 100644
4225--- a/arch/arm/mm/mmap.c
4226+++ b/arch/arm/mm/mmap.c
4227@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4228 struct vm_area_struct *vma;
4229 int do_align = 0;
4230 int aliasing = cache_is_vipt_aliasing();
4231+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4232 struct vm_unmapped_area_info info;
4233
4234 /*
4235@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4236 if (len > TASK_SIZE)
4237 return -ENOMEM;
4238
4239+#ifdef CONFIG_PAX_RANDMMAP
4240+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4241+#endif
4242+
4243 if (addr) {
4244 if (do_align)
4245 addr = COLOUR_ALIGN(addr, pgoff);
4246@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4247 addr = PAGE_ALIGN(addr);
4248
4249 vma = find_vma(mm, addr);
4250- if (TASK_SIZE - len >= addr &&
4251- (!vma || addr + len <= vma->vm_start))
4252+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4253 return addr;
4254 }
4255
4256@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4257 info.high_limit = TASK_SIZE;
4258 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4259 info.align_offset = pgoff << PAGE_SHIFT;
4260+ info.threadstack_offset = offset;
4261 return vm_unmapped_area(&info);
4262 }
4263
4264@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4265 unsigned long addr = addr0;
4266 int do_align = 0;
4267 int aliasing = cache_is_vipt_aliasing();
4268+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4269 struct vm_unmapped_area_info info;
4270
4271 /*
4272@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4273 return addr;
4274 }
4275
4276+#ifdef CONFIG_PAX_RANDMMAP
4277+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4278+#endif
4279+
4280 /* requesting a specific address */
4281 if (addr) {
4282 if (do_align)
4283@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4284 else
4285 addr = PAGE_ALIGN(addr);
4286 vma = find_vma(mm, addr);
4287- if (TASK_SIZE - len >= addr &&
4288- (!vma || addr + len <= vma->vm_start))
4289+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4290 return addr;
4291 }
4292
4293@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4294 info.high_limit = mm->mmap_base;
4295 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4296 info.align_offset = pgoff << PAGE_SHIFT;
4297+ info.threadstack_offset = offset;
4298 addr = vm_unmapped_area(&info);
4299
4300 /*
4301@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4302 {
4303 unsigned long random_factor = 0UL;
4304
4305+#ifdef CONFIG_PAX_RANDMMAP
4306+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4307+#endif
4308+
4309 /* 8 bits of randomness in 20 address space bits */
4310 if ((current->flags & PF_RANDOMIZE) &&
4311 !(current->personality & ADDR_NO_RANDOMIZE))
4312@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4313
4314 if (mmap_is_legacy()) {
4315 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4316+
4317+#ifdef CONFIG_PAX_RANDMMAP
4318+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4319+ mm->mmap_base += mm->delta_mmap;
4320+#endif
4321+
4322 mm->get_unmapped_area = arch_get_unmapped_area;
4323 } else {
4324 mm->mmap_base = mmap_base(random_factor);
4325+
4326+#ifdef CONFIG_PAX_RANDMMAP
4327+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4328+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4329+#endif
4330+
4331 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4332 }
4333 }
4334diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4335index 4e6ef89..21c27f2 100644
4336--- a/arch/arm/mm/mmu.c
4337+++ b/arch/arm/mm/mmu.c
4338@@ -41,6 +41,22 @@
4339 #include "mm.h"
4340 #include "tcm.h"
4341
4342+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4343+void modify_domain(unsigned int dom, unsigned int type)
4344+{
4345+ struct thread_info *thread = current_thread_info();
4346+ unsigned int domain = thread->cpu_domain;
4347+ /*
4348+ * DOMAIN_MANAGER might be defined to some other value,
4349+ * use the arch-defined constant
4350+ */
4351+ domain &= ~domain_val(dom, 3);
4352+ thread->cpu_domain = domain | domain_val(dom, type);
4353+ set_domain(thread->cpu_domain);
4354+}
4355+EXPORT_SYMBOL(modify_domain);
4356+#endif
4357+
4358 /*
4359 * empty_zero_page is a special page that is used for
4360 * zero-initialized data and COW.
4361@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4362 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4363 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4364
4365-static struct mem_type mem_types[] = {
4366+#ifdef CONFIG_PAX_KERNEXEC
4367+#define L_PTE_KERNEXEC L_PTE_RDONLY
4368+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4369+#else
4370+#define L_PTE_KERNEXEC L_PTE_DIRTY
4371+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4372+#endif
4373+
4374+static struct mem_type mem_types[] __read_only = {
4375 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4376 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4377 L_PTE_SHARED,
4378@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4379 .prot_sect = PROT_SECT_DEVICE,
4380 .domain = DOMAIN_IO,
4381 },
4382- [MT_UNCACHED] = {
4383+ [MT_UNCACHED_RW] = {
4384 .prot_pte = PROT_PTE_DEVICE,
4385 .prot_l1 = PMD_TYPE_TABLE,
4386 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4387 .domain = DOMAIN_IO,
4388 },
4389- [MT_CACHECLEAN] = {
4390- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4391+ [MT_CACHECLEAN_RO] = {
4392+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4393 .domain = DOMAIN_KERNEL,
4394 },
4395 #ifndef CONFIG_ARM_LPAE
4396- [MT_MINICLEAN] = {
4397- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4398+ [MT_MINICLEAN_RO] = {
4399+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4400 .domain = DOMAIN_KERNEL,
4401 },
4402 #endif
4403@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4404 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4405 L_PTE_RDONLY,
4406 .prot_l1 = PMD_TYPE_TABLE,
4407- .domain = DOMAIN_USER,
4408+ .domain = DOMAIN_VECTORS,
4409 },
4410 [MT_HIGH_VECTORS] = {
4411 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4412 L_PTE_USER | L_PTE_RDONLY,
4413 .prot_l1 = PMD_TYPE_TABLE,
4414- .domain = DOMAIN_USER,
4415+ .domain = DOMAIN_VECTORS,
4416 },
4417- [MT_MEMORY_RWX] = {
4418+ [__MT_MEMORY_RWX] = {
4419 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4420 .prot_l1 = PMD_TYPE_TABLE,
4421 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4422@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4423 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4424 .domain = DOMAIN_KERNEL,
4425 },
4426- [MT_ROM] = {
4427- .prot_sect = PMD_TYPE_SECT,
4428+ [MT_MEMORY_RX] = {
4429+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4430+ .prot_l1 = PMD_TYPE_TABLE,
4431+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4432+ .domain = DOMAIN_KERNEL,
4433+ },
4434+ [MT_ROM_RX] = {
4435+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4436 .domain = DOMAIN_KERNEL,
4437 },
4438- [MT_MEMORY_RWX_NONCACHED] = {
4439+ [MT_MEMORY_RW_NONCACHED] = {
4440 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4441 L_PTE_MT_BUFFERABLE,
4442 .prot_l1 = PMD_TYPE_TABLE,
4443 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4444 .domain = DOMAIN_KERNEL,
4445 },
4446+ [MT_MEMORY_RX_NONCACHED] = {
4447+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4448+ L_PTE_MT_BUFFERABLE,
4449+ .prot_l1 = PMD_TYPE_TABLE,
4450+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4451+ .domain = DOMAIN_KERNEL,
4452+ },
4453 [MT_MEMORY_RW_DTCM] = {
4454 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4455 L_PTE_XN,
4456@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4457 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4458 .domain = DOMAIN_KERNEL,
4459 },
4460- [MT_MEMORY_RWX_ITCM] = {
4461- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4462+ [MT_MEMORY_RX_ITCM] = {
4463+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4464 .prot_l1 = PMD_TYPE_TABLE,
4465+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4466 .domain = DOMAIN_KERNEL,
4467 },
4468 [MT_MEMORY_RW_SO] = {
4469@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4470 * Mark cache clean areas and XIP ROM read only
4471 * from SVC mode and no access from userspace.
4472 */
4473- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4474- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4475- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4476+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4477+#ifdef CONFIG_PAX_KERNEXEC
4478+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4479+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4480+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4481+#endif
4482+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4483+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4484 #endif
4485
4486 /*
4487@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4488 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4489 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4490 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4491- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4492- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4493+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4494+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4495 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4496 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4497+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4498+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4499 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4500- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4501- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4502+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4503+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4504+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4505+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4506 }
4507 }
4508
4509@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4510 if (cpu_arch >= CPU_ARCH_ARMv6) {
4511 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4512 /* Non-cacheable Normal is XCB = 001 */
4513- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4514+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4515+ PMD_SECT_BUFFERED;
4516+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4517 PMD_SECT_BUFFERED;
4518 } else {
4519 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4520- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4521+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4522+ PMD_SECT_TEX(1);
4523+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4524 PMD_SECT_TEX(1);
4525 }
4526 } else {
4527- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4528+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4529+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4530 }
4531
4532 #ifdef CONFIG_ARM_LPAE
4533@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4534 user_pgprot |= PTE_EXT_PXN;
4535 #endif
4536
4537+ user_pgprot |= __supported_pte_mask;
4538+
4539 for (i = 0; i < 16; i++) {
4540 pteval_t v = pgprot_val(protection_map[i]);
4541 protection_map[i] = __pgprot(v | user_pgprot);
4542@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4543
4544 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4545 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4546- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4547- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4548+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4549+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4550 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4551 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4552+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4553+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4554 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4555- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4556- mem_types[MT_ROM].prot_sect |= cp->pmd;
4557+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4558+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4559+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4560
4561 switch (cp->pmd) {
4562 case PMD_SECT_WT:
4563- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4564+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4565 break;
4566 case PMD_SECT_WB:
4567 case PMD_SECT_WBWA:
4568- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4569+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4570 break;
4571 }
4572 pr_info("Memory policy: %sData cache %s\n",
4573@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4574 return;
4575 }
4576
4577- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4578+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4579 md->virtual >= PAGE_OFFSET &&
4580 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4581 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4582@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4583 * called function. This means you can't use any function or debugging
4584 * method which may touch any device, otherwise the kernel _will_ crash.
4585 */
4586+
4587+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4588+
4589 static void __init devicemaps_init(const struct machine_desc *mdesc)
4590 {
4591 struct map_desc map;
4592 unsigned long addr;
4593- void *vectors;
4594
4595- /*
4596- * Allocate the vector page early.
4597- */
4598- vectors = early_alloc(PAGE_SIZE * 2);
4599-
4600- early_trap_init(vectors);
4601+ early_trap_init(&vectors);
4602
4603 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4604 pmd_clear(pmd_off_k(addr));
4605@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4606 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4607 map.virtual = MODULES_VADDR;
4608 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4609- map.type = MT_ROM;
4610+ map.type = MT_ROM_RX;
4611 create_mapping(&map);
4612 #endif
4613
4614@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4615 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4616 map.virtual = FLUSH_BASE;
4617 map.length = SZ_1M;
4618- map.type = MT_CACHECLEAN;
4619+ map.type = MT_CACHECLEAN_RO;
4620 create_mapping(&map);
4621 #endif
4622 #ifdef FLUSH_BASE_MINICACHE
4623 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4624 map.virtual = FLUSH_BASE_MINICACHE;
4625 map.length = SZ_1M;
4626- map.type = MT_MINICLEAN;
4627+ map.type = MT_MINICLEAN_RO;
4628 create_mapping(&map);
4629 #endif
4630
4631@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4632 * location (0xffff0000). If we aren't using high-vectors, also
4633 * create a mapping at the low-vectors virtual address.
4634 */
4635- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4636+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4637 map.virtual = 0xffff0000;
4638 map.length = PAGE_SIZE;
4639 #ifdef CONFIG_KUSER_HELPERS
4640@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4641 static void __init map_lowmem(void)
4642 {
4643 struct memblock_region *reg;
4644+#ifndef CONFIG_PAX_KERNEXEC
4645 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4646 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4647+#endif
4648
4649 /* Map all the lowmem memory banks. */
4650 for_each_memblock(memory, reg) {
4651@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4652 if (start >= end)
4653 break;
4654
4655+#ifdef CONFIG_PAX_KERNEXEC
4656+ map.pfn = __phys_to_pfn(start);
4657+ map.virtual = __phys_to_virt(start);
4658+ map.length = end - start;
4659+
4660+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4661+ struct map_desc kernel;
4662+ struct map_desc initmap;
4663+
4664+ /* when freeing initmem we will make this RW */
4665+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4666+ initmap.virtual = (unsigned long)__init_begin;
4667+ initmap.length = _sdata - __init_begin;
4668+ initmap.type = __MT_MEMORY_RWX;
4669+ create_mapping(&initmap);
4670+
4671+ /* when freeing initmem we will make this RX */
4672+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4673+ kernel.virtual = (unsigned long)_stext;
4674+ kernel.length = __init_begin - _stext;
4675+ kernel.type = __MT_MEMORY_RWX;
4676+ create_mapping(&kernel);
4677+
4678+ if (map.virtual < (unsigned long)_stext) {
4679+ map.length = (unsigned long)_stext - map.virtual;
4680+ map.type = __MT_MEMORY_RWX;
4681+ create_mapping(&map);
4682+ }
4683+
4684+ map.pfn = __phys_to_pfn(__pa(_sdata));
4685+ map.virtual = (unsigned long)_sdata;
4686+ map.length = end - __pa(_sdata);
4687+ }
4688+
4689+ map.type = MT_MEMORY_RW;
4690+ create_mapping(&map);
4691+#else
4692 if (end < kernel_x_start) {
4693 map.pfn = __phys_to_pfn(start);
4694 map.virtual = __phys_to_virt(start);
4695 map.length = end - start;
4696- map.type = MT_MEMORY_RWX;
4697+ map.type = __MT_MEMORY_RWX;
4698
4699 create_mapping(&map);
4700 } else if (start >= kernel_x_end) {
4701@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4702 map.pfn = __phys_to_pfn(kernel_x_start);
4703 map.virtual = __phys_to_virt(kernel_x_start);
4704 map.length = kernel_x_end - kernel_x_start;
4705- map.type = MT_MEMORY_RWX;
4706+ map.type = __MT_MEMORY_RWX;
4707
4708 create_mapping(&map);
4709
4710@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4711 create_mapping(&map);
4712 }
4713 }
4714+#endif
4715 }
4716 }
4717
4718diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4719index e1268f9..a9755a7 100644
4720--- a/arch/arm/net/bpf_jit_32.c
4721+++ b/arch/arm/net/bpf_jit_32.c
4722@@ -20,6 +20,7 @@
4723 #include <asm/cacheflush.h>
4724 #include <asm/hwcap.h>
4725 #include <asm/opcodes.h>
4726+#include <asm/pgtable.h>
4727
4728 #include "bpf_jit_32.h"
4729
4730@@ -71,7 +72,11 @@ struct jit_ctx {
4731 #endif
4732 };
4733
4734+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4735+int bpf_jit_enable __read_only;
4736+#else
4737 int bpf_jit_enable __read_mostly;
4738+#endif
4739
4740 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4741 {
4742@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4743 {
4744 u32 *ptr;
4745 /* We are guaranteed to have aligned memory. */
4746+ pax_open_kernel();
4747 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4748 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4749+ pax_close_kernel();
4750 }
4751
4752 static void build_prologue(struct jit_ctx *ctx)
4753diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4754index 5b217f4..c23f40e 100644
4755--- a/arch/arm/plat-iop/setup.c
4756+++ b/arch/arm/plat-iop/setup.c
4757@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4758 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4759 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4760 .length = IOP3XX_PERIPHERAL_SIZE,
4761- .type = MT_UNCACHED,
4762+ .type = MT_UNCACHED_RW,
4763 },
4764 };
4765
4766diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4767index a5bc92d..0bb4730 100644
4768--- a/arch/arm/plat-omap/sram.c
4769+++ b/arch/arm/plat-omap/sram.c
4770@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4771 * Looks like we need to preserve some bootloader code at the
4772 * beginning of SRAM for jumping to flash for reboot to work...
4773 */
4774+ pax_open_kernel();
4775 memset_io(omap_sram_base + omap_sram_skip, 0,
4776 omap_sram_size - omap_sram_skip);
4777+ pax_close_kernel();
4778 }
4779diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4780index ce6d763..cfea917 100644
4781--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4782+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4783@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4784 int (*started)(unsigned ch);
4785 int (*flush)(unsigned ch);
4786 int (*stop)(unsigned ch);
4787-};
4788+} __no_const;
4789
4790 extern void *samsung_dmadev_get_ops(void);
4791 extern void *s3c_dma_get_ops(void);
4792diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4793index 7047051..44e8675 100644
4794--- a/arch/arm64/include/asm/atomic.h
4795+++ b/arch/arm64/include/asm/atomic.h
4796@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4797 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4798 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4799
4800+#define atomic64_read_unchecked(v) atomic64_read(v)
4801+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4802+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4803+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4804+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4805+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4806+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4807+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4808+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4809+
4810 #endif
4811 #endif
4812diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4813index a5abb00..9cbca9a 100644
4814--- a/arch/arm64/include/asm/barrier.h
4815+++ b/arch/arm64/include/asm/barrier.h
4816@@ -44,7 +44,7 @@
4817 do { \
4818 compiletime_assert_atomic_type(*p); \
4819 barrier(); \
4820- ACCESS_ONCE(*p) = (v); \
4821+ ACCESS_ONCE_RW(*p) = (v); \
4822 } while (0)
4823
4824 #define smp_load_acquire(p) \
4825diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4826index 4fde8c1..441f84f 100644
4827--- a/arch/arm64/include/asm/percpu.h
4828+++ b/arch/arm64/include/asm/percpu.h
4829@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4830 {
4831 switch (size) {
4832 case 1:
4833- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4834+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4835 break;
4836 case 2:
4837- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4838+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4839 break;
4840 case 4:
4841- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4842+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4843 break;
4844 case 8:
4845- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4846+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4847 break;
4848 default:
4849 BUILD_BUG();
4850diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4851index e20df38..027ede3 100644
4852--- a/arch/arm64/include/asm/pgalloc.h
4853+++ b/arch/arm64/include/asm/pgalloc.h
4854@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4855 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4856 }
4857
4858+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4859+{
4860+ pud_populate(mm, pud, pmd);
4861+}
4862+
4863 #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
4864
4865 #if CONFIG_ARM64_PGTABLE_LEVELS > 3
4866diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4867index 3bf8f4e..5dd5491 100644
4868--- a/arch/arm64/include/asm/uaccess.h
4869+++ b/arch/arm64/include/asm/uaccess.h
4870@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4871 flag; \
4872 })
4873
4874+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4875 #define access_ok(type, addr, size) __range_ok(addr, size)
4876 #define user_addr_max get_fs
4877
4878diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4879index df34a70..5727a75 100644
4880--- a/arch/arm64/mm/dma-mapping.c
4881+++ b/arch/arm64/mm/dma-mapping.c
4882@@ -137,7 +137,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4883 phys_to_page(paddr),
4884 size >> PAGE_SHIFT);
4885 if (!freed)
4886- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4887+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4888 }
4889
4890 static void *__dma_alloc_noncoherent(struct device *dev, size_t size,
4891diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4892index c3a58a1..78fbf54 100644
4893--- a/arch/avr32/include/asm/cache.h
4894+++ b/arch/avr32/include/asm/cache.h
4895@@ -1,8 +1,10 @@
4896 #ifndef __ASM_AVR32_CACHE_H
4897 #define __ASM_AVR32_CACHE_H
4898
4899+#include <linux/const.h>
4900+
4901 #define L1_CACHE_SHIFT 5
4902-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4903+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4904
4905 /*
4906 * Memory returned by kmalloc() may be used for DMA, so we must make
4907diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4908index d232888..87c8df1 100644
4909--- a/arch/avr32/include/asm/elf.h
4910+++ b/arch/avr32/include/asm/elf.h
4911@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4912 the loader. We need to make sure that it is out of the way of the program
4913 that it will "exec", and that there is sufficient room for the brk. */
4914
4915-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4916+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4917
4918+#ifdef CONFIG_PAX_ASLR
4919+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4920+
4921+#define PAX_DELTA_MMAP_LEN 15
4922+#define PAX_DELTA_STACK_LEN 15
4923+#endif
4924
4925 /* This yields a mask that user programs can use to figure out what
4926 instruction set this CPU supports. This could be done in user space,
4927diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4928index 479330b..53717a8 100644
4929--- a/arch/avr32/include/asm/kmap_types.h
4930+++ b/arch/avr32/include/asm/kmap_types.h
4931@@ -2,9 +2,9 @@
4932 #define __ASM_AVR32_KMAP_TYPES_H
4933
4934 #ifdef CONFIG_DEBUG_HIGHMEM
4935-# define KM_TYPE_NR 29
4936+# define KM_TYPE_NR 30
4937 #else
4938-# define KM_TYPE_NR 14
4939+# define KM_TYPE_NR 15
4940 #endif
4941
4942 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4943diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4944index d223a8b..69c5210 100644
4945--- a/arch/avr32/mm/fault.c
4946+++ b/arch/avr32/mm/fault.c
4947@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4948
4949 int exception_trace = 1;
4950
4951+#ifdef CONFIG_PAX_PAGEEXEC
4952+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4953+{
4954+ unsigned long i;
4955+
4956+ printk(KERN_ERR "PAX: bytes at PC: ");
4957+ for (i = 0; i < 20; i++) {
4958+ unsigned char c;
4959+ if (get_user(c, (unsigned char *)pc+i))
4960+ printk(KERN_CONT "???????? ");
4961+ else
4962+ printk(KERN_CONT "%02x ", c);
4963+ }
4964+ printk("\n");
4965+}
4966+#endif
4967+
4968 /*
4969 * This routine handles page faults. It determines the address and the
4970 * problem, and then passes it off to one of the appropriate routines.
4971@@ -178,6 +195,16 @@ bad_area:
4972 up_read(&mm->mmap_sem);
4973
4974 if (user_mode(regs)) {
4975+
4976+#ifdef CONFIG_PAX_PAGEEXEC
4977+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4978+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4979+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4980+ do_group_exit(SIGKILL);
4981+ }
4982+ }
4983+#endif
4984+
4985 if (exception_trace && printk_ratelimit())
4986 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4987 "sp %08lx ecr %lu\n",
4988diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4989index 568885a..f8008df 100644
4990--- a/arch/blackfin/include/asm/cache.h
4991+++ b/arch/blackfin/include/asm/cache.h
4992@@ -7,6 +7,7 @@
4993 #ifndef __ARCH_BLACKFIN_CACHE_H
4994 #define __ARCH_BLACKFIN_CACHE_H
4995
4996+#include <linux/const.h>
4997 #include <linux/linkage.h> /* for asmlinkage */
4998
4999 /*
5000@@ -14,7 +15,7 @@
5001 * Blackfin loads 32 bytes for cache
5002 */
5003 #define L1_CACHE_SHIFT 5
5004-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5005+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5006 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5007
5008 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5009diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5010index aea2718..3639a60 100644
5011--- a/arch/cris/include/arch-v10/arch/cache.h
5012+++ b/arch/cris/include/arch-v10/arch/cache.h
5013@@ -1,8 +1,9 @@
5014 #ifndef _ASM_ARCH_CACHE_H
5015 #define _ASM_ARCH_CACHE_H
5016
5017+#include <linux/const.h>
5018 /* Etrax 100LX have 32-byte cache-lines. */
5019-#define L1_CACHE_BYTES 32
5020 #define L1_CACHE_SHIFT 5
5021+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5022
5023 #endif /* _ASM_ARCH_CACHE_H */
5024diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5025index 7caf25d..ee65ac5 100644
5026--- a/arch/cris/include/arch-v32/arch/cache.h
5027+++ b/arch/cris/include/arch-v32/arch/cache.h
5028@@ -1,11 +1,12 @@
5029 #ifndef _ASM_CRIS_ARCH_CACHE_H
5030 #define _ASM_CRIS_ARCH_CACHE_H
5031
5032+#include <linux/const.h>
5033 #include <arch/hwregs/dma.h>
5034
5035 /* A cache-line is 32 bytes. */
5036-#define L1_CACHE_BYTES 32
5037 #define L1_CACHE_SHIFT 5
5038+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5039
5040 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5041
5042diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5043index 102190a..5334cea 100644
5044--- a/arch/frv/include/asm/atomic.h
5045+++ b/arch/frv/include/asm/atomic.h
5046@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5047 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5048 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5049
5050+#define atomic64_read_unchecked(v) atomic64_read(v)
5051+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5052+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5053+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5054+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5055+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5056+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5057+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5058+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5059+
5060 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5061 {
5062 int c, old;
5063diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5064index 2797163..c2a401df9 100644
5065--- a/arch/frv/include/asm/cache.h
5066+++ b/arch/frv/include/asm/cache.h
5067@@ -12,10 +12,11 @@
5068 #ifndef __ASM_CACHE_H
5069 #define __ASM_CACHE_H
5070
5071+#include <linux/const.h>
5072
5073 /* bytes per L1 cache line */
5074 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5075-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5076+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5077
5078 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5079 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5080diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5081index 43901f2..0d8b865 100644
5082--- a/arch/frv/include/asm/kmap_types.h
5083+++ b/arch/frv/include/asm/kmap_types.h
5084@@ -2,6 +2,6 @@
5085 #ifndef _ASM_KMAP_TYPES_H
5086 #define _ASM_KMAP_TYPES_H
5087
5088-#define KM_TYPE_NR 17
5089+#define KM_TYPE_NR 18
5090
5091 #endif
5092diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5093index 836f147..4cf23f5 100644
5094--- a/arch/frv/mm/elf-fdpic.c
5095+++ b/arch/frv/mm/elf-fdpic.c
5096@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5097 {
5098 struct vm_area_struct *vma;
5099 struct vm_unmapped_area_info info;
5100+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5101
5102 if (len > TASK_SIZE)
5103 return -ENOMEM;
5104@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5105 if (addr) {
5106 addr = PAGE_ALIGN(addr);
5107 vma = find_vma(current->mm, addr);
5108- if (TASK_SIZE - len >= addr &&
5109- (!vma || addr + len <= vma->vm_start))
5110+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5111 goto success;
5112 }
5113
5114@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5115 info.high_limit = (current->mm->start_stack - 0x00200000);
5116 info.align_mask = 0;
5117 info.align_offset = 0;
5118+ info.threadstack_offset = offset;
5119 addr = vm_unmapped_area(&info);
5120 if (!(addr & ~PAGE_MASK))
5121 goto success;
5122diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5123index 69952c1..4fa2908 100644
5124--- a/arch/hexagon/include/asm/cache.h
5125+++ b/arch/hexagon/include/asm/cache.h
5126@@ -21,9 +21,11 @@
5127 #ifndef __ASM_CACHE_H
5128 #define __ASM_CACHE_H
5129
5130+#include <linux/const.h>
5131+
5132 /* Bytes per L1 cache line */
5133-#define L1_CACHE_SHIFT (5)
5134-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5135+#define L1_CACHE_SHIFT 5
5136+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5137
5138 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5139
5140diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5141index 074e52b..76afdac 100644
5142--- a/arch/ia64/Kconfig
5143+++ b/arch/ia64/Kconfig
5144@@ -548,6 +548,7 @@ source "drivers/sn/Kconfig"
5145 config KEXEC
5146 bool "kexec system call"
5147 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5148+ depends on !GRKERNSEC_KMEM
5149 help
5150 kexec is a system call that implements the ability to shutdown your
5151 current kernel, and to start another kernel. It is like a reboot
5152diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5153index 970d0bd..e750b9b 100644
5154--- a/arch/ia64/Makefile
5155+++ b/arch/ia64/Makefile
5156@@ -98,5 +98,6 @@ endef
5157 archprepare: make_nr_irqs_h FORCE
5158 PHONY += make_nr_irqs_h FORCE
5159
5160+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5161 make_nr_irqs_h: FORCE
5162 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5163diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5164index 0bf0350..2ad1957 100644
5165--- a/arch/ia64/include/asm/atomic.h
5166+++ b/arch/ia64/include/asm/atomic.h
5167@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5168 #define atomic64_inc(v) atomic64_add(1, (v))
5169 #define atomic64_dec(v) atomic64_sub(1, (v))
5170
5171+#define atomic64_read_unchecked(v) atomic64_read(v)
5172+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5173+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5174+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5175+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5176+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5177+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5178+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5179+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5180+
5181 #endif /* _ASM_IA64_ATOMIC_H */
5182diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5183index f6769eb..1cdb590 100644
5184--- a/arch/ia64/include/asm/barrier.h
5185+++ b/arch/ia64/include/asm/barrier.h
5186@@ -66,7 +66,7 @@
5187 do { \
5188 compiletime_assert_atomic_type(*p); \
5189 barrier(); \
5190- ACCESS_ONCE(*p) = (v); \
5191+ ACCESS_ONCE_RW(*p) = (v); \
5192 } while (0)
5193
5194 #define smp_load_acquire(p) \
5195diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5196index 988254a..e1ee885 100644
5197--- a/arch/ia64/include/asm/cache.h
5198+++ b/arch/ia64/include/asm/cache.h
5199@@ -1,6 +1,7 @@
5200 #ifndef _ASM_IA64_CACHE_H
5201 #define _ASM_IA64_CACHE_H
5202
5203+#include <linux/const.h>
5204
5205 /*
5206 * Copyright (C) 1998-2000 Hewlett-Packard Co
5207@@ -9,7 +10,7 @@
5208
5209 /* Bytes per L1 (data) cache line. */
5210 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5211-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5212+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5213
5214 #ifdef CONFIG_SMP
5215 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5216diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5217index 5a83c5c..4d7f553 100644
5218--- a/arch/ia64/include/asm/elf.h
5219+++ b/arch/ia64/include/asm/elf.h
5220@@ -42,6 +42,13 @@
5221 */
5222 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5223
5224+#ifdef CONFIG_PAX_ASLR
5225+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5226+
5227+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5228+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5229+#endif
5230+
5231 #define PT_IA_64_UNWIND 0x70000001
5232
5233 /* IA-64 relocations: */
5234diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5235index 5767cdf..7462574 100644
5236--- a/arch/ia64/include/asm/pgalloc.h
5237+++ b/arch/ia64/include/asm/pgalloc.h
5238@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5239 pgd_val(*pgd_entry) = __pa(pud);
5240 }
5241
5242+static inline void
5243+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5244+{
5245+ pgd_populate(mm, pgd_entry, pud);
5246+}
5247+
5248 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5249 {
5250 return quicklist_alloc(0, GFP_KERNEL, NULL);
5251@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5252 pud_val(*pud_entry) = __pa(pmd);
5253 }
5254
5255+static inline void
5256+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5257+{
5258+ pud_populate(mm, pud_entry, pmd);
5259+}
5260+
5261 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5262 {
5263 return quicklist_alloc(0, GFP_KERNEL, NULL);
5264diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5265index 7935115..c0eca6a 100644
5266--- a/arch/ia64/include/asm/pgtable.h
5267+++ b/arch/ia64/include/asm/pgtable.h
5268@@ -12,7 +12,7 @@
5269 * David Mosberger-Tang <davidm@hpl.hp.com>
5270 */
5271
5272-
5273+#include <linux/const.h>
5274 #include <asm/mman.h>
5275 #include <asm/page.h>
5276 #include <asm/processor.h>
5277@@ -142,6 +142,17 @@
5278 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5279 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5280 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5281+
5282+#ifdef CONFIG_PAX_PAGEEXEC
5283+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5284+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5285+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5286+#else
5287+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5288+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5289+# define PAGE_COPY_NOEXEC PAGE_COPY
5290+#endif
5291+
5292 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5293 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5294 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5295diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5296index 45698cd..e8e2dbc 100644
5297--- a/arch/ia64/include/asm/spinlock.h
5298+++ b/arch/ia64/include/asm/spinlock.h
5299@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5300 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5301
5302 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5303- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5304+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5305 }
5306
5307 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5308diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5309index 103bedc..0210597 100644
5310--- a/arch/ia64/include/asm/uaccess.h
5311+++ b/arch/ia64/include/asm/uaccess.h
5312@@ -70,6 +70,7 @@
5313 && ((segment).seg == KERNEL_DS.seg \
5314 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5315 })
5316+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5317 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5318
5319 /*
5320@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5321 static inline unsigned long
5322 __copy_to_user (void __user *to, const void *from, unsigned long count)
5323 {
5324+ if (count > INT_MAX)
5325+ return count;
5326+
5327+ if (!__builtin_constant_p(count))
5328+ check_object_size(from, count, true);
5329+
5330 return __copy_user(to, (__force void __user *) from, count);
5331 }
5332
5333 static inline unsigned long
5334 __copy_from_user (void *to, const void __user *from, unsigned long count)
5335 {
5336+ if (count > INT_MAX)
5337+ return count;
5338+
5339+ if (!__builtin_constant_p(count))
5340+ check_object_size(to, count, false);
5341+
5342 return __copy_user((__force void __user *) to, from, count);
5343 }
5344
5345@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5346 ({ \
5347 void __user *__cu_to = (to); \
5348 const void *__cu_from = (from); \
5349- long __cu_len = (n); \
5350+ unsigned long __cu_len = (n); \
5351 \
5352- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5353+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5354+ if (!__builtin_constant_p(n)) \
5355+ check_object_size(__cu_from, __cu_len, true); \
5356 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5357+ } \
5358 __cu_len; \
5359 })
5360
5361@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5362 ({ \
5363 void *__cu_to = (to); \
5364 const void __user *__cu_from = (from); \
5365- long __cu_len = (n); \
5366+ unsigned long __cu_len = (n); \
5367 \
5368 __chk_user_ptr(__cu_from); \
5369- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5370+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5371+ if (!__builtin_constant_p(n)) \
5372+ check_object_size(__cu_to, __cu_len, false); \
5373 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5374+ } \
5375 __cu_len; \
5376 })
5377
5378diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5379index 29754aa..06d2838 100644
5380--- a/arch/ia64/kernel/module.c
5381+++ b/arch/ia64/kernel/module.c
5382@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5383 }
5384
5385 static inline int
5386+in_init_rx (const struct module *mod, uint64_t addr)
5387+{
5388+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5389+}
5390+
5391+static inline int
5392+in_init_rw (const struct module *mod, uint64_t addr)
5393+{
5394+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5395+}
5396+
5397+static inline int
5398 in_init (const struct module *mod, uint64_t addr)
5399 {
5400- return addr - (uint64_t) mod->module_init < mod->init_size;
5401+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5402+}
5403+
5404+static inline int
5405+in_core_rx (const struct module *mod, uint64_t addr)
5406+{
5407+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5408+}
5409+
5410+static inline int
5411+in_core_rw (const struct module *mod, uint64_t addr)
5412+{
5413+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5414 }
5415
5416 static inline int
5417 in_core (const struct module *mod, uint64_t addr)
5418 {
5419- return addr - (uint64_t) mod->module_core < mod->core_size;
5420+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5421 }
5422
5423 static inline int
5424@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5425 break;
5426
5427 case RV_BDREL:
5428- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5429+ if (in_init_rx(mod, val))
5430+ val -= (uint64_t) mod->module_init_rx;
5431+ else if (in_init_rw(mod, val))
5432+ val -= (uint64_t) mod->module_init_rw;
5433+ else if (in_core_rx(mod, val))
5434+ val -= (uint64_t) mod->module_core_rx;
5435+ else if (in_core_rw(mod, val))
5436+ val -= (uint64_t) mod->module_core_rw;
5437 break;
5438
5439 case RV_LTV:
5440@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5441 * addresses have been selected...
5442 */
5443 uint64_t gp;
5444- if (mod->core_size > MAX_LTOFF)
5445+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5446 /*
5447 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5448 * at the end of the module.
5449 */
5450- gp = mod->core_size - MAX_LTOFF / 2;
5451+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5452 else
5453- gp = mod->core_size / 2;
5454- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5455+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5456+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5457 mod->arch.gp = gp;
5458 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5459 }
5460diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5461index c39c3cd..3c77738 100644
5462--- a/arch/ia64/kernel/palinfo.c
5463+++ b/arch/ia64/kernel/palinfo.c
5464@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5465 return NOTIFY_OK;
5466 }
5467
5468-static struct notifier_block __refdata palinfo_cpu_notifier =
5469+static struct notifier_block palinfo_cpu_notifier =
5470 {
5471 .notifier_call = palinfo_cpu_callback,
5472 .priority = 0,
5473diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5474index 41e33f8..65180b2a 100644
5475--- a/arch/ia64/kernel/sys_ia64.c
5476+++ b/arch/ia64/kernel/sys_ia64.c
5477@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5478 unsigned long align_mask = 0;
5479 struct mm_struct *mm = current->mm;
5480 struct vm_unmapped_area_info info;
5481+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5482
5483 if (len > RGN_MAP_LIMIT)
5484 return -ENOMEM;
5485@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5486 if (REGION_NUMBER(addr) == RGN_HPAGE)
5487 addr = 0;
5488 #endif
5489+
5490+#ifdef CONFIG_PAX_RANDMMAP
5491+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5492+ addr = mm->free_area_cache;
5493+ else
5494+#endif
5495+
5496 if (!addr)
5497 addr = TASK_UNMAPPED_BASE;
5498
5499@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5500 info.high_limit = TASK_SIZE;
5501 info.align_mask = align_mask;
5502 info.align_offset = 0;
5503+ info.threadstack_offset = offset;
5504 return vm_unmapped_area(&info);
5505 }
5506
5507diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5508index 84f8a52..7c76178 100644
5509--- a/arch/ia64/kernel/vmlinux.lds.S
5510+++ b/arch/ia64/kernel/vmlinux.lds.S
5511@@ -192,7 +192,7 @@ SECTIONS {
5512 /* Per-cpu data: */
5513 . = ALIGN(PERCPU_PAGE_SIZE);
5514 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5515- __phys_per_cpu_start = __per_cpu_load;
5516+ __phys_per_cpu_start = per_cpu_load;
5517 /*
5518 * ensure percpu data fits
5519 * into percpu page size
5520diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5521index ba5ba7a..36e9d3a 100644
5522--- a/arch/ia64/mm/fault.c
5523+++ b/arch/ia64/mm/fault.c
5524@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5525 return pte_present(pte);
5526 }
5527
5528+#ifdef CONFIG_PAX_PAGEEXEC
5529+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5530+{
5531+ unsigned long i;
5532+
5533+ printk(KERN_ERR "PAX: bytes at PC: ");
5534+ for (i = 0; i < 8; i++) {
5535+ unsigned int c;
5536+ if (get_user(c, (unsigned int *)pc+i))
5537+ printk(KERN_CONT "???????? ");
5538+ else
5539+ printk(KERN_CONT "%08x ", c);
5540+ }
5541+ printk("\n");
5542+}
5543+#endif
5544+
5545 # define VM_READ_BIT 0
5546 # define VM_WRITE_BIT 1
5547 # define VM_EXEC_BIT 2
5548@@ -151,8 +168,21 @@ retry:
5549 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5550 goto bad_area;
5551
5552- if ((vma->vm_flags & mask) != mask)
5553+ if ((vma->vm_flags & mask) != mask) {
5554+
5555+#ifdef CONFIG_PAX_PAGEEXEC
5556+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5557+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5558+ goto bad_area;
5559+
5560+ up_read(&mm->mmap_sem);
5561+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5562+ do_group_exit(SIGKILL);
5563+ }
5564+#endif
5565+
5566 goto bad_area;
5567+ }
5568
5569 /*
5570 * If for any reason at all we couldn't handle the fault, make
5571diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5572index 52b7604b..455cb85 100644
5573--- a/arch/ia64/mm/hugetlbpage.c
5574+++ b/arch/ia64/mm/hugetlbpage.c
5575@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5576 unsigned long pgoff, unsigned long flags)
5577 {
5578 struct vm_unmapped_area_info info;
5579+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5580
5581 if (len > RGN_MAP_LIMIT)
5582 return -ENOMEM;
5583@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5584 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5585 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5586 info.align_offset = 0;
5587+ info.threadstack_offset = offset;
5588 return vm_unmapped_area(&info);
5589 }
5590
5591diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5592index 6b33457..88b5124 100644
5593--- a/arch/ia64/mm/init.c
5594+++ b/arch/ia64/mm/init.c
5595@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5596 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5597 vma->vm_end = vma->vm_start + PAGE_SIZE;
5598 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5599+
5600+#ifdef CONFIG_PAX_PAGEEXEC
5601+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5602+ vma->vm_flags &= ~VM_EXEC;
5603+
5604+#ifdef CONFIG_PAX_MPROTECT
5605+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5606+ vma->vm_flags &= ~VM_MAYEXEC;
5607+#endif
5608+
5609+ }
5610+#endif
5611+
5612 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5613 down_write(&current->mm->mmap_sem);
5614 if (insert_vm_struct(current->mm, vma)) {
5615@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5616 gate_vma.vm_start = FIXADDR_USER_START;
5617 gate_vma.vm_end = FIXADDR_USER_END;
5618 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5619- gate_vma.vm_page_prot = __P101;
5620+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5621
5622 return 0;
5623 }
5624diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5625index 40b3ee98..8c2c112 100644
5626--- a/arch/m32r/include/asm/cache.h
5627+++ b/arch/m32r/include/asm/cache.h
5628@@ -1,8 +1,10 @@
5629 #ifndef _ASM_M32R_CACHE_H
5630 #define _ASM_M32R_CACHE_H
5631
5632+#include <linux/const.h>
5633+
5634 /* L1 cache line size */
5635 #define L1_CACHE_SHIFT 4
5636-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5637+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5638
5639 #endif /* _ASM_M32R_CACHE_H */
5640diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5641index 82abd15..d95ae5d 100644
5642--- a/arch/m32r/lib/usercopy.c
5643+++ b/arch/m32r/lib/usercopy.c
5644@@ -14,6 +14,9 @@
5645 unsigned long
5646 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5647 {
5648+ if ((long)n < 0)
5649+ return n;
5650+
5651 prefetch(from);
5652 if (access_ok(VERIFY_WRITE, to, n))
5653 __copy_user(to,from,n);
5654@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5655 unsigned long
5656 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5657 {
5658+ if ((long)n < 0)
5659+ return n;
5660+
5661 prefetchw(to);
5662 if (access_ok(VERIFY_READ, from, n))
5663 __copy_user_zeroing(to,from,n);
5664diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5665index 0395c51..5f26031 100644
5666--- a/arch/m68k/include/asm/cache.h
5667+++ b/arch/m68k/include/asm/cache.h
5668@@ -4,9 +4,11 @@
5669 #ifndef __ARCH_M68K_CACHE_H
5670 #define __ARCH_M68K_CACHE_H
5671
5672+#include <linux/const.h>
5673+
5674 /* bytes per L1 cache line */
5675 #define L1_CACHE_SHIFT 4
5676-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5677+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5678
5679 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5680
5681diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5682index d703d8e..a8e2d70 100644
5683--- a/arch/metag/include/asm/barrier.h
5684+++ b/arch/metag/include/asm/barrier.h
5685@@ -90,7 +90,7 @@ static inline void fence(void)
5686 do { \
5687 compiletime_assert_atomic_type(*p); \
5688 smp_mb(); \
5689- ACCESS_ONCE(*p) = (v); \
5690+ ACCESS_ONCE_RW(*p) = (v); \
5691 } while (0)
5692
5693 #define smp_load_acquire(p) \
5694diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5695index 7ca80ac..794ba72 100644
5696--- a/arch/metag/mm/hugetlbpage.c
5697+++ b/arch/metag/mm/hugetlbpage.c
5698@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5699 info.high_limit = TASK_SIZE;
5700 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5701 info.align_offset = 0;
5702+ info.threadstack_offset = 0;
5703 return vm_unmapped_area(&info);
5704 }
5705
5706diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5707index 4efe96a..60e8699 100644
5708--- a/arch/microblaze/include/asm/cache.h
5709+++ b/arch/microblaze/include/asm/cache.h
5710@@ -13,11 +13,12 @@
5711 #ifndef _ASM_MICROBLAZE_CACHE_H
5712 #define _ASM_MICROBLAZE_CACHE_H
5713
5714+#include <linux/const.h>
5715 #include <asm/registers.h>
5716
5717 #define L1_CACHE_SHIFT 5
5718 /* word-granular cache in microblaze */
5719-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5720+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5721
5722 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5723
5724diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5725index 843713c..b6a87b9 100644
5726--- a/arch/mips/Kconfig
5727+++ b/arch/mips/Kconfig
5728@@ -2439,6 +2439,7 @@ source "kernel/Kconfig.preempt"
5729
5730 config KEXEC
5731 bool "Kexec system call"
5732+ depends on !GRKERNSEC_KMEM
5733 help
5734 kexec is a system call that implements the ability to shutdown your
5735 current kernel, and to start another kernel. It is like a reboot
5736diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5737index 3778655..1dff0a9 100644
5738--- a/arch/mips/cavium-octeon/dma-octeon.c
5739+++ b/arch/mips/cavium-octeon/dma-octeon.c
5740@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5741 if (dma_release_from_coherent(dev, order, vaddr))
5742 return;
5743
5744- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5745+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5746 }
5747
5748 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5749diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5750index 857da84..0fee5e2 100644
5751--- a/arch/mips/include/asm/atomic.h
5752+++ b/arch/mips/include/asm/atomic.h
5753@@ -22,15 +22,39 @@
5754 #include <asm/cmpxchg.h>
5755 #include <asm/war.h>
5756
5757+#ifdef CONFIG_GENERIC_ATOMIC64
5758+#include <asm-generic/atomic64.h>
5759+#endif
5760+
5761 #define ATOMIC_INIT(i) { (i) }
5762
5763+#ifdef CONFIG_64BIT
5764+#define _ASM_EXTABLE(from, to) \
5765+" .section __ex_table,\"a\"\n" \
5766+" .dword " #from ", " #to"\n" \
5767+" .previous\n"
5768+#else
5769+#define _ASM_EXTABLE(from, to) \
5770+" .section __ex_table,\"a\"\n" \
5771+" .word " #from ", " #to"\n" \
5772+" .previous\n"
5773+#endif
5774+
5775 /*
5776 * atomic_read - read atomic variable
5777 * @v: pointer of type atomic_t
5778 *
5779 * Atomically reads the value of @v.
5780 */
5781-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5782+static inline int atomic_read(const atomic_t *v)
5783+{
5784+ return ACCESS_ONCE(v->counter);
5785+}
5786+
5787+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5788+{
5789+ return ACCESS_ONCE(v->counter);
5790+}
5791
5792 /*
5793 * atomic_set - set atomic variable
5794@@ -39,47 +63,77 @@
5795 *
5796 * Atomically sets the value of @v to @i.
5797 */
5798-#define atomic_set(v, i) ((v)->counter = (i))
5799+static inline void atomic_set(atomic_t *v, int i)
5800+{
5801+ v->counter = i;
5802+}
5803
5804-#define ATOMIC_OP(op, c_op, asm_op) \
5805-static __inline__ void atomic_##op(int i, atomic_t * v) \
5806+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5807+{
5808+ v->counter = i;
5809+}
5810+
5811+#ifdef CONFIG_PAX_REFCOUNT
5812+#define __OVERFLOW_POST \
5813+ " b 4f \n" \
5814+ " .set noreorder \n" \
5815+ "3: b 5f \n" \
5816+ " move %0, %1 \n" \
5817+ " .set reorder \n"
5818+#define __OVERFLOW_EXTABLE \
5819+ "3:\n" \
5820+ _ASM_EXTABLE(2b, 3b)
5821+#else
5822+#define __OVERFLOW_POST
5823+#define __OVERFLOW_EXTABLE
5824+#endif
5825+
5826+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5827+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5828 { \
5829 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5830 int temp; \
5831 \
5832 __asm__ __volatile__( \
5833- " .set arch=r4000 \n" \
5834- "1: ll %0, %1 # atomic_" #op " \n" \
5835- " " #asm_op " %0, %2 \n" \
5836+ " .set mips3 \n" \
5837+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5838+ "2: " #asm_op " %0, %2 \n" \
5839 " sc %0, %1 \n" \
5840 " beqzl %0, 1b \n" \
5841+ extable \
5842 " .set mips0 \n" \
5843 : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
5844 : "Ir" (i)); \
5845 } else if (kernel_uses_llsc) { \
5846 int temp; \
5847 \
5848- do { \
5849- __asm__ __volatile__( \
5850- " .set arch=r4000 \n" \
5851- " ll %0, %1 # atomic_" #op "\n" \
5852- " " #asm_op " %0, %2 \n" \
5853- " sc %0, %1 \n" \
5854- " .set mips0 \n" \
5855- : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
5856- : "Ir" (i)); \
5857- } while (unlikely(!temp)); \
5858+ __asm__ __volatile__( \
5859+ " .set mips3 \n" \
5860+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5861+ "2: " #asm_op " %0, %2 \n" \
5862+ " sc %0, %1 \n" \
5863+ " beqz %0, 1b \n" \
5864+ extable \
5865+ " .set mips0 \n" \
5866+ : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
5867+ : "Ir" (i)); \
5868 } else { \
5869 unsigned long flags; \
5870 \
5871 raw_local_irq_save(flags); \
5872- v->counter c_op i; \
5873+ __asm__ __volatile__( \
5874+ "2: " #asm_op " %0, %1 \n" \
5875+ extable \
5876+ : "+r" (v->counter) : "Ir" (i)); \
5877 raw_local_irq_restore(flags); \
5878 } \
5879 }
5880
5881-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5882-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5883+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5884+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5885+
5886+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5887+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5888 { \
5889 int result; \
5890 \
5891@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5892 int temp; \
5893 \
5894 __asm__ __volatile__( \
5895- " .set arch=r4000 \n" \
5896- "1: ll %1, %2 # atomic_" #op "_return \n" \
5897- " " #asm_op " %0, %1, %3 \n" \
5898+ " .set mips3 \n" \
5899+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5900+ "2: " #asm_op " %0, %1, %3 \n" \
5901 " sc %0, %2 \n" \
5902 " beqzl %0, 1b \n" \
5903- " " #asm_op " %0, %1, %3 \n" \
5904+ post_op \
5905+ extable \
5906+ "4: " #asm_op " %0, %1, %3 \n" \
5907+ "5: \n" \
5908 " .set mips0 \n" \
5909 : "=&r" (result), "=&r" (temp), \
5910 "+" GCC_OFF12_ASM() (v->counter) \
5911@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5912 } else if (kernel_uses_llsc) { \
5913 int temp; \
5914 \
5915- do { \
5916- __asm__ __volatile__( \
5917- " .set arch=r4000 \n" \
5918- " ll %1, %2 # atomic_" #op "_return \n" \
5919- " " #asm_op " %0, %1, %3 \n" \
5920- " sc %0, %2 \n" \
5921- " .set mips0 \n" \
5922- : "=&r" (result), "=&r" (temp), \
5923- "+" GCC_OFF12_ASM() (v->counter) \
5924- : "Ir" (i)); \
5925- } while (unlikely(!result)); \
5926+ __asm__ __volatile__( \
5927+ " .set mips3 \n" \
5928+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5929+ "2: " #asm_op " %0, %1, %3 \n" \
5930+ " sc %0, %2 \n" \
5931+ post_op \
5932+ extable \
5933+ "4: " #asm_op " %0, %1, %3 \n" \
5934+ "5: \n" \
5935+ " .set mips0 \n" \
5936+ : "=&r" (result), "=&r" (temp), \
5937+ "+" GCC_OFF12_ASM() (v->counter) \
5938+ : "Ir" (i)); \
5939 \
5940 result = temp; result c_op i; \
5941 } else { \
5942 unsigned long flags; \
5943 \
5944 raw_local_irq_save(flags); \
5945- result = v->counter; \
5946- result c_op i; \
5947- v->counter = result; \
5948+ __asm__ __volatile__( \
5949+ " lw %0, %1 \n" \
5950+ "2: " #asm_op " %0, %1, %2 \n" \
5951+ " sw %0, %1 \n" \
5952+ "3: \n" \
5953+ extable \
5954+ : "=&r" (result), "+" GCC_OFF12_ASM() (v->counter) \
5955+ : "Ir" (i)); \
5956 raw_local_irq_restore(flags); \
5957 } \
5958 \
5959@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5960 return result; \
5961 }
5962
5963-#define ATOMIC_OPS(op, c_op, asm_op) \
5964- ATOMIC_OP(op, c_op, asm_op) \
5965- ATOMIC_OP_RETURN(op, c_op, asm_op)
5966+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
5967+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5968
5969-ATOMIC_OPS(add, +=, addu)
5970-ATOMIC_OPS(sub, -=, subu)
5971+#define ATOMIC_OPS(op, asm_op) \
5972+ ATOMIC_OP(op, asm_op) \
5973+ ATOMIC_OP_RETURN(op, asm_op)
5974+
5975+ATOMIC_OPS(add, add)
5976+ATOMIC_OPS(sub, sub)
5977
5978 #undef ATOMIC_OPS
5979 #undef ATOMIC_OP_RETURN
5980+#undef __ATOMIC_OP_RETURN
5981 #undef ATOMIC_OP
5982+#undef __ATOMIC_OP
5983
5984 /*
5985 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5986@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
5987 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5988 * The function returns the old value of @v minus @i.
5989 */
5990-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5991+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5992 {
5993 int result;
5994
5995@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5996 return result;
5997 }
5998
5999-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6000-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6001+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6002+{
6003+ return cmpxchg(&v->counter, old, new);
6004+}
6005+
6006+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6007+ int new)
6008+{
6009+ return cmpxchg(&(v->counter), old, new);
6010+}
6011+
6012+static inline int atomic_xchg(atomic_t *v, int new)
6013+{
6014+ return xchg(&v->counter, new);
6015+}
6016+
6017+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6018+{
6019+ return xchg(&(v->counter), new);
6020+}
6021
6022 /**
6023 * __atomic_add_unless - add unless the number is a given value
6024@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6025
6026 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6027 #define atomic_inc_return(v) atomic_add_return(1, (v))
6028+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6029+{
6030+ return atomic_add_return_unchecked(1, v);
6031+}
6032
6033 /*
6034 * atomic_sub_and_test - subtract value from variable and test result
6035@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6036 * other cases.
6037 */
6038 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6039+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6040+{
6041+ return atomic_add_return_unchecked(1, v) == 0;
6042+}
6043
6044 /*
6045 * atomic_dec_and_test - decrement by 1 and test
6046@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6047 * Atomically increments @v by 1.
6048 */
6049 #define atomic_inc(v) atomic_add(1, (v))
6050+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6051+{
6052+ atomic_add_unchecked(1, v);
6053+}
6054
6055 /*
6056 * atomic_dec - decrement and test
6057@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6058 * Atomically decrements @v by 1.
6059 */
6060 #define atomic_dec(v) atomic_sub(1, (v))
6061+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6062+{
6063+ atomic_sub_unchecked(1, v);
6064+}
6065
6066 /*
6067 * atomic_add_negative - add and test if negative
6068@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6069 * @v: pointer of type atomic64_t
6070 *
6071 */
6072-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6073+static inline long atomic64_read(const atomic64_t *v)
6074+{
6075+ return ACCESS_ONCE(v->counter);
6076+}
6077+
6078+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6079+{
6080+ return ACCESS_ONCE(v->counter);
6081+}
6082
6083 /*
6084 * atomic64_set - set atomic variable
6085 * @v: pointer of type atomic64_t
6086 * @i: required value
6087 */
6088-#define atomic64_set(v, i) ((v)->counter = (i))
6089+static inline void atomic64_set(atomic64_t *v, long i)
6090+{
6091+ v->counter = i;
6092+}
6093
6094-#define ATOMIC64_OP(op, c_op, asm_op) \
6095-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6096+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6097+{
6098+ v->counter = i;
6099+}
6100+
6101+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6102+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6103 { \
6104 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6105 long temp; \
6106 \
6107 __asm__ __volatile__( \
6108- " .set arch=r4000 \n" \
6109- "1: lld %0, %1 # atomic64_" #op " \n" \
6110- " " #asm_op " %0, %2 \n" \
6111+ " .set mips3 \n" \
6112+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6113+ "2: " #asm_op " %0, %2 \n" \
6114 " scd %0, %1 \n" \
6115 " beqzl %0, 1b \n" \
6116+ extable \
6117 " .set mips0 \n" \
6118 : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
6119 : "Ir" (i)); \
6120 } else if (kernel_uses_llsc) { \
6121 long temp; \
6122 \
6123- do { \
6124- __asm__ __volatile__( \
6125- " .set arch=r4000 \n" \
6126- " lld %0, %1 # atomic64_" #op "\n" \
6127- " " #asm_op " %0, %2 \n" \
6128- " scd %0, %1 \n" \
6129- " .set mips0 \n" \
6130- : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
6131- : "Ir" (i)); \
6132- } while (unlikely(!temp)); \
6133+ __asm__ __volatile__( \
6134+ " .set mips3 \n" \
6135+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6136+ "2: " #asm_op " %0, %2 \n" \
6137+ " scd %0, %1 \n" \
6138+ " beqz %0, 1b \n" \
6139+ extable \
6140+ " .set mips0 \n" \
6141+ : "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter) \
6142+ : "Ir" (i)); \
6143 } else { \
6144 unsigned long flags; \
6145 \
6146 raw_local_irq_save(flags); \
6147- v->counter c_op i; \
6148+ __asm__ __volatile__( \
6149+ "2: " #asm_op " %0, %1 \n" \
6150+ extable \
6151+ : "+" GCC_OFF12_ASM() (v->counter) : "Ir" (i)); \
6152 raw_local_irq_restore(flags); \
6153 } \
6154 }
6155
6156-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6157-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6158+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6159+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6160+
6161+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6162+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6163 { \
6164 long result; \
6165 \
6166@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6167 long temp; \
6168 \
6169 __asm__ __volatile__( \
6170- " .set arch=r4000 \n" \
6171+ " .set mips3 \n" \
6172 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6173- " " #asm_op " %0, %1, %3 \n" \
6174+ "2: " #asm_op " %0, %1, %3 \n" \
6175 " scd %0, %2 \n" \
6176 " beqzl %0, 1b \n" \
6177- " " #asm_op " %0, %1, %3 \n" \
6178+ post_op \
6179+ extable \
6180+ "4: " #asm_op " %0, %1, %3 \n" \
6181+ "5: \n" \
6182 " .set mips0 \n" \
6183 : "=&r" (result), "=&r" (temp), \
6184 "+" GCC_OFF12_ASM() (v->counter) \
6185@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6186 } else if (kernel_uses_llsc) { \
6187 long temp; \
6188 \
6189- do { \
6190- __asm__ __volatile__( \
6191- " .set arch=r4000 \n" \
6192- " lld %1, %2 # atomic64_" #op "_return\n" \
6193- " " #asm_op " %0, %1, %3 \n" \
6194- " scd %0, %2 \n" \
6195- " .set mips0 \n" \
6196- : "=&r" (result), "=&r" (temp), \
6197- "=" GCC_OFF12_ASM() (v->counter) \
6198- : "Ir" (i), GCC_OFF12_ASM() (v->counter) \
6199- : "memory"); \
6200- } while (unlikely(!result)); \
6201+ __asm__ __volatile__( \
6202+ " .set mips3 \n" \
6203+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6204+ "2: " #asm_op " %0, %1, %3 \n" \
6205+ " scd %0, %2 \n" \
6206+ " beqz %0, 1b \n" \
6207+ post_op \
6208+ extable \
6209+ "4: " #asm_op " %0, %1, %3 \n" \
6210+ "5: \n" \
6211+ " .set mips0 \n" \
6212+ : "=&r" (result), "=&r" (temp), \
6213+ "=" GCC_OFF12_ASM() (v->counter) \
6214+ : "Ir" (i), GCC_OFF12_ASM() (v->counter) \
6215+ : "memory"); \
6216 \
6217 result = temp; result c_op i; \
6218 } else { \
6219 unsigned long flags; \
6220 \
6221 raw_local_irq_save(flags); \
6222- result = v->counter; \
6223- result c_op i; \
6224- v->counter = result; \
6225+ __asm__ __volatile__( \
6226+ " ld %0, %1 \n" \
6227+ "2: " #asm_op " %0, %1, %2 \n" \
6228+ " sd %0, %1 \n" \
6229+ "3: \n" \
6230+ extable \
6231+ : "=&r" (result), "+" GCC_OFF12_ASM() (v->counter) \
6232+ : "Ir" (i)); \
6233 raw_local_irq_restore(flags); \
6234 } \
6235 \
6236@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6237 return result; \
6238 }
6239
6240-#define ATOMIC64_OPS(op, c_op, asm_op) \
6241- ATOMIC64_OP(op, c_op, asm_op) \
6242- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6243+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6244+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6245
6246-ATOMIC64_OPS(add, +=, daddu)
6247-ATOMIC64_OPS(sub, -=, dsubu)
6248+#define ATOMIC64_OPS(op, asm_op) \
6249+ ATOMIC64_OP(op, asm_op) \
6250+ ATOMIC64_OP_RETURN(op, asm_op)
6251+
6252+ATOMIC64_OPS(add, dadd)
6253+ATOMIC64_OPS(sub, dsub)
6254
6255 #undef ATOMIC64_OPS
6256 #undef ATOMIC64_OP_RETURN
6257+#undef __ATOMIC64_OP_RETURN
6258 #undef ATOMIC64_OP
6259+#undef __ATOMIC64_OP
6260+#undef __OVERFLOW_EXTABLE
6261+#undef __OVERFLOW_POST
6262
6263 /*
6264 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6265@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6266 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6267 * The function returns the old value of @v minus @i.
6268 */
6269-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6270+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6271 {
6272 long result;
6273
6274@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6275 return result;
6276 }
6277
6278-#define atomic64_cmpxchg(v, o, n) \
6279- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6280-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6281+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6282+{
6283+ return cmpxchg(&v->counter, old, new);
6284+}
6285+
6286+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6287+ long new)
6288+{
6289+ return cmpxchg(&(v->counter), old, new);
6290+}
6291+
6292+static inline long atomic64_xchg(atomic64_t *v, long new)
6293+{
6294+ return xchg(&v->counter, new);
6295+}
6296+
6297+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6298+{
6299+ return xchg(&(v->counter), new);
6300+}
6301
6302 /**
6303 * atomic64_add_unless - add unless the number is a given value
6304@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305
6306 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6307 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6308+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6309
6310 /*
6311 * atomic64_sub_and_test - subtract value from variable and test result
6312@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6313 * other cases.
6314 */
6315 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6316+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6317
6318 /*
6319 * atomic64_dec_and_test - decrement by 1 and test
6320@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6321 * Atomically increments @v by 1.
6322 */
6323 #define atomic64_inc(v) atomic64_add(1, (v))
6324+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6325
6326 /*
6327 * atomic64_dec - decrement and test
6328@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6329 * Atomically decrements @v by 1.
6330 */
6331 #define atomic64_dec(v) atomic64_sub(1, (v))
6332+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6333
6334 /*
6335 * atomic64_add_negative - add and test if negative
6336diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6337index 2b8bbbc..4556df6 100644
6338--- a/arch/mips/include/asm/barrier.h
6339+++ b/arch/mips/include/asm/barrier.h
6340@@ -133,7 +133,7 @@
6341 do { \
6342 compiletime_assert_atomic_type(*p); \
6343 smp_mb(); \
6344- ACCESS_ONCE(*p) = (v); \
6345+ ACCESS_ONCE_RW(*p) = (v); \
6346 } while (0)
6347
6348 #define smp_load_acquire(p) \
6349diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6350index b4db69f..8f3b093 100644
6351--- a/arch/mips/include/asm/cache.h
6352+++ b/arch/mips/include/asm/cache.h
6353@@ -9,10 +9,11 @@
6354 #ifndef _ASM_CACHE_H
6355 #define _ASM_CACHE_H
6356
6357+#include <linux/const.h>
6358 #include <kmalloc.h>
6359
6360 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6361-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6362+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6363
6364 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6365 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6366diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6367index eb4d95d..f2f7f93 100644
6368--- a/arch/mips/include/asm/elf.h
6369+++ b/arch/mips/include/asm/elf.h
6370@@ -405,15 +405,18 @@ extern const char *__elf_platform;
6371 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6372 #endif
6373
6374+#ifdef CONFIG_PAX_ASLR
6375+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6376+
6377+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6378+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6379+#endif
6380+
6381 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6382 struct linux_binprm;
6383 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6384 int uses_interp);
6385
6386-struct mm_struct;
6387-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6388-#define arch_randomize_brk arch_randomize_brk
6389-
6390 struct arch_elf_state {
6391 int fp_abi;
6392 int interp_fp_abi;
6393diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6394index c1f6afa..38cc6e9 100644
6395--- a/arch/mips/include/asm/exec.h
6396+++ b/arch/mips/include/asm/exec.h
6397@@ -12,6 +12,6 @@
6398 #ifndef _ASM_EXEC_H
6399 #define _ASM_EXEC_H
6400
6401-extern unsigned long arch_align_stack(unsigned long sp);
6402+#define arch_align_stack(x) ((x) & ~0xfUL)
6403
6404 #endif /* _ASM_EXEC_H */
6405diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6406index 9e8ef59..1139d6b 100644
6407--- a/arch/mips/include/asm/hw_irq.h
6408+++ b/arch/mips/include/asm/hw_irq.h
6409@@ -10,7 +10,7 @@
6410
6411 #include <linux/atomic.h>
6412
6413-extern atomic_t irq_err_count;
6414+extern atomic_unchecked_t irq_err_count;
6415
6416 /*
6417 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6418diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6419index 46dfc3c..a16b13a 100644
6420--- a/arch/mips/include/asm/local.h
6421+++ b/arch/mips/include/asm/local.h
6422@@ -12,15 +12,25 @@ typedef struct
6423 atomic_long_t a;
6424 } local_t;
6425
6426+typedef struct {
6427+ atomic_long_unchecked_t a;
6428+} local_unchecked_t;
6429+
6430 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6431
6432 #define local_read(l) atomic_long_read(&(l)->a)
6433+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6434 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6435+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6436
6437 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6438+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6439 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6440+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6441 #define local_inc(l) atomic_long_inc(&(l)->a)
6442+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6443 #define local_dec(l) atomic_long_dec(&(l)->a)
6444+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6445
6446 /*
6447 * Same as above, but return the result value
6448@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6449 return result;
6450 }
6451
6452+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6453+{
6454+ unsigned long result;
6455+
6456+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6457+ unsigned long temp;
6458+
6459+ __asm__ __volatile__(
6460+ " .set mips3 \n"
6461+ "1:" __LL "%1, %2 # local_add_return \n"
6462+ " addu %0, %1, %3 \n"
6463+ __SC "%0, %2 \n"
6464+ " beqzl %0, 1b \n"
6465+ " addu %0, %1, %3 \n"
6466+ " .set mips0 \n"
6467+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6468+ : "Ir" (i), "m" (l->a.counter)
6469+ : "memory");
6470+ } else if (kernel_uses_llsc) {
6471+ unsigned long temp;
6472+
6473+ __asm__ __volatile__(
6474+ " .set mips3 \n"
6475+ "1:" __LL "%1, %2 # local_add_return \n"
6476+ " addu %0, %1, %3 \n"
6477+ __SC "%0, %2 \n"
6478+ " beqz %0, 1b \n"
6479+ " addu %0, %1, %3 \n"
6480+ " .set mips0 \n"
6481+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6482+ : "Ir" (i), "m" (l->a.counter)
6483+ : "memory");
6484+ } else {
6485+ unsigned long flags;
6486+
6487+ local_irq_save(flags);
6488+ result = l->a.counter;
6489+ result += i;
6490+ l->a.counter = result;
6491+ local_irq_restore(flags);
6492+ }
6493+
6494+ return result;
6495+}
6496+
6497 static __inline__ long local_sub_return(long i, local_t * l)
6498 {
6499 unsigned long result;
6500@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6501
6502 #define local_cmpxchg(l, o, n) \
6503 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6504+#define local_cmpxchg_unchecked(l, o, n) \
6505+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6506 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6507
6508 /**
6509diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6510index 154b70a..426ae3d 100644
6511--- a/arch/mips/include/asm/page.h
6512+++ b/arch/mips/include/asm/page.h
6513@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6514 #ifdef CONFIG_CPU_MIPS32
6515 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6516 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6517- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6518+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6519 #else
6520 typedef struct { unsigned long long pte; } pte_t;
6521 #define pte_val(x) ((x).pte)
6522diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6523index b336037..5b874cc 100644
6524--- a/arch/mips/include/asm/pgalloc.h
6525+++ b/arch/mips/include/asm/pgalloc.h
6526@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6527 {
6528 set_pud(pud, __pud((unsigned long)pmd));
6529 }
6530+
6531+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6532+{
6533+ pud_populate(mm, pud, pmd);
6534+}
6535 #endif
6536
6537 /*
6538diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6539index 845016d..3303268 100644
6540--- a/arch/mips/include/asm/pgtable.h
6541+++ b/arch/mips/include/asm/pgtable.h
6542@@ -20,6 +20,9 @@
6543 #include <asm/io.h>
6544 #include <asm/pgtable-bits.h>
6545
6546+#define ktla_ktva(addr) (addr)
6547+#define ktva_ktla(addr) (addr)
6548+
6549 struct mm_struct;
6550 struct vm_area_struct;
6551
6552diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6553index e4440f9..8fb0005 100644
6554--- a/arch/mips/include/asm/thread_info.h
6555+++ b/arch/mips/include/asm/thread_info.h
6556@@ -106,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
6557 #define TIF_SECCOMP 4 /* secure computing */
6558 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6559 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6560+/* li takes a 32bit immediate */
6561+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6562+
6563 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6564 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6565 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6566@@ -141,14 +144,16 @@ static inline struct thread_info *current_thread_info(void)
6567 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6568 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6569 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6570+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6571
6572 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6573 _TIF_SYSCALL_AUDIT | \
6574- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6575+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6576+ _TIF_GRSEC_SETXID)
6577
6578 /* work to do in syscall_trace_leave() */
6579 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6580- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6581+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6582
6583 /* work to do on interrupt/exception return */
6584 #define _TIF_WORK_MASK \
6585@@ -156,7 +161,7 @@ static inline struct thread_info *current_thread_info(void)
6586 /* work to do on any return to u-space */
6587 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6588 _TIF_WORK_SYSCALL_EXIT | \
6589- _TIF_SYSCALL_TRACEPOINT)
6590+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6591
6592 /*
6593 * We stash processor id into a COP0 register to retrieve it fast
6594diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6595index bf8b324..cec5705 100644
6596--- a/arch/mips/include/asm/uaccess.h
6597+++ b/arch/mips/include/asm/uaccess.h
6598@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6599 __ok == 0; \
6600 })
6601
6602+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6603 #define access_ok(type, addr, size) \
6604 likely(__access_ok((addr), (size), __access_mask))
6605
6606diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6607index 1188e00..41cf144 100644
6608--- a/arch/mips/kernel/binfmt_elfn32.c
6609+++ b/arch/mips/kernel/binfmt_elfn32.c
6610@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6611 #undef ELF_ET_DYN_BASE
6612 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6613
6614+#ifdef CONFIG_PAX_ASLR
6615+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6616+
6617+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6618+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6619+#endif
6620+
6621 #include <asm/processor.h>
6622 #include <linux/module.h>
6623 #include <linux/elfcore.h>
6624diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6625index 9287678..f870e47 100644
6626--- a/arch/mips/kernel/binfmt_elfo32.c
6627+++ b/arch/mips/kernel/binfmt_elfo32.c
6628@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6629 #undef ELF_ET_DYN_BASE
6630 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6631
6632+#ifdef CONFIG_PAX_ASLR
6633+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6634+
6635+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6636+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6637+#endif
6638+
6639 #include <asm/processor.h>
6640
6641 #include <linux/module.h>
6642diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6643index a74ec3a..4f06f18 100644
6644--- a/arch/mips/kernel/i8259.c
6645+++ b/arch/mips/kernel/i8259.c
6646@@ -202,7 +202,7 @@ spurious_8259A_irq:
6647 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6648 spurious_irq_mask |= irqmask;
6649 }
6650- atomic_inc(&irq_err_count);
6651+ atomic_inc_unchecked(&irq_err_count);
6652 /*
6653 * Theoretically we do not have to handle this IRQ,
6654 * but in Linux this does not cause problems and is
6655diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6656index 44a1f79..2bd6aa3 100644
6657--- a/arch/mips/kernel/irq-gt641xx.c
6658+++ b/arch/mips/kernel/irq-gt641xx.c
6659@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6660 }
6661 }
6662
6663- atomic_inc(&irq_err_count);
6664+ atomic_inc_unchecked(&irq_err_count);
6665 }
6666
6667 void __init gt641xx_irq_init(void)
6668diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6669index d2bfbc2..a8eacd2 100644
6670--- a/arch/mips/kernel/irq.c
6671+++ b/arch/mips/kernel/irq.c
6672@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6673 printk("unexpected IRQ # %d\n", irq);
6674 }
6675
6676-atomic_t irq_err_count;
6677+atomic_unchecked_t irq_err_count;
6678
6679 int arch_show_interrupts(struct seq_file *p, int prec)
6680 {
6681- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6682+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6683 return 0;
6684 }
6685
6686 asmlinkage void spurious_interrupt(void)
6687 {
6688- atomic_inc(&irq_err_count);
6689+ atomic_inc_unchecked(&irq_err_count);
6690 }
6691
6692 void __init init_IRQ(void)
6693@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6694 #endif
6695 }
6696
6697+
6698 #ifdef DEBUG_STACKOVERFLOW
6699+extern void gr_handle_kernel_exploit(void);
6700+
6701 static inline void check_stack_overflow(void)
6702 {
6703 unsigned long sp;
6704@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6705 printk("do_IRQ: stack overflow: %ld\n",
6706 sp - sizeof(struct thread_info));
6707 dump_stack();
6708+ gr_handle_kernel_exploit();
6709 }
6710 }
6711 #else
6712diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6713index 0614717..002fa43 100644
6714--- a/arch/mips/kernel/pm-cps.c
6715+++ b/arch/mips/kernel/pm-cps.c
6716@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6717 nc_core_ready_count = nc_addr;
6718
6719 /* Ensure ready_count is zero-initialised before the assembly runs */
6720- ACCESS_ONCE(*nc_core_ready_count) = 0;
6721+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6722 coupled_barrier(&per_cpu(pm_barrier, core), online);
6723
6724 /* Run the generated entry code */
6725diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6726index 85bff5d..39bc202 100644
6727--- a/arch/mips/kernel/process.c
6728+++ b/arch/mips/kernel/process.c
6729@@ -534,18 +534,6 @@ out:
6730 return pc;
6731 }
6732
6733-/*
6734- * Don't forget that the stack pointer must be aligned on a 8 bytes
6735- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6736- */
6737-unsigned long arch_align_stack(unsigned long sp)
6738-{
6739- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6740- sp -= get_random_int() & ~PAGE_MASK;
6741-
6742- return sp & ALMASK;
6743-}
6744-
6745 static void arch_dump_stack(void *info)
6746 {
6747 struct pt_regs *regs;
6748diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6749index 5104528..950bbdc 100644
6750--- a/arch/mips/kernel/ptrace.c
6751+++ b/arch/mips/kernel/ptrace.c
6752@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6753 return ret;
6754 }
6755
6756+#ifdef CONFIG_GRKERNSEC_SETXID
6757+extern void gr_delayed_cred_worker(void);
6758+#endif
6759+
6760 /*
6761 * Notification of system call entry/exit
6762 * - triggered by current->work.syscall_trace
6763@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6764 tracehook_report_syscall_entry(regs))
6765 ret = -1;
6766
6767+#ifdef CONFIG_GRKERNSEC_SETXID
6768+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6769+ gr_delayed_cred_worker();
6770+#endif
6771+
6772 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6773 trace_sys_enter(regs, regs->regs[2]);
6774
6775diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6776index 07fc524..b9d7f28 100644
6777--- a/arch/mips/kernel/reset.c
6778+++ b/arch/mips/kernel/reset.c
6779@@ -13,6 +13,7 @@
6780 #include <linux/reboot.h>
6781
6782 #include <asm/reboot.h>
6783+#include <asm/bug.h>
6784
6785 /*
6786 * Urgs ... Too many MIPS machines to handle this in a generic way.
6787@@ -29,16 +30,19 @@ void machine_restart(char *command)
6788 {
6789 if (_machine_restart)
6790 _machine_restart(command);
6791+ BUG();
6792 }
6793
6794 void machine_halt(void)
6795 {
6796 if (_machine_halt)
6797 _machine_halt();
6798+ BUG();
6799 }
6800
6801 void machine_power_off(void)
6802 {
6803 if (pm_power_off)
6804 pm_power_off();
6805+ BUG();
6806 }
6807diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6808index 2242bdd..b284048 100644
6809--- a/arch/mips/kernel/sync-r4k.c
6810+++ b/arch/mips/kernel/sync-r4k.c
6811@@ -18,8 +18,8 @@
6812 #include <asm/mipsregs.h>
6813
6814 static atomic_t count_start_flag = ATOMIC_INIT(0);
6815-static atomic_t count_count_start = ATOMIC_INIT(0);
6816-static atomic_t count_count_stop = ATOMIC_INIT(0);
6817+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6818+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6819 static atomic_t count_reference = ATOMIC_INIT(0);
6820
6821 #define COUNTON 100
6822@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6823
6824 for (i = 0; i < NR_LOOPS; i++) {
6825 /* slaves loop on '!= 2' */
6826- while (atomic_read(&count_count_start) != 1)
6827+ while (atomic_read_unchecked(&count_count_start) != 1)
6828 mb();
6829- atomic_set(&count_count_stop, 0);
6830+ atomic_set_unchecked(&count_count_stop, 0);
6831 smp_wmb();
6832
6833 /* this lets the slaves write their count register */
6834- atomic_inc(&count_count_start);
6835+ atomic_inc_unchecked(&count_count_start);
6836
6837 /*
6838 * Everyone initialises count in the last loop:
6839@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6840 /*
6841 * Wait for all slaves to leave the synchronization point:
6842 */
6843- while (atomic_read(&count_count_stop) != 1)
6844+ while (atomic_read_unchecked(&count_count_stop) != 1)
6845 mb();
6846- atomic_set(&count_count_start, 0);
6847+ atomic_set_unchecked(&count_count_start, 0);
6848 smp_wmb();
6849- atomic_inc(&count_count_stop);
6850+ atomic_inc_unchecked(&count_count_stop);
6851 }
6852 /* Arrange for an interrupt in a short while */
6853 write_c0_compare(read_c0_count() + COUNTON);
6854@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6855 initcount = atomic_read(&count_reference);
6856
6857 for (i = 0; i < NR_LOOPS; i++) {
6858- atomic_inc(&count_count_start);
6859- while (atomic_read(&count_count_start) != 2)
6860+ atomic_inc_unchecked(&count_count_start);
6861+ while (atomic_read_unchecked(&count_count_start) != 2)
6862 mb();
6863
6864 /*
6865@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6866 if (i == NR_LOOPS-1)
6867 write_c0_count(initcount);
6868
6869- atomic_inc(&count_count_stop);
6870- while (atomic_read(&count_count_stop) != 2)
6871+ atomic_inc_unchecked(&count_count_stop);
6872+ while (atomic_read_unchecked(&count_count_stop) != 2)
6873 mb();
6874 }
6875 /* Arrange for an interrupt in a short while */
6876diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6877index c3b41e2..46c32e9 100644
6878--- a/arch/mips/kernel/traps.c
6879+++ b/arch/mips/kernel/traps.c
6880@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6881 siginfo_t info;
6882
6883 prev_state = exception_enter();
6884- die_if_kernel("Integer overflow", regs);
6885+ if (unlikely(!user_mode(regs))) {
6886+
6887+#ifdef CONFIG_PAX_REFCOUNT
6888+ if (fixup_exception(regs)) {
6889+ pax_report_refcount_overflow(regs);
6890+ exception_exit(prev_state);
6891+ return;
6892+ }
6893+#endif
6894+
6895+ die("Integer overflow", regs);
6896+ }
6897
6898 info.si_code = FPE_INTOVF;
6899 info.si_signo = SIGFPE;
6900diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6901index 270bbd4..c01932a 100644
6902--- a/arch/mips/kvm/mips.c
6903+++ b/arch/mips/kvm/mips.c
6904@@ -815,7 +815,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6905 return r;
6906 }
6907
6908-int kvm_arch_init(void *opaque)
6909+int kvm_arch_init(const void *opaque)
6910 {
6911 if (kvm_mips_callbacks) {
6912 kvm_err("kvm: module already exists\n");
6913diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6914index 70ab5d6..62940fe 100644
6915--- a/arch/mips/mm/fault.c
6916+++ b/arch/mips/mm/fault.c
6917@@ -28,6 +28,23 @@
6918 #include <asm/highmem.h> /* For VMALLOC_END */
6919 #include <linux/kdebug.h>
6920
6921+#ifdef CONFIG_PAX_PAGEEXEC
6922+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6923+{
6924+ unsigned long i;
6925+
6926+ printk(KERN_ERR "PAX: bytes at PC: ");
6927+ for (i = 0; i < 5; i++) {
6928+ unsigned int c;
6929+ if (get_user(c, (unsigned int *)pc+i))
6930+ printk(KERN_CONT "???????? ");
6931+ else
6932+ printk(KERN_CONT "%08x ", c);
6933+ }
6934+ printk("\n");
6935+}
6936+#endif
6937+
6938 /*
6939 * This routine handles page faults. It determines the address,
6940 * and the problem, and then passes it off to one of the appropriate
6941@@ -201,6 +218,14 @@ bad_area:
6942 bad_area_nosemaphore:
6943 /* User mode accesses just cause a SIGSEGV */
6944 if (user_mode(regs)) {
6945+
6946+#ifdef CONFIG_PAX_PAGEEXEC
6947+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6948+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6949+ do_group_exit(SIGKILL);
6950+ }
6951+#endif
6952+
6953 tsk->thread.cp0_badvaddr = address;
6954 tsk->thread.error_code = write;
6955 #if 0
6956diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6957index f1baadd..5472dca 100644
6958--- a/arch/mips/mm/mmap.c
6959+++ b/arch/mips/mm/mmap.c
6960@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6961 struct vm_area_struct *vma;
6962 unsigned long addr = addr0;
6963 int do_color_align;
6964+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6965 struct vm_unmapped_area_info info;
6966
6967 if (unlikely(len > TASK_SIZE))
6968@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6969 do_color_align = 1;
6970
6971 /* requesting a specific address */
6972+
6973+#ifdef CONFIG_PAX_RANDMMAP
6974+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6975+#endif
6976+
6977 if (addr) {
6978 if (do_color_align)
6979 addr = COLOUR_ALIGN(addr, pgoff);
6980@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6981 addr = PAGE_ALIGN(addr);
6982
6983 vma = find_vma(mm, addr);
6984- if (TASK_SIZE - len >= addr &&
6985- (!vma || addr + len <= vma->vm_start))
6986+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6987 return addr;
6988 }
6989
6990 info.length = len;
6991 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6992 info.align_offset = pgoff << PAGE_SHIFT;
6993+ info.threadstack_offset = offset;
6994
6995 if (dir == DOWN) {
6996 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6997@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6998 {
6999 unsigned long random_factor = 0UL;
7000
7001+#ifdef CONFIG_PAX_RANDMMAP
7002+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7003+#endif
7004+
7005 if (current->flags & PF_RANDOMIZE) {
7006 random_factor = get_random_int();
7007 random_factor = random_factor << PAGE_SHIFT;
7008@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7009
7010 if (mmap_is_legacy()) {
7011 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7012+
7013+#ifdef CONFIG_PAX_RANDMMAP
7014+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7015+ mm->mmap_base += mm->delta_mmap;
7016+#endif
7017+
7018 mm->get_unmapped_area = arch_get_unmapped_area;
7019 } else {
7020 mm->mmap_base = mmap_base(random_factor);
7021+
7022+#ifdef CONFIG_PAX_RANDMMAP
7023+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7024+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7025+#endif
7026+
7027 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7028 }
7029 }
7030
7031-static inline unsigned long brk_rnd(void)
7032-{
7033- unsigned long rnd = get_random_int();
7034-
7035- rnd = rnd << PAGE_SHIFT;
7036- /* 8MB for 32bit, 256MB for 64bit */
7037- if (TASK_IS_32BIT_ADDR)
7038- rnd = rnd & 0x7ffffful;
7039- else
7040- rnd = rnd & 0xffffffful;
7041-
7042- return rnd;
7043-}
7044-
7045-unsigned long arch_randomize_brk(struct mm_struct *mm)
7046-{
7047- unsigned long base = mm->brk;
7048- unsigned long ret;
7049-
7050- ret = PAGE_ALIGN(base + brk_rnd());
7051-
7052- if (ret < mm->brk)
7053- return mm->brk;
7054-
7055- return ret;
7056-}
7057-
7058 int __virt_addr_valid(const volatile void *kaddr)
7059 {
7060 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7061diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7062index d07e041..bedb72b 100644
7063--- a/arch/mips/pci/pci-octeon.c
7064+++ b/arch/mips/pci/pci-octeon.c
7065@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7066
7067
7068 static struct pci_ops octeon_pci_ops = {
7069- octeon_read_config,
7070- octeon_write_config,
7071+ .read = octeon_read_config,
7072+ .write = octeon_write_config,
7073 };
7074
7075 static struct resource octeon_pci_mem_resource = {
7076diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7077index 5e36c33..eb4a17b 100644
7078--- a/arch/mips/pci/pcie-octeon.c
7079+++ b/arch/mips/pci/pcie-octeon.c
7080@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7081 }
7082
7083 static struct pci_ops octeon_pcie0_ops = {
7084- octeon_pcie0_read_config,
7085- octeon_pcie0_write_config,
7086+ .read = octeon_pcie0_read_config,
7087+ .write = octeon_pcie0_write_config,
7088 };
7089
7090 static struct resource octeon_pcie0_mem_resource = {
7091@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7092 };
7093
7094 static struct pci_ops octeon_pcie1_ops = {
7095- octeon_pcie1_read_config,
7096- octeon_pcie1_write_config,
7097+ .read = octeon_pcie1_read_config,
7098+ .write = octeon_pcie1_write_config,
7099 };
7100
7101 static struct resource octeon_pcie1_mem_resource = {
7102@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7103 };
7104
7105 static struct pci_ops octeon_dummy_ops = {
7106- octeon_dummy_read_config,
7107- octeon_dummy_write_config,
7108+ .read = octeon_dummy_read_config,
7109+ .write = octeon_dummy_write_config,
7110 };
7111
7112 static struct resource octeon_dummy_mem_resource = {
7113diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7114index a2358b4..7cead4f 100644
7115--- a/arch/mips/sgi-ip27/ip27-nmi.c
7116+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7117@@ -187,9 +187,9 @@ void
7118 cont_nmi_dump(void)
7119 {
7120 #ifndef REAL_NMI_SIGNAL
7121- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7122+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7123
7124- atomic_inc(&nmied_cpus);
7125+ atomic_inc_unchecked(&nmied_cpus);
7126 #endif
7127 /*
7128 * Only allow 1 cpu to proceed
7129@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7130 udelay(10000);
7131 }
7132 #else
7133- while (atomic_read(&nmied_cpus) != num_online_cpus());
7134+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7135 #endif
7136
7137 /*
7138diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7139index a046b30..6799527 100644
7140--- a/arch/mips/sni/rm200.c
7141+++ b/arch/mips/sni/rm200.c
7142@@ -270,7 +270,7 @@ spurious_8259A_irq:
7143 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7144 spurious_irq_mask |= irqmask;
7145 }
7146- atomic_inc(&irq_err_count);
7147+ atomic_inc_unchecked(&irq_err_count);
7148 /*
7149 * Theoretically we do not have to handle this IRQ,
7150 * but in Linux this does not cause problems and is
7151diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7152index 41e873b..34d33a7 100644
7153--- a/arch/mips/vr41xx/common/icu.c
7154+++ b/arch/mips/vr41xx/common/icu.c
7155@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7156
7157 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7158
7159- atomic_inc(&irq_err_count);
7160+ atomic_inc_unchecked(&irq_err_count);
7161
7162 return -1;
7163 }
7164diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7165index ae0e4ee..e8f0692 100644
7166--- a/arch/mips/vr41xx/common/irq.c
7167+++ b/arch/mips/vr41xx/common/irq.c
7168@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7169 irq_cascade_t *cascade;
7170
7171 if (irq >= NR_IRQS) {
7172- atomic_inc(&irq_err_count);
7173+ atomic_inc_unchecked(&irq_err_count);
7174 return;
7175 }
7176
7177@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7178 ret = cascade->get_irq(irq);
7179 irq = ret;
7180 if (ret < 0)
7181- atomic_inc(&irq_err_count);
7182+ atomic_inc_unchecked(&irq_err_count);
7183 else
7184 irq_dispatch(irq);
7185 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7186diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7187index 967d144..db12197 100644
7188--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7189+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7190@@ -11,12 +11,14 @@
7191 #ifndef _ASM_PROC_CACHE_H
7192 #define _ASM_PROC_CACHE_H
7193
7194+#include <linux/const.h>
7195+
7196 /* L1 cache */
7197
7198 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7199 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7200-#define L1_CACHE_BYTES 16 /* bytes per entry */
7201 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7202+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7203 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7204
7205 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7206diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7207index bcb5df2..84fabd2 100644
7208--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7209+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7210@@ -16,13 +16,15 @@
7211 #ifndef _ASM_PROC_CACHE_H
7212 #define _ASM_PROC_CACHE_H
7213
7214+#include <linux/const.h>
7215+
7216 /*
7217 * L1 cache
7218 */
7219 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7220 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7221-#define L1_CACHE_BYTES 32 /* bytes per entry */
7222 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7223+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7224 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7225
7226 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7227diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7228index 4ce7a01..449202a 100644
7229--- a/arch/openrisc/include/asm/cache.h
7230+++ b/arch/openrisc/include/asm/cache.h
7231@@ -19,11 +19,13 @@
7232 #ifndef __ASM_OPENRISC_CACHE_H
7233 #define __ASM_OPENRISC_CACHE_H
7234
7235+#include <linux/const.h>
7236+
7237 /* FIXME: How can we replace these with values from the CPU...
7238 * they shouldn't be hard-coded!
7239 */
7240
7241-#define L1_CACHE_BYTES 16
7242 #define L1_CACHE_SHIFT 4
7243+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7244
7245 #endif /* __ASM_OPENRISC_CACHE_H */
7246diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7247index 226f8ca..9d9b87d 100644
7248--- a/arch/parisc/include/asm/atomic.h
7249+++ b/arch/parisc/include/asm/atomic.h
7250@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7251 return dec;
7252 }
7253
7254+#define atomic64_read_unchecked(v) atomic64_read(v)
7255+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7256+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7257+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7258+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7259+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7260+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7261+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7262+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7263+
7264 #endif /* !CONFIG_64BIT */
7265
7266
7267diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7268index 47f11c7..3420df2 100644
7269--- a/arch/parisc/include/asm/cache.h
7270+++ b/arch/parisc/include/asm/cache.h
7271@@ -5,6 +5,7 @@
7272 #ifndef __ARCH_PARISC_CACHE_H
7273 #define __ARCH_PARISC_CACHE_H
7274
7275+#include <linux/const.h>
7276
7277 /*
7278 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7279@@ -15,13 +16,13 @@
7280 * just ruin performance.
7281 */
7282 #ifdef CONFIG_PA20
7283-#define L1_CACHE_BYTES 64
7284 #define L1_CACHE_SHIFT 6
7285 #else
7286-#define L1_CACHE_BYTES 32
7287 #define L1_CACHE_SHIFT 5
7288 #endif
7289
7290+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7291+
7292 #ifndef __ASSEMBLY__
7293
7294 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7295diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7296index 3391d06..c23a2cc 100644
7297--- a/arch/parisc/include/asm/elf.h
7298+++ b/arch/parisc/include/asm/elf.h
7299@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7300
7301 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7302
7303+#ifdef CONFIG_PAX_ASLR
7304+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7305+
7306+#define PAX_DELTA_MMAP_LEN 16
7307+#define PAX_DELTA_STACK_LEN 16
7308+#endif
7309+
7310 /* This yields a mask that user programs can use to figure out what
7311 instruction set this CPU supports. This could be done in user space,
7312 but it's not easy, and we've already done it here. */
7313diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7314index f213f5b..0af3e8e 100644
7315--- a/arch/parisc/include/asm/pgalloc.h
7316+++ b/arch/parisc/include/asm/pgalloc.h
7317@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7318 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7319 }
7320
7321+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7322+{
7323+ pgd_populate(mm, pgd, pmd);
7324+}
7325+
7326 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7327 {
7328 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7329@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7330 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7331 #define pmd_free(mm, x) do { } while (0)
7332 #define pgd_populate(mm, pmd, pte) BUG()
7333+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7334
7335 #endif
7336
7337diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7338index 22b89d1..ce34230 100644
7339--- a/arch/parisc/include/asm/pgtable.h
7340+++ b/arch/parisc/include/asm/pgtable.h
7341@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7342 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7343 #define PAGE_COPY PAGE_EXECREAD
7344 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7345+
7346+#ifdef CONFIG_PAX_PAGEEXEC
7347+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7348+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7349+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7350+#else
7351+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7352+# define PAGE_COPY_NOEXEC PAGE_COPY
7353+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7354+#endif
7355+
7356 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7357 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7358 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7359diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7360index a5cb070..8604ddc 100644
7361--- a/arch/parisc/include/asm/uaccess.h
7362+++ b/arch/parisc/include/asm/uaccess.h
7363@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7364 const void __user *from,
7365 unsigned long n)
7366 {
7367- int sz = __compiletime_object_size(to);
7368+ size_t sz = __compiletime_object_size(to);
7369 int ret = -EFAULT;
7370
7371- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7372+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7373 ret = __copy_from_user(to, from, n);
7374 else
7375 copy_from_user_overflow();
7376diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7377index 5822e8e..bc5e638 100644
7378--- a/arch/parisc/kernel/module.c
7379+++ b/arch/parisc/kernel/module.c
7380@@ -98,16 +98,38 @@
7381
7382 /* three functions to determine where in the module core
7383 * or init pieces the location is */
7384+static inline int in_init_rx(struct module *me, void *loc)
7385+{
7386+ return (loc >= me->module_init_rx &&
7387+ loc < (me->module_init_rx + me->init_size_rx));
7388+}
7389+
7390+static inline int in_init_rw(struct module *me, void *loc)
7391+{
7392+ return (loc >= me->module_init_rw &&
7393+ loc < (me->module_init_rw + me->init_size_rw));
7394+}
7395+
7396 static inline int in_init(struct module *me, void *loc)
7397 {
7398- return (loc >= me->module_init &&
7399- loc <= (me->module_init + me->init_size));
7400+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7401+}
7402+
7403+static inline int in_core_rx(struct module *me, void *loc)
7404+{
7405+ return (loc >= me->module_core_rx &&
7406+ loc < (me->module_core_rx + me->core_size_rx));
7407+}
7408+
7409+static inline int in_core_rw(struct module *me, void *loc)
7410+{
7411+ return (loc >= me->module_core_rw &&
7412+ loc < (me->module_core_rw + me->core_size_rw));
7413 }
7414
7415 static inline int in_core(struct module *me, void *loc)
7416 {
7417- return (loc >= me->module_core &&
7418- loc <= (me->module_core + me->core_size));
7419+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7420 }
7421
7422 static inline int in_local(struct module *me, void *loc)
7423@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7424 }
7425
7426 /* align things a bit */
7427- me->core_size = ALIGN(me->core_size, 16);
7428- me->arch.got_offset = me->core_size;
7429- me->core_size += gots * sizeof(struct got_entry);
7430+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7431+ me->arch.got_offset = me->core_size_rw;
7432+ me->core_size_rw += gots * sizeof(struct got_entry);
7433
7434- me->core_size = ALIGN(me->core_size, 16);
7435- me->arch.fdesc_offset = me->core_size;
7436- me->core_size += fdescs * sizeof(Elf_Fdesc);
7437+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7438+ me->arch.fdesc_offset = me->core_size_rw;
7439+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7440
7441 me->arch.got_max = gots;
7442 me->arch.fdesc_max = fdescs;
7443@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7444
7445 BUG_ON(value == 0);
7446
7447- got = me->module_core + me->arch.got_offset;
7448+ got = me->module_core_rw + me->arch.got_offset;
7449 for (i = 0; got[i].addr; i++)
7450 if (got[i].addr == value)
7451 goto out;
7452@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7453 #ifdef CONFIG_64BIT
7454 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7455 {
7456- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7457+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7458
7459 if (!value) {
7460 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7461@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7462
7463 /* Create new one */
7464 fdesc->addr = value;
7465- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7466+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7467 return (Elf_Addr)fdesc;
7468 }
7469 #endif /* CONFIG_64BIT */
7470@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7471
7472 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7473 end = table + sechdrs[me->arch.unwind_section].sh_size;
7474- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7475+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7476
7477 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7478 me->arch.unwind_section, table, end, gp);
7479diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7480index e1ffea2..46ed66e 100644
7481--- a/arch/parisc/kernel/sys_parisc.c
7482+++ b/arch/parisc/kernel/sys_parisc.c
7483@@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7484 unsigned long task_size = TASK_SIZE;
7485 int do_color_align, last_mmap;
7486 struct vm_unmapped_area_info info;
7487+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7488
7489 if (len > task_size)
7490 return -ENOMEM;
7491@@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7492 goto found_addr;
7493 }
7494
7495+#ifdef CONFIG_PAX_RANDMMAP
7496+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7497+#endif
7498+
7499 if (addr) {
7500 if (do_color_align && last_mmap)
7501 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7502@@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7503 info.high_limit = mmap_upper_limit();
7504 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7505 info.align_offset = shared_align_offset(last_mmap, pgoff);
7506+ info.threadstack_offset = offset;
7507 addr = vm_unmapped_area(&info);
7508
7509 found_addr:
7510@@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7511 unsigned long addr = addr0;
7512 int do_color_align, last_mmap;
7513 struct vm_unmapped_area_info info;
7514+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7515
7516 #ifdef CONFIG_64BIT
7517 /* This should only ever run for 32-bit processes. */
7518@@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7519 }
7520
7521 /* requesting a specific address */
7522+#ifdef CONFIG_PAX_RANDMMAP
7523+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7524+#endif
7525+
7526 if (addr) {
7527 if (do_color_align && last_mmap)
7528 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7529@@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7530 info.high_limit = mm->mmap_base;
7531 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7532 info.align_offset = shared_align_offset(last_mmap, pgoff);
7533+ info.threadstack_offset = offset;
7534 addr = vm_unmapped_area(&info);
7535 if (!(addr & ~PAGE_MASK))
7536 goto found_addr;
7537@@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7538 mm->mmap_legacy_base = mmap_legacy_base();
7539 mm->mmap_base = mmap_upper_limit();
7540
7541+#ifdef CONFIG_PAX_RANDMMAP
7542+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7543+ mm->mmap_legacy_base += mm->delta_mmap;
7544+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7545+ }
7546+#endif
7547+
7548 if (mmap_is_legacy()) {
7549 mm->mmap_base = mm->mmap_legacy_base;
7550 mm->get_unmapped_area = arch_get_unmapped_area;
7551diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7552index 47ee620..1107387 100644
7553--- a/arch/parisc/kernel/traps.c
7554+++ b/arch/parisc/kernel/traps.c
7555@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7556
7557 down_read(&current->mm->mmap_sem);
7558 vma = find_vma(current->mm,regs->iaoq[0]);
7559- if (vma && (regs->iaoq[0] >= vma->vm_start)
7560- && (vma->vm_flags & VM_EXEC)) {
7561-
7562+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7563 fault_address = regs->iaoq[0];
7564 fault_space = regs->iasq[0];
7565
7566diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7567index e5120e6..8ddb5cc 100644
7568--- a/arch/parisc/mm/fault.c
7569+++ b/arch/parisc/mm/fault.c
7570@@ -15,6 +15,7 @@
7571 #include <linux/sched.h>
7572 #include <linux/interrupt.h>
7573 #include <linux/module.h>
7574+#include <linux/unistd.h>
7575
7576 #include <asm/uaccess.h>
7577 #include <asm/traps.h>
7578@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7579 static unsigned long
7580 parisc_acctyp(unsigned long code, unsigned int inst)
7581 {
7582- if (code == 6 || code == 16)
7583+ if (code == 6 || code == 7 || code == 16)
7584 return VM_EXEC;
7585
7586 switch (inst & 0xf0000000) {
7587@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7588 }
7589 #endif
7590
7591+#ifdef CONFIG_PAX_PAGEEXEC
7592+/*
7593+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7594+ *
7595+ * returns 1 when task should be killed
7596+ * 2 when rt_sigreturn trampoline was detected
7597+ * 3 when unpatched PLT trampoline was detected
7598+ */
7599+static int pax_handle_fetch_fault(struct pt_regs *regs)
7600+{
7601+
7602+#ifdef CONFIG_PAX_EMUPLT
7603+ int err;
7604+
7605+ do { /* PaX: unpatched PLT emulation */
7606+ unsigned int bl, depwi;
7607+
7608+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7609+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7610+
7611+ if (err)
7612+ break;
7613+
7614+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7615+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7616+
7617+ err = get_user(ldw, (unsigned int *)addr);
7618+ err |= get_user(bv, (unsigned int *)(addr+4));
7619+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7620+
7621+ if (err)
7622+ break;
7623+
7624+ if (ldw == 0x0E801096U &&
7625+ bv == 0xEAC0C000U &&
7626+ ldw2 == 0x0E881095U)
7627+ {
7628+ unsigned int resolver, map;
7629+
7630+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7631+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7632+ if (err)
7633+ break;
7634+
7635+ regs->gr[20] = instruction_pointer(regs)+8;
7636+ regs->gr[21] = map;
7637+ regs->gr[22] = resolver;
7638+ regs->iaoq[0] = resolver | 3UL;
7639+ regs->iaoq[1] = regs->iaoq[0] + 4;
7640+ return 3;
7641+ }
7642+ }
7643+ } while (0);
7644+#endif
7645+
7646+#ifdef CONFIG_PAX_EMUTRAMP
7647+
7648+#ifndef CONFIG_PAX_EMUSIGRT
7649+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7650+ return 1;
7651+#endif
7652+
7653+ do { /* PaX: rt_sigreturn emulation */
7654+ unsigned int ldi1, ldi2, bel, nop;
7655+
7656+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7657+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7658+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7659+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7660+
7661+ if (err)
7662+ break;
7663+
7664+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7665+ ldi2 == 0x3414015AU &&
7666+ bel == 0xE4008200U &&
7667+ nop == 0x08000240U)
7668+ {
7669+ regs->gr[25] = (ldi1 & 2) >> 1;
7670+ regs->gr[20] = __NR_rt_sigreturn;
7671+ regs->gr[31] = regs->iaoq[1] + 16;
7672+ regs->sr[0] = regs->iasq[1];
7673+ regs->iaoq[0] = 0x100UL;
7674+ regs->iaoq[1] = regs->iaoq[0] + 4;
7675+ regs->iasq[0] = regs->sr[2];
7676+ regs->iasq[1] = regs->sr[2];
7677+ return 2;
7678+ }
7679+ } while (0);
7680+#endif
7681+
7682+ return 1;
7683+}
7684+
7685+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7686+{
7687+ unsigned long i;
7688+
7689+ printk(KERN_ERR "PAX: bytes at PC: ");
7690+ for (i = 0; i < 5; i++) {
7691+ unsigned int c;
7692+ if (get_user(c, (unsigned int *)pc+i))
7693+ printk(KERN_CONT "???????? ");
7694+ else
7695+ printk(KERN_CONT "%08x ", c);
7696+ }
7697+ printk("\n");
7698+}
7699+#endif
7700+
7701 int fixup_exception(struct pt_regs *regs)
7702 {
7703 const struct exception_table_entry *fix;
7704@@ -234,8 +345,33 @@ retry:
7705
7706 good_area:
7707
7708- if ((vma->vm_flags & acc_type) != acc_type)
7709+ if ((vma->vm_flags & acc_type) != acc_type) {
7710+
7711+#ifdef CONFIG_PAX_PAGEEXEC
7712+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7713+ (address & ~3UL) == instruction_pointer(regs))
7714+ {
7715+ up_read(&mm->mmap_sem);
7716+ switch (pax_handle_fetch_fault(regs)) {
7717+
7718+#ifdef CONFIG_PAX_EMUPLT
7719+ case 3:
7720+ return;
7721+#endif
7722+
7723+#ifdef CONFIG_PAX_EMUTRAMP
7724+ case 2:
7725+ return;
7726+#endif
7727+
7728+ }
7729+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7730+ do_group_exit(SIGKILL);
7731+ }
7732+#endif
7733+
7734 goto bad_area;
7735+ }
7736
7737 /*
7738 * If for any reason at all we couldn't handle the fault, make
7739diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7740index a2a168e..e484682 100644
7741--- a/arch/powerpc/Kconfig
7742+++ b/arch/powerpc/Kconfig
7743@@ -408,6 +408,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7744 config KEXEC
7745 bool "kexec system call"
7746 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7747+ depends on !GRKERNSEC_KMEM
7748 help
7749 kexec is a system call that implements the ability to shutdown your
7750 current kernel, and to start another kernel. It is like a reboot
7751diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7752index 512d278..d31fadd 100644
7753--- a/arch/powerpc/include/asm/atomic.h
7754+++ b/arch/powerpc/include/asm/atomic.h
7755@@ -12,6 +12,11 @@
7756
7757 #define ATOMIC_INIT(i) { (i) }
7758
7759+#define _ASM_EXTABLE(from, to) \
7760+" .section __ex_table,\"a\"\n" \
7761+ PPC_LONG" " #from ", " #to"\n" \
7762+" .previous\n"
7763+
7764 static __inline__ int atomic_read(const atomic_t *v)
7765 {
7766 int t;
7767@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7768 return t;
7769 }
7770
7771+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7772+{
7773+ int t;
7774+
7775+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7776+
7777+ return t;
7778+}
7779+
7780 static __inline__ void atomic_set(atomic_t *v, int i)
7781 {
7782 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7783 }
7784
7785-#define ATOMIC_OP(op, asm_op) \
7786-static __inline__ void atomic_##op(int a, atomic_t *v) \
7787+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7788+{
7789+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7790+}
7791+
7792+#ifdef CONFIG_PAX_REFCOUNT
7793+#define __REFCOUNT_OP(op) op##o.
7794+#define __OVERFLOW_PRE \
7795+ " mcrxr cr0\n"
7796+#define __OVERFLOW_POST \
7797+ " bf 4*cr0+so, 3f\n" \
7798+ "2: .long 0x00c00b00\n" \
7799+ "3:\n"
7800+#define __OVERFLOW_EXTABLE \
7801+ "\n4:\n"
7802+ _ASM_EXTABLE(2b, 4b)
7803+#else
7804+#define __REFCOUNT_OP(op) op
7805+#define __OVERFLOW_PRE
7806+#define __OVERFLOW_POST
7807+#define __OVERFLOW_EXTABLE
7808+#endif
7809+
7810+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7811+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7812 { \
7813 int t; \
7814 \
7815 __asm__ __volatile__( \
7816-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7817+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7818+ pre_op \
7819 #asm_op " %0,%2,%0\n" \
7820+ post_op \
7821 PPC405_ERR77(0,%3) \
7822 " stwcx. %0,0,%3 \n" \
7823 " bne- 1b\n" \
7824+ extable \
7825 : "=&r" (t), "+m" (v->counter) \
7826 : "r" (a), "r" (&v->counter) \
7827 : "cc"); \
7828 } \
7829
7830-#define ATOMIC_OP_RETURN(op, asm_op) \
7831-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7832+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7833+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7834+
7835+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7836+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7837 { \
7838 int t; \
7839 \
7840 __asm__ __volatile__( \
7841 PPC_ATOMIC_ENTRY_BARRIER \
7842-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7843+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7844+ pre_op \
7845 #asm_op " %0,%1,%0\n" \
7846+ post_op \
7847 PPC405_ERR77(0,%2) \
7848 " stwcx. %0,0,%2 \n" \
7849 " bne- 1b\n" \
7850+ extable \
7851 PPC_ATOMIC_EXIT_BARRIER \
7852 : "=&r" (t) \
7853 : "r" (a), "r" (&v->counter) \
7854@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7855 return t; \
7856 }
7857
7858+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7859+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7860+
7861 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7862
7863 ATOMIC_OPS(add, add)
7864@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7865
7866 #undef ATOMIC_OPS
7867 #undef ATOMIC_OP_RETURN
7868+#undef __ATOMIC_OP_RETURN
7869 #undef ATOMIC_OP
7870+#undef __ATOMIC_OP
7871
7872 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7873
7874-static __inline__ void atomic_inc(atomic_t *v)
7875-{
7876- int t;
7877+/*
7878+ * atomic_inc - increment atomic variable
7879+ * @v: pointer of type atomic_t
7880+ *
7881+ * Automatically increments @v by 1
7882+ */
7883+#define atomic_inc(v) atomic_add(1, (v))
7884+#define atomic_inc_return(v) atomic_add_return(1, (v))
7885
7886- __asm__ __volatile__(
7887-"1: lwarx %0,0,%2 # atomic_inc\n\
7888- addic %0,%0,1\n"
7889- PPC405_ERR77(0,%2)
7890-" stwcx. %0,0,%2 \n\
7891- bne- 1b"
7892- : "=&r" (t), "+m" (v->counter)
7893- : "r" (&v->counter)
7894- : "cc", "xer");
7895+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7896+{
7897+ atomic_add_unchecked(1, v);
7898 }
7899
7900-static __inline__ int atomic_inc_return(atomic_t *v)
7901+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7902 {
7903- int t;
7904-
7905- __asm__ __volatile__(
7906- PPC_ATOMIC_ENTRY_BARRIER
7907-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7908- addic %0,%0,1\n"
7909- PPC405_ERR77(0,%1)
7910-" stwcx. %0,0,%1 \n\
7911- bne- 1b"
7912- PPC_ATOMIC_EXIT_BARRIER
7913- : "=&r" (t)
7914- : "r" (&v->counter)
7915- : "cc", "xer", "memory");
7916-
7917- return t;
7918+ return atomic_add_return_unchecked(1, v);
7919 }
7920
7921 /*
7922@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7923 */
7924 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7925
7926-static __inline__ void atomic_dec(atomic_t *v)
7927+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7928 {
7929- int t;
7930-
7931- __asm__ __volatile__(
7932-"1: lwarx %0,0,%2 # atomic_dec\n\
7933- addic %0,%0,-1\n"
7934- PPC405_ERR77(0,%2)\
7935-" stwcx. %0,0,%2\n\
7936- bne- 1b"
7937- : "=&r" (t), "+m" (v->counter)
7938- : "r" (&v->counter)
7939- : "cc", "xer");
7940+ return atomic_add_return_unchecked(1, v) == 0;
7941 }
7942
7943-static __inline__ int atomic_dec_return(atomic_t *v)
7944+/*
7945+ * atomic_dec - decrement atomic variable
7946+ * @v: pointer of type atomic_t
7947+ *
7948+ * Atomically decrements @v by 1
7949+ */
7950+#define atomic_dec(v) atomic_sub(1, (v))
7951+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7952+
7953+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7954 {
7955- int t;
7956-
7957- __asm__ __volatile__(
7958- PPC_ATOMIC_ENTRY_BARRIER
7959-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7960- addic %0,%0,-1\n"
7961- PPC405_ERR77(0,%1)
7962-" stwcx. %0,0,%1\n\
7963- bne- 1b"
7964- PPC_ATOMIC_EXIT_BARRIER
7965- : "=&r" (t)
7966- : "r" (&v->counter)
7967- : "cc", "xer", "memory");
7968-
7969- return t;
7970+ atomic_sub_unchecked(1, v);
7971 }
7972
7973 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7974 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7975
7976+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7977+{
7978+ return cmpxchg(&(v->counter), old, new);
7979+}
7980+
7981+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7982+{
7983+ return xchg(&(v->counter), new);
7984+}
7985+
7986 /**
7987 * __atomic_add_unless - add unless the number is a given value
7988 * @v: pointer of type atomic_t
7989@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7990 PPC_ATOMIC_ENTRY_BARRIER
7991 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7992 cmpw 0,%0,%3 \n\
7993- beq- 2f \n\
7994- add %0,%2,%0 \n"
7995+ beq- 2f \n"
7996+
7997+#ifdef CONFIG_PAX_REFCOUNT
7998+" mcrxr cr0\n"
7999+" addo. %0,%2,%0\n"
8000+" bf 4*cr0+so, 4f\n"
8001+"3:.long " "0x00c00b00""\n"
8002+"4:\n"
8003+#else
8004+ "add %0,%2,%0 \n"
8005+#endif
8006+
8007 PPC405_ERR77(0,%2)
8008 " stwcx. %0,0,%1 \n\
8009 bne- 1b \n"
8010+"5:"
8011+
8012+#ifdef CONFIG_PAX_REFCOUNT
8013+ _ASM_EXTABLE(3b, 5b)
8014+#endif
8015+
8016 PPC_ATOMIC_EXIT_BARRIER
8017 " subf %0,%2,%0 \n\
8018 2:"
8019@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
8020 }
8021 #define atomic_dec_if_positive atomic_dec_if_positive
8022
8023+#define smp_mb__before_atomic_dec() smp_mb()
8024+#define smp_mb__after_atomic_dec() smp_mb()
8025+#define smp_mb__before_atomic_inc() smp_mb()
8026+#define smp_mb__after_atomic_inc() smp_mb()
8027+
8028 #ifdef __powerpc64__
8029
8030 #define ATOMIC64_INIT(i) { (i) }
8031@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8032 return t;
8033 }
8034
8035+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8036+{
8037+ long t;
8038+
8039+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8040+
8041+ return t;
8042+}
8043+
8044 static __inline__ void atomic64_set(atomic64_t *v, long i)
8045 {
8046 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8047 }
8048
8049-#define ATOMIC64_OP(op, asm_op) \
8050-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8051+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8052+{
8053+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8054+}
8055+
8056+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8057+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8058 { \
8059 long t; \
8060 \
8061 __asm__ __volatile__( \
8062 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8063+ pre_op \
8064 #asm_op " %0,%2,%0\n" \
8065+ post_op \
8066 " stdcx. %0,0,%3 \n" \
8067 " bne- 1b\n" \
8068+ extable \
8069 : "=&r" (t), "+m" (v->counter) \
8070 : "r" (a), "r" (&v->counter) \
8071 : "cc"); \
8072 }
8073
8074-#define ATOMIC64_OP_RETURN(op, asm_op) \
8075-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8076+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8077+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8078+
8079+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8080+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8081 { \
8082 long t; \
8083 \
8084 __asm__ __volatile__( \
8085 PPC_ATOMIC_ENTRY_BARRIER \
8086 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8087+ pre_op \
8088 #asm_op " %0,%1,%0\n" \
8089+ post_op \
8090 " stdcx. %0,0,%2 \n" \
8091 " bne- 1b\n" \
8092+ extable \
8093 PPC_ATOMIC_EXIT_BARRIER \
8094 : "=&r" (t) \
8095 : "r" (a), "r" (&v->counter) \
8096@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8097 return t; \
8098 }
8099
8100+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8101+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8102+
8103 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8104
8105 ATOMIC64_OPS(add, add)
8106@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8107
8108 #undef ATOMIC64_OPS
8109 #undef ATOMIC64_OP_RETURN
8110+#undef __ATOMIC64_OP_RETURN
8111 #undef ATOMIC64_OP
8112+#undef __ATOMIC64_OP
8113+#undef __OVERFLOW_EXTABLE
8114+#undef __OVERFLOW_POST
8115+#undef __OVERFLOW_PRE
8116+#undef __REFCOUNT_OP
8117
8118 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8119
8120-static __inline__ void atomic64_inc(atomic64_t *v)
8121-{
8122- long t;
8123+/*
8124+ * atomic64_inc - increment atomic variable
8125+ * @v: pointer of type atomic64_t
8126+ *
8127+ * Automatically increments @v by 1
8128+ */
8129+#define atomic64_inc(v) atomic64_add(1, (v))
8130+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8131
8132- __asm__ __volatile__(
8133-"1: ldarx %0,0,%2 # atomic64_inc\n\
8134- addic %0,%0,1\n\
8135- stdcx. %0,0,%2 \n\
8136- bne- 1b"
8137- : "=&r" (t), "+m" (v->counter)
8138- : "r" (&v->counter)
8139- : "cc", "xer");
8140+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8141+{
8142+ atomic64_add_unchecked(1, v);
8143 }
8144
8145-static __inline__ long atomic64_inc_return(atomic64_t *v)
8146+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8147 {
8148- long t;
8149-
8150- __asm__ __volatile__(
8151- PPC_ATOMIC_ENTRY_BARRIER
8152-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8153- addic %0,%0,1\n\
8154- stdcx. %0,0,%1 \n\
8155- bne- 1b"
8156- PPC_ATOMIC_EXIT_BARRIER
8157- : "=&r" (t)
8158- : "r" (&v->counter)
8159- : "cc", "xer", "memory");
8160-
8161- return t;
8162+ return atomic64_add_return_unchecked(1, v);
8163 }
8164
8165 /*
8166@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8167 */
8168 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8169
8170-static __inline__ void atomic64_dec(atomic64_t *v)
8171+/*
8172+ * atomic64_dec - decrement atomic variable
8173+ * @v: pointer of type atomic64_t
8174+ *
8175+ * Atomically decrements @v by 1
8176+ */
8177+#define atomic64_dec(v) atomic64_sub(1, (v))
8178+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8179+
8180+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8181 {
8182- long t;
8183-
8184- __asm__ __volatile__(
8185-"1: ldarx %0,0,%2 # atomic64_dec\n\
8186- addic %0,%0,-1\n\
8187- stdcx. %0,0,%2\n\
8188- bne- 1b"
8189- : "=&r" (t), "+m" (v->counter)
8190- : "r" (&v->counter)
8191- : "cc", "xer");
8192-}
8193-
8194-static __inline__ long atomic64_dec_return(atomic64_t *v)
8195-{
8196- long t;
8197-
8198- __asm__ __volatile__(
8199- PPC_ATOMIC_ENTRY_BARRIER
8200-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8201- addic %0,%0,-1\n\
8202- stdcx. %0,0,%1\n\
8203- bne- 1b"
8204- PPC_ATOMIC_EXIT_BARRIER
8205- : "=&r" (t)
8206- : "r" (&v->counter)
8207- : "cc", "xer", "memory");
8208-
8209- return t;
8210+ atomic64_sub_unchecked(1, v);
8211 }
8212
8213 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8214@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8215 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8216 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8217
8218+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8219+{
8220+ return cmpxchg(&(v->counter), old, new);
8221+}
8222+
8223+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8224+{
8225+ return xchg(&(v->counter), new);
8226+}
8227+
8228 /**
8229 * atomic64_add_unless - add unless the number is a given value
8230 * @v: pointer of type atomic64_t
8231@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8232
8233 __asm__ __volatile__ (
8234 PPC_ATOMIC_ENTRY_BARRIER
8235-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8236+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8237 cmpd 0,%0,%3 \n\
8238- beq- 2f \n\
8239- add %0,%2,%0 \n"
8240+ beq- 2f \n"
8241+
8242+#ifdef CONFIG_PAX_REFCOUNT
8243+" mcrxr cr0\n"
8244+" addo. %0,%2,%0\n"
8245+" bf 4*cr0+so, 4f\n"
8246+"3:.long " "0x00c00b00""\n"
8247+"4:\n"
8248+#else
8249+ "add %0,%2,%0 \n"
8250+#endif
8251+
8252 " stdcx. %0,0,%1 \n\
8253 bne- 1b \n"
8254 PPC_ATOMIC_EXIT_BARRIER
8255+"5:"
8256+
8257+#ifdef CONFIG_PAX_REFCOUNT
8258+ _ASM_EXTABLE(3b, 5b)
8259+#endif
8260+
8261 " subf %0,%2,%0 \n\
8262 2:"
8263 : "=&r" (t)
8264diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8265index a3bf5be..e03ba81 100644
8266--- a/arch/powerpc/include/asm/barrier.h
8267+++ b/arch/powerpc/include/asm/barrier.h
8268@@ -76,7 +76,7 @@
8269 do { \
8270 compiletime_assert_atomic_type(*p); \
8271 smp_lwsync(); \
8272- ACCESS_ONCE(*p) = (v); \
8273+ ACCESS_ONCE_RW(*p) = (v); \
8274 } while (0)
8275
8276 #define smp_load_acquire(p) \
8277diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8278index 34a05a1..a1f2c67 100644
8279--- a/arch/powerpc/include/asm/cache.h
8280+++ b/arch/powerpc/include/asm/cache.h
8281@@ -4,6 +4,7 @@
8282 #ifdef __KERNEL__
8283
8284 #include <asm/reg.h>
8285+#include <linux/const.h>
8286
8287 /* bytes per L1 cache line */
8288 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8289@@ -23,7 +24,7 @@
8290 #define L1_CACHE_SHIFT 7
8291 #endif
8292
8293-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8294+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8295
8296 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8297
8298diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8299index 57d289a..b36c98c 100644
8300--- a/arch/powerpc/include/asm/elf.h
8301+++ b/arch/powerpc/include/asm/elf.h
8302@@ -30,6 +30,18 @@
8303
8304 #define ELF_ET_DYN_BASE 0x20000000
8305
8306+#ifdef CONFIG_PAX_ASLR
8307+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8308+
8309+#ifdef __powerpc64__
8310+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8311+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8312+#else
8313+#define PAX_DELTA_MMAP_LEN 15
8314+#define PAX_DELTA_STACK_LEN 15
8315+#endif
8316+#endif
8317+
8318 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8319
8320 /*
8321@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8322 (0x7ff >> (PAGE_SHIFT - 12)) : \
8323 (0x3ffff >> (PAGE_SHIFT - 12)))
8324
8325-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8326-#define arch_randomize_brk arch_randomize_brk
8327-
8328-
8329 #ifdef CONFIG_SPU_BASE
8330 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8331 #define NT_SPU 1
8332diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8333index 8196e9c..d83a9f3 100644
8334--- a/arch/powerpc/include/asm/exec.h
8335+++ b/arch/powerpc/include/asm/exec.h
8336@@ -4,6 +4,6 @@
8337 #ifndef _ASM_POWERPC_EXEC_H
8338 #define _ASM_POWERPC_EXEC_H
8339
8340-extern unsigned long arch_align_stack(unsigned long sp);
8341+#define arch_align_stack(x) ((x) & ~0xfUL)
8342
8343 #endif /* _ASM_POWERPC_EXEC_H */
8344diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8345index 5acabbd..7ea14fa 100644
8346--- a/arch/powerpc/include/asm/kmap_types.h
8347+++ b/arch/powerpc/include/asm/kmap_types.h
8348@@ -10,7 +10,7 @@
8349 * 2 of the License, or (at your option) any later version.
8350 */
8351
8352-#define KM_TYPE_NR 16
8353+#define KM_TYPE_NR 17
8354
8355 #endif /* __KERNEL__ */
8356 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8357diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8358index b8da913..c02b593 100644
8359--- a/arch/powerpc/include/asm/local.h
8360+++ b/arch/powerpc/include/asm/local.h
8361@@ -9,21 +9,65 @@ typedef struct
8362 atomic_long_t a;
8363 } local_t;
8364
8365+typedef struct
8366+{
8367+ atomic_long_unchecked_t a;
8368+} local_unchecked_t;
8369+
8370 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8371
8372 #define local_read(l) atomic_long_read(&(l)->a)
8373+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8374 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8375+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8376
8377 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8378+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8379 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8380+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8381 #define local_inc(l) atomic_long_inc(&(l)->a)
8382+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8383 #define local_dec(l) atomic_long_dec(&(l)->a)
8384+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8385
8386 static __inline__ long local_add_return(long a, local_t *l)
8387 {
8388 long t;
8389
8390 __asm__ __volatile__(
8391+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8392+
8393+#ifdef CONFIG_PAX_REFCOUNT
8394+" mcrxr cr0\n"
8395+" addo. %0,%1,%0\n"
8396+" bf 4*cr0+so, 3f\n"
8397+"2:.long " "0x00c00b00""\n"
8398+#else
8399+" add %0,%1,%0\n"
8400+#endif
8401+
8402+"3:\n"
8403+ PPC405_ERR77(0,%2)
8404+ PPC_STLCX "%0,0,%2 \n\
8405+ bne- 1b"
8406+
8407+#ifdef CONFIG_PAX_REFCOUNT
8408+"\n4:\n"
8409+ _ASM_EXTABLE(2b, 4b)
8410+#endif
8411+
8412+ : "=&r" (t)
8413+ : "r" (a), "r" (&(l->a.counter))
8414+ : "cc", "memory");
8415+
8416+ return t;
8417+}
8418+
8419+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8420+{
8421+ long t;
8422+
8423+ __asm__ __volatile__(
8424 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8425 add %0,%1,%0\n"
8426 PPC405_ERR77(0,%2)
8427@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8428
8429 #define local_cmpxchg(l, o, n) \
8430 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8431+#define local_cmpxchg_unchecked(l, o, n) \
8432+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8433 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8434
8435 /**
8436diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8437index 8565c25..2865190 100644
8438--- a/arch/powerpc/include/asm/mman.h
8439+++ b/arch/powerpc/include/asm/mman.h
8440@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8441 }
8442 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8443
8444-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8445+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8446 {
8447 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8448 }
8449diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8450index 69c0598..2c56964 100644
8451--- a/arch/powerpc/include/asm/page.h
8452+++ b/arch/powerpc/include/asm/page.h
8453@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8454 * and needs to be executable. This means the whole heap ends
8455 * up being executable.
8456 */
8457-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8458- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8459+#define VM_DATA_DEFAULT_FLAGS32 \
8460+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8461+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8462
8463 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8465@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8466 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8467 #endif
8468
8469+#define ktla_ktva(addr) (addr)
8470+#define ktva_ktla(addr) (addr)
8471+
8472 #ifndef CONFIG_PPC_BOOK3S_64
8473 /*
8474 * Use the top bit of the higher-level page table entries to indicate whether
8475diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8476index d908a46..3753f71 100644
8477--- a/arch/powerpc/include/asm/page_64.h
8478+++ b/arch/powerpc/include/asm/page_64.h
8479@@ -172,15 +172,18 @@ do { \
8480 * stack by default, so in the absence of a PT_GNU_STACK program header
8481 * we turn execute permission off.
8482 */
8483-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8484- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8485+#define VM_STACK_DEFAULT_FLAGS32 \
8486+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8487+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8488
8489 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8490 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8491
8492+#ifndef CONFIG_PAX_PAGEEXEC
8493 #define VM_STACK_DEFAULT_FLAGS \
8494 (is_32bit_task() ? \
8495 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8496+#endif
8497
8498 #include <asm-generic/getorder.h>
8499
8500diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8501index 4b0be20..c15a27d 100644
8502--- a/arch/powerpc/include/asm/pgalloc-64.h
8503+++ b/arch/powerpc/include/asm/pgalloc-64.h
8504@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8505 #ifndef CONFIG_PPC_64K_PAGES
8506
8507 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8508+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8509
8510 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8511 {
8512@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8513 pud_set(pud, (unsigned long)pmd);
8514 }
8515
8516+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8517+{
8518+ pud_populate(mm, pud, pmd);
8519+}
8520+
8521 #define pmd_populate(mm, pmd, pte_page) \
8522 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8523 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8524@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8525 #endif
8526
8527 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8528+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8529
8530 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8531 pte_t *pte)
8532diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8533index a8805fe..6d69617 100644
8534--- a/arch/powerpc/include/asm/pgtable.h
8535+++ b/arch/powerpc/include/asm/pgtable.h
8536@@ -2,6 +2,7 @@
8537 #define _ASM_POWERPC_PGTABLE_H
8538 #ifdef __KERNEL__
8539
8540+#include <linux/const.h>
8541 #ifndef __ASSEMBLY__
8542 #include <linux/mmdebug.h>
8543 #include <linux/mmzone.h>
8544diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8545index 4aad413..85d86bf 100644
8546--- a/arch/powerpc/include/asm/pte-hash32.h
8547+++ b/arch/powerpc/include/asm/pte-hash32.h
8548@@ -21,6 +21,7 @@
8549 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8550 #define _PAGE_USER 0x004 /* usermode access allowed */
8551 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8552+#define _PAGE_EXEC _PAGE_GUARDED
8553 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8554 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8555 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8556diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8557index 1c874fb..e8480a4 100644
8558--- a/arch/powerpc/include/asm/reg.h
8559+++ b/arch/powerpc/include/asm/reg.h
8560@@ -253,6 +253,7 @@
8561 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8562 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8563 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8564+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8565 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8566 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8567 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8568diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8569index 5a6614a..d89995d1 100644
8570--- a/arch/powerpc/include/asm/smp.h
8571+++ b/arch/powerpc/include/asm/smp.h
8572@@ -51,7 +51,7 @@ struct smp_ops_t {
8573 int (*cpu_disable)(void);
8574 void (*cpu_die)(unsigned int nr);
8575 int (*cpu_bootable)(unsigned int nr);
8576-};
8577+} __no_const;
8578
8579 extern void smp_send_debugger_break(void);
8580 extern void start_secondary_resume(void);
8581diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8582index 4dbe072..b803275 100644
8583--- a/arch/powerpc/include/asm/spinlock.h
8584+++ b/arch/powerpc/include/asm/spinlock.h
8585@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8586 __asm__ __volatile__(
8587 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8588 __DO_SIGN_EXTEND
8589-" addic. %0,%0,1\n\
8590- ble- 2f\n"
8591+
8592+#ifdef CONFIG_PAX_REFCOUNT
8593+" mcrxr cr0\n"
8594+" addico. %0,%0,1\n"
8595+" bf 4*cr0+so, 3f\n"
8596+"2:.long " "0x00c00b00""\n"
8597+#else
8598+" addic. %0,%0,1\n"
8599+#endif
8600+
8601+"3:\n"
8602+ "ble- 4f\n"
8603 PPC405_ERR77(0,%1)
8604 " stwcx. %0,0,%1\n\
8605 bne- 1b\n"
8606 PPC_ACQUIRE_BARRIER
8607-"2:" : "=&r" (tmp)
8608+"4:"
8609+
8610+#ifdef CONFIG_PAX_REFCOUNT
8611+ _ASM_EXTABLE(2b,4b)
8612+#endif
8613+
8614+ : "=&r" (tmp)
8615 : "r" (&rw->lock)
8616 : "cr0", "xer", "memory");
8617
8618@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8619 __asm__ __volatile__(
8620 "# read_unlock\n\t"
8621 PPC_RELEASE_BARRIER
8622-"1: lwarx %0,0,%1\n\
8623- addic %0,%0,-1\n"
8624+"1: lwarx %0,0,%1\n"
8625+
8626+#ifdef CONFIG_PAX_REFCOUNT
8627+" mcrxr cr0\n"
8628+" addico. %0,%0,-1\n"
8629+" bf 4*cr0+so, 3f\n"
8630+"2:.long " "0x00c00b00""\n"
8631+#else
8632+" addic. %0,%0,-1\n"
8633+#endif
8634+
8635+"3:\n"
8636 PPC405_ERR77(0,%1)
8637 " stwcx. %0,0,%1\n\
8638 bne- 1b"
8639+
8640+#ifdef CONFIG_PAX_REFCOUNT
8641+"\n4:\n"
8642+ _ASM_EXTABLE(2b, 4b)
8643+#endif
8644+
8645 : "=&r"(tmp)
8646 : "r"(&rw->lock)
8647 : "cr0", "xer", "memory");
8648diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8649index 0be6c68..9c3c6ee 100644
8650--- a/arch/powerpc/include/asm/thread_info.h
8651+++ b/arch/powerpc/include/asm/thread_info.h
8652@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8653 #if defined(CONFIG_PPC64)
8654 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8655 #endif
8656+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8657+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8658
8659 /* as above, but as bit values */
8660 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8661@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8662 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8663 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8664 #define _TIF_NOHZ (1<<TIF_NOHZ)
8665+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8666 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8667 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8668- _TIF_NOHZ)
8669+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8670
8671 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8672 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8673diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8674index a0c071d..49cdc7f 100644
8675--- a/arch/powerpc/include/asm/uaccess.h
8676+++ b/arch/powerpc/include/asm/uaccess.h
8677@@ -58,6 +58,7 @@
8678
8679 #endif
8680
8681+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8682 #define access_ok(type, addr, size) \
8683 (__chk_user_ptr(addr), \
8684 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8685@@ -318,52 +319,6 @@ do { \
8686 extern unsigned long __copy_tofrom_user(void __user *to,
8687 const void __user *from, unsigned long size);
8688
8689-#ifndef __powerpc64__
8690-
8691-static inline unsigned long copy_from_user(void *to,
8692- const void __user *from, unsigned long n)
8693-{
8694- unsigned long over;
8695-
8696- if (access_ok(VERIFY_READ, from, n))
8697- return __copy_tofrom_user((__force void __user *)to, from, n);
8698- if ((unsigned long)from < TASK_SIZE) {
8699- over = (unsigned long)from + n - TASK_SIZE;
8700- return __copy_tofrom_user((__force void __user *)to, from,
8701- n - over) + over;
8702- }
8703- return n;
8704-}
8705-
8706-static inline unsigned long copy_to_user(void __user *to,
8707- const void *from, unsigned long n)
8708-{
8709- unsigned long over;
8710-
8711- if (access_ok(VERIFY_WRITE, to, n))
8712- return __copy_tofrom_user(to, (__force void __user *)from, n);
8713- if ((unsigned long)to < TASK_SIZE) {
8714- over = (unsigned long)to + n - TASK_SIZE;
8715- return __copy_tofrom_user(to, (__force void __user *)from,
8716- n - over) + over;
8717- }
8718- return n;
8719-}
8720-
8721-#else /* __powerpc64__ */
8722-
8723-#define __copy_in_user(to, from, size) \
8724- __copy_tofrom_user((to), (from), (size))
8725-
8726-extern unsigned long copy_from_user(void *to, const void __user *from,
8727- unsigned long n);
8728-extern unsigned long copy_to_user(void __user *to, const void *from,
8729- unsigned long n);
8730-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8731- unsigned long n);
8732-
8733-#endif /* __powerpc64__ */
8734-
8735 static inline unsigned long __copy_from_user_inatomic(void *to,
8736 const void __user *from, unsigned long n)
8737 {
8738@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8739 if (ret == 0)
8740 return 0;
8741 }
8742+
8743+ if (!__builtin_constant_p(n))
8744+ check_object_size(to, n, false);
8745+
8746 return __copy_tofrom_user((__force void __user *)to, from, n);
8747 }
8748
8749@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8750 if (ret == 0)
8751 return 0;
8752 }
8753+
8754+ if (!__builtin_constant_p(n))
8755+ check_object_size(from, n, true);
8756+
8757 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8758 }
8759
8760@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8761 return __copy_to_user_inatomic(to, from, size);
8762 }
8763
8764+#ifndef __powerpc64__
8765+
8766+static inline unsigned long __must_check copy_from_user(void *to,
8767+ const void __user *from, unsigned long n)
8768+{
8769+ unsigned long over;
8770+
8771+ if ((long)n < 0)
8772+ return n;
8773+
8774+ if (access_ok(VERIFY_READ, from, n)) {
8775+ if (!__builtin_constant_p(n))
8776+ check_object_size(to, n, false);
8777+ return __copy_tofrom_user((__force void __user *)to, from, n);
8778+ }
8779+ if ((unsigned long)from < TASK_SIZE) {
8780+ over = (unsigned long)from + n - TASK_SIZE;
8781+ if (!__builtin_constant_p(n - over))
8782+ check_object_size(to, n - over, false);
8783+ return __copy_tofrom_user((__force void __user *)to, from,
8784+ n - over) + over;
8785+ }
8786+ return n;
8787+}
8788+
8789+static inline unsigned long __must_check copy_to_user(void __user *to,
8790+ const void *from, unsigned long n)
8791+{
8792+ unsigned long over;
8793+
8794+ if ((long)n < 0)
8795+ return n;
8796+
8797+ if (access_ok(VERIFY_WRITE, to, n)) {
8798+ if (!__builtin_constant_p(n))
8799+ check_object_size(from, n, true);
8800+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8801+ }
8802+ if ((unsigned long)to < TASK_SIZE) {
8803+ over = (unsigned long)to + n - TASK_SIZE;
8804+ if (!__builtin_constant_p(n))
8805+ check_object_size(from, n - over, true);
8806+ return __copy_tofrom_user(to, (__force void __user *)from,
8807+ n - over) + over;
8808+ }
8809+ return n;
8810+}
8811+
8812+#else /* __powerpc64__ */
8813+
8814+#define __copy_in_user(to, from, size) \
8815+ __copy_tofrom_user((to), (from), (size))
8816+
8817+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8818+{
8819+ if ((long)n < 0 || n > INT_MAX)
8820+ return n;
8821+
8822+ if (!__builtin_constant_p(n))
8823+ check_object_size(to, n, false);
8824+
8825+ if (likely(access_ok(VERIFY_READ, from, n)))
8826+ n = __copy_from_user(to, from, n);
8827+ else
8828+ memset(to, 0, n);
8829+ return n;
8830+}
8831+
8832+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8833+{
8834+ if ((long)n < 0 || n > INT_MAX)
8835+ return n;
8836+
8837+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8838+ if (!__builtin_constant_p(n))
8839+ check_object_size(from, n, true);
8840+ n = __copy_to_user(to, from, n);
8841+ }
8842+ return n;
8843+}
8844+
8845+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8846+ unsigned long n);
8847+
8848+#endif /* __powerpc64__ */
8849+
8850 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8851
8852 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8853diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8854index 502cf69..53936a1 100644
8855--- a/arch/powerpc/kernel/Makefile
8856+++ b/arch/powerpc/kernel/Makefile
8857@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8858 CFLAGS_btext.o += -fPIC
8859 endif
8860
8861+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8862+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8863+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8864+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8865+
8866 ifdef CONFIG_FUNCTION_TRACER
8867 # Do not trace early boot code
8868 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8869@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8870 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8871 endif
8872
8873+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8874+
8875 obj-y := cputable.o ptrace.o syscalls.o \
8876 irq.o align.o signal_32.o pmc.o vdso.o \
8877 process.o systbl.o idle.o \
8878diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8879index 3e68d1c..72a5ee6 100644
8880--- a/arch/powerpc/kernel/exceptions-64e.S
8881+++ b/arch/powerpc/kernel/exceptions-64e.S
8882@@ -1010,6 +1010,7 @@ storage_fault_common:
8883 std r14,_DAR(r1)
8884 std r15,_DSISR(r1)
8885 addi r3,r1,STACK_FRAME_OVERHEAD
8886+ bl save_nvgprs
8887 mr r4,r14
8888 mr r5,r15
8889 ld r14,PACA_EXGEN+EX_R14(r13)
8890@@ -1018,8 +1019,7 @@ storage_fault_common:
8891 cmpdi r3,0
8892 bne- 1f
8893 b ret_from_except_lite
8894-1: bl save_nvgprs
8895- mr r5,r3
8896+1: mr r5,r3
8897 addi r3,r1,STACK_FRAME_OVERHEAD
8898 ld r4,_DAR(r1)
8899 bl bad_page_fault
8900diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8901index 9519e6b..13f6c38 100644
8902--- a/arch/powerpc/kernel/exceptions-64s.S
8903+++ b/arch/powerpc/kernel/exceptions-64s.S
8904@@ -1599,10 +1599,10 @@ handle_page_fault:
8905 11: ld r4,_DAR(r1)
8906 ld r5,_DSISR(r1)
8907 addi r3,r1,STACK_FRAME_OVERHEAD
8908+ bl save_nvgprs
8909 bl do_page_fault
8910 cmpdi r3,0
8911 beq+ 12f
8912- bl save_nvgprs
8913 mr r5,r3
8914 addi r3,r1,STACK_FRAME_OVERHEAD
8915 lwz r4,_DAR(r1)
8916diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8917index 4509603..cdb491f 100644
8918--- a/arch/powerpc/kernel/irq.c
8919+++ b/arch/powerpc/kernel/irq.c
8920@@ -460,6 +460,8 @@ void migrate_irqs(void)
8921 }
8922 #endif
8923
8924+extern void gr_handle_kernel_exploit(void);
8925+
8926 static inline void check_stack_overflow(void)
8927 {
8928 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8929@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8930 pr_err("do_IRQ: stack overflow: %ld\n",
8931 sp - sizeof(struct thread_info));
8932 dump_stack();
8933+ gr_handle_kernel_exploit();
8934 }
8935 #endif
8936 }
8937diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8938index c94d2e0..992a9ce 100644
8939--- a/arch/powerpc/kernel/module_32.c
8940+++ b/arch/powerpc/kernel/module_32.c
8941@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8942 me->arch.core_plt_section = i;
8943 }
8944 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8945- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8946+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8947 return -ENOEXEC;
8948 }
8949
8950@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8951
8952 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8953 /* Init, or core PLT? */
8954- if (location >= mod->module_core
8955- && location < mod->module_core + mod->core_size)
8956+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8957+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8958 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8959- else
8960+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8961+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8962 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8963+ else {
8964+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8965+ return ~0UL;
8966+ }
8967
8968 /* Find this entry, or if that fails, the next avail. entry */
8969 while (entry->jump[0]) {
8970@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8971 }
8972 #ifdef CONFIG_DYNAMIC_FTRACE
8973 module->arch.tramp =
8974- do_plt_call(module->module_core,
8975+ do_plt_call(module->module_core_rx,
8976 (unsigned long)ftrace_caller,
8977 sechdrs, module);
8978 #endif
8979diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8980index b4cc7be..1fe8bb3 100644
8981--- a/arch/powerpc/kernel/process.c
8982+++ b/arch/powerpc/kernel/process.c
8983@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8984 * Lookup NIP late so we have the best change of getting the
8985 * above info out without failing
8986 */
8987- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8988- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8989+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8990+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8991 #endif
8992 show_stack(current, (unsigned long *) regs->gpr[1]);
8993 if (!user_mode(regs))
8994@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8995 newsp = stack[0];
8996 ip = stack[STACK_FRAME_LR_SAVE];
8997 if (!firstframe || ip != lr) {
8998- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8999+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
9000 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
9001 if ((ip == rth) && curr_frame >= 0) {
9002- printk(" (%pS)",
9003+ printk(" (%pA)",
9004 (void *)current->ret_stack[curr_frame].ret);
9005 curr_frame--;
9006 }
9007@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
9008 struct pt_regs *regs = (struct pt_regs *)
9009 (sp + STACK_FRAME_OVERHEAD);
9010 lr = regs->link;
9011- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
9012+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
9013 regs->trap, (void *)regs->nip, (void *)lr);
9014 firstframe = 1;
9015 }
9016@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
9017 mtspr(SPRN_CTRLT, ctrl);
9018 }
9019 #endif /* CONFIG_PPC64 */
9020-
9021-unsigned long arch_align_stack(unsigned long sp)
9022-{
9023- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9024- sp -= get_random_int() & ~PAGE_MASK;
9025- return sp & ~0xf;
9026-}
9027-
9028-static inline unsigned long brk_rnd(void)
9029-{
9030- unsigned long rnd = 0;
9031-
9032- /* 8MB for 32bit, 1GB for 64bit */
9033- if (is_32bit_task())
9034- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
9035- else
9036- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
9037-
9038- return rnd << PAGE_SHIFT;
9039-}
9040-
9041-unsigned long arch_randomize_brk(struct mm_struct *mm)
9042-{
9043- unsigned long base = mm->brk;
9044- unsigned long ret;
9045-
9046-#ifdef CONFIG_PPC_STD_MMU_64
9047- /*
9048- * If we are using 1TB segments and we are allowed to randomise
9049- * the heap, we can put it above 1TB so it is backed by a 1TB
9050- * segment. Otherwise the heap will be in the bottom 1TB
9051- * which always uses 256MB segments and this may result in a
9052- * performance penalty.
9053- */
9054- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9055- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9056-#endif
9057-
9058- ret = PAGE_ALIGN(base + brk_rnd());
9059-
9060- if (ret < mm->brk)
9061- return mm->brk;
9062-
9063- return ret;
9064-}
9065-
9066diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9067index f21897b..28c0428 100644
9068--- a/arch/powerpc/kernel/ptrace.c
9069+++ b/arch/powerpc/kernel/ptrace.c
9070@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9071 return ret;
9072 }
9073
9074+#ifdef CONFIG_GRKERNSEC_SETXID
9075+extern void gr_delayed_cred_worker(void);
9076+#endif
9077+
9078 /*
9079 * We must return the syscall number to actually look up in the table.
9080 * This can be -1L to skip running any syscall at all.
9081@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9082
9083 secure_computing_strict(regs->gpr[0]);
9084
9085+#ifdef CONFIG_GRKERNSEC_SETXID
9086+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9087+ gr_delayed_cred_worker();
9088+#endif
9089+
9090 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9091 tracehook_report_syscall_entry(regs))
9092 /*
9093@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9094 {
9095 int step;
9096
9097+#ifdef CONFIG_GRKERNSEC_SETXID
9098+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9099+ gr_delayed_cred_worker();
9100+#endif
9101+
9102 audit_syscall_exit(regs);
9103
9104 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9105diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9106index b171001..4ac7ac5 100644
9107--- a/arch/powerpc/kernel/signal_32.c
9108+++ b/arch/powerpc/kernel/signal_32.c
9109@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9110 /* Save user registers on the stack */
9111 frame = &rt_sf->uc.uc_mcontext;
9112 addr = frame;
9113- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9114+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9115 sigret = 0;
9116 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9117 } else {
9118diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9119index 2cb0c94..c0c0bc9 100644
9120--- a/arch/powerpc/kernel/signal_64.c
9121+++ b/arch/powerpc/kernel/signal_64.c
9122@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9123 current->thread.fp_state.fpscr = 0;
9124
9125 /* Set up to return from userspace. */
9126- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9127+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9128 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9129 } else {
9130 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9131diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9132index e6595b7..24bde6e 100644
9133--- a/arch/powerpc/kernel/traps.c
9134+++ b/arch/powerpc/kernel/traps.c
9135@@ -36,6 +36,7 @@
9136 #include <linux/debugfs.h>
9137 #include <linux/ratelimit.h>
9138 #include <linux/context_tracking.h>
9139+#include <linux/uaccess.h>
9140
9141 #include <asm/emulated_ops.h>
9142 #include <asm/pgtable.h>
9143@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9144 return flags;
9145 }
9146
9147+extern void gr_handle_kernel_exploit(void);
9148+
9149 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9150 int signr)
9151 {
9152@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9153 panic("Fatal exception in interrupt");
9154 if (panic_on_oops)
9155 panic("Fatal exception");
9156+
9157+ gr_handle_kernel_exploit();
9158+
9159 do_exit(signr);
9160 }
9161
9162@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9163 enum ctx_state prev_state = exception_enter();
9164 unsigned int reason = get_reason(regs);
9165
9166+#ifdef CONFIG_PAX_REFCOUNT
9167+ unsigned int bkpt;
9168+ const struct exception_table_entry *entry;
9169+
9170+ if (reason & REASON_ILLEGAL) {
9171+ /* Check if PaX bad instruction */
9172+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9173+ current->thread.trap_nr = 0;
9174+ pax_report_refcount_overflow(regs);
9175+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9176+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9177+ regs->nip = entry->fixup;
9178+ return;
9179+ }
9180+ /* fixup_exception() could not handle */
9181+ goto bail;
9182+ }
9183+ }
9184+#endif
9185+
9186 /* We can now get here via a FP Unavailable exception if the core
9187 * has no FPU, in that case the reason flags will be 0 */
9188
9189diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9190index 305eb0d..accc5b40 100644
9191--- a/arch/powerpc/kernel/vdso.c
9192+++ b/arch/powerpc/kernel/vdso.c
9193@@ -34,6 +34,7 @@
9194 #include <asm/vdso.h>
9195 #include <asm/vdso_datapage.h>
9196 #include <asm/setup.h>
9197+#include <asm/mman.h>
9198
9199 #undef DEBUG
9200
9201@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9202 vdso_base = VDSO32_MBASE;
9203 #endif
9204
9205- current->mm->context.vdso_base = 0;
9206+ current->mm->context.vdso_base = ~0UL;
9207
9208 /* vDSO has a problem and was disabled, just don't "enable" it for the
9209 * process
9210@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9211 vdso_base = get_unmapped_area(NULL, vdso_base,
9212 (vdso_pages << PAGE_SHIFT) +
9213 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9214- 0, 0);
9215+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9216 if (IS_ERR_VALUE(vdso_base)) {
9217 rc = vdso_base;
9218 goto fail_mmapsem;
9219diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9220index c45eaab..5f41b57 100644
9221--- a/arch/powerpc/kvm/powerpc.c
9222+++ b/arch/powerpc/kvm/powerpc.c
9223@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9224 }
9225 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9226
9227-int kvm_arch_init(void *opaque)
9228+int kvm_arch_init(const void *opaque)
9229 {
9230 return 0;
9231 }
9232diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9233index 5eea6f3..5d10396 100644
9234--- a/arch/powerpc/lib/usercopy_64.c
9235+++ b/arch/powerpc/lib/usercopy_64.c
9236@@ -9,22 +9,6 @@
9237 #include <linux/module.h>
9238 #include <asm/uaccess.h>
9239
9240-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9241-{
9242- if (likely(access_ok(VERIFY_READ, from, n)))
9243- n = __copy_from_user(to, from, n);
9244- else
9245- memset(to, 0, n);
9246- return n;
9247-}
9248-
9249-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9250-{
9251- if (likely(access_ok(VERIFY_WRITE, to, n)))
9252- n = __copy_to_user(to, from, n);
9253- return n;
9254-}
9255-
9256 unsigned long copy_in_user(void __user *to, const void __user *from,
9257 unsigned long n)
9258 {
9259@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9260 return n;
9261 }
9262
9263-EXPORT_SYMBOL(copy_from_user);
9264-EXPORT_SYMBOL(copy_to_user);
9265 EXPORT_SYMBOL(copy_in_user);
9266
9267diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9268index 6154b0a..4de2b19 100644
9269--- a/arch/powerpc/mm/fault.c
9270+++ b/arch/powerpc/mm/fault.c
9271@@ -33,6 +33,10 @@
9272 #include <linux/ratelimit.h>
9273 #include <linux/context_tracking.h>
9274 #include <linux/hugetlb.h>
9275+#include <linux/slab.h>
9276+#include <linux/pagemap.h>
9277+#include <linux/compiler.h>
9278+#include <linux/unistd.h>
9279
9280 #include <asm/firmware.h>
9281 #include <asm/page.h>
9282@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9283 }
9284 #endif
9285
9286+#ifdef CONFIG_PAX_PAGEEXEC
9287+/*
9288+ * PaX: decide what to do with offenders (regs->nip = fault address)
9289+ *
9290+ * returns 1 when task should be killed
9291+ */
9292+static int pax_handle_fetch_fault(struct pt_regs *regs)
9293+{
9294+ return 1;
9295+}
9296+
9297+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9298+{
9299+ unsigned long i;
9300+
9301+ printk(KERN_ERR "PAX: bytes at PC: ");
9302+ for (i = 0; i < 5; i++) {
9303+ unsigned int c;
9304+ if (get_user(c, (unsigned int __user *)pc+i))
9305+ printk(KERN_CONT "???????? ");
9306+ else
9307+ printk(KERN_CONT "%08x ", c);
9308+ }
9309+ printk("\n");
9310+}
9311+#endif
9312+
9313 /*
9314 * Check whether the instruction at regs->nip is a store using
9315 * an update addressing form which will update r1.
9316@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9317 * indicate errors in DSISR but can validly be set in SRR1.
9318 */
9319 if (trap == 0x400)
9320- error_code &= 0x48200000;
9321+ error_code &= 0x58200000;
9322 else
9323 is_write = error_code & DSISR_ISSTORE;
9324 #else
9325@@ -383,7 +414,7 @@ good_area:
9326 * "undefined". Of those that can be set, this is the only
9327 * one which seems bad.
9328 */
9329- if (error_code & 0x10000000)
9330+ if (error_code & DSISR_GUARDED)
9331 /* Guarded storage error. */
9332 goto bad_area;
9333 #endif /* CONFIG_8xx */
9334@@ -398,7 +429,7 @@ good_area:
9335 * processors use the same I/D cache coherency mechanism
9336 * as embedded.
9337 */
9338- if (error_code & DSISR_PROTFAULT)
9339+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9340 goto bad_area;
9341 #endif /* CONFIG_PPC_STD_MMU */
9342
9343@@ -490,6 +521,23 @@ bad_area:
9344 bad_area_nosemaphore:
9345 /* User mode accesses cause a SIGSEGV */
9346 if (user_mode(regs)) {
9347+
9348+#ifdef CONFIG_PAX_PAGEEXEC
9349+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9350+#ifdef CONFIG_PPC_STD_MMU
9351+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9352+#else
9353+ if (is_exec && regs->nip == address) {
9354+#endif
9355+ switch (pax_handle_fetch_fault(regs)) {
9356+ }
9357+
9358+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9359+ do_group_exit(SIGKILL);
9360+ }
9361+ }
9362+#endif
9363+
9364 _exception(SIGSEGV, regs, code, address);
9365 goto bail;
9366 }
9367diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9368index cb8bdbe..cde4bc7 100644
9369--- a/arch/powerpc/mm/mmap.c
9370+++ b/arch/powerpc/mm/mmap.c
9371@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9372 return sysctl_legacy_va_layout;
9373 }
9374
9375-static unsigned long mmap_rnd(void)
9376+static unsigned long mmap_rnd(struct mm_struct *mm)
9377 {
9378 unsigned long rnd = 0;
9379
9380+#ifdef CONFIG_PAX_RANDMMAP
9381+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9382+#endif
9383+
9384 if (current->flags & PF_RANDOMIZE) {
9385 /* 8MB for 32bit, 1GB for 64bit */
9386 if (is_32bit_task())
9387@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9388 return rnd << PAGE_SHIFT;
9389 }
9390
9391-static inline unsigned long mmap_base(void)
9392+static inline unsigned long mmap_base(struct mm_struct *mm)
9393 {
9394 unsigned long gap = rlimit(RLIMIT_STACK);
9395
9396@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9397 else if (gap > MAX_GAP)
9398 gap = MAX_GAP;
9399
9400- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9401+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9402 }
9403
9404 /*
9405@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9406 */
9407 if (mmap_is_legacy()) {
9408 mm->mmap_base = TASK_UNMAPPED_BASE;
9409+
9410+#ifdef CONFIG_PAX_RANDMMAP
9411+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9412+ mm->mmap_base += mm->delta_mmap;
9413+#endif
9414+
9415 mm->get_unmapped_area = arch_get_unmapped_area;
9416 } else {
9417- mm->mmap_base = mmap_base();
9418+ mm->mmap_base = mmap_base(mm);
9419+
9420+#ifdef CONFIG_PAX_RANDMMAP
9421+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9422+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9423+#endif
9424+
9425 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9426 }
9427 }
9428diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9429index ded0ea1..f213a9b 100644
9430--- a/arch/powerpc/mm/slice.c
9431+++ b/arch/powerpc/mm/slice.c
9432@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9433 if ((mm->task_size - len) < addr)
9434 return 0;
9435 vma = find_vma(mm, addr);
9436- return (!vma || (addr + len) <= vma->vm_start);
9437+ return check_heap_stack_gap(vma, addr, len, 0);
9438 }
9439
9440 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9441@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9442 info.align_offset = 0;
9443
9444 addr = TASK_UNMAPPED_BASE;
9445+
9446+#ifdef CONFIG_PAX_RANDMMAP
9447+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9448+ addr += mm->delta_mmap;
9449+#endif
9450+
9451 while (addr < TASK_SIZE) {
9452 info.low_limit = addr;
9453 if (!slice_scan_available(addr, available, 1, &addr))
9454@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9455 if (fixed && addr > (mm->task_size - len))
9456 return -ENOMEM;
9457
9458+#ifdef CONFIG_PAX_RANDMMAP
9459+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9460+ addr = 0;
9461+#endif
9462+
9463 /* If hint, make sure it matches our alignment restrictions */
9464 if (!fixed && addr) {
9465 addr = _ALIGN_UP(addr, 1ul << pshift);
9466diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9467index f223875..94170e4 100644
9468--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9469+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9470@@ -399,8 +399,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9471 }
9472
9473 static struct pci_ops scc_pciex_pci_ops = {
9474- scc_pciex_read_config,
9475- scc_pciex_write_config,
9476+ .read = scc_pciex_read_config,
9477+ .write = scc_pciex_write_config,
9478 };
9479
9480 static void pciex_clear_intr_all(unsigned int __iomem *base)
9481diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9482index d966bbe..372124a 100644
9483--- a/arch/powerpc/platforms/cell/spufs/file.c
9484+++ b/arch/powerpc/platforms/cell/spufs/file.c
9485@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9486 return VM_FAULT_NOPAGE;
9487 }
9488
9489-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9490+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9491 unsigned long address,
9492- void *buf, int len, int write)
9493+ void *buf, size_t len, int write)
9494 {
9495 struct spu_context *ctx = vma->vm_file->private_data;
9496 unsigned long offset = address - vma->vm_start;
9497diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9498index fa934fe..c296056 100644
9499--- a/arch/s390/include/asm/atomic.h
9500+++ b/arch/s390/include/asm/atomic.h
9501@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9502 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9503 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9504
9505+#define atomic64_read_unchecked(v) atomic64_read(v)
9506+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9507+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9508+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9509+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9510+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9511+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9512+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9513+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9514+
9515 #endif /* __ARCH_S390_ATOMIC__ */
9516diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9517index 8d72471..5322500 100644
9518--- a/arch/s390/include/asm/barrier.h
9519+++ b/arch/s390/include/asm/barrier.h
9520@@ -42,7 +42,7 @@
9521 do { \
9522 compiletime_assert_atomic_type(*p); \
9523 barrier(); \
9524- ACCESS_ONCE(*p) = (v); \
9525+ ACCESS_ONCE_RW(*p) = (v); \
9526 } while (0)
9527
9528 #define smp_load_acquire(p) \
9529diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9530index 4d7ccac..d03d0ad 100644
9531--- a/arch/s390/include/asm/cache.h
9532+++ b/arch/s390/include/asm/cache.h
9533@@ -9,8 +9,10 @@
9534 #ifndef __ARCH_S390_CACHE_H
9535 #define __ARCH_S390_CACHE_H
9536
9537-#define L1_CACHE_BYTES 256
9538+#include <linux/const.h>
9539+
9540 #define L1_CACHE_SHIFT 8
9541+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9542 #define NET_SKB_PAD 32
9543
9544 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9545diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9546index f6e43d3..5f57681 100644
9547--- a/arch/s390/include/asm/elf.h
9548+++ b/arch/s390/include/asm/elf.h
9549@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9550 the loader. We need to make sure that it is out of the way of the program
9551 that it will "exec", and that there is sufficient room for the brk. */
9552
9553-extern unsigned long randomize_et_dyn(unsigned long base);
9554-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9555+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9556+
9557+#ifdef CONFIG_PAX_ASLR
9558+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9559+
9560+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9561+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9562+#endif
9563
9564 /* This yields a mask that user programs can use to figure out what
9565 instruction set this CPU supports. */
9566@@ -223,9 +229,6 @@ struct linux_binprm;
9567 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9568 int arch_setup_additional_pages(struct linux_binprm *, int);
9569
9570-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9571-#define arch_randomize_brk arch_randomize_brk
9572-
9573 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9574
9575 #endif
9576diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9577index c4a93d6..4d2a9b4 100644
9578--- a/arch/s390/include/asm/exec.h
9579+++ b/arch/s390/include/asm/exec.h
9580@@ -7,6 +7,6 @@
9581 #ifndef __ASM_EXEC_H
9582 #define __ASM_EXEC_H
9583
9584-extern unsigned long arch_align_stack(unsigned long sp);
9585+#define arch_align_stack(x) ((x) & ~0xfUL)
9586
9587 #endif /* __ASM_EXEC_H */
9588diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9589index cd4c68e..6764641 100644
9590--- a/arch/s390/include/asm/uaccess.h
9591+++ b/arch/s390/include/asm/uaccess.h
9592@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9593 __range_ok((unsigned long)(addr), (size)); \
9594 })
9595
9596+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9597 #define access_ok(type, addr, size) __access_ok(addr, size)
9598
9599 /*
9600@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9601 copy_to_user(void __user *to, const void *from, unsigned long n)
9602 {
9603 might_fault();
9604+
9605+ if ((long)n < 0)
9606+ return n;
9607+
9608 return __copy_to_user(to, from, n);
9609 }
9610
9611@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9612 static inline unsigned long __must_check
9613 copy_from_user(void *to, const void __user *from, unsigned long n)
9614 {
9615- unsigned int sz = __compiletime_object_size(to);
9616+ size_t sz = __compiletime_object_size(to);
9617
9618 might_fault();
9619- if (unlikely(sz != -1 && sz < n)) {
9620+
9621+ if ((long)n < 0)
9622+ return n;
9623+
9624+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9625 copy_from_user_overflow();
9626 return n;
9627 }
9628diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9629index 409d152..d90d368 100644
9630--- a/arch/s390/kernel/module.c
9631+++ b/arch/s390/kernel/module.c
9632@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9633
9634 /* Increase core size by size of got & plt and set start
9635 offsets for got and plt. */
9636- me->core_size = ALIGN(me->core_size, 4);
9637- me->arch.got_offset = me->core_size;
9638- me->core_size += me->arch.got_size;
9639- me->arch.plt_offset = me->core_size;
9640- me->core_size += me->arch.plt_size;
9641+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9642+ me->arch.got_offset = me->core_size_rw;
9643+ me->core_size_rw += me->arch.got_size;
9644+ me->arch.plt_offset = me->core_size_rx;
9645+ me->core_size_rx += me->arch.plt_size;
9646 return 0;
9647 }
9648
9649@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9650 if (info->got_initialized == 0) {
9651 Elf_Addr *gotent;
9652
9653- gotent = me->module_core + me->arch.got_offset +
9654+ gotent = me->module_core_rw + me->arch.got_offset +
9655 info->got_offset;
9656 *gotent = val;
9657 info->got_initialized = 1;
9658@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9659 rc = apply_rela_bits(loc, val, 0, 64, 0);
9660 else if (r_type == R_390_GOTENT ||
9661 r_type == R_390_GOTPLTENT) {
9662- val += (Elf_Addr) me->module_core - loc;
9663+ val += (Elf_Addr) me->module_core_rw - loc;
9664 rc = apply_rela_bits(loc, val, 1, 32, 1);
9665 }
9666 break;
9667@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9668 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9669 if (info->plt_initialized == 0) {
9670 unsigned int *ip;
9671- ip = me->module_core + me->arch.plt_offset +
9672+ ip = me->module_core_rx + me->arch.plt_offset +
9673 info->plt_offset;
9674 #ifndef CONFIG_64BIT
9675 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9676@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9677 val - loc + 0xffffUL < 0x1ffffeUL) ||
9678 (r_type == R_390_PLT32DBL &&
9679 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9680- val = (Elf_Addr) me->module_core +
9681+ val = (Elf_Addr) me->module_core_rx +
9682 me->arch.plt_offset +
9683 info->plt_offset;
9684 val += rela->r_addend - loc;
9685@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9686 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9687 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9688 val = val + rela->r_addend -
9689- ((Elf_Addr) me->module_core + me->arch.got_offset);
9690+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9691 if (r_type == R_390_GOTOFF16)
9692 rc = apply_rela_bits(loc, val, 0, 16, 0);
9693 else if (r_type == R_390_GOTOFF32)
9694@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9695 break;
9696 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9697 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9698- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9699+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9700 rela->r_addend - loc;
9701 if (r_type == R_390_GOTPC)
9702 rc = apply_rela_bits(loc, val, 1, 32, 0);
9703diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9704index aa7a839..6c2a916 100644
9705--- a/arch/s390/kernel/process.c
9706+++ b/arch/s390/kernel/process.c
9707@@ -219,37 +219,3 @@ unsigned long get_wchan(struct task_struct *p)
9708 }
9709 return 0;
9710 }
9711-
9712-unsigned long arch_align_stack(unsigned long sp)
9713-{
9714- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9715- sp -= get_random_int() & ~PAGE_MASK;
9716- return sp & ~0xf;
9717-}
9718-
9719-static inline unsigned long brk_rnd(void)
9720-{
9721- /* 8MB for 32bit, 1GB for 64bit */
9722- if (is_32bit_task())
9723- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9724- else
9725- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9726-}
9727-
9728-unsigned long arch_randomize_brk(struct mm_struct *mm)
9729-{
9730- unsigned long ret;
9731-
9732- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9733- return (ret > mm->brk) ? ret : mm->brk;
9734-}
9735-
9736-unsigned long randomize_et_dyn(unsigned long base)
9737-{
9738- unsigned long ret;
9739-
9740- if (!(current->flags & PF_RANDOMIZE))
9741- return base;
9742- ret = PAGE_ALIGN(base + brk_rnd());
9743- return (ret > base) ? ret : base;
9744-}
9745diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9746index 9b436c2..54fbf0a 100644
9747--- a/arch/s390/mm/mmap.c
9748+++ b/arch/s390/mm/mmap.c
9749@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9750 */
9751 if (mmap_is_legacy()) {
9752 mm->mmap_base = mmap_base_legacy();
9753+
9754+#ifdef CONFIG_PAX_RANDMMAP
9755+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9756+ mm->mmap_base += mm->delta_mmap;
9757+#endif
9758+
9759 mm->get_unmapped_area = arch_get_unmapped_area;
9760 } else {
9761 mm->mmap_base = mmap_base();
9762+
9763+#ifdef CONFIG_PAX_RANDMMAP
9764+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9765+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9766+#endif
9767+
9768 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9769 }
9770 }
9771@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9772 */
9773 if (mmap_is_legacy()) {
9774 mm->mmap_base = mmap_base_legacy();
9775+
9776+#ifdef CONFIG_PAX_RANDMMAP
9777+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9778+ mm->mmap_base += mm->delta_mmap;
9779+#endif
9780+
9781 mm->get_unmapped_area = s390_get_unmapped_area;
9782 } else {
9783 mm->mmap_base = mmap_base();
9784+
9785+#ifdef CONFIG_PAX_RANDMMAP
9786+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9787+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9788+#endif
9789+
9790 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9791 }
9792 }
9793diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9794index ae3d59f..f65f075 100644
9795--- a/arch/score/include/asm/cache.h
9796+++ b/arch/score/include/asm/cache.h
9797@@ -1,7 +1,9 @@
9798 #ifndef _ASM_SCORE_CACHE_H
9799 #define _ASM_SCORE_CACHE_H
9800
9801+#include <linux/const.h>
9802+
9803 #define L1_CACHE_SHIFT 4
9804-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9805+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9806
9807 #endif /* _ASM_SCORE_CACHE_H */
9808diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9809index f9f3cd5..58ff438 100644
9810--- a/arch/score/include/asm/exec.h
9811+++ b/arch/score/include/asm/exec.h
9812@@ -1,6 +1,6 @@
9813 #ifndef _ASM_SCORE_EXEC_H
9814 #define _ASM_SCORE_EXEC_H
9815
9816-extern unsigned long arch_align_stack(unsigned long sp);
9817+#define arch_align_stack(x) (x)
9818
9819 #endif /* _ASM_SCORE_EXEC_H */
9820diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9821index a1519ad3..e8ac1ff 100644
9822--- a/arch/score/kernel/process.c
9823+++ b/arch/score/kernel/process.c
9824@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9825
9826 return task_pt_regs(task)->cp0_epc;
9827 }
9828-
9829-unsigned long arch_align_stack(unsigned long sp)
9830-{
9831- return sp;
9832-}
9833diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9834index ef9e555..331bd29 100644
9835--- a/arch/sh/include/asm/cache.h
9836+++ b/arch/sh/include/asm/cache.h
9837@@ -9,10 +9,11 @@
9838 #define __ASM_SH_CACHE_H
9839 #ifdef __KERNEL__
9840
9841+#include <linux/const.h>
9842 #include <linux/init.h>
9843 #include <cpu/cache.h>
9844
9845-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9846+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9847
9848 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9849
9850diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9851index 6777177..cb5e44f 100644
9852--- a/arch/sh/mm/mmap.c
9853+++ b/arch/sh/mm/mmap.c
9854@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9855 struct mm_struct *mm = current->mm;
9856 struct vm_area_struct *vma;
9857 int do_colour_align;
9858+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9859 struct vm_unmapped_area_info info;
9860
9861 if (flags & MAP_FIXED) {
9862@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9863 if (filp || (flags & MAP_SHARED))
9864 do_colour_align = 1;
9865
9866+#ifdef CONFIG_PAX_RANDMMAP
9867+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9868+#endif
9869+
9870 if (addr) {
9871 if (do_colour_align)
9872 addr = COLOUR_ALIGN(addr, pgoff);
9873@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9874 addr = PAGE_ALIGN(addr);
9875
9876 vma = find_vma(mm, addr);
9877- if (TASK_SIZE - len >= addr &&
9878- (!vma || addr + len <= vma->vm_start))
9879+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9880 return addr;
9881 }
9882
9883 info.flags = 0;
9884 info.length = len;
9885- info.low_limit = TASK_UNMAPPED_BASE;
9886+ info.low_limit = mm->mmap_base;
9887 info.high_limit = TASK_SIZE;
9888 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9889 info.align_offset = pgoff << PAGE_SHIFT;
9890@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9891 struct mm_struct *mm = current->mm;
9892 unsigned long addr = addr0;
9893 int do_colour_align;
9894+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9895 struct vm_unmapped_area_info info;
9896
9897 if (flags & MAP_FIXED) {
9898@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9899 if (filp || (flags & MAP_SHARED))
9900 do_colour_align = 1;
9901
9902+#ifdef CONFIG_PAX_RANDMMAP
9903+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9904+#endif
9905+
9906 /* requesting a specific address */
9907 if (addr) {
9908 if (do_colour_align)
9909@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9910 addr = PAGE_ALIGN(addr);
9911
9912 vma = find_vma(mm, addr);
9913- if (TASK_SIZE - len >= addr &&
9914- (!vma || addr + len <= vma->vm_start))
9915+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9916 return addr;
9917 }
9918
9919@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9920 VM_BUG_ON(addr != -ENOMEM);
9921 info.flags = 0;
9922 info.low_limit = TASK_UNMAPPED_BASE;
9923+
9924+#ifdef CONFIG_PAX_RANDMMAP
9925+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9926+ info.low_limit += mm->delta_mmap;
9927+#endif
9928+
9929 info.high_limit = TASK_SIZE;
9930 addr = vm_unmapped_area(&info);
9931 }
9932diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9933index 4082749..fd97781 100644
9934--- a/arch/sparc/include/asm/atomic_64.h
9935+++ b/arch/sparc/include/asm/atomic_64.h
9936@@ -15,18 +15,38 @@
9937 #define ATOMIC64_INIT(i) { (i) }
9938
9939 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9940+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9941+{
9942+ return ACCESS_ONCE(v->counter);
9943+}
9944 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9945+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9946+{
9947+ return ACCESS_ONCE(v->counter);
9948+}
9949
9950 #define atomic_set(v, i) (((v)->counter) = i)
9951+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9952+{
9953+ v->counter = i;
9954+}
9955 #define atomic64_set(v, i) (((v)->counter) = i)
9956+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9957+{
9958+ v->counter = i;
9959+}
9960
9961-#define ATOMIC_OP(op) \
9962-void atomic_##op(int, atomic_t *); \
9963-void atomic64_##op(long, atomic64_t *);
9964+#define __ATOMIC_OP(op, suffix) \
9965+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9966+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9967
9968-#define ATOMIC_OP_RETURN(op) \
9969-int atomic_##op##_return(int, atomic_t *); \
9970-long atomic64_##op##_return(long, atomic64_t *);
9971+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9972+
9973+#define __ATOMIC_OP_RETURN(op, suffix) \
9974+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9975+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9976+
9977+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9978
9979 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9980
9981@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9982
9983 #undef ATOMIC_OPS
9984 #undef ATOMIC_OP_RETURN
9985+#undef __ATOMIC_OP_RETURN
9986 #undef ATOMIC_OP
9987+#undef __ATOMIC_OP
9988
9989 #define atomic_dec_return(v) atomic_sub_return(1, v)
9990 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9991
9992 #define atomic_inc_return(v) atomic_add_return(1, v)
9993+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9994+{
9995+ return atomic_add_return_unchecked(1, v);
9996+}
9997 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9998+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9999+{
10000+ return atomic64_add_return_unchecked(1, v);
10001+}
10002
10003 /*
10004 * atomic_inc_and_test - increment and test
10005@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
10006 * other cases.
10007 */
10008 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
10009+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
10010+{
10011+ return atomic_inc_return_unchecked(v) == 0;
10012+}
10013 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
10014
10015 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
10016@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
10017 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
10018
10019 #define atomic_inc(v) atomic_add(1, v)
10020+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
10021+{
10022+ atomic_add_unchecked(1, v);
10023+}
10024 #define atomic64_inc(v) atomic64_add(1, v)
10025+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
10026+{
10027+ atomic64_add_unchecked(1, v);
10028+}
10029
10030 #define atomic_dec(v) atomic_sub(1, v)
10031+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10032+{
10033+ atomic_sub_unchecked(1, v);
10034+}
10035 #define atomic64_dec(v) atomic64_sub(1, v)
10036+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10037+{
10038+ atomic64_sub_unchecked(1, v);
10039+}
10040
10041 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10042 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10043
10044 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10045+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10046+{
10047+ return cmpxchg(&v->counter, old, new);
10048+}
10049 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10050+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10051+{
10052+ return xchg(&v->counter, new);
10053+}
10054
10055 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10056 {
10057- int c, old;
10058+ int c, old, new;
10059 c = atomic_read(v);
10060 for (;;) {
10061- if (unlikely(c == (u)))
10062+ if (unlikely(c == u))
10063 break;
10064- old = atomic_cmpxchg((v), c, c + (a));
10065+
10066+ asm volatile("addcc %2, %0, %0\n"
10067+
10068+#ifdef CONFIG_PAX_REFCOUNT
10069+ "tvs %%icc, 6\n"
10070+#endif
10071+
10072+ : "=r" (new)
10073+ : "0" (c), "ir" (a)
10074+ : "cc");
10075+
10076+ old = atomic_cmpxchg(v, c, new);
10077 if (likely(old == c))
10078 break;
10079 c = old;
10080@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10081 #define atomic64_cmpxchg(v, o, n) \
10082 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10083 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10084+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10085+{
10086+ return xchg(&v->counter, new);
10087+}
10088
10089 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10090 {
10091- long c, old;
10092+ long c, old, new;
10093 c = atomic64_read(v);
10094 for (;;) {
10095- if (unlikely(c == (u)))
10096+ if (unlikely(c == u))
10097 break;
10098- old = atomic64_cmpxchg((v), c, c + (a));
10099+
10100+ asm volatile("addcc %2, %0, %0\n"
10101+
10102+#ifdef CONFIG_PAX_REFCOUNT
10103+ "tvs %%xcc, 6\n"
10104+#endif
10105+
10106+ : "=r" (new)
10107+ : "0" (c), "ir" (a)
10108+ : "cc");
10109+
10110+ old = atomic64_cmpxchg(v, c, new);
10111 if (likely(old == c))
10112 break;
10113 c = old;
10114 }
10115- return c != (u);
10116+ return c != u;
10117 }
10118
10119 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10120diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10121index 7664894..45a974b 100644
10122--- a/arch/sparc/include/asm/barrier_64.h
10123+++ b/arch/sparc/include/asm/barrier_64.h
10124@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10125 do { \
10126 compiletime_assert_atomic_type(*p); \
10127 barrier(); \
10128- ACCESS_ONCE(*p) = (v); \
10129+ ACCESS_ONCE_RW(*p) = (v); \
10130 } while (0)
10131
10132 #define smp_load_acquire(p) \
10133diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10134index 5bb6991..5c2132e 100644
10135--- a/arch/sparc/include/asm/cache.h
10136+++ b/arch/sparc/include/asm/cache.h
10137@@ -7,10 +7,12 @@
10138 #ifndef _SPARC_CACHE_H
10139 #define _SPARC_CACHE_H
10140
10141+#include <linux/const.h>
10142+
10143 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10144
10145 #define L1_CACHE_SHIFT 5
10146-#define L1_CACHE_BYTES 32
10147+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10148
10149 #ifdef CONFIG_SPARC32
10150 #define SMP_CACHE_BYTES_SHIFT 5
10151diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10152index a24e41f..47677ff 100644
10153--- a/arch/sparc/include/asm/elf_32.h
10154+++ b/arch/sparc/include/asm/elf_32.h
10155@@ -114,6 +114,13 @@ typedef struct {
10156
10157 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10158
10159+#ifdef CONFIG_PAX_ASLR
10160+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10161+
10162+#define PAX_DELTA_MMAP_LEN 16
10163+#define PAX_DELTA_STACK_LEN 16
10164+#endif
10165+
10166 /* This yields a mask that user programs can use to figure out what
10167 instruction set this cpu supports. This can NOT be done in userspace
10168 on Sparc. */
10169diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10170index 370ca1e..d4f4a98 100644
10171--- a/arch/sparc/include/asm/elf_64.h
10172+++ b/arch/sparc/include/asm/elf_64.h
10173@@ -189,6 +189,13 @@ typedef struct {
10174 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10175 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10176
10177+#ifdef CONFIG_PAX_ASLR
10178+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10179+
10180+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10181+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10182+#endif
10183+
10184 extern unsigned long sparc64_elf_hwcap;
10185 #define ELF_HWCAP sparc64_elf_hwcap
10186
10187diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10188index a3890da..f6a408e 100644
10189--- a/arch/sparc/include/asm/pgalloc_32.h
10190+++ b/arch/sparc/include/asm/pgalloc_32.h
10191@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10192 }
10193
10194 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10195+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10196
10197 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10198 unsigned long address)
10199diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10200index 5e31871..13469c6 100644
10201--- a/arch/sparc/include/asm/pgalloc_64.h
10202+++ b/arch/sparc/include/asm/pgalloc_64.h
10203@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10204 }
10205
10206 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10207+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10208
10209 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10210 {
10211@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10212 }
10213
10214 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10215+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10216
10217 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10218 {
10219diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10220index 59ba6f6..4518128 100644
10221--- a/arch/sparc/include/asm/pgtable.h
10222+++ b/arch/sparc/include/asm/pgtable.h
10223@@ -5,4 +5,8 @@
10224 #else
10225 #include <asm/pgtable_32.h>
10226 #endif
10227+
10228+#define ktla_ktva(addr) (addr)
10229+#define ktva_ktla(addr) (addr)
10230+
10231 #endif
10232diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10233index b9b91ae..950b91e 100644
10234--- a/arch/sparc/include/asm/pgtable_32.h
10235+++ b/arch/sparc/include/asm/pgtable_32.h
10236@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10237 #define PAGE_SHARED SRMMU_PAGE_SHARED
10238 #define PAGE_COPY SRMMU_PAGE_COPY
10239 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10240+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10241+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10242+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10243 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10244
10245 /* Top-level page directory - dummy used by init-mm.
10246@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10247
10248 /* xwr */
10249 #define __P000 PAGE_NONE
10250-#define __P001 PAGE_READONLY
10251-#define __P010 PAGE_COPY
10252-#define __P011 PAGE_COPY
10253+#define __P001 PAGE_READONLY_NOEXEC
10254+#define __P010 PAGE_COPY_NOEXEC
10255+#define __P011 PAGE_COPY_NOEXEC
10256 #define __P100 PAGE_READONLY
10257 #define __P101 PAGE_READONLY
10258 #define __P110 PAGE_COPY
10259 #define __P111 PAGE_COPY
10260
10261 #define __S000 PAGE_NONE
10262-#define __S001 PAGE_READONLY
10263-#define __S010 PAGE_SHARED
10264-#define __S011 PAGE_SHARED
10265+#define __S001 PAGE_READONLY_NOEXEC
10266+#define __S010 PAGE_SHARED_NOEXEC
10267+#define __S011 PAGE_SHARED_NOEXEC
10268 #define __S100 PAGE_READONLY
10269 #define __S101 PAGE_READONLY
10270 #define __S110 PAGE_SHARED
10271diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10272index 79da178..c2eede8 100644
10273--- a/arch/sparc/include/asm/pgtsrmmu.h
10274+++ b/arch/sparc/include/asm/pgtsrmmu.h
10275@@ -115,6 +115,11 @@
10276 SRMMU_EXEC | SRMMU_REF)
10277 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10278 SRMMU_EXEC | SRMMU_REF)
10279+
10280+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10281+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10282+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10283+
10284 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10285 SRMMU_DIRTY | SRMMU_REF)
10286
10287diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10288index 29d64b1..4272fe8 100644
10289--- a/arch/sparc/include/asm/setup.h
10290+++ b/arch/sparc/include/asm/setup.h
10291@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10292 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10293
10294 /* init_64.c */
10295-extern atomic_t dcpage_flushes;
10296-extern atomic_t dcpage_flushes_xcall;
10297+extern atomic_unchecked_t dcpage_flushes;
10298+extern atomic_unchecked_t dcpage_flushes_xcall;
10299
10300 extern int sysctl_tsb_ratio;
10301 #endif
10302diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10303index 9689176..63c18ea 100644
10304--- a/arch/sparc/include/asm/spinlock_64.h
10305+++ b/arch/sparc/include/asm/spinlock_64.h
10306@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10307
10308 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10309
10310-static void inline arch_read_lock(arch_rwlock_t *lock)
10311+static inline void arch_read_lock(arch_rwlock_t *lock)
10312 {
10313 unsigned long tmp1, tmp2;
10314
10315 __asm__ __volatile__ (
10316 "1: ldsw [%2], %0\n"
10317 " brlz,pn %0, 2f\n"
10318-"4: add %0, 1, %1\n"
10319+"4: addcc %0, 1, %1\n"
10320+
10321+#ifdef CONFIG_PAX_REFCOUNT
10322+" tvs %%icc, 6\n"
10323+#endif
10324+
10325 " cas [%2], %0, %1\n"
10326 " cmp %0, %1\n"
10327 " bne,pn %%icc, 1b\n"
10328@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10329 " .previous"
10330 : "=&r" (tmp1), "=&r" (tmp2)
10331 : "r" (lock)
10332- : "memory");
10333+ : "memory", "cc");
10334 }
10335
10336-static int inline arch_read_trylock(arch_rwlock_t *lock)
10337+static inline int arch_read_trylock(arch_rwlock_t *lock)
10338 {
10339 int tmp1, tmp2;
10340
10341@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10342 "1: ldsw [%2], %0\n"
10343 " brlz,a,pn %0, 2f\n"
10344 " mov 0, %0\n"
10345-" add %0, 1, %1\n"
10346+" addcc %0, 1, %1\n"
10347+
10348+#ifdef CONFIG_PAX_REFCOUNT
10349+" tvs %%icc, 6\n"
10350+#endif
10351+
10352 " cas [%2], %0, %1\n"
10353 " cmp %0, %1\n"
10354 " bne,pn %%icc, 1b\n"
10355@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10356 return tmp1;
10357 }
10358
10359-static void inline arch_read_unlock(arch_rwlock_t *lock)
10360+static inline void arch_read_unlock(arch_rwlock_t *lock)
10361 {
10362 unsigned long tmp1, tmp2;
10363
10364 __asm__ __volatile__(
10365 "1: lduw [%2], %0\n"
10366-" sub %0, 1, %1\n"
10367+" subcc %0, 1, %1\n"
10368+
10369+#ifdef CONFIG_PAX_REFCOUNT
10370+" tvs %%icc, 6\n"
10371+#endif
10372+
10373 " cas [%2], %0, %1\n"
10374 " cmp %0, %1\n"
10375 " bne,pn %%xcc, 1b\n"
10376@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10377 : "memory");
10378 }
10379
10380-static void inline arch_write_lock(arch_rwlock_t *lock)
10381+static inline void arch_write_lock(arch_rwlock_t *lock)
10382 {
10383 unsigned long mask, tmp1, tmp2;
10384
10385@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10386 : "memory");
10387 }
10388
10389-static void inline arch_write_unlock(arch_rwlock_t *lock)
10390+static inline void arch_write_unlock(arch_rwlock_t *lock)
10391 {
10392 __asm__ __volatile__(
10393 " stw %%g0, [%0]"
10394@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10395 : "memory");
10396 }
10397
10398-static int inline arch_write_trylock(arch_rwlock_t *lock)
10399+static inline int arch_write_trylock(arch_rwlock_t *lock)
10400 {
10401 unsigned long mask, tmp1, tmp2, result;
10402
10403diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10404index 025c984..a216504 100644
10405--- a/arch/sparc/include/asm/thread_info_32.h
10406+++ b/arch/sparc/include/asm/thread_info_32.h
10407@@ -49,6 +49,8 @@ struct thread_info {
10408 unsigned long w_saved;
10409
10410 struct restart_block restart_block;
10411+
10412+ unsigned long lowest_stack;
10413 };
10414
10415 /*
10416diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10417index 798f027..b009941 100644
10418--- a/arch/sparc/include/asm/thread_info_64.h
10419+++ b/arch/sparc/include/asm/thread_info_64.h
10420@@ -63,6 +63,8 @@ struct thread_info {
10421 struct pt_regs *kern_una_regs;
10422 unsigned int kern_una_insn;
10423
10424+ unsigned long lowest_stack;
10425+
10426 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10427 __attribute__ ((aligned(64)));
10428 };
10429@@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10430 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10431 /* flag bit 4 is available */
10432 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10433-/* flag bit 6 is available */
10434+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10435 #define TIF_32BIT 7 /* 32-bit binary */
10436 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10437 #define TIF_SECCOMP 9 /* secure computing */
10438 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10439 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10440+
10441 /* NOTE: Thread flags >= 12 should be ones we have no interest
10442 * in using in assembly, else we can't use the mask as
10443 * an immediate value in instructions such as andcc.
10444@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10445 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10446 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10447 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10448+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10449
10450 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10451 _TIF_DO_NOTIFY_RESUME_MASK | \
10452 _TIF_NEED_RESCHED)
10453 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10454
10455+#define _TIF_WORK_SYSCALL \
10456+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10457+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10458+
10459 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10460
10461 /*
10462diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10463index bd56c28..4b63d83 100644
10464--- a/arch/sparc/include/asm/uaccess.h
10465+++ b/arch/sparc/include/asm/uaccess.h
10466@@ -1,5 +1,6 @@
10467 #ifndef ___ASM_SPARC_UACCESS_H
10468 #define ___ASM_SPARC_UACCESS_H
10469+
10470 #if defined(__sparc__) && defined(__arch64__)
10471 #include <asm/uaccess_64.h>
10472 #else
10473diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10474index 9634d08..020b2dc 100644
10475--- a/arch/sparc/include/asm/uaccess_32.h
10476+++ b/arch/sparc/include/asm/uaccess_32.h
10477@@ -47,6 +47,7 @@
10478 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10479 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10480 #define __access_ok(addr,size) (__user_ok((addr) & get_fs().seg,(size)))
10481+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10482 #define access_ok(type, addr, size) \
10483 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10484
10485@@ -250,27 +251,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10486
10487 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10488 {
10489- if (n && __access_ok((unsigned long) to, n))
10490+ if ((long)n < 0)
10491+ return n;
10492+
10493+ if (n && __access_ok((unsigned long) to, n)) {
10494+ if (!__builtin_constant_p(n))
10495+ check_object_size(from, n, true);
10496 return __copy_user(to, (__force void __user *) from, n);
10497- else
10498+ } else
10499 return n;
10500 }
10501
10502 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10503 {
10504+ if ((long)n < 0)
10505+ return n;
10506+
10507+ if (!__builtin_constant_p(n))
10508+ check_object_size(from, n, true);
10509+
10510 return __copy_user(to, (__force void __user *) from, n);
10511 }
10512
10513 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10514 {
10515- if (n && __access_ok((unsigned long) from, n))
10516+ if ((long)n < 0)
10517+ return n;
10518+
10519+ if (n && __access_ok((unsigned long) from, n)) {
10520+ if (!__builtin_constant_p(n))
10521+ check_object_size(to, n, false);
10522 return __copy_user((__force void __user *) to, from, n);
10523- else
10524+ } else
10525 return n;
10526 }
10527
10528 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10529 {
10530+ if ((long)n < 0)
10531+ return n;
10532+
10533 return __copy_user((__force void __user *) to, from, n);
10534 }
10535
10536diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10537index c990a5e..7384856 100644
10538--- a/arch/sparc/include/asm/uaccess_64.h
10539+++ b/arch/sparc/include/asm/uaccess_64.h
10540@@ -10,6 +10,7 @@
10541 #include <linux/compiler.h>
10542 #include <linux/string.h>
10543 #include <linux/thread_info.h>
10544+#include <linux/kernel.h>
10545 #include <asm/asi.h>
10546 #include <asm/spitfire.h>
10547 #include <asm-generic/uaccess-unaligned.h>
10548@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10549 return 1;
10550 }
10551
10552+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10553+{
10554+ return 1;
10555+}
10556+
10557 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10558 {
10559 return 1;
10560@@ -214,8 +220,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10561 static inline unsigned long __must_check
10562 copy_from_user(void *to, const void __user *from, unsigned long size)
10563 {
10564- unsigned long ret = ___copy_from_user(to, from, size);
10565+ unsigned long ret;
10566
10567+ if ((long)size < 0 || size > INT_MAX)
10568+ return size;
10569+
10570+ if (!__builtin_constant_p(size))
10571+ check_object_size(to, size, false);
10572+
10573+ ret = ___copy_from_user(to, from, size);
10574 if (unlikely(ret))
10575 ret = copy_from_user_fixup(to, from, size);
10576
10577@@ -231,8 +244,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10578 static inline unsigned long __must_check
10579 copy_to_user(void __user *to, const void *from, unsigned long size)
10580 {
10581- unsigned long ret = ___copy_to_user(to, from, size);
10582+ unsigned long ret;
10583
10584+ if ((long)size < 0 || size > INT_MAX)
10585+ return size;
10586+
10587+ if (!__builtin_constant_p(size))
10588+ check_object_size(from, size, true);
10589+
10590+ ret = ___copy_to_user(to, from, size);
10591 if (unlikely(ret))
10592 ret = copy_to_user_fixup(to, from, size);
10593 return ret;
10594diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10595index 7cf9c6e..6206648 100644
10596--- a/arch/sparc/kernel/Makefile
10597+++ b/arch/sparc/kernel/Makefile
10598@@ -4,7 +4,7 @@
10599 #
10600
10601 asflags-y := -ansi
10602-ccflags-y := -Werror
10603+#ccflags-y := -Werror
10604
10605 extra-y := head_$(BITS).o
10606
10607diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10608index 50e7b62..79fae35 100644
10609--- a/arch/sparc/kernel/process_32.c
10610+++ b/arch/sparc/kernel/process_32.c
10611@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10612
10613 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10614 r->psr, r->pc, r->npc, r->y, print_tainted());
10615- printk("PC: <%pS>\n", (void *) r->pc);
10616+ printk("PC: <%pA>\n", (void *) r->pc);
10617 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10618 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10619 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10620 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10621 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10622 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10623- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10624+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10625
10626 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10627 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10628@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10629 rw = (struct reg_window32 *) fp;
10630 pc = rw->ins[7];
10631 printk("[%08lx : ", pc);
10632- printk("%pS ] ", (void *) pc);
10633+ printk("%pA ] ", (void *) pc);
10634 fp = rw->ins[6];
10635 } while (++count < 16);
10636 printk("\n");
10637diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10638index 46a5964..a35c62c 100644
10639--- a/arch/sparc/kernel/process_64.c
10640+++ b/arch/sparc/kernel/process_64.c
10641@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10642 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10643 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10644 if (regs->tstate & TSTATE_PRIV)
10645- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10646+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10647 }
10648
10649 void show_regs(struct pt_regs *regs)
10650@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10651
10652 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10653 regs->tpc, regs->tnpc, regs->y, print_tainted());
10654- printk("TPC: <%pS>\n", (void *) regs->tpc);
10655+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10656 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10657 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10658 regs->u_regs[3]);
10659@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10660 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10661 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10662 regs->u_regs[15]);
10663- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10664+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10665 show_regwindow(regs);
10666 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10667 }
10668@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10669 ((tp && tp->task) ? tp->task->pid : -1));
10670
10671 if (gp->tstate & TSTATE_PRIV) {
10672- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10673+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10674 (void *) gp->tpc,
10675 (void *) gp->o7,
10676 (void *) gp->i7,
10677diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10678index 79cc0d1..ec62734 100644
10679--- a/arch/sparc/kernel/prom_common.c
10680+++ b/arch/sparc/kernel/prom_common.c
10681@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10682
10683 unsigned int prom_early_allocated __initdata;
10684
10685-static struct of_pdt_ops prom_sparc_ops __initdata = {
10686+static struct of_pdt_ops prom_sparc_ops __initconst = {
10687 .nextprop = prom_common_nextprop,
10688 .getproplen = prom_getproplen,
10689 .getproperty = prom_getproperty,
10690diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10691index 9ddc492..27a5619 100644
10692--- a/arch/sparc/kernel/ptrace_64.c
10693+++ b/arch/sparc/kernel/ptrace_64.c
10694@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10695 return ret;
10696 }
10697
10698+#ifdef CONFIG_GRKERNSEC_SETXID
10699+extern void gr_delayed_cred_worker(void);
10700+#endif
10701+
10702 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10703 {
10704 int ret = 0;
10705@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10706 if (test_thread_flag(TIF_NOHZ))
10707 user_exit();
10708
10709+#ifdef CONFIG_GRKERNSEC_SETXID
10710+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10711+ gr_delayed_cred_worker();
10712+#endif
10713+
10714 if (test_thread_flag(TIF_SYSCALL_TRACE))
10715 ret = tracehook_report_syscall_entry(regs);
10716
10717@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10718 if (test_thread_flag(TIF_NOHZ))
10719 user_exit();
10720
10721+#ifdef CONFIG_GRKERNSEC_SETXID
10722+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10723+ gr_delayed_cred_worker();
10724+#endif
10725+
10726 audit_syscall_exit(regs);
10727
10728 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10729diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10730index da6f1a7..e5dea8f 100644
10731--- a/arch/sparc/kernel/smp_64.c
10732+++ b/arch/sparc/kernel/smp_64.c
10733@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10734 return;
10735
10736 #ifdef CONFIG_DEBUG_DCFLUSH
10737- atomic_inc(&dcpage_flushes);
10738+ atomic_inc_unchecked(&dcpage_flushes);
10739 #endif
10740
10741 this_cpu = get_cpu();
10742@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10743 xcall_deliver(data0, __pa(pg_addr),
10744 (u64) pg_addr, cpumask_of(cpu));
10745 #ifdef CONFIG_DEBUG_DCFLUSH
10746- atomic_inc(&dcpage_flushes_xcall);
10747+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10748 #endif
10749 }
10750 }
10751@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10752 preempt_disable();
10753
10754 #ifdef CONFIG_DEBUG_DCFLUSH
10755- atomic_inc(&dcpage_flushes);
10756+ atomic_inc_unchecked(&dcpage_flushes);
10757 #endif
10758 data0 = 0;
10759 pg_addr = page_address(page);
10760@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10761 xcall_deliver(data0, __pa(pg_addr),
10762 (u64) pg_addr, cpu_online_mask);
10763 #ifdef CONFIG_DEBUG_DCFLUSH
10764- atomic_inc(&dcpage_flushes_xcall);
10765+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10766 #endif
10767 }
10768 __local_flush_dcache_page(page);
10769diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10770index 646988d..b88905f 100644
10771--- a/arch/sparc/kernel/sys_sparc_32.c
10772+++ b/arch/sparc/kernel/sys_sparc_32.c
10773@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10774 if (len > TASK_SIZE - PAGE_SIZE)
10775 return -ENOMEM;
10776 if (!addr)
10777- addr = TASK_UNMAPPED_BASE;
10778+ addr = current->mm->mmap_base;
10779
10780 info.flags = 0;
10781 info.length = len;
10782diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10783index 30e7ddb..266a3b0 100644
10784--- a/arch/sparc/kernel/sys_sparc_64.c
10785+++ b/arch/sparc/kernel/sys_sparc_64.c
10786@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10787 struct vm_area_struct * vma;
10788 unsigned long task_size = TASK_SIZE;
10789 int do_color_align;
10790+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10791 struct vm_unmapped_area_info info;
10792
10793 if (flags & MAP_FIXED) {
10794 /* We do not accept a shared mapping if it would violate
10795 * cache aliasing constraints.
10796 */
10797- if ((flags & MAP_SHARED) &&
10798+ if ((filp || (flags & MAP_SHARED)) &&
10799 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10800 return -EINVAL;
10801 return addr;
10802@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10803 if (filp || (flags & MAP_SHARED))
10804 do_color_align = 1;
10805
10806+#ifdef CONFIG_PAX_RANDMMAP
10807+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10808+#endif
10809+
10810 if (addr) {
10811 if (do_color_align)
10812 addr = COLOR_ALIGN(addr, pgoff);
10813@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10814 addr = PAGE_ALIGN(addr);
10815
10816 vma = find_vma(mm, addr);
10817- if (task_size - len >= addr &&
10818- (!vma || addr + len <= vma->vm_start))
10819+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10820 return addr;
10821 }
10822
10823 info.flags = 0;
10824 info.length = len;
10825- info.low_limit = TASK_UNMAPPED_BASE;
10826+ info.low_limit = mm->mmap_base;
10827 info.high_limit = min(task_size, VA_EXCLUDE_START);
10828 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10829 info.align_offset = pgoff << PAGE_SHIFT;
10830+ info.threadstack_offset = offset;
10831 addr = vm_unmapped_area(&info);
10832
10833 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10834 VM_BUG_ON(addr != -ENOMEM);
10835 info.low_limit = VA_EXCLUDE_END;
10836+
10837+#ifdef CONFIG_PAX_RANDMMAP
10838+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10839+ info.low_limit += mm->delta_mmap;
10840+#endif
10841+
10842 info.high_limit = task_size;
10843 addr = vm_unmapped_area(&info);
10844 }
10845@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10846 unsigned long task_size = STACK_TOP32;
10847 unsigned long addr = addr0;
10848 int do_color_align;
10849+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10850 struct vm_unmapped_area_info info;
10851
10852 /* This should only ever run for 32-bit processes. */
10853@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10854 /* We do not accept a shared mapping if it would violate
10855 * cache aliasing constraints.
10856 */
10857- if ((flags & MAP_SHARED) &&
10858+ if ((filp || (flags & MAP_SHARED)) &&
10859 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10860 return -EINVAL;
10861 return addr;
10862@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10863 if (filp || (flags & MAP_SHARED))
10864 do_color_align = 1;
10865
10866+#ifdef CONFIG_PAX_RANDMMAP
10867+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10868+#endif
10869+
10870 /* requesting a specific address */
10871 if (addr) {
10872 if (do_color_align)
10873@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10874 addr = PAGE_ALIGN(addr);
10875
10876 vma = find_vma(mm, addr);
10877- if (task_size - len >= addr &&
10878- (!vma || addr + len <= vma->vm_start))
10879+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10880 return addr;
10881 }
10882
10883@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10884 info.high_limit = mm->mmap_base;
10885 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10886 info.align_offset = pgoff << PAGE_SHIFT;
10887+ info.threadstack_offset = offset;
10888 addr = vm_unmapped_area(&info);
10889
10890 /*
10891@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10892 VM_BUG_ON(addr != -ENOMEM);
10893 info.flags = 0;
10894 info.low_limit = TASK_UNMAPPED_BASE;
10895+
10896+#ifdef CONFIG_PAX_RANDMMAP
10897+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10898+ info.low_limit += mm->delta_mmap;
10899+#endif
10900+
10901 info.high_limit = STACK_TOP32;
10902 addr = vm_unmapped_area(&info);
10903 }
10904@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10905 EXPORT_SYMBOL(get_fb_unmapped_area);
10906
10907 /* Essentially the same as PowerPC. */
10908-static unsigned long mmap_rnd(void)
10909+static unsigned long mmap_rnd(struct mm_struct *mm)
10910 {
10911 unsigned long rnd = 0UL;
10912
10913+#ifdef CONFIG_PAX_RANDMMAP
10914+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10915+#endif
10916+
10917 if (current->flags & PF_RANDOMIZE) {
10918 unsigned long val = get_random_int();
10919 if (test_thread_flag(TIF_32BIT))
10920@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10921
10922 void arch_pick_mmap_layout(struct mm_struct *mm)
10923 {
10924- unsigned long random_factor = mmap_rnd();
10925+ unsigned long random_factor = mmap_rnd(mm);
10926 unsigned long gap;
10927
10928 /*
10929@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10930 gap == RLIM_INFINITY ||
10931 sysctl_legacy_va_layout) {
10932 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10933+
10934+#ifdef CONFIG_PAX_RANDMMAP
10935+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10936+ mm->mmap_base += mm->delta_mmap;
10937+#endif
10938+
10939 mm->get_unmapped_area = arch_get_unmapped_area;
10940 } else {
10941 /* We know it's 32-bit */
10942@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10943 gap = (task_size / 6 * 5);
10944
10945 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10946+
10947+#ifdef CONFIG_PAX_RANDMMAP
10948+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10949+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10950+#endif
10951+
10952 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10953 }
10954 }
10955diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10956index bb00089..e0ea580 100644
10957--- a/arch/sparc/kernel/syscalls.S
10958+++ b/arch/sparc/kernel/syscalls.S
10959@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10960 #endif
10961 .align 32
10962 1: ldx [%g6 + TI_FLAGS], %l5
10963- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10964+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10965 be,pt %icc, rtrap
10966 nop
10967 call syscall_trace_leave
10968@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10969
10970 srl %i3, 0, %o3 ! IEU0
10971 srl %i2, 0, %o2 ! IEU0 Group
10972- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10973+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10974 bne,pn %icc, linux_syscall_trace32 ! CTI
10975 mov %i0, %l5 ! IEU1
10976 5: call %l7 ! CTI Group brk forced
10977@@ -218,7 +218,7 @@ linux_sparc_syscall:
10978
10979 mov %i3, %o3 ! IEU1
10980 mov %i4, %o4 ! IEU0 Group
10981- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10982+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10983 bne,pn %icc, linux_syscall_trace ! CTI Group
10984 mov %i0, %l5 ! IEU0
10985 2: call %l7 ! CTI Group brk forced
10986@@ -233,7 +233,7 @@ ret_sys_call:
10987
10988 cmp %o0, -ERESTART_RESTARTBLOCK
10989 bgeu,pn %xcc, 1f
10990- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10991+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10992 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10993
10994 2:
10995diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10996index 6fd386c5..6907d81 100644
10997--- a/arch/sparc/kernel/traps_32.c
10998+++ b/arch/sparc/kernel/traps_32.c
10999@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
11000 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
11001 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
11002
11003+extern void gr_handle_kernel_exploit(void);
11004+
11005 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11006 {
11007 static int die_counter;
11008@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11009 count++ < 30 &&
11010 (((unsigned long) rw) >= PAGE_OFFSET) &&
11011 !(((unsigned long) rw) & 0x7)) {
11012- printk("Caller[%08lx]: %pS\n", rw->ins[7],
11013+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
11014 (void *) rw->ins[7]);
11015 rw = (struct reg_window32 *)rw->ins[6];
11016 }
11017 }
11018 printk("Instruction DUMP:");
11019 instruction_dump ((unsigned long *) regs->pc);
11020- if(regs->psr & PSR_PS)
11021+ if(regs->psr & PSR_PS) {
11022+ gr_handle_kernel_exploit();
11023 do_exit(SIGKILL);
11024+ }
11025 do_exit(SIGSEGV);
11026 }
11027
11028diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
11029index 981a769..d906eda 100644
11030--- a/arch/sparc/kernel/traps_64.c
11031+++ b/arch/sparc/kernel/traps_64.c
11032@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
11033 i + 1,
11034 p->trapstack[i].tstate, p->trapstack[i].tpc,
11035 p->trapstack[i].tnpc, p->trapstack[i].tt);
11036- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
11037+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
11038 }
11039 }
11040
11041@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
11042
11043 lvl -= 0x100;
11044 if (regs->tstate & TSTATE_PRIV) {
11045+
11046+#ifdef CONFIG_PAX_REFCOUNT
11047+ if (lvl == 6)
11048+ pax_report_refcount_overflow(regs);
11049+#endif
11050+
11051 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11052 die_if_kernel(buffer, regs);
11053 }
11054@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11055 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11056 {
11057 char buffer[32];
11058-
11059+
11060 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11061 0, lvl, SIGTRAP) == NOTIFY_STOP)
11062 return;
11063
11064+#ifdef CONFIG_PAX_REFCOUNT
11065+ if (lvl == 6)
11066+ pax_report_refcount_overflow(regs);
11067+#endif
11068+
11069 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11070
11071 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11072@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11073 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11074 printk("%s" "ERROR(%d): ",
11075 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11076- printk("TPC<%pS>\n", (void *) regs->tpc);
11077+ printk("TPC<%pA>\n", (void *) regs->tpc);
11078 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11079 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11080 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11081@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11082 smp_processor_id(),
11083 (type & 0x1) ? 'I' : 'D',
11084 regs->tpc);
11085- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11086+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11087 panic("Irrecoverable Cheetah+ parity error.");
11088 }
11089
11090@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11091 smp_processor_id(),
11092 (type & 0x1) ? 'I' : 'D',
11093 regs->tpc);
11094- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11095+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11096 }
11097
11098 struct sun4v_error_entry {
11099@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11100 /*0x38*/u64 reserved_5;
11101 };
11102
11103-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11104-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11105+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11106+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11107
11108 static const char *sun4v_err_type_to_str(u8 type)
11109 {
11110@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11111 }
11112
11113 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11114- int cpu, const char *pfx, atomic_t *ocnt)
11115+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11116 {
11117 u64 *raw_ptr = (u64 *) ent;
11118 u32 attrs;
11119@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11120
11121 show_regs(regs);
11122
11123- if ((cnt = atomic_read(ocnt)) != 0) {
11124- atomic_set(ocnt, 0);
11125+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11126+ atomic_set_unchecked(ocnt, 0);
11127 wmb();
11128 printk("%s: Queue overflowed %d times.\n",
11129 pfx, cnt);
11130@@ -2048,7 +2059,7 @@ out:
11131 */
11132 void sun4v_resum_overflow(struct pt_regs *regs)
11133 {
11134- atomic_inc(&sun4v_resum_oflow_cnt);
11135+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11136 }
11137
11138 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11139@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11140 /* XXX Actually even this can make not that much sense. Perhaps
11141 * XXX we should just pull the plug and panic directly from here?
11142 */
11143- atomic_inc(&sun4v_nonresum_oflow_cnt);
11144+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11145 }
11146
11147 static void sun4v_tlb_error(struct pt_regs *regs)
11148@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11149
11150 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11151 regs->tpc, tl);
11152- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11153+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11154 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11155- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11156+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11157 (void *) regs->u_regs[UREG_I7]);
11158 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11159 "pte[%lx] error[%lx]\n",
11160@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11161
11162 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11163 regs->tpc, tl);
11164- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11165+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11166 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11167- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11168+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11169 (void *) regs->u_regs[UREG_I7]);
11170 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11171 "pte[%lx] error[%lx]\n",
11172@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11173 fp = (unsigned long)sf->fp + STACK_BIAS;
11174 }
11175
11176- printk(" [%016lx] %pS\n", pc, (void *) pc);
11177+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11178 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11179 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11180 int index = tsk->curr_ret_stack;
11181 if (tsk->ret_stack && index >= graph) {
11182 pc = tsk->ret_stack[index - graph].ret;
11183- printk(" [%016lx] %pS\n", pc, (void *) pc);
11184+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11185 graph++;
11186 }
11187 }
11188@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11189 return (struct reg_window *) (fp + STACK_BIAS);
11190 }
11191
11192+extern void gr_handle_kernel_exploit(void);
11193+
11194 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11195 {
11196 static int die_counter;
11197@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11198 while (rw &&
11199 count++ < 30 &&
11200 kstack_valid(tp, (unsigned long) rw)) {
11201- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11202+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11203 (void *) rw->ins[7]);
11204
11205 rw = kernel_stack_up(rw);
11206@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11207 }
11208 user_instruction_dump ((unsigned int __user *) regs->tpc);
11209 }
11210- if (regs->tstate & TSTATE_PRIV)
11211+ if (regs->tstate & TSTATE_PRIV) {
11212+ gr_handle_kernel_exploit();
11213 do_exit(SIGKILL);
11214+ }
11215 do_exit(SIGSEGV);
11216 }
11217 EXPORT_SYMBOL(die_if_kernel);
11218diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11219index 62098a8..547ab2c 100644
11220--- a/arch/sparc/kernel/unaligned_64.c
11221+++ b/arch/sparc/kernel/unaligned_64.c
11222@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11223 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11224
11225 if (__ratelimit(&ratelimit)) {
11226- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11227+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11228 regs->tpc, (void *) regs->tpc);
11229 }
11230 }
11231diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11232index 3269b02..64f5231 100644
11233--- a/arch/sparc/lib/Makefile
11234+++ b/arch/sparc/lib/Makefile
11235@@ -2,7 +2,7 @@
11236 #
11237
11238 asflags-y := -ansi -DST_DIV0=0x02
11239-ccflags-y := -Werror
11240+#ccflags-y := -Werror
11241
11242 lib-$(CONFIG_SPARC32) += ashrdi3.o
11243 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11244diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11245index 05dac43..76f8ed4 100644
11246--- a/arch/sparc/lib/atomic_64.S
11247+++ b/arch/sparc/lib/atomic_64.S
11248@@ -15,11 +15,22 @@
11249 * a value and does the barriers.
11250 */
11251
11252-#define ATOMIC_OP(op) \
11253-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11254+#ifdef CONFIG_PAX_REFCOUNT
11255+#define __REFCOUNT_OP(op) op##cc
11256+#define __OVERFLOW_IOP tvs %icc, 6;
11257+#define __OVERFLOW_XOP tvs %xcc, 6;
11258+#else
11259+#define __REFCOUNT_OP(op) op
11260+#define __OVERFLOW_IOP
11261+#define __OVERFLOW_XOP
11262+#endif
11263+
11264+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11265+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11266 BACKOFF_SETUP(%o2); \
11267 1: lduw [%o1], %g1; \
11268- op %g1, %o0, %g7; \
11269+ asm_op %g1, %o0, %g7; \
11270+ post_op \
11271 cas [%o1], %g1, %g7; \
11272 cmp %g1, %g7; \
11273 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11274@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11275 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11276 ENDPROC(atomic_##op); \
11277
11278-#define ATOMIC_OP_RETURN(op) \
11279-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11280+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11281+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11282+
11283+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11284+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11285 BACKOFF_SETUP(%o2); \
11286 1: lduw [%o1], %g1; \
11287- op %g1, %o0, %g7; \
11288+ asm_op %g1, %o0, %g7; \
11289+ post_op \
11290 cas [%o1], %g1, %g7; \
11291 cmp %g1, %g7; \
11292 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11293@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11294 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11295 ENDPROC(atomic_##op##_return);
11296
11297+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11298+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11299+
11300 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11301
11302 ATOMIC_OPS(add)
11303@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11304
11305 #undef ATOMIC_OPS
11306 #undef ATOMIC_OP_RETURN
11307+#undef __ATOMIC_OP_RETURN
11308 #undef ATOMIC_OP
11309+#undef __ATOMIC_OP
11310
11311-#define ATOMIC64_OP(op) \
11312-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11313+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11314+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11315 BACKOFF_SETUP(%o2); \
11316 1: ldx [%o1], %g1; \
11317- op %g1, %o0, %g7; \
11318+ asm_op %g1, %o0, %g7; \
11319+ post_op \
11320 casx [%o1], %g1, %g7; \
11321 cmp %g1, %g7; \
11322 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11323@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11324 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11325 ENDPROC(atomic64_##op); \
11326
11327-#define ATOMIC64_OP_RETURN(op) \
11328-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11329+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11330+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11331+
11332+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11333+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11334 BACKOFF_SETUP(%o2); \
11335 1: ldx [%o1], %g1; \
11336- op %g1, %o0, %g7; \
11337+ asm_op %g1, %o0, %g7; \
11338+ post_op \
11339 casx [%o1], %g1, %g7; \
11340 cmp %g1, %g7; \
11341 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11342@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11343 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11344 ENDPROC(atomic64_##op##_return);
11345
11346+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11347+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11348+
11349 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11350
11351 ATOMIC64_OPS(add)
11352@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11353
11354 #undef ATOMIC64_OPS
11355 #undef ATOMIC64_OP_RETURN
11356+#undef __ATOMIC64_OP_RETURN
11357 #undef ATOMIC64_OP
11358+#undef __ATOMIC64_OP
11359+#undef __OVERFLOW_XOP
11360+#undef __OVERFLOW_IOP
11361+#undef __REFCOUNT_OP
11362
11363 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11364 BACKOFF_SETUP(%o2)
11365diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11366index 1d649a9..fbc5bfc 100644
11367--- a/arch/sparc/lib/ksyms.c
11368+++ b/arch/sparc/lib/ksyms.c
11369@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11370 /* Atomic counter implementation. */
11371 #define ATOMIC_OP(op) \
11372 EXPORT_SYMBOL(atomic_##op); \
11373-EXPORT_SYMBOL(atomic64_##op);
11374+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11375+EXPORT_SYMBOL(atomic64_##op); \
11376+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11377
11378 #define ATOMIC_OP_RETURN(op) \
11379 EXPORT_SYMBOL(atomic_##op##_return); \
11380@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11381 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11382
11383 ATOMIC_OPS(add)
11384+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11385+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11386 ATOMIC_OPS(sub)
11387
11388 #undef ATOMIC_OPS
11389diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11390index 30c3ecc..736f015 100644
11391--- a/arch/sparc/mm/Makefile
11392+++ b/arch/sparc/mm/Makefile
11393@@ -2,7 +2,7 @@
11394 #
11395
11396 asflags-y := -ansi
11397-ccflags-y := -Werror
11398+#ccflags-y := -Werror
11399
11400 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11401 obj-y += fault_$(BITS).o
11402diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11403index 70d8171..274c6c0 100644
11404--- a/arch/sparc/mm/fault_32.c
11405+++ b/arch/sparc/mm/fault_32.c
11406@@ -21,6 +21,9 @@
11407 #include <linux/perf_event.h>
11408 #include <linux/interrupt.h>
11409 #include <linux/kdebug.h>
11410+#include <linux/slab.h>
11411+#include <linux/pagemap.h>
11412+#include <linux/compiler.h>
11413
11414 #include <asm/page.h>
11415 #include <asm/pgtable.h>
11416@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11417 return safe_compute_effective_address(regs, insn);
11418 }
11419
11420+#ifdef CONFIG_PAX_PAGEEXEC
11421+#ifdef CONFIG_PAX_DLRESOLVE
11422+static void pax_emuplt_close(struct vm_area_struct *vma)
11423+{
11424+ vma->vm_mm->call_dl_resolve = 0UL;
11425+}
11426+
11427+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11428+{
11429+ unsigned int *kaddr;
11430+
11431+ vmf->page = alloc_page(GFP_HIGHUSER);
11432+ if (!vmf->page)
11433+ return VM_FAULT_OOM;
11434+
11435+ kaddr = kmap(vmf->page);
11436+ memset(kaddr, 0, PAGE_SIZE);
11437+ kaddr[0] = 0x9DE3BFA8U; /* save */
11438+ flush_dcache_page(vmf->page);
11439+ kunmap(vmf->page);
11440+ return VM_FAULT_MAJOR;
11441+}
11442+
11443+static const struct vm_operations_struct pax_vm_ops = {
11444+ .close = pax_emuplt_close,
11445+ .fault = pax_emuplt_fault
11446+};
11447+
11448+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11449+{
11450+ int ret;
11451+
11452+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11453+ vma->vm_mm = current->mm;
11454+ vma->vm_start = addr;
11455+ vma->vm_end = addr + PAGE_SIZE;
11456+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11457+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11458+ vma->vm_ops = &pax_vm_ops;
11459+
11460+ ret = insert_vm_struct(current->mm, vma);
11461+ if (ret)
11462+ return ret;
11463+
11464+ ++current->mm->total_vm;
11465+ return 0;
11466+}
11467+#endif
11468+
11469+/*
11470+ * PaX: decide what to do with offenders (regs->pc = fault address)
11471+ *
11472+ * returns 1 when task should be killed
11473+ * 2 when patched PLT trampoline was detected
11474+ * 3 when unpatched PLT trampoline was detected
11475+ */
11476+static int pax_handle_fetch_fault(struct pt_regs *regs)
11477+{
11478+
11479+#ifdef CONFIG_PAX_EMUPLT
11480+ int err;
11481+
11482+ do { /* PaX: patched PLT emulation #1 */
11483+ unsigned int sethi1, sethi2, jmpl;
11484+
11485+ err = get_user(sethi1, (unsigned int *)regs->pc);
11486+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11487+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11488+
11489+ if (err)
11490+ break;
11491+
11492+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11493+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11494+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11495+ {
11496+ unsigned int addr;
11497+
11498+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11499+ addr = regs->u_regs[UREG_G1];
11500+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11501+ regs->pc = addr;
11502+ regs->npc = addr+4;
11503+ return 2;
11504+ }
11505+ } while (0);
11506+
11507+ do { /* PaX: patched PLT emulation #2 */
11508+ unsigned int ba;
11509+
11510+ err = get_user(ba, (unsigned int *)regs->pc);
11511+
11512+ if (err)
11513+ break;
11514+
11515+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11516+ unsigned int addr;
11517+
11518+ if ((ba & 0xFFC00000U) == 0x30800000U)
11519+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11520+ else
11521+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11522+ regs->pc = addr;
11523+ regs->npc = addr+4;
11524+ return 2;
11525+ }
11526+ } while (0);
11527+
11528+ do { /* PaX: patched PLT emulation #3 */
11529+ unsigned int sethi, bajmpl, nop;
11530+
11531+ err = get_user(sethi, (unsigned int *)regs->pc);
11532+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11533+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11534+
11535+ if (err)
11536+ break;
11537+
11538+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11539+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11540+ nop == 0x01000000U)
11541+ {
11542+ unsigned int addr;
11543+
11544+ addr = (sethi & 0x003FFFFFU) << 10;
11545+ regs->u_regs[UREG_G1] = addr;
11546+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11547+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11548+ else
11549+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11550+ regs->pc = addr;
11551+ regs->npc = addr+4;
11552+ return 2;
11553+ }
11554+ } while (0);
11555+
11556+ do { /* PaX: unpatched PLT emulation step 1 */
11557+ unsigned int sethi, ba, nop;
11558+
11559+ err = get_user(sethi, (unsigned int *)regs->pc);
11560+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11561+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11562+
11563+ if (err)
11564+ break;
11565+
11566+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11567+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11568+ nop == 0x01000000U)
11569+ {
11570+ unsigned int addr, save, call;
11571+
11572+ if ((ba & 0xFFC00000U) == 0x30800000U)
11573+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11574+ else
11575+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11576+
11577+ err = get_user(save, (unsigned int *)addr);
11578+ err |= get_user(call, (unsigned int *)(addr+4));
11579+ err |= get_user(nop, (unsigned int *)(addr+8));
11580+ if (err)
11581+ break;
11582+
11583+#ifdef CONFIG_PAX_DLRESOLVE
11584+ if (save == 0x9DE3BFA8U &&
11585+ (call & 0xC0000000U) == 0x40000000U &&
11586+ nop == 0x01000000U)
11587+ {
11588+ struct vm_area_struct *vma;
11589+ unsigned long call_dl_resolve;
11590+
11591+ down_read(&current->mm->mmap_sem);
11592+ call_dl_resolve = current->mm->call_dl_resolve;
11593+ up_read(&current->mm->mmap_sem);
11594+ if (likely(call_dl_resolve))
11595+ goto emulate;
11596+
11597+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11598+
11599+ down_write(&current->mm->mmap_sem);
11600+ if (current->mm->call_dl_resolve) {
11601+ call_dl_resolve = current->mm->call_dl_resolve;
11602+ up_write(&current->mm->mmap_sem);
11603+ if (vma)
11604+ kmem_cache_free(vm_area_cachep, vma);
11605+ goto emulate;
11606+ }
11607+
11608+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11609+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11610+ up_write(&current->mm->mmap_sem);
11611+ if (vma)
11612+ kmem_cache_free(vm_area_cachep, vma);
11613+ return 1;
11614+ }
11615+
11616+ if (pax_insert_vma(vma, call_dl_resolve)) {
11617+ up_write(&current->mm->mmap_sem);
11618+ kmem_cache_free(vm_area_cachep, vma);
11619+ return 1;
11620+ }
11621+
11622+ current->mm->call_dl_resolve = call_dl_resolve;
11623+ up_write(&current->mm->mmap_sem);
11624+
11625+emulate:
11626+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11627+ regs->pc = call_dl_resolve;
11628+ regs->npc = addr+4;
11629+ return 3;
11630+ }
11631+#endif
11632+
11633+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11634+ if ((save & 0xFFC00000U) == 0x05000000U &&
11635+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11636+ nop == 0x01000000U)
11637+ {
11638+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11639+ regs->u_regs[UREG_G2] = addr + 4;
11640+ addr = (save & 0x003FFFFFU) << 10;
11641+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11642+ regs->pc = addr;
11643+ regs->npc = addr+4;
11644+ return 3;
11645+ }
11646+ }
11647+ } while (0);
11648+
11649+ do { /* PaX: unpatched PLT emulation step 2 */
11650+ unsigned int save, call, nop;
11651+
11652+ err = get_user(save, (unsigned int *)(regs->pc-4));
11653+ err |= get_user(call, (unsigned int *)regs->pc);
11654+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11655+ if (err)
11656+ break;
11657+
11658+ if (save == 0x9DE3BFA8U &&
11659+ (call & 0xC0000000U) == 0x40000000U &&
11660+ nop == 0x01000000U)
11661+ {
11662+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11663+
11664+ regs->u_regs[UREG_RETPC] = regs->pc;
11665+ regs->pc = dl_resolve;
11666+ regs->npc = dl_resolve+4;
11667+ return 3;
11668+ }
11669+ } while (0);
11670+#endif
11671+
11672+ return 1;
11673+}
11674+
11675+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11676+{
11677+ unsigned long i;
11678+
11679+ printk(KERN_ERR "PAX: bytes at PC: ");
11680+ for (i = 0; i < 8; i++) {
11681+ unsigned int c;
11682+ if (get_user(c, (unsigned int *)pc+i))
11683+ printk(KERN_CONT "???????? ");
11684+ else
11685+ printk(KERN_CONT "%08x ", c);
11686+ }
11687+ printk("\n");
11688+}
11689+#endif
11690+
11691 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11692 int text_fault)
11693 {
11694@@ -226,6 +500,24 @@ good_area:
11695 if (!(vma->vm_flags & VM_WRITE))
11696 goto bad_area;
11697 } else {
11698+
11699+#ifdef CONFIG_PAX_PAGEEXEC
11700+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11701+ up_read(&mm->mmap_sem);
11702+ switch (pax_handle_fetch_fault(regs)) {
11703+
11704+#ifdef CONFIG_PAX_EMUPLT
11705+ case 2:
11706+ case 3:
11707+ return;
11708+#endif
11709+
11710+ }
11711+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11712+ do_group_exit(SIGKILL);
11713+ }
11714+#endif
11715+
11716 /* Allow reads even for write-only mappings */
11717 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11718 goto bad_area;
11719diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11720index 4798232..f76e3aa 100644
11721--- a/arch/sparc/mm/fault_64.c
11722+++ b/arch/sparc/mm/fault_64.c
11723@@ -22,6 +22,9 @@
11724 #include <linux/kdebug.h>
11725 #include <linux/percpu.h>
11726 #include <linux/context_tracking.h>
11727+#include <linux/slab.h>
11728+#include <linux/pagemap.h>
11729+#include <linux/compiler.h>
11730
11731 #include <asm/page.h>
11732 #include <asm/pgtable.h>
11733@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11734 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11735 regs->tpc);
11736 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11737- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11738+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11739 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11740 dump_stack();
11741 unhandled_fault(regs->tpc, current, regs);
11742@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11743 show_regs(regs);
11744 }
11745
11746+#ifdef CONFIG_PAX_PAGEEXEC
11747+#ifdef CONFIG_PAX_DLRESOLVE
11748+static void pax_emuplt_close(struct vm_area_struct *vma)
11749+{
11750+ vma->vm_mm->call_dl_resolve = 0UL;
11751+}
11752+
11753+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11754+{
11755+ unsigned int *kaddr;
11756+
11757+ vmf->page = alloc_page(GFP_HIGHUSER);
11758+ if (!vmf->page)
11759+ return VM_FAULT_OOM;
11760+
11761+ kaddr = kmap(vmf->page);
11762+ memset(kaddr, 0, PAGE_SIZE);
11763+ kaddr[0] = 0x9DE3BFA8U; /* save */
11764+ flush_dcache_page(vmf->page);
11765+ kunmap(vmf->page);
11766+ return VM_FAULT_MAJOR;
11767+}
11768+
11769+static const struct vm_operations_struct pax_vm_ops = {
11770+ .close = pax_emuplt_close,
11771+ .fault = pax_emuplt_fault
11772+};
11773+
11774+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11775+{
11776+ int ret;
11777+
11778+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11779+ vma->vm_mm = current->mm;
11780+ vma->vm_start = addr;
11781+ vma->vm_end = addr + PAGE_SIZE;
11782+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11783+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11784+ vma->vm_ops = &pax_vm_ops;
11785+
11786+ ret = insert_vm_struct(current->mm, vma);
11787+ if (ret)
11788+ return ret;
11789+
11790+ ++current->mm->total_vm;
11791+ return 0;
11792+}
11793+#endif
11794+
11795+/*
11796+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11797+ *
11798+ * returns 1 when task should be killed
11799+ * 2 when patched PLT trampoline was detected
11800+ * 3 when unpatched PLT trampoline was detected
11801+ */
11802+static int pax_handle_fetch_fault(struct pt_regs *regs)
11803+{
11804+
11805+#ifdef CONFIG_PAX_EMUPLT
11806+ int err;
11807+
11808+ do { /* PaX: patched PLT emulation #1 */
11809+ unsigned int sethi1, sethi2, jmpl;
11810+
11811+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11812+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11813+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11814+
11815+ if (err)
11816+ break;
11817+
11818+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11819+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11820+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11821+ {
11822+ unsigned long addr;
11823+
11824+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11825+ addr = regs->u_regs[UREG_G1];
11826+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11827+
11828+ if (test_thread_flag(TIF_32BIT))
11829+ addr &= 0xFFFFFFFFUL;
11830+
11831+ regs->tpc = addr;
11832+ regs->tnpc = addr+4;
11833+ return 2;
11834+ }
11835+ } while (0);
11836+
11837+ do { /* PaX: patched PLT emulation #2 */
11838+ unsigned int ba;
11839+
11840+ err = get_user(ba, (unsigned int *)regs->tpc);
11841+
11842+ if (err)
11843+ break;
11844+
11845+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11846+ unsigned long addr;
11847+
11848+ if ((ba & 0xFFC00000U) == 0x30800000U)
11849+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11850+ else
11851+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11852+
11853+ if (test_thread_flag(TIF_32BIT))
11854+ addr &= 0xFFFFFFFFUL;
11855+
11856+ regs->tpc = addr;
11857+ regs->tnpc = addr+4;
11858+ return 2;
11859+ }
11860+ } while (0);
11861+
11862+ do { /* PaX: patched PLT emulation #3 */
11863+ unsigned int sethi, bajmpl, nop;
11864+
11865+ err = get_user(sethi, (unsigned int *)regs->tpc);
11866+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11867+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11868+
11869+ if (err)
11870+ break;
11871+
11872+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11873+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11874+ nop == 0x01000000U)
11875+ {
11876+ unsigned long addr;
11877+
11878+ addr = (sethi & 0x003FFFFFU) << 10;
11879+ regs->u_regs[UREG_G1] = addr;
11880+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11881+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11882+ else
11883+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11884+
11885+ if (test_thread_flag(TIF_32BIT))
11886+ addr &= 0xFFFFFFFFUL;
11887+
11888+ regs->tpc = addr;
11889+ regs->tnpc = addr+4;
11890+ return 2;
11891+ }
11892+ } while (0);
11893+
11894+ do { /* PaX: patched PLT emulation #4 */
11895+ unsigned int sethi, mov1, call, mov2;
11896+
11897+ err = get_user(sethi, (unsigned int *)regs->tpc);
11898+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11899+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11900+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11901+
11902+ if (err)
11903+ break;
11904+
11905+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11906+ mov1 == 0x8210000FU &&
11907+ (call & 0xC0000000U) == 0x40000000U &&
11908+ mov2 == 0x9E100001U)
11909+ {
11910+ unsigned long addr;
11911+
11912+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11913+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11914+
11915+ if (test_thread_flag(TIF_32BIT))
11916+ addr &= 0xFFFFFFFFUL;
11917+
11918+ regs->tpc = addr;
11919+ regs->tnpc = addr+4;
11920+ return 2;
11921+ }
11922+ } while (0);
11923+
11924+ do { /* PaX: patched PLT emulation #5 */
11925+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11926+
11927+ err = get_user(sethi, (unsigned int *)regs->tpc);
11928+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11929+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11930+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11931+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11932+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11933+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11934+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11935+
11936+ if (err)
11937+ break;
11938+
11939+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11940+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11941+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11942+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11943+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11944+ sllx == 0x83287020U &&
11945+ jmpl == 0x81C04005U &&
11946+ nop == 0x01000000U)
11947+ {
11948+ unsigned long addr;
11949+
11950+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11951+ regs->u_regs[UREG_G1] <<= 32;
11952+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11953+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11954+ regs->tpc = addr;
11955+ regs->tnpc = addr+4;
11956+ return 2;
11957+ }
11958+ } while (0);
11959+
11960+ do { /* PaX: patched PLT emulation #6 */
11961+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11962+
11963+ err = get_user(sethi, (unsigned int *)regs->tpc);
11964+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11965+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11966+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11967+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11968+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11969+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11970+
11971+ if (err)
11972+ break;
11973+
11974+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11975+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11976+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11977+ sllx == 0x83287020U &&
11978+ (or & 0xFFFFE000U) == 0x8A116000U &&
11979+ jmpl == 0x81C04005U &&
11980+ nop == 0x01000000U)
11981+ {
11982+ unsigned long addr;
11983+
11984+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11985+ regs->u_regs[UREG_G1] <<= 32;
11986+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11987+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11988+ regs->tpc = addr;
11989+ regs->tnpc = addr+4;
11990+ return 2;
11991+ }
11992+ } while (0);
11993+
11994+ do { /* PaX: unpatched PLT emulation step 1 */
11995+ unsigned int sethi, ba, nop;
11996+
11997+ err = get_user(sethi, (unsigned int *)regs->tpc);
11998+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11999+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12000+
12001+ if (err)
12002+ break;
12003+
12004+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12005+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
12006+ nop == 0x01000000U)
12007+ {
12008+ unsigned long addr;
12009+ unsigned int save, call;
12010+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
12011+
12012+ if ((ba & 0xFFC00000U) == 0x30800000U)
12013+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
12014+ else
12015+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12016+
12017+ if (test_thread_flag(TIF_32BIT))
12018+ addr &= 0xFFFFFFFFUL;
12019+
12020+ err = get_user(save, (unsigned int *)addr);
12021+ err |= get_user(call, (unsigned int *)(addr+4));
12022+ err |= get_user(nop, (unsigned int *)(addr+8));
12023+ if (err)
12024+ break;
12025+
12026+#ifdef CONFIG_PAX_DLRESOLVE
12027+ if (save == 0x9DE3BFA8U &&
12028+ (call & 0xC0000000U) == 0x40000000U &&
12029+ nop == 0x01000000U)
12030+ {
12031+ struct vm_area_struct *vma;
12032+ unsigned long call_dl_resolve;
12033+
12034+ down_read(&current->mm->mmap_sem);
12035+ call_dl_resolve = current->mm->call_dl_resolve;
12036+ up_read(&current->mm->mmap_sem);
12037+ if (likely(call_dl_resolve))
12038+ goto emulate;
12039+
12040+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
12041+
12042+ down_write(&current->mm->mmap_sem);
12043+ if (current->mm->call_dl_resolve) {
12044+ call_dl_resolve = current->mm->call_dl_resolve;
12045+ up_write(&current->mm->mmap_sem);
12046+ if (vma)
12047+ kmem_cache_free(vm_area_cachep, vma);
12048+ goto emulate;
12049+ }
12050+
12051+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12052+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12053+ up_write(&current->mm->mmap_sem);
12054+ if (vma)
12055+ kmem_cache_free(vm_area_cachep, vma);
12056+ return 1;
12057+ }
12058+
12059+ if (pax_insert_vma(vma, call_dl_resolve)) {
12060+ up_write(&current->mm->mmap_sem);
12061+ kmem_cache_free(vm_area_cachep, vma);
12062+ return 1;
12063+ }
12064+
12065+ current->mm->call_dl_resolve = call_dl_resolve;
12066+ up_write(&current->mm->mmap_sem);
12067+
12068+emulate:
12069+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12070+ regs->tpc = call_dl_resolve;
12071+ regs->tnpc = addr+4;
12072+ return 3;
12073+ }
12074+#endif
12075+
12076+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12077+ if ((save & 0xFFC00000U) == 0x05000000U &&
12078+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12079+ nop == 0x01000000U)
12080+ {
12081+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12082+ regs->u_regs[UREG_G2] = addr + 4;
12083+ addr = (save & 0x003FFFFFU) << 10;
12084+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12085+
12086+ if (test_thread_flag(TIF_32BIT))
12087+ addr &= 0xFFFFFFFFUL;
12088+
12089+ regs->tpc = addr;
12090+ regs->tnpc = addr+4;
12091+ return 3;
12092+ }
12093+
12094+ /* PaX: 64-bit PLT stub */
12095+ err = get_user(sethi1, (unsigned int *)addr);
12096+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12097+ err |= get_user(or1, (unsigned int *)(addr+8));
12098+ err |= get_user(or2, (unsigned int *)(addr+12));
12099+ err |= get_user(sllx, (unsigned int *)(addr+16));
12100+ err |= get_user(add, (unsigned int *)(addr+20));
12101+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12102+ err |= get_user(nop, (unsigned int *)(addr+28));
12103+ if (err)
12104+ break;
12105+
12106+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12107+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12108+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12109+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12110+ sllx == 0x89293020U &&
12111+ add == 0x8A010005U &&
12112+ jmpl == 0x89C14000U &&
12113+ nop == 0x01000000U)
12114+ {
12115+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12116+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12117+ regs->u_regs[UREG_G4] <<= 32;
12118+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12119+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12120+ regs->u_regs[UREG_G4] = addr + 24;
12121+ addr = regs->u_regs[UREG_G5];
12122+ regs->tpc = addr;
12123+ regs->tnpc = addr+4;
12124+ return 3;
12125+ }
12126+ }
12127+ } while (0);
12128+
12129+#ifdef CONFIG_PAX_DLRESOLVE
12130+ do { /* PaX: unpatched PLT emulation step 2 */
12131+ unsigned int save, call, nop;
12132+
12133+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12134+ err |= get_user(call, (unsigned int *)regs->tpc);
12135+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12136+ if (err)
12137+ break;
12138+
12139+ if (save == 0x9DE3BFA8U &&
12140+ (call & 0xC0000000U) == 0x40000000U &&
12141+ nop == 0x01000000U)
12142+ {
12143+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12144+
12145+ if (test_thread_flag(TIF_32BIT))
12146+ dl_resolve &= 0xFFFFFFFFUL;
12147+
12148+ regs->u_regs[UREG_RETPC] = regs->tpc;
12149+ regs->tpc = dl_resolve;
12150+ regs->tnpc = dl_resolve+4;
12151+ return 3;
12152+ }
12153+ } while (0);
12154+#endif
12155+
12156+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12157+ unsigned int sethi, ba, nop;
12158+
12159+ err = get_user(sethi, (unsigned int *)regs->tpc);
12160+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12161+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12162+
12163+ if (err)
12164+ break;
12165+
12166+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12167+ (ba & 0xFFF00000U) == 0x30600000U &&
12168+ nop == 0x01000000U)
12169+ {
12170+ unsigned long addr;
12171+
12172+ addr = (sethi & 0x003FFFFFU) << 10;
12173+ regs->u_regs[UREG_G1] = addr;
12174+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12175+
12176+ if (test_thread_flag(TIF_32BIT))
12177+ addr &= 0xFFFFFFFFUL;
12178+
12179+ regs->tpc = addr;
12180+ regs->tnpc = addr+4;
12181+ return 2;
12182+ }
12183+ } while (0);
12184+
12185+#endif
12186+
12187+ return 1;
12188+}
12189+
12190+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12191+{
12192+ unsigned long i;
12193+
12194+ printk(KERN_ERR "PAX: bytes at PC: ");
12195+ for (i = 0; i < 8; i++) {
12196+ unsigned int c;
12197+ if (get_user(c, (unsigned int *)pc+i))
12198+ printk(KERN_CONT "???????? ");
12199+ else
12200+ printk(KERN_CONT "%08x ", c);
12201+ }
12202+ printk("\n");
12203+}
12204+#endif
12205+
12206 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12207 {
12208 enum ctx_state prev_state = exception_enter();
12209@@ -353,6 +816,29 @@ retry:
12210 if (!vma)
12211 goto bad_area;
12212
12213+#ifdef CONFIG_PAX_PAGEEXEC
12214+ /* PaX: detect ITLB misses on non-exec pages */
12215+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12216+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12217+ {
12218+ if (address != regs->tpc)
12219+ goto good_area;
12220+
12221+ up_read(&mm->mmap_sem);
12222+ switch (pax_handle_fetch_fault(regs)) {
12223+
12224+#ifdef CONFIG_PAX_EMUPLT
12225+ case 2:
12226+ case 3:
12227+ return;
12228+#endif
12229+
12230+ }
12231+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12232+ do_group_exit(SIGKILL);
12233+ }
12234+#endif
12235+
12236 /* Pure DTLB misses do not tell us whether the fault causing
12237 * load/store/atomic was a write or not, it only says that there
12238 * was no match. So in such a case we (carefully) read the
12239diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12240index 4242eab..9ae6360 100644
12241--- a/arch/sparc/mm/hugetlbpage.c
12242+++ b/arch/sparc/mm/hugetlbpage.c
12243@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12244 unsigned long addr,
12245 unsigned long len,
12246 unsigned long pgoff,
12247- unsigned long flags)
12248+ unsigned long flags,
12249+ unsigned long offset)
12250 {
12251+ struct mm_struct *mm = current->mm;
12252 unsigned long task_size = TASK_SIZE;
12253 struct vm_unmapped_area_info info;
12254
12255@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12256
12257 info.flags = 0;
12258 info.length = len;
12259- info.low_limit = TASK_UNMAPPED_BASE;
12260+ info.low_limit = mm->mmap_base;
12261 info.high_limit = min(task_size, VA_EXCLUDE_START);
12262 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12263 info.align_offset = 0;
12264+ info.threadstack_offset = offset;
12265 addr = vm_unmapped_area(&info);
12266
12267 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12268 VM_BUG_ON(addr != -ENOMEM);
12269 info.low_limit = VA_EXCLUDE_END;
12270+
12271+#ifdef CONFIG_PAX_RANDMMAP
12272+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12273+ info.low_limit += mm->delta_mmap;
12274+#endif
12275+
12276 info.high_limit = task_size;
12277 addr = vm_unmapped_area(&info);
12278 }
12279@@ -55,7 +64,8 @@ static unsigned long
12280 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12281 const unsigned long len,
12282 const unsigned long pgoff,
12283- const unsigned long flags)
12284+ const unsigned long flags,
12285+ const unsigned long offset)
12286 {
12287 struct mm_struct *mm = current->mm;
12288 unsigned long addr = addr0;
12289@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12290 info.high_limit = mm->mmap_base;
12291 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12292 info.align_offset = 0;
12293+ info.threadstack_offset = offset;
12294 addr = vm_unmapped_area(&info);
12295
12296 /*
12297@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12298 VM_BUG_ON(addr != -ENOMEM);
12299 info.flags = 0;
12300 info.low_limit = TASK_UNMAPPED_BASE;
12301+
12302+#ifdef CONFIG_PAX_RANDMMAP
12303+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12304+ info.low_limit += mm->delta_mmap;
12305+#endif
12306+
12307 info.high_limit = STACK_TOP32;
12308 addr = vm_unmapped_area(&info);
12309 }
12310@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12311 struct mm_struct *mm = current->mm;
12312 struct vm_area_struct *vma;
12313 unsigned long task_size = TASK_SIZE;
12314+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12315
12316 if (test_thread_flag(TIF_32BIT))
12317 task_size = STACK_TOP32;
12318@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12319 return addr;
12320 }
12321
12322+#ifdef CONFIG_PAX_RANDMMAP
12323+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12324+#endif
12325+
12326 if (addr) {
12327 addr = ALIGN(addr, HPAGE_SIZE);
12328 vma = find_vma(mm, addr);
12329- if (task_size - len >= addr &&
12330- (!vma || addr + len <= vma->vm_start))
12331+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12332 return addr;
12333 }
12334 if (mm->get_unmapped_area == arch_get_unmapped_area)
12335 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12336- pgoff, flags);
12337+ pgoff, flags, offset);
12338 else
12339 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12340- pgoff, flags);
12341+ pgoff, flags, offset);
12342 }
12343
12344 pte_t *huge_pte_alloc(struct mm_struct *mm,
12345diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12346index 3ea267c..93f0659 100644
12347--- a/arch/sparc/mm/init_64.c
12348+++ b/arch/sparc/mm/init_64.c
12349@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12350 int num_kernel_image_mappings;
12351
12352 #ifdef CONFIG_DEBUG_DCFLUSH
12353-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12354+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12355 #ifdef CONFIG_SMP
12356-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12357+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12358 #endif
12359 #endif
12360
12361@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12362 {
12363 BUG_ON(tlb_type == hypervisor);
12364 #ifdef CONFIG_DEBUG_DCFLUSH
12365- atomic_inc(&dcpage_flushes);
12366+ atomic_inc_unchecked(&dcpage_flushes);
12367 #endif
12368
12369 #ifdef DCACHE_ALIASING_POSSIBLE
12370@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12371
12372 #ifdef CONFIG_DEBUG_DCFLUSH
12373 seq_printf(m, "DCPageFlushes\t: %d\n",
12374- atomic_read(&dcpage_flushes));
12375+ atomic_read_unchecked(&dcpage_flushes));
12376 #ifdef CONFIG_SMP
12377 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12378- atomic_read(&dcpage_flushes_xcall));
12379+ atomic_read_unchecked(&dcpage_flushes_xcall));
12380 #endif /* CONFIG_SMP */
12381 #endif /* CONFIG_DEBUG_DCFLUSH */
12382 }
12383diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12384index 7cca418..53fc030 100644
12385--- a/arch/tile/Kconfig
12386+++ b/arch/tile/Kconfig
12387@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12388
12389 config KEXEC
12390 bool "kexec system call"
12391+ depends on !GRKERNSEC_KMEM
12392 ---help---
12393 kexec is a system call that implements the ability to shutdown your
12394 current kernel, and to start another kernel. It is like a reboot
12395diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12396index 7b11c5f..755a026 100644
12397--- a/arch/tile/include/asm/atomic_64.h
12398+++ b/arch/tile/include/asm/atomic_64.h
12399@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12400
12401 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12402
12403+#define atomic64_read_unchecked(v) atomic64_read(v)
12404+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12405+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12406+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12407+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12408+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12409+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12410+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12411+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12412+
12413 /* Define this to indicate that cmpxchg is an efficient operation. */
12414 #define __HAVE_ARCH_CMPXCHG
12415
12416diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12417index 6160761..00cac88 100644
12418--- a/arch/tile/include/asm/cache.h
12419+++ b/arch/tile/include/asm/cache.h
12420@@ -15,11 +15,12 @@
12421 #ifndef _ASM_TILE_CACHE_H
12422 #define _ASM_TILE_CACHE_H
12423
12424+#include <linux/const.h>
12425 #include <arch/chip.h>
12426
12427 /* bytes per L1 data cache line */
12428 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12429-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12430+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12431
12432 /* bytes per L2 cache line */
12433 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12434diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12435index b6cde32..c0cb736 100644
12436--- a/arch/tile/include/asm/uaccess.h
12437+++ b/arch/tile/include/asm/uaccess.h
12438@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12439 const void __user *from,
12440 unsigned long n)
12441 {
12442- int sz = __compiletime_object_size(to);
12443+ size_t sz = __compiletime_object_size(to);
12444
12445- if (likely(sz == -1 || sz >= n))
12446+ if (likely(sz == (size_t)-1 || sz >= n))
12447 n = _copy_from_user(to, from, n);
12448 else
12449 copy_from_user_overflow();
12450diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12451index 8416240..a012fb7 100644
12452--- a/arch/tile/mm/hugetlbpage.c
12453+++ b/arch/tile/mm/hugetlbpage.c
12454@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12455 info.high_limit = TASK_SIZE;
12456 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12457 info.align_offset = 0;
12458+ info.threadstack_offset = 0;
12459 return vm_unmapped_area(&info);
12460 }
12461
12462@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12463 info.high_limit = current->mm->mmap_base;
12464 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12465 info.align_offset = 0;
12466+ info.threadstack_offset = 0;
12467 addr = vm_unmapped_area(&info);
12468
12469 /*
12470diff --git a/arch/um/Makefile b/arch/um/Makefile
12471index e4b1a96..16162f8 100644
12472--- a/arch/um/Makefile
12473+++ b/arch/um/Makefile
12474@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12475 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12476 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12477
12478+ifdef CONSTIFY_PLUGIN
12479+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12480+endif
12481+
12482 #This will adjust *FLAGS accordingly to the platform.
12483 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12484
12485diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12486index 19e1bdd..3665b77 100644
12487--- a/arch/um/include/asm/cache.h
12488+++ b/arch/um/include/asm/cache.h
12489@@ -1,6 +1,7 @@
12490 #ifndef __UM_CACHE_H
12491 #define __UM_CACHE_H
12492
12493+#include <linux/const.h>
12494
12495 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12496 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12497@@ -12,6 +13,6 @@
12498 # define L1_CACHE_SHIFT 5
12499 #endif
12500
12501-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12502+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12503
12504 #endif
12505diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12506index 2e0a6b1..a64d0f5 100644
12507--- a/arch/um/include/asm/kmap_types.h
12508+++ b/arch/um/include/asm/kmap_types.h
12509@@ -8,6 +8,6 @@
12510
12511 /* No more #include "asm/arch/kmap_types.h" ! */
12512
12513-#define KM_TYPE_NR 14
12514+#define KM_TYPE_NR 15
12515
12516 #endif
12517diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12518index 71c5d13..4c7b9f1 100644
12519--- a/arch/um/include/asm/page.h
12520+++ b/arch/um/include/asm/page.h
12521@@ -14,6 +14,9 @@
12522 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12523 #define PAGE_MASK (~(PAGE_SIZE-1))
12524
12525+#define ktla_ktva(addr) (addr)
12526+#define ktva_ktla(addr) (addr)
12527+
12528 #ifndef __ASSEMBLY__
12529
12530 struct page;
12531diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12532index 0032f92..cd151e0 100644
12533--- a/arch/um/include/asm/pgtable-3level.h
12534+++ b/arch/um/include/asm/pgtable-3level.h
12535@@ -58,6 +58,7 @@
12536 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12537 #define pud_populate(mm, pud, pmd) \
12538 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12539+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12540
12541 #ifdef CONFIG_64BIT
12542 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12543diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12544index f17bca8..48adb87 100644
12545--- a/arch/um/kernel/process.c
12546+++ b/arch/um/kernel/process.c
12547@@ -356,22 +356,6 @@ int singlestepping(void * t)
12548 return 2;
12549 }
12550
12551-/*
12552- * Only x86 and x86_64 have an arch_align_stack().
12553- * All other arches have "#define arch_align_stack(x) (x)"
12554- * in their asm/exec.h
12555- * As this is included in UML from asm-um/system-generic.h,
12556- * we can use it to behave as the subarch does.
12557- */
12558-#ifndef arch_align_stack
12559-unsigned long arch_align_stack(unsigned long sp)
12560-{
12561- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12562- sp -= get_random_int() % 8192;
12563- return sp & ~0xf;
12564-}
12565-#endif
12566-
12567 unsigned long get_wchan(struct task_struct *p)
12568 {
12569 unsigned long stack_page, sp, ip;
12570diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12571index ad8f795..2c7eec6 100644
12572--- a/arch/unicore32/include/asm/cache.h
12573+++ b/arch/unicore32/include/asm/cache.h
12574@@ -12,8 +12,10 @@
12575 #ifndef __UNICORE_CACHE_H__
12576 #define __UNICORE_CACHE_H__
12577
12578-#define L1_CACHE_SHIFT (5)
12579-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12580+#include <linux/const.h>
12581+
12582+#define L1_CACHE_SHIFT 5
12583+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12584
12585 /*
12586 * Memory returned by kmalloc() may be used for DMA, so we must make
12587diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12588index 0dc9d01..98df103 100644
12589--- a/arch/x86/Kconfig
12590+++ b/arch/x86/Kconfig
12591@@ -130,7 +130,7 @@ config X86
12592 select RTC_LIB
12593 select HAVE_DEBUG_STACKOVERFLOW
12594 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12595- select HAVE_CC_STACKPROTECTOR
12596+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12597 select GENERIC_CPU_AUTOPROBE
12598 select HAVE_ARCH_AUDITSYSCALL
12599 select ARCH_SUPPORTS_ATOMIC_RMW
12600@@ -263,7 +263,7 @@ config X86_HT
12601
12602 config X86_32_LAZY_GS
12603 def_bool y
12604- depends on X86_32 && !CC_STACKPROTECTOR
12605+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12606
12607 config ARCH_HWEIGHT_CFLAGS
12608 string
12609@@ -601,6 +601,7 @@ config SCHED_OMIT_FRAME_POINTER
12610
12611 menuconfig HYPERVISOR_GUEST
12612 bool "Linux guest support"
12613+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12614 ---help---
12615 Say Y here to enable options for running Linux under various hyper-
12616 visors. This option enables basic hypervisor detection and platform
12617@@ -978,6 +979,7 @@ config VM86
12618
12619 config X86_16BIT
12620 bool "Enable support for 16-bit segments" if EXPERT
12621+ depends on !GRKERNSEC
12622 default y
12623 ---help---
12624 This option is required by programs like Wine to run 16-bit
12625@@ -1151,6 +1153,7 @@ choice
12626
12627 config NOHIGHMEM
12628 bool "off"
12629+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12630 ---help---
12631 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12632 However, the address space of 32-bit x86 processors is only 4
12633@@ -1187,6 +1190,7 @@ config NOHIGHMEM
12634
12635 config HIGHMEM4G
12636 bool "4GB"
12637+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12638 ---help---
12639 Select this if you have a 32-bit processor and between 1 and 4
12640 gigabytes of physical RAM.
12641@@ -1239,7 +1243,7 @@ config PAGE_OFFSET
12642 hex
12643 default 0xB0000000 if VMSPLIT_3G_OPT
12644 default 0x80000000 if VMSPLIT_2G
12645- default 0x78000000 if VMSPLIT_2G_OPT
12646+ default 0x70000000 if VMSPLIT_2G_OPT
12647 default 0x40000000 if VMSPLIT_1G
12648 default 0xC0000000
12649 depends on X86_32
12650@@ -1680,6 +1684,7 @@ source kernel/Kconfig.hz
12651
12652 config KEXEC
12653 bool "kexec system call"
12654+ depends on !GRKERNSEC_KMEM
12655 ---help---
12656 kexec is a system call that implements the ability to shutdown your
12657 current kernel, and to start another kernel. It is like a reboot
12658@@ -1865,7 +1870,9 @@ config X86_NEED_RELOCS
12659
12660 config PHYSICAL_ALIGN
12661 hex "Alignment value to which kernel should be aligned"
12662- default "0x200000"
12663+ default "0x1000000"
12664+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12665+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12666 range 0x2000 0x1000000 if X86_32
12667 range 0x200000 0x1000000 if X86_64
12668 ---help---
12669@@ -1948,6 +1955,7 @@ config COMPAT_VDSO
12670 def_bool n
12671 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12672 depends on X86_32 || IA32_EMULATION
12673+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12674 ---help---
12675 Certain buggy versions of glibc will crash if they are
12676 presented with a 32-bit vDSO that is not mapped at the address
12677diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12678index 6983314..54ad7e8 100644
12679--- a/arch/x86/Kconfig.cpu
12680+++ b/arch/x86/Kconfig.cpu
12681@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12682
12683 config X86_F00F_BUG
12684 def_bool y
12685- depends on M586MMX || M586TSC || M586 || M486
12686+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12687
12688 config X86_INVD_BUG
12689 def_bool y
12690@@ -327,7 +327,7 @@ config X86_INVD_BUG
12691
12692 config X86_ALIGNMENT_16
12693 def_bool y
12694- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12695+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12696
12697 config X86_INTEL_USERCOPY
12698 def_bool y
12699@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12700 # generates cmov.
12701 config X86_CMOV
12702 def_bool y
12703- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12704+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12705
12706 config X86_MINIMUM_CPU_FAMILY
12707 int
12708diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12709index 61bd2ad..50b625d 100644
12710--- a/arch/x86/Kconfig.debug
12711+++ b/arch/x86/Kconfig.debug
12712@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12713 config DEBUG_RODATA
12714 bool "Write protect kernel read-only data structures"
12715 default y
12716- depends on DEBUG_KERNEL
12717+ depends on DEBUG_KERNEL && BROKEN
12718 ---help---
12719 Mark the kernel read-only data as write-protected in the pagetables,
12720 in order to catch accidental (and incorrect) writes to such const
12721@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12722
12723 config DEBUG_SET_MODULE_RONX
12724 bool "Set loadable kernel module data as NX and text as RO"
12725- depends on MODULES
12726+ depends on MODULES && BROKEN
12727 ---help---
12728 This option helps catch unintended modifications to loadable
12729 kernel module's text and read-only data. It also prevents execution
12730diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12731index 920e616..ac3d4df 100644
12732--- a/arch/x86/Makefile
12733+++ b/arch/x86/Makefile
12734@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12735 # CPU-specific tuning. Anything which can be shared with UML should go here.
12736 include $(srctree)/arch/x86/Makefile_32.cpu
12737 KBUILD_CFLAGS += $(cflags-y)
12738-
12739- # temporary until string.h is fixed
12740- KBUILD_CFLAGS += -ffreestanding
12741 else
12742 BITS := 64
12743 UTS_MACHINE := x86_64
12744@@ -107,6 +104,9 @@ else
12745 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12746 endif
12747
12748+# temporary until string.h is fixed
12749+KBUILD_CFLAGS += -ffreestanding
12750+
12751 # Make sure compiler does not have buggy stack-protector support.
12752 ifdef CONFIG_CC_STACKPROTECTOR
12753 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12754@@ -180,6 +180,7 @@ archheaders:
12755 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12756
12757 archprepare:
12758+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12759 ifeq ($(CONFIG_KEXEC_FILE),y)
12760 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12761 endif
12762@@ -263,3 +264,9 @@ define archhelp
12763 echo ' FDARGS="..." arguments for the booted kernel'
12764 echo ' FDINITRD=file initrd for the booted kernel'
12765 endef
12766+
12767+define OLD_LD
12768+
12769+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12770+*** Please upgrade your binutils to 2.18 or newer
12771+endef
12772diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12773index 3db07f3..9d81d0f 100644
12774--- a/arch/x86/boot/Makefile
12775+++ b/arch/x86/boot/Makefile
12776@@ -56,6 +56,9 @@ clean-files += cpustr.h
12777 # ---------------------------------------------------------------------------
12778
12779 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12780+ifdef CONSTIFY_PLUGIN
12781+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12782+endif
12783 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12784 GCOV_PROFILE := n
12785
12786diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12787index 878e4b9..20537ab 100644
12788--- a/arch/x86/boot/bitops.h
12789+++ b/arch/x86/boot/bitops.h
12790@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12791 u8 v;
12792 const u32 *p = (const u32 *)addr;
12793
12794- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12795+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12796 return v;
12797 }
12798
12799@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12800
12801 static inline void set_bit(int nr, void *addr)
12802 {
12803- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12804+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12805 }
12806
12807 #endif /* BOOT_BITOPS_H */
12808diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12809index bd49ec6..94c7f58 100644
12810--- a/arch/x86/boot/boot.h
12811+++ b/arch/x86/boot/boot.h
12812@@ -84,7 +84,7 @@ static inline void io_delay(void)
12813 static inline u16 ds(void)
12814 {
12815 u16 seg;
12816- asm("movw %%ds,%0" : "=rm" (seg));
12817+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12818 return seg;
12819 }
12820
12821diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12822index 8bd44e8..6b111e9 100644
12823--- a/arch/x86/boot/compressed/Makefile
12824+++ b/arch/x86/boot/compressed/Makefile
12825@@ -28,6 +28,9 @@ KBUILD_CFLAGS += $(cflags-y)
12826 KBUILD_CFLAGS += -mno-mmx -mno-sse
12827 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12828 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12829+ifdef CONSTIFY_PLUGIN
12830+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12831+endif
12832
12833 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12834 GCOV_PROFILE := n
12835diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12836index a53440e..c3dbf1e 100644
12837--- a/arch/x86/boot/compressed/efi_stub_32.S
12838+++ b/arch/x86/boot/compressed/efi_stub_32.S
12839@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12840 * parameter 2, ..., param n. To make things easy, we save the return
12841 * address of efi_call_phys in a global variable.
12842 */
12843- popl %ecx
12844- movl %ecx, saved_return_addr(%edx)
12845- /* get the function pointer into ECX*/
12846- popl %ecx
12847- movl %ecx, efi_rt_function_ptr(%edx)
12848+ popl saved_return_addr(%edx)
12849+ popl efi_rt_function_ptr(%edx)
12850
12851 /*
12852 * 3. Call the physical function.
12853 */
12854- call *%ecx
12855+ call *efi_rt_function_ptr(%edx)
12856
12857 /*
12858 * 4. Balance the stack. And because EAX contain the return value,
12859@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12860 1: popl %edx
12861 subl $1b, %edx
12862
12863- movl efi_rt_function_ptr(%edx), %ecx
12864- pushl %ecx
12865+ pushl efi_rt_function_ptr(%edx)
12866
12867 /*
12868 * 10. Push the saved return address onto the stack and return.
12869 */
12870- movl saved_return_addr(%edx), %ecx
12871- pushl %ecx
12872- ret
12873+ jmpl *saved_return_addr(%edx)
12874 ENDPROC(efi_call_phys)
12875 .previous
12876
12877diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12878index 630384a..278e788 100644
12879--- a/arch/x86/boot/compressed/efi_thunk_64.S
12880+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12881@@ -189,8 +189,8 @@ efi_gdt64:
12882 .long 0 /* Filled out by user */
12883 .word 0
12884 .quad 0x0000000000000000 /* NULL descriptor */
12885- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12886- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12887+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12888+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12889 .quad 0x0080890000000000 /* TS descriptor */
12890 .quad 0x0000000000000000 /* TS continued */
12891 efi_gdt64_end:
12892diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12893index 1d7fbbc..36ecd58 100644
12894--- a/arch/x86/boot/compressed/head_32.S
12895+++ b/arch/x86/boot/compressed/head_32.S
12896@@ -140,10 +140,10 @@ preferred_addr:
12897 addl %eax, %ebx
12898 notl %eax
12899 andl %eax, %ebx
12900- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12901+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12902 jge 1f
12903 #endif
12904- movl $LOAD_PHYSICAL_ADDR, %ebx
12905+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12906 1:
12907
12908 /* Target address to relocate to for decompression */
12909diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12910index 6b1766c..ad465c9 100644
12911--- a/arch/x86/boot/compressed/head_64.S
12912+++ b/arch/x86/boot/compressed/head_64.S
12913@@ -94,10 +94,10 @@ ENTRY(startup_32)
12914 addl %eax, %ebx
12915 notl %eax
12916 andl %eax, %ebx
12917- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12918+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12919 jge 1f
12920 #endif
12921- movl $LOAD_PHYSICAL_ADDR, %ebx
12922+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12923 1:
12924
12925 /* Target address to relocate to for decompression */
12926@@ -322,10 +322,10 @@ preferred_addr:
12927 addq %rax, %rbp
12928 notq %rax
12929 andq %rax, %rbp
12930- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12931+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12932 jge 1f
12933 #endif
12934- movq $LOAD_PHYSICAL_ADDR, %rbp
12935+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12936 1:
12937
12938 /* Target address to relocate to for decompression */
12939@@ -434,8 +434,8 @@ gdt:
12940 .long gdt
12941 .word 0
12942 .quad 0x0000000000000000 /* NULL descriptor */
12943- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12944- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12945+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12946+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12947 .quad 0x0080890000000000 /* TS descriptor */
12948 .quad 0x0000000000000000 /* TS continued */
12949 gdt_end:
12950diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12951index a950864..c710239 100644
12952--- a/arch/x86/boot/compressed/misc.c
12953+++ b/arch/x86/boot/compressed/misc.c
12954@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12955 * Calculate the delta between where vmlinux was linked to load
12956 * and where it was actually loaded.
12957 */
12958- delta = min_addr - LOAD_PHYSICAL_ADDR;
12959+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12960 if (!delta) {
12961 debug_putstr("No relocation needed... ");
12962 return;
12963@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12964 Elf32_Ehdr ehdr;
12965 Elf32_Phdr *phdrs, *phdr;
12966 #endif
12967- void *dest;
12968+ void *dest, *prev;
12969 int i;
12970
12971 memcpy(&ehdr, output, sizeof(ehdr));
12972@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12973 case PT_LOAD:
12974 #ifdef CONFIG_RELOCATABLE
12975 dest = output;
12976- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12977+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12978 #else
12979 dest = (void *)(phdr->p_paddr);
12980 #endif
12981 memcpy(dest,
12982 output + phdr->p_offset,
12983 phdr->p_filesz);
12984+ if (i)
12985+ memset(prev, 0xff, dest - prev);
12986+ prev = dest + phdr->p_filesz;
12987 break;
12988 default: /* Ignore other PT_* */ break;
12989 }
12990@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12991 error("Destination address too large");
12992 #endif
12993 #ifndef CONFIG_RELOCATABLE
12994- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12995+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12996 error("Wrong destination address");
12997 #endif
12998
12999diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
13000index 1fd7d57..0f7d096 100644
13001--- a/arch/x86/boot/cpucheck.c
13002+++ b/arch/x86/boot/cpucheck.c
13003@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13004 u32 ecx = MSR_K7_HWCR;
13005 u32 eax, edx;
13006
13007- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13008+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13009 eax &= ~(1 << 15);
13010- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13011+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13012
13013 get_cpuflags(); /* Make sure it really did something */
13014 err = check_cpuflags();
13015@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13016 u32 ecx = MSR_VIA_FCR;
13017 u32 eax, edx;
13018
13019- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13020+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13021 eax |= (1<<1)|(1<<7);
13022- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13023+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13024
13025 set_bit(X86_FEATURE_CX8, cpu.flags);
13026 err = check_cpuflags();
13027@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13028 u32 eax, edx;
13029 u32 level = 1;
13030
13031- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13032- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13033- asm("cpuid"
13034+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13035+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13036+ asm volatile("cpuid"
13037 : "+a" (level), "=d" (cpu.flags[0])
13038 : : "ecx", "ebx");
13039- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13040+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13041
13042 err = check_cpuflags();
13043 } else if (err == 0x01 &&
13044diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
13045index 16ef025..91e033b 100644
13046--- a/arch/x86/boot/header.S
13047+++ b/arch/x86/boot/header.S
13048@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
13049 # single linked list of
13050 # struct setup_data
13051
13052-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
13053+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
13054
13055 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
13056+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13057+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
13058+#else
13059 #define VO_INIT_SIZE (VO__end - VO__text)
13060+#endif
13061 #if ZO_INIT_SIZE > VO_INIT_SIZE
13062 #define INIT_SIZE ZO_INIT_SIZE
13063 #else
13064diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13065index db75d07..8e6d0af 100644
13066--- a/arch/x86/boot/memory.c
13067+++ b/arch/x86/boot/memory.c
13068@@ -19,7 +19,7 @@
13069
13070 static int detect_memory_e820(void)
13071 {
13072- int count = 0;
13073+ unsigned int count = 0;
13074 struct biosregs ireg, oreg;
13075 struct e820entry *desc = boot_params.e820_map;
13076 static struct e820entry buf; /* static so it is zeroed */
13077diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13078index ba3e100..6501b8f 100644
13079--- a/arch/x86/boot/video-vesa.c
13080+++ b/arch/x86/boot/video-vesa.c
13081@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13082
13083 boot_params.screen_info.vesapm_seg = oreg.es;
13084 boot_params.screen_info.vesapm_off = oreg.di;
13085+ boot_params.screen_info.vesapm_size = oreg.cx;
13086 }
13087
13088 /*
13089diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13090index 43eda28..5ab5fdb 100644
13091--- a/arch/x86/boot/video.c
13092+++ b/arch/x86/boot/video.c
13093@@ -96,7 +96,7 @@ static void store_mode_params(void)
13094 static unsigned int get_entry(void)
13095 {
13096 char entry_buf[4];
13097- int i, len = 0;
13098+ unsigned int i, len = 0;
13099 int key;
13100 unsigned int v;
13101
13102diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13103index 9105655..41779c1 100644
13104--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13105+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13106@@ -8,6 +8,8 @@
13107 * including this sentence is retained in full.
13108 */
13109
13110+#include <asm/alternative-asm.h>
13111+
13112 .extern crypto_ft_tab
13113 .extern crypto_it_tab
13114 .extern crypto_fl_tab
13115@@ -70,6 +72,8 @@
13116 je B192; \
13117 leaq 32(r9),r9;
13118
13119+#define ret pax_force_retaddr; ret
13120+
13121 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13122 movq r1,r2; \
13123 movq r3,r4; \
13124diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13125index 477e9d7..c92c7d8 100644
13126--- a/arch/x86/crypto/aesni-intel_asm.S
13127+++ b/arch/x86/crypto/aesni-intel_asm.S
13128@@ -31,6 +31,7 @@
13129
13130 #include <linux/linkage.h>
13131 #include <asm/inst.h>
13132+#include <asm/alternative-asm.h>
13133
13134 #ifdef __x86_64__
13135 .data
13136@@ -205,7 +206,7 @@ enc: .octa 0x2
13137 * num_initial_blocks = b mod 4
13138 * encrypt the initial num_initial_blocks blocks and apply ghash on
13139 * the ciphertext
13140-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13141+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13142 * are clobbered
13143 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13144 */
13145@@ -214,8 +215,8 @@ enc: .octa 0x2
13146 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13147 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13148 mov arg7, %r10 # %r10 = AAD
13149- mov arg8, %r12 # %r12 = aadLen
13150- mov %r12, %r11
13151+ mov arg8, %r15 # %r15 = aadLen
13152+ mov %r15, %r11
13153 pxor %xmm\i, %xmm\i
13154 _get_AAD_loop\num_initial_blocks\operation:
13155 movd (%r10), \TMP1
13156@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13157 psrldq $4, %xmm\i
13158 pxor \TMP1, %xmm\i
13159 add $4, %r10
13160- sub $4, %r12
13161+ sub $4, %r15
13162 jne _get_AAD_loop\num_initial_blocks\operation
13163 cmp $16, %r11
13164 je _get_AAD_loop2_done\num_initial_blocks\operation
13165- mov $16, %r12
13166+ mov $16, %r15
13167 _get_AAD_loop2\num_initial_blocks\operation:
13168 psrldq $4, %xmm\i
13169- sub $4, %r12
13170- cmp %r11, %r12
13171+ sub $4, %r15
13172+ cmp %r11, %r15
13173 jne _get_AAD_loop2\num_initial_blocks\operation
13174 _get_AAD_loop2_done\num_initial_blocks\operation:
13175 movdqa SHUF_MASK(%rip), %xmm14
13176@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13177 * num_initial_blocks = b mod 4
13178 * encrypt the initial num_initial_blocks blocks and apply ghash on
13179 * the ciphertext
13180-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13181+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13182 * are clobbered
13183 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13184 */
13185@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13186 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13187 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13188 mov arg7, %r10 # %r10 = AAD
13189- mov arg8, %r12 # %r12 = aadLen
13190- mov %r12, %r11
13191+ mov arg8, %r15 # %r15 = aadLen
13192+ mov %r15, %r11
13193 pxor %xmm\i, %xmm\i
13194 _get_AAD_loop\num_initial_blocks\operation:
13195 movd (%r10), \TMP1
13196@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13197 psrldq $4, %xmm\i
13198 pxor \TMP1, %xmm\i
13199 add $4, %r10
13200- sub $4, %r12
13201+ sub $4, %r15
13202 jne _get_AAD_loop\num_initial_blocks\operation
13203 cmp $16, %r11
13204 je _get_AAD_loop2_done\num_initial_blocks\operation
13205- mov $16, %r12
13206+ mov $16, %r15
13207 _get_AAD_loop2\num_initial_blocks\operation:
13208 psrldq $4, %xmm\i
13209- sub $4, %r12
13210- cmp %r11, %r12
13211+ sub $4, %r15
13212+ cmp %r11, %r15
13213 jne _get_AAD_loop2\num_initial_blocks\operation
13214 _get_AAD_loop2_done\num_initial_blocks\operation:
13215 movdqa SHUF_MASK(%rip), %xmm14
13216@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13217 *
13218 *****************************************************************************/
13219 ENTRY(aesni_gcm_dec)
13220- push %r12
13221+ push %r15
13222 push %r13
13223 push %r14
13224 mov %rsp, %r14
13225@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13226 */
13227 sub $VARIABLE_OFFSET, %rsp
13228 and $~63, %rsp # align rsp to 64 bytes
13229- mov %arg6, %r12
13230- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13231+ mov %arg6, %r15
13232+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13233 movdqa SHUF_MASK(%rip), %xmm2
13234 PSHUFB_XMM %xmm2, %xmm13
13235
13236@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13237 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13238 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13239 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13240- mov %r13, %r12
13241- and $(3<<4), %r12
13242+ mov %r13, %r15
13243+ and $(3<<4), %r15
13244 jz _initial_num_blocks_is_0_decrypt
13245- cmp $(2<<4), %r12
13246+ cmp $(2<<4), %r15
13247 jb _initial_num_blocks_is_1_decrypt
13248 je _initial_num_blocks_is_2_decrypt
13249 _initial_num_blocks_is_3_decrypt:
13250@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13251 sub $16, %r11
13252 add %r13, %r11
13253 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13254- lea SHIFT_MASK+16(%rip), %r12
13255- sub %r13, %r12
13256+ lea SHIFT_MASK+16(%rip), %r15
13257+ sub %r13, %r15
13258 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13259 # (%r13 is the number of bytes in plaintext mod 16)
13260- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13261+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13262 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13263
13264 movdqa %xmm1, %xmm2
13265 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13266- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13267+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13268 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13269 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13270 pand %xmm1, %xmm2
13271@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13272 sub $1, %r13
13273 jne _less_than_8_bytes_left_decrypt
13274 _multiple_of_16_bytes_decrypt:
13275- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13276- shl $3, %r12 # convert into number of bits
13277- movd %r12d, %xmm15 # len(A) in %xmm15
13278+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13279+ shl $3, %r15 # convert into number of bits
13280+ movd %r15d, %xmm15 # len(A) in %xmm15
13281 shl $3, %arg4 # len(C) in bits (*128)
13282 MOVQ_R64_XMM %arg4, %xmm1
13283 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13284@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13285 mov %r14, %rsp
13286 pop %r14
13287 pop %r13
13288- pop %r12
13289+ pop %r15
13290+ pax_force_retaddr
13291 ret
13292 ENDPROC(aesni_gcm_dec)
13293
13294@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13295 * poly = x^128 + x^127 + x^126 + x^121 + 1
13296 ***************************************************************************/
13297 ENTRY(aesni_gcm_enc)
13298- push %r12
13299+ push %r15
13300 push %r13
13301 push %r14
13302 mov %rsp, %r14
13303@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13304 #
13305 sub $VARIABLE_OFFSET, %rsp
13306 and $~63, %rsp
13307- mov %arg6, %r12
13308- movdqu (%r12), %xmm13
13309+ mov %arg6, %r15
13310+ movdqu (%r15), %xmm13
13311 movdqa SHUF_MASK(%rip), %xmm2
13312 PSHUFB_XMM %xmm2, %xmm13
13313
13314@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13315 movdqa %xmm13, HashKey(%rsp)
13316 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13317 and $-16, %r13
13318- mov %r13, %r12
13319+ mov %r13, %r15
13320
13321 # Encrypt first few blocks
13322
13323- and $(3<<4), %r12
13324+ and $(3<<4), %r15
13325 jz _initial_num_blocks_is_0_encrypt
13326- cmp $(2<<4), %r12
13327+ cmp $(2<<4), %r15
13328 jb _initial_num_blocks_is_1_encrypt
13329 je _initial_num_blocks_is_2_encrypt
13330 _initial_num_blocks_is_3_encrypt:
13331@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13332 sub $16, %r11
13333 add %r13, %r11
13334 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13335- lea SHIFT_MASK+16(%rip), %r12
13336- sub %r13, %r12
13337+ lea SHIFT_MASK+16(%rip), %r15
13338+ sub %r13, %r15
13339 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13340 # (%r13 is the number of bytes in plaintext mod 16)
13341- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13342+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13343 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13344 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13345- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13346+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13347 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13348 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13349 movdqa SHUF_MASK(%rip), %xmm10
13350@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13351 sub $1, %r13
13352 jne _less_than_8_bytes_left_encrypt
13353 _multiple_of_16_bytes_encrypt:
13354- mov arg8, %r12 # %r12 = addLen (number of bytes)
13355- shl $3, %r12
13356- movd %r12d, %xmm15 # len(A) in %xmm15
13357+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13358+ shl $3, %r15
13359+ movd %r15d, %xmm15 # len(A) in %xmm15
13360 shl $3, %arg4 # len(C) in bits (*128)
13361 MOVQ_R64_XMM %arg4, %xmm1
13362 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13363@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13364 mov %r14, %rsp
13365 pop %r14
13366 pop %r13
13367- pop %r12
13368+ pop %r15
13369+ pax_force_retaddr
13370 ret
13371 ENDPROC(aesni_gcm_enc)
13372
13373@@ -1722,6 +1725,7 @@ _key_expansion_256a:
13374 pxor %xmm1, %xmm0
13375 movaps %xmm0, (TKEYP)
13376 add $0x10, TKEYP
13377+ pax_force_retaddr
13378 ret
13379 ENDPROC(_key_expansion_128)
13380 ENDPROC(_key_expansion_256a)
13381@@ -1748,6 +1752,7 @@ _key_expansion_192a:
13382 shufps $0b01001110, %xmm2, %xmm1
13383 movaps %xmm1, 0x10(TKEYP)
13384 add $0x20, TKEYP
13385+ pax_force_retaddr
13386 ret
13387 ENDPROC(_key_expansion_192a)
13388
13389@@ -1768,6 +1773,7 @@ _key_expansion_192b:
13390
13391 movaps %xmm0, (TKEYP)
13392 add $0x10, TKEYP
13393+ pax_force_retaddr
13394 ret
13395 ENDPROC(_key_expansion_192b)
13396
13397@@ -1781,6 +1787,7 @@ _key_expansion_256b:
13398 pxor %xmm1, %xmm2
13399 movaps %xmm2, (TKEYP)
13400 add $0x10, TKEYP
13401+ pax_force_retaddr
13402 ret
13403 ENDPROC(_key_expansion_256b)
13404
13405@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13406 #ifndef __x86_64__
13407 popl KEYP
13408 #endif
13409+ pax_force_retaddr
13410 ret
13411 ENDPROC(aesni_set_key)
13412
13413@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13414 popl KLEN
13415 popl KEYP
13416 #endif
13417+ pax_force_retaddr
13418 ret
13419 ENDPROC(aesni_enc)
13420
13421@@ -1974,6 +1983,7 @@ _aesni_enc1:
13422 AESENC KEY STATE
13423 movaps 0x70(TKEYP), KEY
13424 AESENCLAST KEY STATE
13425+ pax_force_retaddr
13426 ret
13427 ENDPROC(_aesni_enc1)
13428
13429@@ -2083,6 +2093,7 @@ _aesni_enc4:
13430 AESENCLAST KEY STATE2
13431 AESENCLAST KEY STATE3
13432 AESENCLAST KEY STATE4
13433+ pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_enc4)
13436
13437@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13438 popl KLEN
13439 popl KEYP
13440 #endif
13441+ pax_force_retaddr
13442 ret
13443 ENDPROC(aesni_dec)
13444
13445@@ -2164,6 +2176,7 @@ _aesni_dec1:
13446 AESDEC KEY STATE
13447 movaps 0x70(TKEYP), KEY
13448 AESDECLAST KEY STATE
13449+ pax_force_retaddr
13450 ret
13451 ENDPROC(_aesni_dec1)
13452
13453@@ -2273,6 +2286,7 @@ _aesni_dec4:
13454 AESDECLAST KEY STATE2
13455 AESDECLAST KEY STATE3
13456 AESDECLAST KEY STATE4
13457+ pax_force_retaddr
13458 ret
13459 ENDPROC(_aesni_dec4)
13460
13461@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13462 popl KEYP
13463 popl LEN
13464 #endif
13465+ pax_force_retaddr
13466 ret
13467 ENDPROC(aesni_ecb_enc)
13468
13469@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13470 popl KEYP
13471 popl LEN
13472 #endif
13473+ pax_force_retaddr
13474 ret
13475 ENDPROC(aesni_ecb_dec)
13476
13477@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13478 popl LEN
13479 popl IVP
13480 #endif
13481+ pax_force_retaddr
13482 ret
13483 ENDPROC(aesni_cbc_enc)
13484
13485@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13486 popl LEN
13487 popl IVP
13488 #endif
13489+ pax_force_retaddr
13490 ret
13491 ENDPROC(aesni_cbc_dec)
13492
13493@@ -2550,6 +2568,7 @@ _aesni_inc_init:
13494 mov $1, TCTR_LOW
13495 MOVQ_R64_XMM TCTR_LOW INC
13496 MOVQ_R64_XMM CTR TCTR_LOW
13497+ pax_force_retaddr
13498 ret
13499 ENDPROC(_aesni_inc_init)
13500
13501@@ -2579,6 +2598,7 @@ _aesni_inc:
13502 .Linc_low:
13503 movaps CTR, IV
13504 PSHUFB_XMM BSWAP_MASK IV
13505+ pax_force_retaddr
13506 ret
13507 ENDPROC(_aesni_inc)
13508
13509@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13510 .Lctr_enc_ret:
13511 movups IV, (IVP)
13512 .Lctr_enc_just_ret:
13513+ pax_force_retaddr
13514 ret
13515 ENDPROC(aesni_ctr_enc)
13516
13517@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13518 pxor INC, STATE4
13519 movdqu STATE4, 0x70(OUTP)
13520
13521+ pax_force_retaddr
13522 ret
13523 ENDPROC(aesni_xts_crypt8)
13524
13525diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13526index 246c670..466e2d6 100644
13527--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13528+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13529@@ -21,6 +21,7 @@
13530 */
13531
13532 #include <linux/linkage.h>
13533+#include <asm/alternative-asm.h>
13534
13535 .file "blowfish-x86_64-asm.S"
13536 .text
13537@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13538 jnz .L__enc_xor;
13539
13540 write_block();
13541+ pax_force_retaddr
13542 ret;
13543 .L__enc_xor:
13544 xor_block();
13545+ pax_force_retaddr
13546 ret;
13547 ENDPROC(__blowfish_enc_blk)
13548
13549@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13550
13551 movq %r11, %rbp;
13552
13553+ pax_force_retaddr
13554 ret;
13555 ENDPROC(blowfish_dec_blk)
13556
13557@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13558
13559 popq %rbx;
13560 popq %rbp;
13561+ pax_force_retaddr
13562 ret;
13563
13564 .L__enc_xor4:
13565@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13566
13567 popq %rbx;
13568 popq %rbp;
13569+ pax_force_retaddr
13570 ret;
13571 ENDPROC(__blowfish_enc_blk_4way)
13572
13573@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13574 popq %rbx;
13575 popq %rbp;
13576
13577+ pax_force_retaddr
13578 ret;
13579 ENDPROC(blowfish_dec_blk_4way)
13580diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13581index ce71f92..1dce7ec 100644
13582--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13583+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13584@@ -16,6 +16,7 @@
13585 */
13586
13587 #include <linux/linkage.h>
13588+#include <asm/alternative-asm.h>
13589
13590 #define CAMELLIA_TABLE_BYTE_LEN 272
13591
13592@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13593 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13594 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13595 %rcx, (%r9));
13596+ pax_force_retaddr
13597 ret;
13598 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13599
13600@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13601 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13602 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13603 %rax, (%r9));
13604+ pax_force_retaddr
13605 ret;
13606 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13607
13608@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13609 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13610 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13611
13612+ pax_force_retaddr
13613 ret;
13614
13615 .align 8
13616@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13617 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13618 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13619
13620+ pax_force_retaddr
13621 ret;
13622
13623 .align 8
13624@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13625 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13626 %xmm8, %rsi);
13627
13628+ pax_force_retaddr
13629 ret;
13630 ENDPROC(camellia_ecb_enc_16way)
13631
13632@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13633 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13634 %xmm8, %rsi);
13635
13636+ pax_force_retaddr
13637 ret;
13638 ENDPROC(camellia_ecb_dec_16way)
13639
13640@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13641 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13642 %xmm8, %rsi);
13643
13644+ pax_force_retaddr
13645 ret;
13646 ENDPROC(camellia_cbc_dec_16way)
13647
13648@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13649 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13650 %xmm8, %rsi);
13651
13652+ pax_force_retaddr
13653 ret;
13654 ENDPROC(camellia_ctr_16way)
13655
13656@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13657 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13658 %xmm8, %rsi);
13659
13660+ pax_force_retaddr
13661 ret;
13662 ENDPROC(camellia_xts_crypt_16way)
13663
13664diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13665index 0e0b886..5a3123c 100644
13666--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13667+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13668@@ -11,6 +11,7 @@
13669 */
13670
13671 #include <linux/linkage.h>
13672+#include <asm/alternative-asm.h>
13673
13674 #define CAMELLIA_TABLE_BYTE_LEN 272
13675
13676@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13677 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13678 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13679 %rcx, (%r9));
13680+ pax_force_retaddr
13681 ret;
13682 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13683
13684@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13685 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13686 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13687 %rax, (%r9));
13688+ pax_force_retaddr
13689 ret;
13690 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13691
13692@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13693 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13694 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13695
13696+ pax_force_retaddr
13697 ret;
13698
13699 .align 8
13700@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13701 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13702 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13703
13704+ pax_force_retaddr
13705 ret;
13706
13707 .align 8
13708@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13709
13710 vzeroupper;
13711
13712+ pax_force_retaddr
13713 ret;
13714 ENDPROC(camellia_ecb_enc_32way)
13715
13716@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13717
13718 vzeroupper;
13719
13720+ pax_force_retaddr
13721 ret;
13722 ENDPROC(camellia_ecb_dec_32way)
13723
13724@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13725
13726 vzeroupper;
13727
13728+ pax_force_retaddr
13729 ret;
13730 ENDPROC(camellia_cbc_dec_32way)
13731
13732@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13733
13734 vzeroupper;
13735
13736+ pax_force_retaddr
13737 ret;
13738 ENDPROC(camellia_ctr_32way)
13739
13740@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13741
13742 vzeroupper;
13743
13744+ pax_force_retaddr
13745 ret;
13746 ENDPROC(camellia_xts_crypt_32way)
13747
13748diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13749index 310319c..db3d7b5 100644
13750--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13751+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13752@@ -21,6 +21,7 @@
13753 */
13754
13755 #include <linux/linkage.h>
13756+#include <asm/alternative-asm.h>
13757
13758 .file "camellia-x86_64-asm_64.S"
13759 .text
13760@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13761 enc_outunpack(mov, RT1);
13762
13763 movq RRBP, %rbp;
13764+ pax_force_retaddr
13765 ret;
13766
13767 .L__enc_xor:
13768 enc_outunpack(xor, RT1);
13769
13770 movq RRBP, %rbp;
13771+ pax_force_retaddr
13772 ret;
13773 ENDPROC(__camellia_enc_blk)
13774
13775@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13776 dec_outunpack();
13777
13778 movq RRBP, %rbp;
13779+ pax_force_retaddr
13780 ret;
13781 ENDPROC(camellia_dec_blk)
13782
13783@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13784
13785 movq RRBP, %rbp;
13786 popq %rbx;
13787+ pax_force_retaddr
13788 ret;
13789
13790 .L__enc2_xor:
13791@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13792
13793 movq RRBP, %rbp;
13794 popq %rbx;
13795+ pax_force_retaddr
13796 ret;
13797 ENDPROC(__camellia_enc_blk_2way)
13798
13799@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13800
13801 movq RRBP, %rbp;
13802 movq RXOR, %rbx;
13803+ pax_force_retaddr
13804 ret;
13805 ENDPROC(camellia_dec_blk_2way)
13806diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13807index c35fd5d..2d8c7db 100644
13808--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13809+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13810@@ -24,6 +24,7 @@
13811 */
13812
13813 #include <linux/linkage.h>
13814+#include <asm/alternative-asm.h>
13815
13816 .file "cast5-avx-x86_64-asm_64.S"
13817
13818@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13819 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13820 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13821
13822+ pax_force_retaddr
13823 ret;
13824 ENDPROC(__cast5_enc_blk16)
13825
13826@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13827 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13828 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13829
13830+ pax_force_retaddr
13831 ret;
13832
13833 .L__skip_dec:
13834@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13835 vmovdqu RR4, (6*4*4)(%r11);
13836 vmovdqu RL4, (7*4*4)(%r11);
13837
13838+ pax_force_retaddr
13839 ret;
13840 ENDPROC(cast5_ecb_enc_16way)
13841
13842@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13843 vmovdqu RR4, (6*4*4)(%r11);
13844 vmovdqu RL4, (7*4*4)(%r11);
13845
13846+ pax_force_retaddr
13847 ret;
13848 ENDPROC(cast5_ecb_dec_16way)
13849
13850@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13851 * %rdx: src
13852 */
13853
13854- pushq %r12;
13855+ pushq %r14;
13856
13857 movq %rsi, %r11;
13858- movq %rdx, %r12;
13859+ movq %rdx, %r14;
13860
13861 vmovdqu (0*16)(%rdx), RL1;
13862 vmovdqu (1*16)(%rdx), RR1;
13863@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13864 call __cast5_dec_blk16;
13865
13866 /* xor with src */
13867- vmovq (%r12), RX;
13868+ vmovq (%r14), RX;
13869 vpshufd $0x4f, RX, RX;
13870 vpxor RX, RR1, RR1;
13871- vpxor 0*16+8(%r12), RL1, RL1;
13872- vpxor 1*16+8(%r12), RR2, RR2;
13873- vpxor 2*16+8(%r12), RL2, RL2;
13874- vpxor 3*16+8(%r12), RR3, RR3;
13875- vpxor 4*16+8(%r12), RL3, RL3;
13876- vpxor 5*16+8(%r12), RR4, RR4;
13877- vpxor 6*16+8(%r12), RL4, RL4;
13878+ vpxor 0*16+8(%r14), RL1, RL1;
13879+ vpxor 1*16+8(%r14), RR2, RR2;
13880+ vpxor 2*16+8(%r14), RL2, RL2;
13881+ vpxor 3*16+8(%r14), RR3, RR3;
13882+ vpxor 4*16+8(%r14), RL3, RL3;
13883+ vpxor 5*16+8(%r14), RR4, RR4;
13884+ vpxor 6*16+8(%r14), RL4, RL4;
13885
13886 vmovdqu RR1, (0*16)(%r11);
13887 vmovdqu RL1, (1*16)(%r11);
13888@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13889 vmovdqu RR4, (6*16)(%r11);
13890 vmovdqu RL4, (7*16)(%r11);
13891
13892- popq %r12;
13893+ popq %r14;
13894
13895+ pax_force_retaddr
13896 ret;
13897 ENDPROC(cast5_cbc_dec_16way)
13898
13899@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13900 * %rcx: iv (big endian, 64bit)
13901 */
13902
13903- pushq %r12;
13904+ pushq %r14;
13905
13906 movq %rsi, %r11;
13907- movq %rdx, %r12;
13908+ movq %rdx, %r14;
13909
13910 vpcmpeqd RTMP, RTMP, RTMP;
13911 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13912@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13913 call __cast5_enc_blk16;
13914
13915 /* dst = src ^ iv */
13916- vpxor (0*16)(%r12), RR1, RR1;
13917- vpxor (1*16)(%r12), RL1, RL1;
13918- vpxor (2*16)(%r12), RR2, RR2;
13919- vpxor (3*16)(%r12), RL2, RL2;
13920- vpxor (4*16)(%r12), RR3, RR3;
13921- vpxor (5*16)(%r12), RL3, RL3;
13922- vpxor (6*16)(%r12), RR4, RR4;
13923- vpxor (7*16)(%r12), RL4, RL4;
13924+ vpxor (0*16)(%r14), RR1, RR1;
13925+ vpxor (1*16)(%r14), RL1, RL1;
13926+ vpxor (2*16)(%r14), RR2, RR2;
13927+ vpxor (3*16)(%r14), RL2, RL2;
13928+ vpxor (4*16)(%r14), RR3, RR3;
13929+ vpxor (5*16)(%r14), RL3, RL3;
13930+ vpxor (6*16)(%r14), RR4, RR4;
13931+ vpxor (7*16)(%r14), RL4, RL4;
13932 vmovdqu RR1, (0*16)(%r11);
13933 vmovdqu RL1, (1*16)(%r11);
13934 vmovdqu RR2, (2*16)(%r11);
13935@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13936 vmovdqu RR4, (6*16)(%r11);
13937 vmovdqu RL4, (7*16)(%r11);
13938
13939- popq %r12;
13940+ popq %r14;
13941
13942+ pax_force_retaddr
13943 ret;
13944 ENDPROC(cast5_ctr_16way)
13945diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13946index e3531f8..e123f35 100644
13947--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13948+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13949@@ -24,6 +24,7 @@
13950 */
13951
13952 #include <linux/linkage.h>
13953+#include <asm/alternative-asm.h>
13954 #include "glue_helper-asm-avx.S"
13955
13956 .file "cast6-avx-x86_64-asm_64.S"
13957@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13958 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13959 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13960
13961+ pax_force_retaddr
13962 ret;
13963 ENDPROC(__cast6_enc_blk8)
13964
13965@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13966 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13967 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13968
13969+ pax_force_retaddr
13970 ret;
13971 ENDPROC(__cast6_dec_blk8)
13972
13973@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13974
13975 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13976
13977+ pax_force_retaddr
13978 ret;
13979 ENDPROC(cast6_ecb_enc_8way)
13980
13981@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13982
13983 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13984
13985+ pax_force_retaddr
13986 ret;
13987 ENDPROC(cast6_ecb_dec_8way)
13988
13989@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13990 * %rdx: src
13991 */
13992
13993- pushq %r12;
13994+ pushq %r14;
13995
13996 movq %rsi, %r11;
13997- movq %rdx, %r12;
13998+ movq %rdx, %r14;
13999
14000 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14001
14002 call __cast6_dec_blk8;
14003
14004- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14005+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14006
14007- popq %r12;
14008+ popq %r14;
14009
14010+ pax_force_retaddr
14011 ret;
14012 ENDPROC(cast6_cbc_dec_8way)
14013
14014@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
14015 * %rcx: iv (little endian, 128bit)
14016 */
14017
14018- pushq %r12;
14019+ pushq %r14;
14020
14021 movq %rsi, %r11;
14022- movq %rdx, %r12;
14023+ movq %rdx, %r14;
14024
14025 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14026 RD2, RX, RKR, RKM);
14027
14028 call __cast6_enc_blk8;
14029
14030- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14031+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14032
14033- popq %r12;
14034+ popq %r14;
14035
14036+ pax_force_retaddr
14037 ret;
14038 ENDPROC(cast6_ctr_8way)
14039
14040@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
14041 /* dst <= regs xor IVs(in dst) */
14042 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14043
14044+ pax_force_retaddr
14045 ret;
14046 ENDPROC(cast6_xts_enc_8way)
14047
14048@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
14049 /* dst <= regs xor IVs(in dst) */
14050 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14051
14052+ pax_force_retaddr
14053 ret;
14054 ENDPROC(cast6_xts_dec_8way)
14055diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14056index 26d49eb..c0a8c84 100644
14057--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14058+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14059@@ -45,6 +45,7 @@
14060
14061 #include <asm/inst.h>
14062 #include <linux/linkage.h>
14063+#include <asm/alternative-asm.h>
14064
14065 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14066
14067@@ -309,6 +310,7 @@ do_return:
14068 popq %rsi
14069 popq %rdi
14070 popq %rbx
14071+ pax_force_retaddr
14072 ret
14073
14074 ################################################################
14075diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14076index 5d1e007..098cb4f 100644
14077--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14078+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14079@@ -18,6 +18,7 @@
14080
14081 #include <linux/linkage.h>
14082 #include <asm/inst.h>
14083+#include <asm/alternative-asm.h>
14084
14085 .data
14086
14087@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14088 psrlq $1, T2
14089 pxor T2, T1
14090 pxor T1, DATA
14091+ pax_force_retaddr
14092 ret
14093 ENDPROC(__clmul_gf128mul_ble)
14094
14095@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14096 call __clmul_gf128mul_ble
14097 PSHUFB_XMM BSWAP DATA
14098 movups DATA, (%rdi)
14099+ pax_force_retaddr
14100 ret
14101 ENDPROC(clmul_ghash_mul)
14102
14103@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14104 PSHUFB_XMM BSWAP DATA
14105 movups DATA, (%rdi)
14106 .Lupdate_just_ret:
14107+ pax_force_retaddr
14108 ret
14109 ENDPROC(clmul_ghash_update)
14110diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14111index 9279e0b..c4b3d2c 100644
14112--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14113+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14114@@ -1,4 +1,5 @@
14115 #include <linux/linkage.h>
14116+#include <asm/alternative-asm.h>
14117
14118 # enter salsa20_encrypt_bytes
14119 ENTRY(salsa20_encrypt_bytes)
14120@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14121 add %r11,%rsp
14122 mov %rdi,%rax
14123 mov %rsi,%rdx
14124+ pax_force_retaddr
14125 ret
14126 # bytesatleast65:
14127 ._bytesatleast65:
14128@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14129 add %r11,%rsp
14130 mov %rdi,%rax
14131 mov %rsi,%rdx
14132+ pax_force_retaddr
14133 ret
14134 ENDPROC(salsa20_keysetup)
14135
14136@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14137 add %r11,%rsp
14138 mov %rdi,%rax
14139 mov %rsi,%rdx
14140+ pax_force_retaddr
14141 ret
14142 ENDPROC(salsa20_ivsetup)
14143diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14144index 2f202f4..d9164d6 100644
14145--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14146+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14147@@ -24,6 +24,7 @@
14148 */
14149
14150 #include <linux/linkage.h>
14151+#include <asm/alternative-asm.h>
14152 #include "glue_helper-asm-avx.S"
14153
14154 .file "serpent-avx-x86_64-asm_64.S"
14155@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14156 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14157 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14158
14159+ pax_force_retaddr
14160 ret;
14161 ENDPROC(__serpent_enc_blk8_avx)
14162
14163@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14164 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14165 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14166
14167+ pax_force_retaddr
14168 ret;
14169 ENDPROC(__serpent_dec_blk8_avx)
14170
14171@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14172
14173 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14174
14175+ pax_force_retaddr
14176 ret;
14177 ENDPROC(serpent_ecb_enc_8way_avx)
14178
14179@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14180
14181 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14182
14183+ pax_force_retaddr
14184 ret;
14185 ENDPROC(serpent_ecb_dec_8way_avx)
14186
14187@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14188
14189 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14190
14191+ pax_force_retaddr
14192 ret;
14193 ENDPROC(serpent_cbc_dec_8way_avx)
14194
14195@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14196
14197 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14198
14199+ pax_force_retaddr
14200 ret;
14201 ENDPROC(serpent_ctr_8way_avx)
14202
14203@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14204 /* dst <= regs xor IVs(in dst) */
14205 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14206
14207+ pax_force_retaddr
14208 ret;
14209 ENDPROC(serpent_xts_enc_8way_avx)
14210
14211@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14212 /* dst <= regs xor IVs(in dst) */
14213 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14214
14215+ pax_force_retaddr
14216 ret;
14217 ENDPROC(serpent_xts_dec_8way_avx)
14218diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14219index b222085..abd483c 100644
14220--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14221+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14222@@ -15,6 +15,7 @@
14223 */
14224
14225 #include <linux/linkage.h>
14226+#include <asm/alternative-asm.h>
14227 #include "glue_helper-asm-avx2.S"
14228
14229 .file "serpent-avx2-asm_64.S"
14230@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14231 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14232 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14233
14234+ pax_force_retaddr
14235 ret;
14236 ENDPROC(__serpent_enc_blk16)
14237
14238@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14239 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14240 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14241
14242+ pax_force_retaddr
14243 ret;
14244 ENDPROC(__serpent_dec_blk16)
14245
14246@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14247
14248 vzeroupper;
14249
14250+ pax_force_retaddr
14251 ret;
14252 ENDPROC(serpent_ecb_enc_16way)
14253
14254@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14255
14256 vzeroupper;
14257
14258+ pax_force_retaddr
14259 ret;
14260 ENDPROC(serpent_ecb_dec_16way)
14261
14262@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14263
14264 vzeroupper;
14265
14266+ pax_force_retaddr
14267 ret;
14268 ENDPROC(serpent_cbc_dec_16way)
14269
14270@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14271
14272 vzeroupper;
14273
14274+ pax_force_retaddr
14275 ret;
14276 ENDPROC(serpent_ctr_16way)
14277
14278@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14279
14280 vzeroupper;
14281
14282+ pax_force_retaddr
14283 ret;
14284 ENDPROC(serpent_xts_enc_16way)
14285
14286@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14287
14288 vzeroupper;
14289
14290+ pax_force_retaddr
14291 ret;
14292 ENDPROC(serpent_xts_dec_16way)
14293diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14294index acc066c..1559cc4 100644
14295--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14296+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14297@@ -25,6 +25,7 @@
14298 */
14299
14300 #include <linux/linkage.h>
14301+#include <asm/alternative-asm.h>
14302
14303 .file "serpent-sse2-x86_64-asm_64.S"
14304 .text
14305@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14306 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14307 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14308
14309+ pax_force_retaddr
14310 ret;
14311
14312 .L__enc_xor8:
14313 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14314 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14315
14316+ pax_force_retaddr
14317 ret;
14318 ENDPROC(__serpent_enc_blk_8way)
14319
14320@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14321 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14322 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14323
14324+ pax_force_retaddr
14325 ret;
14326 ENDPROC(serpent_dec_blk_8way)
14327diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14328index a410950..9dfe7ad 100644
14329--- a/arch/x86/crypto/sha1_ssse3_asm.S
14330+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14331@@ -29,6 +29,7 @@
14332 */
14333
14334 #include <linux/linkage.h>
14335+#include <asm/alternative-asm.h>
14336
14337 #define CTX %rdi // arg1
14338 #define BUF %rsi // arg2
14339@@ -75,9 +76,9 @@
14340
14341 push %rbx
14342 push %rbp
14343- push %r12
14344+ push %r14
14345
14346- mov %rsp, %r12
14347+ mov %rsp, %r14
14348 sub $64, %rsp # allocate workspace
14349 and $~15, %rsp # align stack
14350
14351@@ -99,11 +100,12 @@
14352 xor %rax, %rax
14353 rep stosq
14354
14355- mov %r12, %rsp # deallocate workspace
14356+ mov %r14, %rsp # deallocate workspace
14357
14358- pop %r12
14359+ pop %r14
14360 pop %rbp
14361 pop %rbx
14362+ pax_force_retaddr
14363 ret
14364
14365 ENDPROC(\name)
14366diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14367index 642f156..51a513c 100644
14368--- a/arch/x86/crypto/sha256-avx-asm.S
14369+++ b/arch/x86/crypto/sha256-avx-asm.S
14370@@ -49,6 +49,7 @@
14371
14372 #ifdef CONFIG_AS_AVX
14373 #include <linux/linkage.h>
14374+#include <asm/alternative-asm.h>
14375
14376 ## assume buffers not aligned
14377 #define VMOVDQ vmovdqu
14378@@ -460,6 +461,7 @@ done_hash:
14379 popq %r13
14380 popq %rbp
14381 popq %rbx
14382+ pax_force_retaddr
14383 ret
14384 ENDPROC(sha256_transform_avx)
14385
14386diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14387index 9e86944..3795e6a 100644
14388--- a/arch/x86/crypto/sha256-avx2-asm.S
14389+++ b/arch/x86/crypto/sha256-avx2-asm.S
14390@@ -50,6 +50,7 @@
14391
14392 #ifdef CONFIG_AS_AVX2
14393 #include <linux/linkage.h>
14394+#include <asm/alternative-asm.h>
14395
14396 ## assume buffers not aligned
14397 #define VMOVDQ vmovdqu
14398@@ -720,6 +721,7 @@ done_hash:
14399 popq %r12
14400 popq %rbp
14401 popq %rbx
14402+ pax_force_retaddr
14403 ret
14404 ENDPROC(sha256_transform_rorx)
14405
14406diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14407index f833b74..8c62a9e 100644
14408--- a/arch/x86/crypto/sha256-ssse3-asm.S
14409+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14410@@ -47,6 +47,7 @@
14411 ########################################################################
14412
14413 #include <linux/linkage.h>
14414+#include <asm/alternative-asm.h>
14415
14416 ## assume buffers not aligned
14417 #define MOVDQ movdqu
14418@@ -471,6 +472,7 @@ done_hash:
14419 popq %rbp
14420 popq %rbx
14421
14422+ pax_force_retaddr
14423 ret
14424 ENDPROC(sha256_transform_ssse3)
14425
14426diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14427index 974dde9..a823ff9 100644
14428--- a/arch/x86/crypto/sha512-avx-asm.S
14429+++ b/arch/x86/crypto/sha512-avx-asm.S
14430@@ -49,6 +49,7 @@
14431
14432 #ifdef CONFIG_AS_AVX
14433 #include <linux/linkage.h>
14434+#include <asm/alternative-asm.h>
14435
14436 .text
14437
14438@@ -364,6 +365,7 @@ updateblock:
14439 mov frame_RSPSAVE(%rsp), %rsp
14440
14441 nowork:
14442+ pax_force_retaddr
14443 ret
14444 ENDPROC(sha512_transform_avx)
14445
14446diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14447index 568b961..ed20c37 100644
14448--- a/arch/x86/crypto/sha512-avx2-asm.S
14449+++ b/arch/x86/crypto/sha512-avx2-asm.S
14450@@ -51,6 +51,7 @@
14451
14452 #ifdef CONFIG_AS_AVX2
14453 #include <linux/linkage.h>
14454+#include <asm/alternative-asm.h>
14455
14456 .text
14457
14458@@ -678,6 +679,7 @@ done_hash:
14459
14460 # Restore Stack Pointer
14461 mov frame_RSPSAVE(%rsp), %rsp
14462+ pax_force_retaddr
14463 ret
14464 ENDPROC(sha512_transform_rorx)
14465
14466diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14467index fb56855..6edd768 100644
14468--- a/arch/x86/crypto/sha512-ssse3-asm.S
14469+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14470@@ -48,6 +48,7 @@
14471 ########################################################################
14472
14473 #include <linux/linkage.h>
14474+#include <asm/alternative-asm.h>
14475
14476 .text
14477
14478@@ -363,6 +364,7 @@ updateblock:
14479 mov frame_RSPSAVE(%rsp), %rsp
14480
14481 nowork:
14482+ pax_force_retaddr
14483 ret
14484 ENDPROC(sha512_transform_ssse3)
14485
14486diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14487index 0505813..b067311 100644
14488--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14489+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14490@@ -24,6 +24,7 @@
14491 */
14492
14493 #include <linux/linkage.h>
14494+#include <asm/alternative-asm.h>
14495 #include "glue_helper-asm-avx.S"
14496
14497 .file "twofish-avx-x86_64-asm_64.S"
14498@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14499 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14500 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14501
14502+ pax_force_retaddr
14503 ret;
14504 ENDPROC(__twofish_enc_blk8)
14505
14506@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14507 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14508 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14509
14510+ pax_force_retaddr
14511 ret;
14512 ENDPROC(__twofish_dec_blk8)
14513
14514@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14515
14516 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14517
14518+ pax_force_retaddr
14519 ret;
14520 ENDPROC(twofish_ecb_enc_8way)
14521
14522@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14523
14524 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14525
14526+ pax_force_retaddr
14527 ret;
14528 ENDPROC(twofish_ecb_dec_8way)
14529
14530@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14531 * %rdx: src
14532 */
14533
14534- pushq %r12;
14535+ pushq %r14;
14536
14537 movq %rsi, %r11;
14538- movq %rdx, %r12;
14539+ movq %rdx, %r14;
14540
14541 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14542
14543 call __twofish_dec_blk8;
14544
14545- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14546+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14547
14548- popq %r12;
14549+ popq %r14;
14550
14551+ pax_force_retaddr
14552 ret;
14553 ENDPROC(twofish_cbc_dec_8way)
14554
14555@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14556 * %rcx: iv (little endian, 128bit)
14557 */
14558
14559- pushq %r12;
14560+ pushq %r14;
14561
14562 movq %rsi, %r11;
14563- movq %rdx, %r12;
14564+ movq %rdx, %r14;
14565
14566 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14567 RD2, RX0, RX1, RY0);
14568
14569 call __twofish_enc_blk8;
14570
14571- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14572+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14573
14574- popq %r12;
14575+ popq %r14;
14576
14577+ pax_force_retaddr
14578 ret;
14579 ENDPROC(twofish_ctr_8way)
14580
14581@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14582 /* dst <= regs xor IVs(in dst) */
14583 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14584
14585+ pax_force_retaddr
14586 ret;
14587 ENDPROC(twofish_xts_enc_8way)
14588
14589@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14590 /* dst <= regs xor IVs(in dst) */
14591 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14592
14593+ pax_force_retaddr
14594 ret;
14595 ENDPROC(twofish_xts_dec_8way)
14596diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14597index 1c3b7ce..02f578d 100644
14598--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14599+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14600@@ -21,6 +21,7 @@
14601 */
14602
14603 #include <linux/linkage.h>
14604+#include <asm/alternative-asm.h>
14605
14606 .file "twofish-x86_64-asm-3way.S"
14607 .text
14608@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14609 popq %r13;
14610 popq %r14;
14611 popq %r15;
14612+ pax_force_retaddr
14613 ret;
14614
14615 .L__enc_xor3:
14616@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14617 popq %r13;
14618 popq %r14;
14619 popq %r15;
14620+ pax_force_retaddr
14621 ret;
14622 ENDPROC(__twofish_enc_blk_3way)
14623
14624@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14625 popq %r13;
14626 popq %r14;
14627 popq %r15;
14628+ pax_force_retaddr
14629 ret;
14630 ENDPROC(twofish_dec_blk_3way)
14631diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14632index a039d21..524b8b2 100644
14633--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14634+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14635@@ -22,6 +22,7 @@
14636
14637 #include <linux/linkage.h>
14638 #include <asm/asm-offsets.h>
14639+#include <asm/alternative-asm.h>
14640
14641 #define a_offset 0
14642 #define b_offset 4
14643@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14644
14645 popq R1
14646 movq $1,%rax
14647+ pax_force_retaddr
14648 ret
14649 ENDPROC(twofish_enc_blk)
14650
14651@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14652
14653 popq R1
14654 movq $1,%rax
14655+ pax_force_retaddr
14656 ret
14657 ENDPROC(twofish_dec_blk)
14658diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14659index ae6aad1..719d6d9 100644
14660--- a/arch/x86/ia32/ia32_aout.c
14661+++ b/arch/x86/ia32/ia32_aout.c
14662@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14663 unsigned long dump_start, dump_size;
14664 struct user32 dump;
14665
14666+ memset(&dump, 0, sizeof(dump));
14667+
14668 fs = get_fs();
14669 set_fs(KERNEL_DS);
14670 has_dumped = 1;
14671diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14672index f9e181a..300544c 100644
14673--- a/arch/x86/ia32/ia32_signal.c
14674+++ b/arch/x86/ia32/ia32_signal.c
14675@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14676 if (__get_user(set.sig[0], &frame->sc.oldmask)
14677 || (_COMPAT_NSIG_WORDS > 1
14678 && __copy_from_user((((char *) &set.sig) + 4),
14679- &frame->extramask,
14680+ frame->extramask,
14681 sizeof(frame->extramask))))
14682 goto badframe;
14683
14684@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14685 sp -= frame_size;
14686 /* Align the stack pointer according to the i386 ABI,
14687 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14688- sp = ((sp + 4) & -16ul) - 4;
14689+ sp = ((sp - 12) & -16ul) - 4;
14690 return (void __user *) sp;
14691 }
14692
14693@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14694 } else {
14695 /* Return stub is in 32bit vsyscall page */
14696 if (current->mm->context.vdso)
14697- restorer = current->mm->context.vdso +
14698- selected_vdso32->sym___kernel_sigreturn;
14699+ restorer = (void __force_user *)(current->mm->context.vdso +
14700+ selected_vdso32->sym___kernel_sigreturn);
14701 else
14702- restorer = &frame->retcode;
14703+ restorer = frame->retcode;
14704 }
14705
14706 put_user_try {
14707@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14708 * These are actually not used anymore, but left because some
14709 * gdb versions depend on them as a marker.
14710 */
14711- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14712+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14713 } put_user_catch(err);
14714
14715 if (err)
14716@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14717 0xb8,
14718 __NR_ia32_rt_sigreturn,
14719 0x80cd,
14720- 0,
14721+ 0
14722 };
14723
14724 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14725@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14726
14727 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14728 restorer = ksig->ka.sa.sa_restorer;
14729+ else if (current->mm->context.vdso)
14730+ /* Return stub is in 32bit vsyscall page */
14731+ restorer = (void __force_user *)(current->mm->context.vdso +
14732+ selected_vdso32->sym___kernel_rt_sigreturn);
14733 else
14734- restorer = current->mm->context.vdso +
14735- selected_vdso32->sym___kernel_rt_sigreturn;
14736+ restorer = frame->retcode;
14737 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14738
14739 /*
14740 * Not actually used anymore, but left because some gdb
14741 * versions need it.
14742 */
14743- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14744+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14745 } put_user_catch(err);
14746
14747 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14748diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14749index 82e8a1d..4e998d5 100644
14750--- a/arch/x86/ia32/ia32entry.S
14751+++ b/arch/x86/ia32/ia32entry.S
14752@@ -15,8 +15,10 @@
14753 #include <asm/irqflags.h>
14754 #include <asm/asm.h>
14755 #include <asm/smap.h>
14756+#include <asm/pgtable.h>
14757 #include <linux/linkage.h>
14758 #include <linux/err.h>
14759+#include <asm/alternative-asm.h>
14760
14761 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14762 #include <linux/elf-em.h>
14763@@ -62,12 +64,12 @@
14764 */
14765 .macro LOAD_ARGS32 offset, _r9=0
14766 .if \_r9
14767- movl \offset+16(%rsp),%r9d
14768+ movl \offset+R9(%rsp),%r9d
14769 .endif
14770- movl \offset+40(%rsp),%ecx
14771- movl \offset+48(%rsp),%edx
14772- movl \offset+56(%rsp),%esi
14773- movl \offset+64(%rsp),%edi
14774+ movl \offset+RCX(%rsp),%ecx
14775+ movl \offset+RDX(%rsp),%edx
14776+ movl \offset+RSI(%rsp),%esi
14777+ movl \offset+RDI(%rsp),%edi
14778 movl %eax,%eax /* zero extension */
14779 .endm
14780
14781@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14782 ENDPROC(native_irq_enable_sysexit)
14783 #endif
14784
14785+ .macro pax_enter_kernel_user
14786+ pax_set_fptr_mask
14787+#ifdef CONFIG_PAX_MEMORY_UDEREF
14788+ call pax_enter_kernel_user
14789+#endif
14790+ .endm
14791+
14792+ .macro pax_exit_kernel_user
14793+#ifdef CONFIG_PAX_MEMORY_UDEREF
14794+ call pax_exit_kernel_user
14795+#endif
14796+#ifdef CONFIG_PAX_RANDKSTACK
14797+ pushq %rax
14798+ pushq %r11
14799+ call pax_randomize_kstack
14800+ popq %r11
14801+ popq %rax
14802+#endif
14803+ .endm
14804+
14805+ .macro pax_erase_kstack
14806+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14807+ call pax_erase_kstack
14808+#endif
14809+ .endm
14810+
14811 /*
14812 * 32bit SYSENTER instruction entry.
14813 *
14814@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14815 CFI_REGISTER rsp,rbp
14816 SWAPGS_UNSAFE_STACK
14817 movq PER_CPU_VAR(kernel_stack), %rsp
14818- addq $(KERNEL_STACK_OFFSET),%rsp
14819- /*
14820- * No need to follow this irqs on/off section: the syscall
14821- * disabled irqs, here we enable it straight after entry:
14822- */
14823- ENABLE_INTERRUPTS(CLBR_NONE)
14824 movl %ebp,%ebp /* zero extension */
14825 pushq_cfi $__USER32_DS
14826 /*CFI_REL_OFFSET ss,0*/
14827@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14828 CFI_REL_OFFSET rsp,0
14829 pushfq_cfi
14830 /*CFI_REL_OFFSET rflags,0*/
14831- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14832- CFI_REGISTER rip,r10
14833+ orl $X86_EFLAGS_IF,(%rsp)
14834+ GET_THREAD_INFO(%r11)
14835+ movl TI_sysenter_return(%r11), %r11d
14836+ CFI_REGISTER rip,r11
14837 pushq_cfi $__USER32_CS
14838 /*CFI_REL_OFFSET cs,0*/
14839 movl %eax, %eax
14840- pushq_cfi %r10
14841+ pushq_cfi %r11
14842 CFI_REL_OFFSET rip,0
14843 pushq_cfi %rax
14844 cld
14845 SAVE_ARGS 0,1,0
14846+ pax_enter_kernel_user
14847+
14848+#ifdef CONFIG_PAX_RANDKSTACK
14849+ pax_erase_kstack
14850+#endif
14851+
14852+ /*
14853+ * No need to follow this irqs on/off section: the syscall
14854+ * disabled irqs, here we enable it straight after entry:
14855+ */
14856+ ENABLE_INTERRUPTS(CLBR_NONE)
14857 /* no need to do an access_ok check here because rbp has been
14858 32bit zero extended */
14859+
14860+#ifdef CONFIG_PAX_MEMORY_UDEREF
14861+ addq pax_user_shadow_base,%rbp
14862+ ASM_PAX_OPEN_USERLAND
14863+#endif
14864+
14865 ASM_STAC
14866 1: movl (%rbp),%ebp
14867 _ASM_EXTABLE(1b,ia32_badarg)
14868 ASM_CLAC
14869
14870+#ifdef CONFIG_PAX_MEMORY_UDEREF
14871+ ASM_PAX_CLOSE_USERLAND
14872+#endif
14873+
14874 /*
14875 * Sysenter doesn't filter flags, so we need to clear NT
14876 * ourselves. To save a few cycles, we can check whether
14877@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14878 jnz sysenter_fix_flags
14879 sysenter_flags_fixed:
14880
14881- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14882- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14883+ GET_THREAD_INFO(%r11)
14884+ orl $TS_COMPAT,TI_status(%r11)
14885+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14886 CFI_REMEMBER_STATE
14887 jnz sysenter_tracesys
14888 cmpq $(IA32_NR_syscalls-1),%rax
14889@@ -172,15 +218,18 @@ sysenter_do_call:
14890 sysenter_dispatch:
14891 call *ia32_sys_call_table(,%rax,8)
14892 movq %rax,RAX-ARGOFFSET(%rsp)
14893+ GET_THREAD_INFO(%r11)
14894 DISABLE_INTERRUPTS(CLBR_NONE)
14895 TRACE_IRQS_OFF
14896- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14897+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14898 jnz sysexit_audit
14899 sysexit_from_sys_call:
14900- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14901+ pax_exit_kernel_user
14902+ pax_erase_kstack
14903+ andl $~TS_COMPAT,TI_status(%r11)
14904 /* clear IF, that popfq doesn't enable interrupts early */
14905- andl $~0x200,EFLAGS-R11(%rsp)
14906- movl RIP-R11(%rsp),%edx /* User %eip */
14907+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14908+ movl RIP(%rsp),%edx /* User %eip */
14909 CFI_REGISTER rip,rdx
14910 RESTORE_ARGS 0,24,0,0,0,0
14911 xorq %r8,%r8
14912@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14913 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14914 movl %eax,%edi /* 1st arg: syscall number */
14915 call __audit_syscall_entry
14916+
14917+ pax_erase_kstack
14918+
14919 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14920 cmpq $(IA32_NR_syscalls-1),%rax
14921 ja ia32_badsys
14922@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14923 .endm
14924
14925 .macro auditsys_exit exit
14926- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14927+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14928 jnz ia32_ret_from_sys_call
14929 TRACE_IRQS_ON
14930 ENABLE_INTERRUPTS(CLBR_NONE)
14931@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14932 1: setbe %al /* 1 if error, 0 if not */
14933 movzbl %al,%edi /* zero-extend that into %edi */
14934 call __audit_syscall_exit
14935+ GET_THREAD_INFO(%r11)
14936 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14937 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14938 DISABLE_INTERRUPTS(CLBR_NONE)
14939 TRACE_IRQS_OFF
14940- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14941+ testl %edi,TI_flags(%r11)
14942 jz \exit
14943 CLEAR_RREGS -ARGOFFSET
14944 jmp int_with_check
14945@@ -253,7 +306,7 @@ sysenter_fix_flags:
14946
14947 sysenter_tracesys:
14948 #ifdef CONFIG_AUDITSYSCALL
14949- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14950+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14951 jz sysenter_auditsys
14952 #endif
14953 SAVE_REST
14954@@ -265,6 +318,9 @@ sysenter_tracesys:
14955 RESTORE_REST
14956 cmpq $(IA32_NR_syscalls-1),%rax
14957 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14958+
14959+ pax_erase_kstack
14960+
14961 jmp sysenter_do_call
14962 CFI_ENDPROC
14963 ENDPROC(ia32_sysenter_target)
14964@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14965 ENTRY(ia32_cstar_target)
14966 CFI_STARTPROC32 simple
14967 CFI_SIGNAL_FRAME
14968- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14969+ CFI_DEF_CFA rsp,0
14970 CFI_REGISTER rip,rcx
14971 /*CFI_REGISTER rflags,r11*/
14972 SWAPGS_UNSAFE_STACK
14973 movl %esp,%r8d
14974 CFI_REGISTER rsp,r8
14975 movq PER_CPU_VAR(kernel_stack),%rsp
14976+ SAVE_ARGS 8*6,0,0
14977+ pax_enter_kernel_user
14978+
14979+#ifdef CONFIG_PAX_RANDKSTACK
14980+ pax_erase_kstack
14981+#endif
14982+
14983 /*
14984 * No need to follow this irqs on/off section: the syscall
14985 * disabled irqs and here we enable it straight after entry:
14986 */
14987 ENABLE_INTERRUPTS(CLBR_NONE)
14988- SAVE_ARGS 8,0,0
14989 movl %eax,%eax /* zero extension */
14990 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14991 movq %rcx,RIP-ARGOFFSET(%rsp)
14992@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14993 /* no need to do an access_ok check here because r8 has been
14994 32bit zero extended */
14995 /* hardware stack frame is complete now */
14996+
14997+#ifdef CONFIG_PAX_MEMORY_UDEREF
14998+ ASM_PAX_OPEN_USERLAND
14999+ movq pax_user_shadow_base,%r8
15000+ addq RSP-ARGOFFSET(%rsp),%r8
15001+#endif
15002+
15003 ASM_STAC
15004 1: movl (%r8),%r9d
15005 _ASM_EXTABLE(1b,ia32_badarg)
15006 ASM_CLAC
15007- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15008- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15009+
15010+#ifdef CONFIG_PAX_MEMORY_UDEREF
15011+ ASM_PAX_CLOSE_USERLAND
15012+#endif
15013+
15014+ GET_THREAD_INFO(%r11)
15015+ orl $TS_COMPAT,TI_status(%r11)
15016+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15017 CFI_REMEMBER_STATE
15018 jnz cstar_tracesys
15019 cmpq $IA32_NR_syscalls-1,%rax
15020@@ -335,13 +410,16 @@ cstar_do_call:
15021 cstar_dispatch:
15022 call *ia32_sys_call_table(,%rax,8)
15023 movq %rax,RAX-ARGOFFSET(%rsp)
15024+ GET_THREAD_INFO(%r11)
15025 DISABLE_INTERRUPTS(CLBR_NONE)
15026 TRACE_IRQS_OFF
15027- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15028+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
15029 jnz sysretl_audit
15030 sysretl_from_sys_call:
15031- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15032- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
15033+ pax_exit_kernel_user
15034+ pax_erase_kstack
15035+ andl $~TS_COMPAT,TI_status(%r11)
15036+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
15037 movl RIP-ARGOFFSET(%rsp),%ecx
15038 CFI_REGISTER rip,rcx
15039 movl EFLAGS-ARGOFFSET(%rsp),%r11d
15040@@ -368,7 +446,7 @@ sysretl_audit:
15041
15042 cstar_tracesys:
15043 #ifdef CONFIG_AUDITSYSCALL
15044- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15045+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
15046 jz cstar_auditsys
15047 #endif
15048 xchgl %r9d,%ebp
15049@@ -382,11 +460,19 @@ cstar_tracesys:
15050 xchgl %ebp,%r9d
15051 cmpq $(IA32_NR_syscalls-1),%rax
15052 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
15053+
15054+ pax_erase_kstack
15055+
15056 jmp cstar_do_call
15057 END(ia32_cstar_target)
15058
15059 ia32_badarg:
15060 ASM_CLAC
15061+
15062+#ifdef CONFIG_PAX_MEMORY_UDEREF
15063+ ASM_PAX_CLOSE_USERLAND
15064+#endif
15065+
15066 movq $-EFAULT,%rax
15067 jmp ia32_sysret
15068 CFI_ENDPROC
15069@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15070 CFI_REL_OFFSET rip,RIP-RIP
15071 PARAVIRT_ADJUST_EXCEPTION_FRAME
15072 SWAPGS
15073- /*
15074- * No need to follow this irqs on/off section: the syscall
15075- * disabled irqs and here we enable it straight after entry:
15076- */
15077- ENABLE_INTERRUPTS(CLBR_NONE)
15078 movl %eax,%eax
15079 pushq_cfi %rax
15080 cld
15081 /* note the registers are not zero extended to the sf.
15082 this could be a problem. */
15083 SAVE_ARGS 0,1,0
15084- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15085- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15086+ pax_enter_kernel_user
15087+
15088+#ifdef CONFIG_PAX_RANDKSTACK
15089+ pax_erase_kstack
15090+#endif
15091+
15092+ /*
15093+ * No need to follow this irqs on/off section: the syscall
15094+ * disabled irqs and here we enable it straight after entry:
15095+ */
15096+ ENABLE_INTERRUPTS(CLBR_NONE)
15097+ GET_THREAD_INFO(%r11)
15098+ orl $TS_COMPAT,TI_status(%r11)
15099+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15100 jnz ia32_tracesys
15101 cmpq $(IA32_NR_syscalls-1),%rax
15102 ja ia32_badsys
15103@@ -458,6 +551,9 @@ ia32_tracesys:
15104 RESTORE_REST
15105 cmpq $(IA32_NR_syscalls-1),%rax
15106 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15107+
15108+ pax_erase_kstack
15109+
15110 jmp ia32_do_call
15111 END(ia32_syscall)
15112
15113diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15114index 8e0ceec..af13504 100644
15115--- a/arch/x86/ia32/sys_ia32.c
15116+++ b/arch/x86/ia32/sys_ia32.c
15117@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15118 */
15119 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15120 {
15121- typeof(ubuf->st_uid) uid = 0;
15122- typeof(ubuf->st_gid) gid = 0;
15123+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15124+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15125 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15126 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15127 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15128diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15129index 372231c..51b537d 100644
15130--- a/arch/x86/include/asm/alternative-asm.h
15131+++ b/arch/x86/include/asm/alternative-asm.h
15132@@ -18,6 +18,45 @@
15133 .endm
15134 #endif
15135
15136+#ifdef KERNEXEC_PLUGIN
15137+ .macro pax_force_retaddr_bts rip=0
15138+ btsq $63,\rip(%rsp)
15139+ .endm
15140+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15141+ .macro pax_force_retaddr rip=0, reload=0
15142+ btsq $63,\rip(%rsp)
15143+ .endm
15144+ .macro pax_force_fptr ptr
15145+ btsq $63,\ptr
15146+ .endm
15147+ .macro pax_set_fptr_mask
15148+ .endm
15149+#endif
15150+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15151+ .macro pax_force_retaddr rip=0, reload=0
15152+ .if \reload
15153+ pax_set_fptr_mask
15154+ .endif
15155+ orq %r12,\rip(%rsp)
15156+ .endm
15157+ .macro pax_force_fptr ptr
15158+ orq %r12,\ptr
15159+ .endm
15160+ .macro pax_set_fptr_mask
15161+ movabs $0x8000000000000000,%r12
15162+ .endm
15163+#endif
15164+#else
15165+ .macro pax_force_retaddr rip=0, reload=0
15166+ .endm
15167+ .macro pax_force_fptr ptr
15168+ .endm
15169+ .macro pax_force_retaddr_bts rip=0
15170+ .endm
15171+ .macro pax_set_fptr_mask
15172+ .endm
15173+#endif
15174+
15175 .macro altinstruction_entry orig alt feature orig_len alt_len
15176 .long \orig - .
15177 .long \alt - .
15178diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15179index 473bdbe..b1e3377 100644
15180--- a/arch/x86/include/asm/alternative.h
15181+++ b/arch/x86/include/asm/alternative.h
15182@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15183 ".pushsection .discard,\"aw\",@progbits\n" \
15184 DISCARD_ENTRY(1) \
15185 ".popsection\n" \
15186- ".pushsection .altinstr_replacement, \"ax\"\n" \
15187+ ".pushsection .altinstr_replacement, \"a\"\n" \
15188 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15189 ".popsection"
15190
15191@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15192 DISCARD_ENTRY(1) \
15193 DISCARD_ENTRY(2) \
15194 ".popsection\n" \
15195- ".pushsection .altinstr_replacement, \"ax\"\n" \
15196+ ".pushsection .altinstr_replacement, \"a\"\n" \
15197 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15198 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15199 ".popsection"
15200diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15201index 465b309..ab7e51f 100644
15202--- a/arch/x86/include/asm/apic.h
15203+++ b/arch/x86/include/asm/apic.h
15204@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15205
15206 #ifdef CONFIG_X86_LOCAL_APIC
15207
15208-extern unsigned int apic_verbosity;
15209+extern int apic_verbosity;
15210 extern int local_apic_timer_c2_ok;
15211
15212 extern int disable_apic;
15213diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15214index 20370c6..a2eb9b0 100644
15215--- a/arch/x86/include/asm/apm.h
15216+++ b/arch/x86/include/asm/apm.h
15217@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15218 __asm__ __volatile__(APM_DO_ZERO_SEGS
15219 "pushl %%edi\n\t"
15220 "pushl %%ebp\n\t"
15221- "lcall *%%cs:apm_bios_entry\n\t"
15222+ "lcall *%%ss:apm_bios_entry\n\t"
15223 "setc %%al\n\t"
15224 "popl %%ebp\n\t"
15225 "popl %%edi\n\t"
15226@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15227 __asm__ __volatile__(APM_DO_ZERO_SEGS
15228 "pushl %%edi\n\t"
15229 "pushl %%ebp\n\t"
15230- "lcall *%%cs:apm_bios_entry\n\t"
15231+ "lcall *%%ss:apm_bios_entry\n\t"
15232 "setc %%bl\n\t"
15233 "popl %%ebp\n\t"
15234 "popl %%edi\n\t"
15235diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15236index 5e5cd12..51cdc93 100644
15237--- a/arch/x86/include/asm/atomic.h
15238+++ b/arch/x86/include/asm/atomic.h
15239@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15240 }
15241
15242 /**
15243+ * atomic_read_unchecked - read atomic variable
15244+ * @v: pointer of type atomic_unchecked_t
15245+ *
15246+ * Atomically reads the value of @v.
15247+ */
15248+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15249+{
15250+ return ACCESS_ONCE((v)->counter);
15251+}
15252+
15253+/**
15254 * atomic_set - set atomic variable
15255 * @v: pointer of type atomic_t
15256 * @i: required value
15257@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15258 }
15259
15260 /**
15261+ * atomic_set_unchecked - set atomic variable
15262+ * @v: pointer of type atomic_unchecked_t
15263+ * @i: required value
15264+ *
15265+ * Atomically sets the value of @v to @i.
15266+ */
15267+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15268+{
15269+ v->counter = i;
15270+}
15271+
15272+/**
15273 * atomic_add - add integer to atomic variable
15274 * @i: integer value to add
15275 * @v: pointer of type atomic_t
15276@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15277 */
15278 static inline void atomic_add(int i, atomic_t *v)
15279 {
15280- asm volatile(LOCK_PREFIX "addl %1,%0"
15281+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15282+
15283+#ifdef CONFIG_PAX_REFCOUNT
15284+ "jno 0f\n"
15285+ LOCK_PREFIX "subl %1,%0\n"
15286+ "int $4\n0:\n"
15287+ _ASM_EXTABLE(0b, 0b)
15288+#endif
15289+
15290+ : "+m" (v->counter)
15291+ : "ir" (i));
15292+}
15293+
15294+/**
15295+ * atomic_add_unchecked - add integer to atomic variable
15296+ * @i: integer value to add
15297+ * @v: pointer of type atomic_unchecked_t
15298+ *
15299+ * Atomically adds @i to @v.
15300+ */
15301+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15302+{
15303+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15304 : "+m" (v->counter)
15305 : "ir" (i));
15306 }
15307@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15308 */
15309 static inline void atomic_sub(int i, atomic_t *v)
15310 {
15311- asm volatile(LOCK_PREFIX "subl %1,%0"
15312+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15313+
15314+#ifdef CONFIG_PAX_REFCOUNT
15315+ "jno 0f\n"
15316+ LOCK_PREFIX "addl %1,%0\n"
15317+ "int $4\n0:\n"
15318+ _ASM_EXTABLE(0b, 0b)
15319+#endif
15320+
15321+ : "+m" (v->counter)
15322+ : "ir" (i));
15323+}
15324+
15325+/**
15326+ * atomic_sub_unchecked - subtract integer from atomic variable
15327+ * @i: integer value to subtract
15328+ * @v: pointer of type atomic_unchecked_t
15329+ *
15330+ * Atomically subtracts @i from @v.
15331+ */
15332+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15333+{
15334+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15335 : "+m" (v->counter)
15336 : "ir" (i));
15337 }
15338@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15339 */
15340 static inline int atomic_sub_and_test(int i, atomic_t *v)
15341 {
15342- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15343+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15344 }
15345
15346 /**
15347@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15348 */
15349 static inline void atomic_inc(atomic_t *v)
15350 {
15351- asm volatile(LOCK_PREFIX "incl %0"
15352+ asm volatile(LOCK_PREFIX "incl %0\n"
15353+
15354+#ifdef CONFIG_PAX_REFCOUNT
15355+ "jno 0f\n"
15356+ LOCK_PREFIX "decl %0\n"
15357+ "int $4\n0:\n"
15358+ _ASM_EXTABLE(0b, 0b)
15359+#endif
15360+
15361+ : "+m" (v->counter));
15362+}
15363+
15364+/**
15365+ * atomic_inc_unchecked - increment atomic variable
15366+ * @v: pointer of type atomic_unchecked_t
15367+ *
15368+ * Atomically increments @v by 1.
15369+ */
15370+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15371+{
15372+ asm volatile(LOCK_PREFIX "incl %0\n"
15373 : "+m" (v->counter));
15374 }
15375
15376@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15377 */
15378 static inline void atomic_dec(atomic_t *v)
15379 {
15380- asm volatile(LOCK_PREFIX "decl %0"
15381+ asm volatile(LOCK_PREFIX "decl %0\n"
15382+
15383+#ifdef CONFIG_PAX_REFCOUNT
15384+ "jno 0f\n"
15385+ LOCK_PREFIX "incl %0\n"
15386+ "int $4\n0:\n"
15387+ _ASM_EXTABLE(0b, 0b)
15388+#endif
15389+
15390+ : "+m" (v->counter));
15391+}
15392+
15393+/**
15394+ * atomic_dec_unchecked - decrement atomic variable
15395+ * @v: pointer of type atomic_unchecked_t
15396+ *
15397+ * Atomically decrements @v by 1.
15398+ */
15399+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15400+{
15401+ asm volatile(LOCK_PREFIX "decl %0\n"
15402 : "+m" (v->counter));
15403 }
15404
15405@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15406 */
15407 static inline int atomic_dec_and_test(atomic_t *v)
15408 {
15409- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15410+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15411 }
15412
15413 /**
15414@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15415 */
15416 static inline int atomic_inc_and_test(atomic_t *v)
15417 {
15418- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15419+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15420+}
15421+
15422+/**
15423+ * atomic_inc_and_test_unchecked - increment and test
15424+ * @v: pointer of type atomic_unchecked_t
15425+ *
15426+ * Atomically increments @v by 1
15427+ * and returns true if the result is zero, or false for all
15428+ * other cases.
15429+ */
15430+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15431+{
15432+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15433 }
15434
15435 /**
15436@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15437 */
15438 static inline int atomic_add_negative(int i, atomic_t *v)
15439 {
15440- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15441+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15442 }
15443
15444 /**
15445@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15446 *
15447 * Atomically adds @i to @v and returns @i + @v
15448 */
15449-static inline int atomic_add_return(int i, atomic_t *v)
15450+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15451+{
15452+ return i + xadd_check_overflow(&v->counter, i);
15453+}
15454+
15455+/**
15456+ * atomic_add_return_unchecked - add integer and return
15457+ * @i: integer value to add
15458+ * @v: pointer of type atomic_unchecked_t
15459+ *
15460+ * Atomically adds @i to @v and returns @i + @v
15461+ */
15462+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15463 {
15464 return i + xadd(&v->counter, i);
15465 }
15466@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15467 *
15468 * Atomically subtracts @i from @v and returns @v - @i
15469 */
15470-static inline int atomic_sub_return(int i, atomic_t *v)
15471+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15472 {
15473 return atomic_add_return(-i, v);
15474 }
15475
15476 #define atomic_inc_return(v) (atomic_add_return(1, v))
15477+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15478+{
15479+ return atomic_add_return_unchecked(1, v);
15480+}
15481 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15482
15483-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15484+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15485+{
15486+ return cmpxchg(&v->counter, old, new);
15487+}
15488+
15489+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15490 {
15491 return cmpxchg(&v->counter, old, new);
15492 }
15493@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15494 return xchg(&v->counter, new);
15495 }
15496
15497+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15498+{
15499+ return xchg(&v->counter, new);
15500+}
15501+
15502 /**
15503 * __atomic_add_unless - add unless the number is already a given value
15504 * @v: pointer of type atomic_t
15505@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15506 */
15507 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15508 {
15509- int c, old;
15510+ int c, old, new;
15511 c = atomic_read(v);
15512 for (;;) {
15513- if (unlikely(c == (u)))
15514+ if (unlikely(c == u))
15515 break;
15516- old = atomic_cmpxchg((v), c, c + (a));
15517+
15518+ asm volatile("addl %2,%0\n"
15519+
15520+#ifdef CONFIG_PAX_REFCOUNT
15521+ "jno 0f\n"
15522+ "subl %2,%0\n"
15523+ "int $4\n0:\n"
15524+ _ASM_EXTABLE(0b, 0b)
15525+#endif
15526+
15527+ : "=r" (new)
15528+ : "0" (c), "ir" (a));
15529+
15530+ old = atomic_cmpxchg(v, c, new);
15531 if (likely(old == c))
15532 break;
15533 c = old;
15534@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15535 }
15536
15537 /**
15538+ * atomic_inc_not_zero_hint - increment if not null
15539+ * @v: pointer of type atomic_t
15540+ * @hint: probable value of the atomic before the increment
15541+ *
15542+ * This version of atomic_inc_not_zero() gives a hint of probable
15543+ * value of the atomic. This helps processor to not read the memory
15544+ * before doing the atomic read/modify/write cycle, lowering
15545+ * number of bus transactions on some arches.
15546+ *
15547+ * Returns: 0 if increment was not done, 1 otherwise.
15548+ */
15549+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15550+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15551+{
15552+ int val, c = hint, new;
15553+
15554+ /* sanity test, should be removed by compiler if hint is a constant */
15555+ if (!hint)
15556+ return __atomic_add_unless(v, 1, 0);
15557+
15558+ do {
15559+ asm volatile("incl %0\n"
15560+
15561+#ifdef CONFIG_PAX_REFCOUNT
15562+ "jno 0f\n"
15563+ "decl %0\n"
15564+ "int $4\n0:\n"
15565+ _ASM_EXTABLE(0b, 0b)
15566+#endif
15567+
15568+ : "=r" (new)
15569+ : "0" (c));
15570+
15571+ val = atomic_cmpxchg(v, c, new);
15572+ if (val == c)
15573+ return 1;
15574+ c = val;
15575+ } while (c);
15576+
15577+ return 0;
15578+}
15579+
15580+/**
15581 * atomic_inc_short - increment of a short integer
15582 * @v: pointer to type int
15583 *
15584@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15585 }
15586
15587 /* These are x86-specific, used by some header files */
15588-#define atomic_clear_mask(mask, addr) \
15589- asm volatile(LOCK_PREFIX "andl %0,%1" \
15590- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15591+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15592+{
15593+ asm volatile(LOCK_PREFIX "andl %1,%0"
15594+ : "+m" (v->counter)
15595+ : "r" (~(mask))
15596+ : "memory");
15597+}
15598
15599-#define atomic_set_mask(mask, addr) \
15600- asm volatile(LOCK_PREFIX "orl %0,%1" \
15601- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15602- : "memory")
15603+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15604+{
15605+ asm volatile(LOCK_PREFIX "andl %1,%0"
15606+ : "+m" (v->counter)
15607+ : "r" (~(mask))
15608+ : "memory");
15609+}
15610+
15611+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15612+{
15613+ asm volatile(LOCK_PREFIX "orl %1,%0"
15614+ : "+m" (v->counter)
15615+ : "r" (mask)
15616+ : "memory");
15617+}
15618+
15619+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15620+{
15621+ asm volatile(LOCK_PREFIX "orl %1,%0"
15622+ : "+m" (v->counter)
15623+ : "r" (mask)
15624+ : "memory");
15625+}
15626
15627 #ifdef CONFIG_X86_32
15628 # include <asm/atomic64_32.h>
15629diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15630index b154de7..bf18a5a 100644
15631--- a/arch/x86/include/asm/atomic64_32.h
15632+++ b/arch/x86/include/asm/atomic64_32.h
15633@@ -12,6 +12,14 @@ typedef struct {
15634 u64 __aligned(8) counter;
15635 } atomic64_t;
15636
15637+#ifdef CONFIG_PAX_REFCOUNT
15638+typedef struct {
15639+ u64 __aligned(8) counter;
15640+} atomic64_unchecked_t;
15641+#else
15642+typedef atomic64_t atomic64_unchecked_t;
15643+#endif
15644+
15645 #define ATOMIC64_INIT(val) { (val) }
15646
15647 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15648@@ -37,21 +45,31 @@ typedef struct {
15649 ATOMIC64_DECL_ONE(sym##_386)
15650
15651 ATOMIC64_DECL_ONE(add_386);
15652+ATOMIC64_DECL_ONE(add_unchecked_386);
15653 ATOMIC64_DECL_ONE(sub_386);
15654+ATOMIC64_DECL_ONE(sub_unchecked_386);
15655 ATOMIC64_DECL_ONE(inc_386);
15656+ATOMIC64_DECL_ONE(inc_unchecked_386);
15657 ATOMIC64_DECL_ONE(dec_386);
15658+ATOMIC64_DECL_ONE(dec_unchecked_386);
15659 #endif
15660
15661 #define alternative_atomic64(f, out, in...) \
15662 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15663
15664 ATOMIC64_DECL(read);
15665+ATOMIC64_DECL(read_unchecked);
15666 ATOMIC64_DECL(set);
15667+ATOMIC64_DECL(set_unchecked);
15668 ATOMIC64_DECL(xchg);
15669 ATOMIC64_DECL(add_return);
15670+ATOMIC64_DECL(add_return_unchecked);
15671 ATOMIC64_DECL(sub_return);
15672+ATOMIC64_DECL(sub_return_unchecked);
15673 ATOMIC64_DECL(inc_return);
15674+ATOMIC64_DECL(inc_return_unchecked);
15675 ATOMIC64_DECL(dec_return);
15676+ATOMIC64_DECL(dec_return_unchecked);
15677 ATOMIC64_DECL(dec_if_positive);
15678 ATOMIC64_DECL(inc_not_zero);
15679 ATOMIC64_DECL(add_unless);
15680@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15681 }
15682
15683 /**
15684+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15685+ * @p: pointer to type atomic64_unchecked_t
15686+ * @o: expected value
15687+ * @n: new value
15688+ *
15689+ * Atomically sets @v to @n if it was equal to @o and returns
15690+ * the old value.
15691+ */
15692+
15693+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15694+{
15695+ return cmpxchg64(&v->counter, o, n);
15696+}
15697+
15698+/**
15699 * atomic64_xchg - xchg atomic64 variable
15700 * @v: pointer to type atomic64_t
15701 * @n: value to assign
15702@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15703 }
15704
15705 /**
15706+ * atomic64_set_unchecked - set atomic64 variable
15707+ * @v: pointer to type atomic64_unchecked_t
15708+ * @n: value to assign
15709+ *
15710+ * Atomically sets the value of @v to @n.
15711+ */
15712+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15713+{
15714+ unsigned high = (unsigned)(i >> 32);
15715+ unsigned low = (unsigned)i;
15716+ alternative_atomic64(set, /* no output */,
15717+ "S" (v), "b" (low), "c" (high)
15718+ : "eax", "edx", "memory");
15719+}
15720+
15721+/**
15722 * atomic64_read - read atomic64 variable
15723 * @v: pointer to type atomic64_t
15724 *
15725@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15726 }
15727
15728 /**
15729+ * atomic64_read_unchecked - read atomic64 variable
15730+ * @v: pointer to type atomic64_unchecked_t
15731+ *
15732+ * Atomically reads the value of @v and returns it.
15733+ */
15734+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15735+{
15736+ long long r;
15737+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15738+ return r;
15739+ }
15740+
15741+/**
15742 * atomic64_add_return - add and return
15743 * @i: integer value to add
15744 * @v: pointer to type atomic64_t
15745@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15746 return i;
15747 }
15748
15749+/**
15750+ * atomic64_add_return_unchecked - add and return
15751+ * @i: integer value to add
15752+ * @v: pointer to type atomic64_unchecked_t
15753+ *
15754+ * Atomically adds @i to @v and returns @i + *@v
15755+ */
15756+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15757+{
15758+ alternative_atomic64(add_return_unchecked,
15759+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15760+ ASM_NO_INPUT_CLOBBER("memory"));
15761+ return i;
15762+}
15763+
15764 /*
15765 * Other variants with different arithmetic operators:
15766 */
15767@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15768 return a;
15769 }
15770
15771+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15772+{
15773+ long long a;
15774+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15775+ "S" (v) : "memory", "ecx");
15776+ return a;
15777+}
15778+
15779 static inline long long atomic64_dec_return(atomic64_t *v)
15780 {
15781 long long a;
15782@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15783 }
15784
15785 /**
15786+ * atomic64_add_unchecked - add integer to atomic64 variable
15787+ * @i: integer value to add
15788+ * @v: pointer to type atomic64_unchecked_t
15789+ *
15790+ * Atomically adds @i to @v.
15791+ */
15792+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15793+{
15794+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15795+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15796+ ASM_NO_INPUT_CLOBBER("memory"));
15797+ return i;
15798+}
15799+
15800+/**
15801 * atomic64_sub - subtract the atomic64 variable
15802 * @i: integer value to subtract
15803 * @v: pointer to type atomic64_t
15804diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15805index f8d273e..02f39f3 100644
15806--- a/arch/x86/include/asm/atomic64_64.h
15807+++ b/arch/x86/include/asm/atomic64_64.h
15808@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15809 }
15810
15811 /**
15812+ * atomic64_read_unchecked - read atomic64 variable
15813+ * @v: pointer of type atomic64_unchecked_t
15814+ *
15815+ * Atomically reads the value of @v.
15816+ * Doesn't imply a read memory barrier.
15817+ */
15818+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15819+{
15820+ return ACCESS_ONCE((v)->counter);
15821+}
15822+
15823+/**
15824 * atomic64_set - set atomic64 variable
15825 * @v: pointer to type atomic64_t
15826 * @i: required value
15827@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15828 }
15829
15830 /**
15831+ * atomic64_set_unchecked - set atomic64 variable
15832+ * @v: pointer to type atomic64_unchecked_t
15833+ * @i: required value
15834+ *
15835+ * Atomically sets the value of @v to @i.
15836+ */
15837+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15838+{
15839+ v->counter = i;
15840+}
15841+
15842+/**
15843 * atomic64_add - add integer to atomic64 variable
15844 * @i: integer value to add
15845 * @v: pointer to type atomic64_t
15846@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15847 */
15848 static inline void atomic64_add(long i, atomic64_t *v)
15849 {
15850+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15851+
15852+#ifdef CONFIG_PAX_REFCOUNT
15853+ "jno 0f\n"
15854+ LOCK_PREFIX "subq %1,%0\n"
15855+ "int $4\n0:\n"
15856+ _ASM_EXTABLE(0b, 0b)
15857+#endif
15858+
15859+ : "=m" (v->counter)
15860+ : "er" (i), "m" (v->counter));
15861+}
15862+
15863+/**
15864+ * atomic64_add_unchecked - add integer to atomic64 variable
15865+ * @i: integer value to add
15866+ * @v: pointer to type atomic64_unchecked_t
15867+ *
15868+ * Atomically adds @i to @v.
15869+ */
15870+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15871+{
15872 asm volatile(LOCK_PREFIX "addq %1,%0"
15873 : "=m" (v->counter)
15874 : "er" (i), "m" (v->counter));
15875@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15876 */
15877 static inline void atomic64_sub(long i, atomic64_t *v)
15878 {
15879- asm volatile(LOCK_PREFIX "subq %1,%0"
15880+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15881+
15882+#ifdef CONFIG_PAX_REFCOUNT
15883+ "jno 0f\n"
15884+ LOCK_PREFIX "addq %1,%0\n"
15885+ "int $4\n0:\n"
15886+ _ASM_EXTABLE(0b, 0b)
15887+#endif
15888+
15889+ : "=m" (v->counter)
15890+ : "er" (i), "m" (v->counter));
15891+}
15892+
15893+/**
15894+ * atomic64_sub_unchecked - subtract the atomic64 variable
15895+ * @i: integer value to subtract
15896+ * @v: pointer to type atomic64_unchecked_t
15897+ *
15898+ * Atomically subtracts @i from @v.
15899+ */
15900+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15901+{
15902+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15903 : "=m" (v->counter)
15904 : "er" (i), "m" (v->counter));
15905 }
15906@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15907 */
15908 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15909 {
15910- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15911+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15912 }
15913
15914 /**
15915@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15916 */
15917 static inline void atomic64_inc(atomic64_t *v)
15918 {
15919+ asm volatile(LOCK_PREFIX "incq %0\n"
15920+
15921+#ifdef CONFIG_PAX_REFCOUNT
15922+ "jno 0f\n"
15923+ LOCK_PREFIX "decq %0\n"
15924+ "int $4\n0:\n"
15925+ _ASM_EXTABLE(0b, 0b)
15926+#endif
15927+
15928+ : "=m" (v->counter)
15929+ : "m" (v->counter));
15930+}
15931+
15932+/**
15933+ * atomic64_inc_unchecked - increment atomic64 variable
15934+ * @v: pointer to type atomic64_unchecked_t
15935+ *
15936+ * Atomically increments @v by 1.
15937+ */
15938+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15939+{
15940 asm volatile(LOCK_PREFIX "incq %0"
15941 : "=m" (v->counter)
15942 : "m" (v->counter));
15943@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15944 */
15945 static inline void atomic64_dec(atomic64_t *v)
15946 {
15947- asm volatile(LOCK_PREFIX "decq %0"
15948+ asm volatile(LOCK_PREFIX "decq %0\n"
15949+
15950+#ifdef CONFIG_PAX_REFCOUNT
15951+ "jno 0f\n"
15952+ LOCK_PREFIX "incq %0\n"
15953+ "int $4\n0:\n"
15954+ _ASM_EXTABLE(0b, 0b)
15955+#endif
15956+
15957+ : "=m" (v->counter)
15958+ : "m" (v->counter));
15959+}
15960+
15961+/**
15962+ * atomic64_dec_unchecked - decrement atomic64 variable
15963+ * @v: pointer to type atomic64_t
15964+ *
15965+ * Atomically decrements @v by 1.
15966+ */
15967+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15968+{
15969+ asm volatile(LOCK_PREFIX "decq %0\n"
15970 : "=m" (v->counter)
15971 : "m" (v->counter));
15972 }
15973@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15974 */
15975 static inline int atomic64_dec_and_test(atomic64_t *v)
15976 {
15977- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15978+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15979 }
15980
15981 /**
15982@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15983 */
15984 static inline int atomic64_inc_and_test(atomic64_t *v)
15985 {
15986- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15987+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15988 }
15989
15990 /**
15991@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15992 */
15993 static inline int atomic64_add_negative(long i, atomic64_t *v)
15994 {
15995- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15996+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15997 }
15998
15999 /**
16000@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
16001 */
16002 static inline long atomic64_add_return(long i, atomic64_t *v)
16003 {
16004+ return i + xadd_check_overflow(&v->counter, i);
16005+}
16006+
16007+/**
16008+ * atomic64_add_return_unchecked - add and return
16009+ * @i: integer value to add
16010+ * @v: pointer to type atomic64_unchecked_t
16011+ *
16012+ * Atomically adds @i to @v and returns @i + @v
16013+ */
16014+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
16015+{
16016 return i + xadd(&v->counter, i);
16017 }
16018
16019@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
16020 }
16021
16022 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
16023+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
16024+{
16025+ return atomic64_add_return_unchecked(1, v);
16026+}
16027 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
16028
16029 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16030@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16031 return cmpxchg(&v->counter, old, new);
16032 }
16033
16034+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
16035+{
16036+ return cmpxchg(&v->counter, old, new);
16037+}
16038+
16039 static inline long atomic64_xchg(atomic64_t *v, long new)
16040 {
16041 return xchg(&v->counter, new);
16042@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
16043 */
16044 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
16045 {
16046- long c, old;
16047+ long c, old, new;
16048 c = atomic64_read(v);
16049 for (;;) {
16050- if (unlikely(c == (u)))
16051+ if (unlikely(c == u))
16052 break;
16053- old = atomic64_cmpxchg((v), c, c + (a));
16054+
16055+ asm volatile("add %2,%0\n"
16056+
16057+#ifdef CONFIG_PAX_REFCOUNT
16058+ "jno 0f\n"
16059+ "sub %2,%0\n"
16060+ "int $4\n0:\n"
16061+ _ASM_EXTABLE(0b, 0b)
16062+#endif
16063+
16064+ : "=r" (new)
16065+ : "0" (c), "ir" (a));
16066+
16067+ old = atomic64_cmpxchg(v, c, new);
16068 if (likely(old == c))
16069 break;
16070 c = old;
16071 }
16072- return c != (u);
16073+ return c != u;
16074 }
16075
16076 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16077diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16078index 2ab1eb3..1e8cc5d 100644
16079--- a/arch/x86/include/asm/barrier.h
16080+++ b/arch/x86/include/asm/barrier.h
16081@@ -57,7 +57,7 @@
16082 do { \
16083 compiletime_assert_atomic_type(*p); \
16084 smp_mb(); \
16085- ACCESS_ONCE(*p) = (v); \
16086+ ACCESS_ONCE_RW(*p) = (v); \
16087 } while (0)
16088
16089 #define smp_load_acquire(p) \
16090@@ -74,7 +74,7 @@ do { \
16091 do { \
16092 compiletime_assert_atomic_type(*p); \
16093 barrier(); \
16094- ACCESS_ONCE(*p) = (v); \
16095+ ACCESS_ONCE_RW(*p) = (v); \
16096 } while (0)
16097
16098 #define smp_load_acquire(p) \
16099diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16100index cfe3b95..d01b118 100644
16101--- a/arch/x86/include/asm/bitops.h
16102+++ b/arch/x86/include/asm/bitops.h
16103@@ -50,7 +50,7 @@
16104 * a mask operation on a byte.
16105 */
16106 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16107-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16108+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16109 #define CONST_MASK(nr) (1 << ((nr) & 7))
16110
16111 /**
16112@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16113 */
16114 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16115 {
16116- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16117+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16118 }
16119
16120 /**
16121@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16122 */
16123 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16124 {
16125- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16126+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16127 }
16128
16129 /**
16130@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16131 */
16132 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16133 {
16134- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16135+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16136 }
16137
16138 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16139@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16140 *
16141 * Undefined if no bit exists, so code should check against 0 first.
16142 */
16143-static inline unsigned long __ffs(unsigned long word)
16144+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16145 {
16146 asm("rep; bsf %1,%0"
16147 : "=r" (word)
16148@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16149 *
16150 * Undefined if no zero exists, so code should check against ~0UL first.
16151 */
16152-static inline unsigned long ffz(unsigned long word)
16153+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16154 {
16155 asm("rep; bsf %1,%0"
16156 : "=r" (word)
16157@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16158 *
16159 * Undefined if no set bit exists, so code should check against 0 first.
16160 */
16161-static inline unsigned long __fls(unsigned long word)
16162+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16163 {
16164 asm("bsr %1,%0"
16165 : "=r" (word)
16166@@ -434,7 +434,7 @@ static inline int ffs(int x)
16167 * set bit if value is nonzero. The last (most significant) bit is
16168 * at position 32.
16169 */
16170-static inline int fls(int x)
16171+static inline int __intentional_overflow(-1) fls(int x)
16172 {
16173 int r;
16174
16175@@ -476,7 +476,7 @@ static inline int fls(int x)
16176 * at position 64.
16177 */
16178 #ifdef CONFIG_X86_64
16179-static __always_inline int fls64(__u64 x)
16180+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16181 {
16182 int bitpos = -1;
16183 /*
16184diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16185index 4fa687a..60f2d39 100644
16186--- a/arch/x86/include/asm/boot.h
16187+++ b/arch/x86/include/asm/boot.h
16188@@ -6,10 +6,15 @@
16189 #include <uapi/asm/boot.h>
16190
16191 /* Physical address where kernel should be loaded. */
16192-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16193+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16194 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16195 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16196
16197+#ifndef __ASSEMBLY__
16198+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16199+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16200+#endif
16201+
16202 /* Minimum kernel alignment, as a power of two */
16203 #ifdef CONFIG_X86_64
16204 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16205diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16206index 48f99f1..d78ebf9 100644
16207--- a/arch/x86/include/asm/cache.h
16208+++ b/arch/x86/include/asm/cache.h
16209@@ -5,12 +5,13 @@
16210
16211 /* L1 cache line size */
16212 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16213-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16214+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16215
16216 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16217+#define __read_only __attribute__((__section__(".data..read_only")))
16218
16219 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16220-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16221+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16222
16223 #ifdef CONFIG_X86_VSMP
16224 #ifdef CONFIG_SMP
16225diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16226index 76659b6..72b8439 100644
16227--- a/arch/x86/include/asm/calling.h
16228+++ b/arch/x86/include/asm/calling.h
16229@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16230 #define RSP 152
16231 #define SS 160
16232
16233-#define ARGOFFSET R11
16234-#define SWFRAME ORIG_RAX
16235+#define ARGOFFSET R15
16236
16237 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16238- subq $9*8+\addskip, %rsp
16239- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16240- movq_cfi rdi, 8*8
16241- movq_cfi rsi, 7*8
16242- movq_cfi rdx, 6*8
16243+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16244+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16245+ movq_cfi rdi, RDI
16246+ movq_cfi rsi, RSI
16247+ movq_cfi rdx, RDX
16248
16249 .if \save_rcx
16250- movq_cfi rcx, 5*8
16251+ movq_cfi rcx, RCX
16252 .endif
16253
16254 .if \rax_enosys
16255- movq $-ENOSYS, 4*8(%rsp)
16256+ movq $-ENOSYS, RAX(%rsp)
16257 .else
16258- movq_cfi rax, 4*8
16259+ movq_cfi rax, RAX
16260 .endif
16261
16262 .if \save_r891011
16263- movq_cfi r8, 3*8
16264- movq_cfi r9, 2*8
16265- movq_cfi r10, 1*8
16266- movq_cfi r11, 0*8
16267+ movq_cfi r8, R8
16268+ movq_cfi r9, R9
16269+ movq_cfi r10, R10
16270+ movq_cfi r11, R11
16271 .endif
16272
16273+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16274+ movq_cfi r12, R12
16275+#endif
16276+
16277 .endm
16278
16279-#define ARG_SKIP (9*8)
16280+#define ARG_SKIP ORIG_RAX
16281
16282 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16283 rstor_r8910=1, rstor_rdx=1
16284+
16285+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16286+ movq_cfi_restore R12, r12
16287+#endif
16288+
16289 .if \rstor_r11
16290- movq_cfi_restore 0*8, r11
16291+ movq_cfi_restore R11, r11
16292 .endif
16293
16294 .if \rstor_r8910
16295- movq_cfi_restore 1*8, r10
16296- movq_cfi_restore 2*8, r9
16297- movq_cfi_restore 3*8, r8
16298+ movq_cfi_restore R10, r10
16299+ movq_cfi_restore R9, r9
16300+ movq_cfi_restore R8, r8
16301 .endif
16302
16303 .if \rstor_rax
16304- movq_cfi_restore 4*8, rax
16305+ movq_cfi_restore RAX, rax
16306 .endif
16307
16308 .if \rstor_rcx
16309- movq_cfi_restore 5*8, rcx
16310+ movq_cfi_restore RCX, rcx
16311 .endif
16312
16313 .if \rstor_rdx
16314- movq_cfi_restore 6*8, rdx
16315+ movq_cfi_restore RDX, rdx
16316 .endif
16317
16318- movq_cfi_restore 7*8, rsi
16319- movq_cfi_restore 8*8, rdi
16320+ movq_cfi_restore RSI, rsi
16321+ movq_cfi_restore RDI, rdi
16322
16323- .if ARG_SKIP+\addskip > 0
16324- addq $ARG_SKIP+\addskip, %rsp
16325- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16326+ .if ORIG_RAX+\addskip > 0
16327+ addq $ORIG_RAX+\addskip, %rsp
16328+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16329 .endif
16330 .endm
16331
16332- .macro LOAD_ARGS offset, skiprax=0
16333- movq \offset(%rsp), %r11
16334- movq \offset+8(%rsp), %r10
16335- movq \offset+16(%rsp), %r9
16336- movq \offset+24(%rsp), %r8
16337- movq \offset+40(%rsp), %rcx
16338- movq \offset+48(%rsp), %rdx
16339- movq \offset+56(%rsp), %rsi
16340- movq \offset+64(%rsp), %rdi
16341+ .macro LOAD_ARGS skiprax=0
16342+ movq R11(%rsp), %r11
16343+ movq R10(%rsp), %r10
16344+ movq R9(%rsp), %r9
16345+ movq R8(%rsp), %r8
16346+ movq RCX(%rsp), %rcx
16347+ movq RDX(%rsp), %rdx
16348+ movq RSI(%rsp), %rsi
16349+ movq RDI(%rsp), %rdi
16350 .if \skiprax
16351 .else
16352- movq \offset+72(%rsp), %rax
16353+ movq ORIG_RAX(%rsp), %rax
16354 .endif
16355 .endm
16356
16357-#define REST_SKIP (6*8)
16358-
16359 .macro SAVE_REST
16360- subq $REST_SKIP, %rsp
16361- CFI_ADJUST_CFA_OFFSET REST_SKIP
16362- movq_cfi rbx, 5*8
16363- movq_cfi rbp, 4*8
16364- movq_cfi r12, 3*8
16365- movq_cfi r13, 2*8
16366- movq_cfi r14, 1*8
16367- movq_cfi r15, 0*8
16368+ movq_cfi rbx, RBX
16369+ movq_cfi rbp, RBP
16370+
16371+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16372+ movq_cfi r12, R12
16373+#endif
16374+
16375+ movq_cfi r13, R13
16376+ movq_cfi r14, R14
16377+ movq_cfi r15, R15
16378 .endm
16379
16380 .macro RESTORE_REST
16381- movq_cfi_restore 0*8, r15
16382- movq_cfi_restore 1*8, r14
16383- movq_cfi_restore 2*8, r13
16384- movq_cfi_restore 3*8, r12
16385- movq_cfi_restore 4*8, rbp
16386- movq_cfi_restore 5*8, rbx
16387- addq $REST_SKIP, %rsp
16388- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16389+ movq_cfi_restore R15, r15
16390+ movq_cfi_restore R14, r14
16391+ movq_cfi_restore R13, r13
16392+
16393+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16394+ movq_cfi_restore R12, r12
16395+#endif
16396+
16397+ movq_cfi_restore RBP, rbp
16398+ movq_cfi_restore RBX, rbx
16399 .endm
16400
16401 .macro SAVE_ALL
16402diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16403index f50de69..2b0a458 100644
16404--- a/arch/x86/include/asm/checksum_32.h
16405+++ b/arch/x86/include/asm/checksum_32.h
16406@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16407 int len, __wsum sum,
16408 int *src_err_ptr, int *dst_err_ptr);
16409
16410+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16411+ int len, __wsum sum,
16412+ int *src_err_ptr, int *dst_err_ptr);
16413+
16414+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16415+ int len, __wsum sum,
16416+ int *src_err_ptr, int *dst_err_ptr);
16417+
16418 /*
16419 * Note: when you get a NULL pointer exception here this means someone
16420 * passed in an incorrect kernel address to one of these functions.
16421@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16422
16423 might_sleep();
16424 stac();
16425- ret = csum_partial_copy_generic((__force void *)src, dst,
16426+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16427 len, sum, err_ptr, NULL);
16428 clac();
16429
16430@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16431 might_sleep();
16432 if (access_ok(VERIFY_WRITE, dst, len)) {
16433 stac();
16434- ret = csum_partial_copy_generic(src, (__force void *)dst,
16435+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16436 len, sum, NULL, err_ptr);
16437 clac();
16438 return ret;
16439diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16440index 99c105d7..2f667ac 100644
16441--- a/arch/x86/include/asm/cmpxchg.h
16442+++ b/arch/x86/include/asm/cmpxchg.h
16443@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16444 __compiletime_error("Bad argument size for cmpxchg");
16445 extern void __xadd_wrong_size(void)
16446 __compiletime_error("Bad argument size for xadd");
16447+extern void __xadd_check_overflow_wrong_size(void)
16448+ __compiletime_error("Bad argument size for xadd_check_overflow");
16449 extern void __add_wrong_size(void)
16450 __compiletime_error("Bad argument size for add");
16451+extern void __add_check_overflow_wrong_size(void)
16452+ __compiletime_error("Bad argument size for add_check_overflow");
16453
16454 /*
16455 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16456@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16457 __ret; \
16458 })
16459
16460+#ifdef CONFIG_PAX_REFCOUNT
16461+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16462+ ({ \
16463+ __typeof__ (*(ptr)) __ret = (arg); \
16464+ switch (sizeof(*(ptr))) { \
16465+ case __X86_CASE_L: \
16466+ asm volatile (lock #op "l %0, %1\n" \
16467+ "jno 0f\n" \
16468+ "mov %0,%1\n" \
16469+ "int $4\n0:\n" \
16470+ _ASM_EXTABLE(0b, 0b) \
16471+ : "+r" (__ret), "+m" (*(ptr)) \
16472+ : : "memory", "cc"); \
16473+ break; \
16474+ case __X86_CASE_Q: \
16475+ asm volatile (lock #op "q %q0, %1\n" \
16476+ "jno 0f\n" \
16477+ "mov %0,%1\n" \
16478+ "int $4\n0:\n" \
16479+ _ASM_EXTABLE(0b, 0b) \
16480+ : "+r" (__ret), "+m" (*(ptr)) \
16481+ : : "memory", "cc"); \
16482+ break; \
16483+ default: \
16484+ __ ## op ## _check_overflow_wrong_size(); \
16485+ } \
16486+ __ret; \
16487+ })
16488+#else
16489+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16490+#endif
16491+
16492 /*
16493 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16494 * Since this is generally used to protect other memory information, we
16495@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16496 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16497 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16498
16499+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16500+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16501+
16502 #define __add(ptr, inc, lock) \
16503 ({ \
16504 __typeof__ (*(ptr)) __ret = (inc); \
16505diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16506index 59c6c40..5e0b22c 100644
16507--- a/arch/x86/include/asm/compat.h
16508+++ b/arch/x86/include/asm/compat.h
16509@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16510 typedef u32 compat_uint_t;
16511 typedef u32 compat_ulong_t;
16512 typedef u64 __attribute__((aligned(4))) compat_u64;
16513-typedef u32 compat_uptr_t;
16514+typedef u32 __user compat_uptr_t;
16515
16516 struct compat_timespec {
16517 compat_time_t tv_sec;
16518diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16519index aede2c3..40d7a8f 100644
16520--- a/arch/x86/include/asm/cpufeature.h
16521+++ b/arch/x86/include/asm/cpufeature.h
16522@@ -212,7 +212,7 @@
16523 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16524 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16525 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16526-
16527+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16528
16529 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16530 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16531@@ -220,7 +220,7 @@
16532 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16533 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16534 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16535-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16536+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16537 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16538 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16539 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16540@@ -388,6 +388,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16541 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16542 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16543 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16544+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16545
16546 #if __GNUC__ >= 4
16547 extern void warn_pre_alternatives(void);
16548@@ -439,7 +440,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16549
16550 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16551 t_warn:
16552- warn_pre_alternatives();
16553+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16554+ warn_pre_alternatives();
16555 return false;
16556 #endif
16557
16558@@ -459,7 +461,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16559 ".section .discard,\"aw\",@progbits\n"
16560 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16561 ".previous\n"
16562- ".section .altinstr_replacement,\"ax\"\n"
16563+ ".section .altinstr_replacement,\"a\"\n"
16564 "3: movb $1,%0\n"
16565 "4:\n"
16566 ".previous\n"
16567@@ -496,7 +498,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16568 " .byte 2b - 1b\n" /* src len */
16569 " .byte 4f - 3f\n" /* repl len */
16570 ".previous\n"
16571- ".section .altinstr_replacement,\"ax\"\n"
16572+ ".section .altinstr_replacement,\"a\"\n"
16573 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16574 "4:\n"
16575 ".previous\n"
16576@@ -529,7 +531,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16577 ".section .discard,\"aw\",@progbits\n"
16578 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16579 ".previous\n"
16580- ".section .altinstr_replacement,\"ax\"\n"
16581+ ".section .altinstr_replacement,\"a\"\n"
16582 "3: movb $0,%0\n"
16583 "4:\n"
16584 ".previous\n"
16585@@ -543,7 +545,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16586 ".section .discard,\"aw\",@progbits\n"
16587 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16588 ".previous\n"
16589- ".section .altinstr_replacement,\"ax\"\n"
16590+ ".section .altinstr_replacement,\"a\"\n"
16591 "5: movb $1,%0\n"
16592 "6:\n"
16593 ".previous\n"
16594diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16595index a94b82e..59ecefa 100644
16596--- a/arch/x86/include/asm/desc.h
16597+++ b/arch/x86/include/asm/desc.h
16598@@ -4,6 +4,7 @@
16599 #include <asm/desc_defs.h>
16600 #include <asm/ldt.h>
16601 #include <asm/mmu.h>
16602+#include <asm/pgtable.h>
16603
16604 #include <linux/smp.h>
16605 #include <linux/percpu.h>
16606@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16607
16608 desc->type = (info->read_exec_only ^ 1) << 1;
16609 desc->type |= info->contents << 2;
16610+ desc->type |= info->seg_not_present ^ 1;
16611
16612 desc->s = 1;
16613 desc->dpl = 0x3;
16614@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16615 }
16616
16617 extern struct desc_ptr idt_descr;
16618-extern gate_desc idt_table[];
16619-extern struct desc_ptr debug_idt_descr;
16620-extern gate_desc debug_idt_table[];
16621-
16622-struct gdt_page {
16623- struct desc_struct gdt[GDT_ENTRIES];
16624-} __attribute__((aligned(PAGE_SIZE)));
16625-
16626-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16627+extern gate_desc idt_table[IDT_ENTRIES];
16628+extern const struct desc_ptr debug_idt_descr;
16629+extern gate_desc debug_idt_table[IDT_ENTRIES];
16630
16631+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16632 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16633 {
16634- return per_cpu(gdt_page, cpu).gdt;
16635+ return cpu_gdt_table[cpu];
16636 }
16637
16638 #ifdef CONFIG_X86_64
16639@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16640 unsigned long base, unsigned dpl, unsigned flags,
16641 unsigned short seg)
16642 {
16643- gate->a = (seg << 16) | (base & 0xffff);
16644- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16645+ gate->gate.offset_low = base;
16646+ gate->gate.seg = seg;
16647+ gate->gate.reserved = 0;
16648+ gate->gate.type = type;
16649+ gate->gate.s = 0;
16650+ gate->gate.dpl = dpl;
16651+ gate->gate.p = 1;
16652+ gate->gate.offset_high = base >> 16;
16653 }
16654
16655 #endif
16656@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16657
16658 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16659 {
16660+ pax_open_kernel();
16661 memcpy(&idt[entry], gate, sizeof(*gate));
16662+ pax_close_kernel();
16663 }
16664
16665 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16666 {
16667+ pax_open_kernel();
16668 memcpy(&ldt[entry], desc, 8);
16669+ pax_close_kernel();
16670 }
16671
16672 static inline void
16673@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16674 default: size = sizeof(*gdt); break;
16675 }
16676
16677+ pax_open_kernel();
16678 memcpy(&gdt[entry], desc, size);
16679+ pax_close_kernel();
16680 }
16681
16682 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16683@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16684
16685 static inline void native_load_tr_desc(void)
16686 {
16687+ pax_open_kernel();
16688 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16689+ pax_close_kernel();
16690 }
16691
16692 static inline void native_load_gdt(const struct desc_ptr *dtr)
16693@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16694 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16695 unsigned int i;
16696
16697+ pax_open_kernel();
16698 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16699 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16700+ pax_close_kernel();
16701 }
16702
16703 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16704@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16705 preempt_enable();
16706 }
16707
16708-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16709+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16710 {
16711 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16712 }
16713@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16714 }
16715
16716 #ifdef CONFIG_X86_64
16717-static inline void set_nmi_gate(int gate, void *addr)
16718+static inline void set_nmi_gate(int gate, const void *addr)
16719 {
16720 gate_desc s;
16721
16722@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16723 #endif
16724
16725 #ifdef CONFIG_TRACING
16726-extern struct desc_ptr trace_idt_descr;
16727-extern gate_desc trace_idt_table[];
16728+extern const struct desc_ptr trace_idt_descr;
16729+extern gate_desc trace_idt_table[IDT_ENTRIES];
16730 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16731 {
16732 write_idt_entry(trace_idt_table, entry, gate);
16733 }
16734
16735-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16736+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16737 unsigned dpl, unsigned ist, unsigned seg)
16738 {
16739 gate_desc s;
16740@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16741 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16742 #endif
16743
16744-static inline void _set_gate(int gate, unsigned type, void *addr,
16745+static inline void _set_gate(int gate, unsigned type, const void *addr,
16746 unsigned dpl, unsigned ist, unsigned seg)
16747 {
16748 gate_desc s;
16749@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16750 #define set_intr_gate(n, addr) \
16751 do { \
16752 BUG_ON((unsigned)n > 0xFF); \
16753- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16754+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16755 __KERNEL_CS); \
16756- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16757+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16758 0, 0, __KERNEL_CS); \
16759 } while (0)
16760
16761@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16762 /*
16763 * This routine sets up an interrupt gate at directory privilege level 3.
16764 */
16765-static inline void set_system_intr_gate(unsigned int n, void *addr)
16766+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16767 {
16768 BUG_ON((unsigned)n > 0xFF);
16769 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16770 }
16771
16772-static inline void set_system_trap_gate(unsigned int n, void *addr)
16773+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16774 {
16775 BUG_ON((unsigned)n > 0xFF);
16776 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16777 }
16778
16779-static inline void set_trap_gate(unsigned int n, void *addr)
16780+static inline void set_trap_gate(unsigned int n, const void *addr)
16781 {
16782 BUG_ON((unsigned)n > 0xFF);
16783 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16784@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16785 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16786 {
16787 BUG_ON((unsigned)n > 0xFF);
16788- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16789+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16790 }
16791
16792-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16793+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16794 {
16795 BUG_ON((unsigned)n > 0xFF);
16796 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16797 }
16798
16799-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16800+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16801 {
16802 BUG_ON((unsigned)n > 0xFF);
16803 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16804@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16805 else
16806 load_idt((const struct desc_ptr *)&idt_descr);
16807 }
16808+
16809+#ifdef CONFIG_X86_32
16810+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16811+{
16812+ struct desc_struct d;
16813+
16814+ if (likely(limit))
16815+ limit = (limit - 1UL) >> PAGE_SHIFT;
16816+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16817+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16818+}
16819+#endif
16820+
16821 #endif /* _ASM_X86_DESC_H */
16822diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16823index 278441f..b95a174 100644
16824--- a/arch/x86/include/asm/desc_defs.h
16825+++ b/arch/x86/include/asm/desc_defs.h
16826@@ -31,6 +31,12 @@ struct desc_struct {
16827 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16828 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16829 };
16830+ struct {
16831+ u16 offset_low;
16832+ u16 seg;
16833+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16834+ unsigned offset_high: 16;
16835+ } gate;
16836 };
16837 } __attribute__((packed));
16838
16839diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16840index ced283a..ffe04cc 100644
16841--- a/arch/x86/include/asm/div64.h
16842+++ b/arch/x86/include/asm/div64.h
16843@@ -39,7 +39,7 @@
16844 __mod; \
16845 })
16846
16847-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16848+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16849 {
16850 union {
16851 u64 v64;
16852diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16853index ca3347a..1a5082a 100644
16854--- a/arch/x86/include/asm/elf.h
16855+++ b/arch/x86/include/asm/elf.h
16856@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16857
16858 #include <asm/vdso.h>
16859
16860-#ifdef CONFIG_X86_64
16861-extern unsigned int vdso64_enabled;
16862-#endif
16863 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16864 extern unsigned int vdso32_enabled;
16865 #endif
16866@@ -249,7 +246,25 @@ extern int force_personality32;
16867 the loader. We need to make sure that it is out of the way of the program
16868 that it will "exec", and that there is sufficient room for the brk. */
16869
16870+#ifdef CONFIG_PAX_SEGMEXEC
16871+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16872+#else
16873 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16874+#endif
16875+
16876+#ifdef CONFIG_PAX_ASLR
16877+#ifdef CONFIG_X86_32
16878+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16879+
16880+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16881+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16882+#else
16883+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16884+
16885+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16886+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16887+#endif
16888+#endif
16889
16890 /* This yields a mask that user programs can use to figure out what
16891 instruction set this CPU supports. This could be done in user space,
16892@@ -298,17 +313,13 @@ do { \
16893
16894 #define ARCH_DLINFO \
16895 do { \
16896- if (vdso64_enabled) \
16897- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16898- (unsigned long __force)current->mm->context.vdso); \
16899+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16900 } while (0)
16901
16902 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16903 #define ARCH_DLINFO_X32 \
16904 do { \
16905- if (vdso64_enabled) \
16906- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16907- (unsigned long __force)current->mm->context.vdso); \
16908+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16909 } while (0)
16910
16911 #define AT_SYSINFO 32
16912@@ -323,10 +334,10 @@ else \
16913
16914 #endif /* !CONFIG_X86_32 */
16915
16916-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16917+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16918
16919 #define VDSO_ENTRY \
16920- ((unsigned long)current->mm->context.vdso + \
16921+ (current->mm->context.vdso + \
16922 selected_vdso32->sym___kernel_vsyscall)
16923
16924 struct linux_binprm;
16925@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16926 int uses_interp);
16927 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16928
16929-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16930-#define arch_randomize_brk arch_randomize_brk
16931-
16932 /*
16933 * True on X86_32 or when emulating IA32 on X86_64
16934 */
16935diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16936index 77a99ac..39ff7f5 100644
16937--- a/arch/x86/include/asm/emergency-restart.h
16938+++ b/arch/x86/include/asm/emergency-restart.h
16939@@ -1,6 +1,6 @@
16940 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16941 #define _ASM_X86_EMERGENCY_RESTART_H
16942
16943-extern void machine_emergency_restart(void);
16944+extern void machine_emergency_restart(void) __noreturn;
16945
16946 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16947diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16948index 1c7eefe..d0e4702 100644
16949--- a/arch/x86/include/asm/floppy.h
16950+++ b/arch/x86/include/asm/floppy.h
16951@@ -229,18 +229,18 @@ static struct fd_routine_l {
16952 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16953 } fd_routine[] = {
16954 {
16955- request_dma,
16956- free_dma,
16957- get_dma_residue,
16958- dma_mem_alloc,
16959- hard_dma_setup
16960+ ._request_dma = request_dma,
16961+ ._free_dma = free_dma,
16962+ ._get_dma_residue = get_dma_residue,
16963+ ._dma_mem_alloc = dma_mem_alloc,
16964+ ._dma_setup = hard_dma_setup
16965 },
16966 {
16967- vdma_request_dma,
16968- vdma_nop,
16969- vdma_get_dma_residue,
16970- vdma_mem_alloc,
16971- vdma_dma_setup
16972+ ._request_dma = vdma_request_dma,
16973+ ._free_dma = vdma_nop,
16974+ ._get_dma_residue = vdma_get_dma_residue,
16975+ ._dma_mem_alloc = vdma_mem_alloc,
16976+ ._dma_setup = vdma_dma_setup
16977 }
16978 };
16979
16980diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16981index f895358..800c60d 100644
16982--- a/arch/x86/include/asm/fpu-internal.h
16983+++ b/arch/x86/include/asm/fpu-internal.h
16984@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16985 #define user_insn(insn, output, input...) \
16986 ({ \
16987 int err; \
16988+ pax_open_userland(); \
16989 asm volatile(ASM_STAC "\n" \
16990- "1:" #insn "\n\t" \
16991+ "1:" \
16992+ __copyuser_seg \
16993+ #insn "\n\t" \
16994 "2: " ASM_CLAC "\n" \
16995 ".section .fixup,\"ax\"\n" \
16996 "3: movl $-1,%[err]\n" \
16997@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16998 _ASM_EXTABLE(1b, 3b) \
16999 : [err] "=r" (err), output \
17000 : "0"(0), input); \
17001+ pax_close_userland(); \
17002 err; \
17003 })
17004
17005@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
17006 "fnclex\n\t"
17007 "emms\n\t"
17008 "fildl %P[addr]" /* set F?P to defined value */
17009- : : [addr] "m" (tsk->thread.fpu.has_fpu));
17010+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
17011 }
17012
17013 return fpu_restore_checking(&tsk->thread.fpu);
17014diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
17015index b4c1f54..e290c08 100644
17016--- a/arch/x86/include/asm/futex.h
17017+++ b/arch/x86/include/asm/futex.h
17018@@ -12,6 +12,7 @@
17019 #include <asm/smap.h>
17020
17021 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
17022+ typecheck(u32 __user *, uaddr); \
17023 asm volatile("\t" ASM_STAC "\n" \
17024 "1:\t" insn "\n" \
17025 "2:\t" ASM_CLAC "\n" \
17026@@ -20,15 +21,16 @@
17027 "\tjmp\t2b\n" \
17028 "\t.previous\n" \
17029 _ASM_EXTABLE(1b, 3b) \
17030- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
17031+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
17032 : "i" (-EFAULT), "0" (oparg), "1" (0))
17033
17034 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
17035+ typecheck(u32 __user *, uaddr); \
17036 asm volatile("\t" ASM_STAC "\n" \
17037 "1:\tmovl %2, %0\n" \
17038 "\tmovl\t%0, %3\n" \
17039 "\t" insn "\n" \
17040- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
17041+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
17042 "\tjnz\t1b\n" \
17043 "3:\t" ASM_CLAC "\n" \
17044 "\t.section .fixup,\"ax\"\n" \
17045@@ -38,7 +40,7 @@
17046 _ASM_EXTABLE(1b, 4b) \
17047 _ASM_EXTABLE(2b, 4b) \
17048 : "=&a" (oldval), "=&r" (ret), \
17049- "+m" (*uaddr), "=&r" (tem) \
17050+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17051 : "r" (oparg), "i" (-EFAULT), "1" (0))
17052
17053 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17054@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17055
17056 pagefault_disable();
17057
17058+ pax_open_userland();
17059 switch (op) {
17060 case FUTEX_OP_SET:
17061- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17062+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17063 break;
17064 case FUTEX_OP_ADD:
17065- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17066+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17067 uaddr, oparg);
17068 break;
17069 case FUTEX_OP_OR:
17070@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17071 default:
17072 ret = -ENOSYS;
17073 }
17074+ pax_close_userland();
17075
17076 pagefault_enable();
17077
17078diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17079index 9662290..49ca5e5 100644
17080--- a/arch/x86/include/asm/hw_irq.h
17081+++ b/arch/x86/include/asm/hw_irq.h
17082@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17083 #endif /* CONFIG_X86_LOCAL_APIC */
17084
17085 /* Statistics */
17086-extern atomic_t irq_err_count;
17087-extern atomic_t irq_mis_count;
17088+extern atomic_unchecked_t irq_err_count;
17089+extern atomic_unchecked_t irq_mis_count;
17090
17091 /* EISA */
17092 extern void eisa_set_level_irq(unsigned int irq);
17093diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17094index ccffa53..3c90c87 100644
17095--- a/arch/x86/include/asm/i8259.h
17096+++ b/arch/x86/include/asm/i8259.h
17097@@ -62,7 +62,7 @@ struct legacy_pic {
17098 void (*init)(int auto_eoi);
17099 int (*irq_pending)(unsigned int irq);
17100 void (*make_irq)(unsigned int irq);
17101-};
17102+} __do_const;
17103
17104 extern struct legacy_pic *legacy_pic;
17105 extern struct legacy_pic null_legacy_pic;
17106diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17107index 34a5b93..27e40a6 100644
17108--- a/arch/x86/include/asm/io.h
17109+++ b/arch/x86/include/asm/io.h
17110@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17111 "m" (*(volatile type __force *)addr) barrier); }
17112
17113 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17114-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17115-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17116+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17117+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17118
17119 build_mmio_read(__readb, "b", unsigned char, "=q", )
17120-build_mmio_read(__readw, "w", unsigned short, "=r", )
17121-build_mmio_read(__readl, "l", unsigned int, "=r", )
17122+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17123+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17124
17125 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17126 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17127@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17128 * this function
17129 */
17130
17131-static inline phys_addr_t virt_to_phys(volatile void *address)
17132+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17133 {
17134 return __pa(address);
17135 }
17136@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17137 return ioremap_nocache(offset, size);
17138 }
17139
17140-extern void iounmap(volatile void __iomem *addr);
17141+extern void iounmap(const volatile void __iomem *addr);
17142
17143 extern void set_iounmap_nonlazy(void);
17144
17145@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17146
17147 #include <linux/vmalloc.h>
17148
17149+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17150+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17151+{
17152+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17153+}
17154+
17155+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17156+{
17157+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17158+}
17159+
17160 /*
17161 * Convert a virtual cached pointer to an uncached pointer
17162 */
17163diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17164index 0a8b519..80e7d5b 100644
17165--- a/arch/x86/include/asm/irqflags.h
17166+++ b/arch/x86/include/asm/irqflags.h
17167@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17168 sti; \
17169 sysexit
17170
17171+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17172+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17173+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17174+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17175+
17176 #else
17177 #define INTERRUPT_RETURN iret
17178 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17179diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17180index 4421b5d..8543006 100644
17181--- a/arch/x86/include/asm/kprobes.h
17182+++ b/arch/x86/include/asm/kprobes.h
17183@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17184 #define RELATIVEJUMP_SIZE 5
17185 #define RELATIVECALL_OPCODE 0xe8
17186 #define RELATIVE_ADDR_SIZE 4
17187-#define MAX_STACK_SIZE 64
17188-#define MIN_STACK_SIZE(ADDR) \
17189- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17190- THREAD_SIZE - (unsigned long)(ADDR))) \
17191- ? (MAX_STACK_SIZE) \
17192- : (((unsigned long)current_thread_info()) + \
17193- THREAD_SIZE - (unsigned long)(ADDR)))
17194+#define MAX_STACK_SIZE 64UL
17195+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17196
17197 #define flush_insn_slot(p) do { } while (0)
17198
17199diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17200index d89c6b8..e711c69 100644
17201--- a/arch/x86/include/asm/kvm_host.h
17202+++ b/arch/x86/include/asm/kvm_host.h
17203@@ -51,7 +51,7 @@
17204 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17205
17206 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17207-#define CR3_PCID_INVD (1UL << 63)
17208+#define CR3_PCID_INVD (1ULL << 63)
17209 #define CR4_RESERVED_BITS \
17210 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17211 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17212diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17213index 4ad6560..75c7bdd 100644
17214--- a/arch/x86/include/asm/local.h
17215+++ b/arch/x86/include/asm/local.h
17216@@ -10,33 +10,97 @@ typedef struct {
17217 atomic_long_t a;
17218 } local_t;
17219
17220+typedef struct {
17221+ atomic_long_unchecked_t a;
17222+} local_unchecked_t;
17223+
17224 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17225
17226 #define local_read(l) atomic_long_read(&(l)->a)
17227+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17228 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17229+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17230
17231 static inline void local_inc(local_t *l)
17232 {
17233- asm volatile(_ASM_INC "%0"
17234+ asm volatile(_ASM_INC "%0\n"
17235+
17236+#ifdef CONFIG_PAX_REFCOUNT
17237+ "jno 0f\n"
17238+ _ASM_DEC "%0\n"
17239+ "int $4\n0:\n"
17240+ _ASM_EXTABLE(0b, 0b)
17241+#endif
17242+
17243+ : "+m" (l->a.counter));
17244+}
17245+
17246+static inline void local_inc_unchecked(local_unchecked_t *l)
17247+{
17248+ asm volatile(_ASM_INC "%0\n"
17249 : "+m" (l->a.counter));
17250 }
17251
17252 static inline void local_dec(local_t *l)
17253 {
17254- asm volatile(_ASM_DEC "%0"
17255+ asm volatile(_ASM_DEC "%0\n"
17256+
17257+#ifdef CONFIG_PAX_REFCOUNT
17258+ "jno 0f\n"
17259+ _ASM_INC "%0\n"
17260+ "int $4\n0:\n"
17261+ _ASM_EXTABLE(0b, 0b)
17262+#endif
17263+
17264+ : "+m" (l->a.counter));
17265+}
17266+
17267+static inline void local_dec_unchecked(local_unchecked_t *l)
17268+{
17269+ asm volatile(_ASM_DEC "%0\n"
17270 : "+m" (l->a.counter));
17271 }
17272
17273 static inline void local_add(long i, local_t *l)
17274 {
17275- asm volatile(_ASM_ADD "%1,%0"
17276+ asm volatile(_ASM_ADD "%1,%0\n"
17277+
17278+#ifdef CONFIG_PAX_REFCOUNT
17279+ "jno 0f\n"
17280+ _ASM_SUB "%1,%0\n"
17281+ "int $4\n0:\n"
17282+ _ASM_EXTABLE(0b, 0b)
17283+#endif
17284+
17285+ : "+m" (l->a.counter)
17286+ : "ir" (i));
17287+}
17288+
17289+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17290+{
17291+ asm volatile(_ASM_ADD "%1,%0\n"
17292 : "+m" (l->a.counter)
17293 : "ir" (i));
17294 }
17295
17296 static inline void local_sub(long i, local_t *l)
17297 {
17298- asm volatile(_ASM_SUB "%1,%0"
17299+ asm volatile(_ASM_SUB "%1,%0\n"
17300+
17301+#ifdef CONFIG_PAX_REFCOUNT
17302+ "jno 0f\n"
17303+ _ASM_ADD "%1,%0\n"
17304+ "int $4\n0:\n"
17305+ _ASM_EXTABLE(0b, 0b)
17306+#endif
17307+
17308+ : "+m" (l->a.counter)
17309+ : "ir" (i));
17310+}
17311+
17312+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17313+{
17314+ asm volatile(_ASM_SUB "%1,%0\n"
17315 : "+m" (l->a.counter)
17316 : "ir" (i));
17317 }
17318@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17319 */
17320 static inline int local_sub_and_test(long i, local_t *l)
17321 {
17322- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17323+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17324 }
17325
17326 /**
17327@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17328 */
17329 static inline int local_dec_and_test(local_t *l)
17330 {
17331- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17332+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17333 }
17334
17335 /**
17336@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17337 */
17338 static inline int local_inc_and_test(local_t *l)
17339 {
17340- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17341+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17342 }
17343
17344 /**
17345@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17346 */
17347 static inline int local_add_negative(long i, local_t *l)
17348 {
17349- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17350+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17351 }
17352
17353 /**
17354@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17355 static inline long local_add_return(long i, local_t *l)
17356 {
17357 long __i = i;
17358+ asm volatile(_ASM_XADD "%0, %1\n"
17359+
17360+#ifdef CONFIG_PAX_REFCOUNT
17361+ "jno 0f\n"
17362+ _ASM_MOV "%0,%1\n"
17363+ "int $4\n0:\n"
17364+ _ASM_EXTABLE(0b, 0b)
17365+#endif
17366+
17367+ : "+r" (i), "+m" (l->a.counter)
17368+ : : "memory");
17369+ return i + __i;
17370+}
17371+
17372+/**
17373+ * local_add_return_unchecked - add and return
17374+ * @i: integer value to add
17375+ * @l: pointer to type local_unchecked_t
17376+ *
17377+ * Atomically adds @i to @l and returns @i + @l
17378+ */
17379+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17380+{
17381+ long __i = i;
17382 asm volatile(_ASM_XADD "%0, %1;"
17383 : "+r" (i), "+m" (l->a.counter)
17384 : : "memory");
17385@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17386
17387 #define local_cmpxchg(l, o, n) \
17388 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17389+#define local_cmpxchg_unchecked(l, o, n) \
17390+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17391 /* Always has a lock prefix */
17392 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17393
17394diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17395new file mode 100644
17396index 0000000..2bfd3ba
17397--- /dev/null
17398+++ b/arch/x86/include/asm/mman.h
17399@@ -0,0 +1,15 @@
17400+#ifndef _X86_MMAN_H
17401+#define _X86_MMAN_H
17402+
17403+#include <uapi/asm/mman.h>
17404+
17405+#ifdef __KERNEL__
17406+#ifndef __ASSEMBLY__
17407+#ifdef CONFIG_X86_32
17408+#define arch_mmap_check i386_mmap_check
17409+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17410+#endif
17411+#endif
17412+#endif
17413+
17414+#endif /* X86_MMAN_H */
17415diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17416index 876e74e..e20bfb1 100644
17417--- a/arch/x86/include/asm/mmu.h
17418+++ b/arch/x86/include/asm/mmu.h
17419@@ -9,7 +9,7 @@
17420 * we put the segment information here.
17421 */
17422 typedef struct {
17423- void *ldt;
17424+ struct desc_struct *ldt;
17425 int size;
17426
17427 #ifdef CONFIG_X86_64
17428@@ -18,7 +18,19 @@ typedef struct {
17429 #endif
17430
17431 struct mutex lock;
17432- void __user *vdso;
17433+ unsigned long vdso;
17434+
17435+#ifdef CONFIG_X86_32
17436+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17437+ unsigned long user_cs_base;
17438+ unsigned long user_cs_limit;
17439+
17440+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17441+ cpumask_t cpu_user_cs_mask;
17442+#endif
17443+
17444+#endif
17445+#endif
17446 } mm_context_t;
17447
17448 #ifdef CONFIG_SMP
17449diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17450index 4b75d59..8ffacb6 100644
17451--- a/arch/x86/include/asm/mmu_context.h
17452+++ b/arch/x86/include/asm/mmu_context.h
17453@@ -27,6 +27,20 @@ void destroy_context(struct mm_struct *mm);
17454
17455 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17456 {
17457+
17458+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17459+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17460+ unsigned int i;
17461+ pgd_t *pgd;
17462+
17463+ pax_open_kernel();
17464+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17465+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17466+ set_pgd_batched(pgd+i, native_make_pgd(0));
17467+ pax_close_kernel();
17468+ }
17469+#endif
17470+
17471 #ifdef CONFIG_SMP
17472 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17473 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17474@@ -37,16 +51,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17475 struct task_struct *tsk)
17476 {
17477 unsigned cpu = smp_processor_id();
17478+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17479+ int tlbstate = TLBSTATE_OK;
17480+#endif
17481
17482 if (likely(prev != next)) {
17483 #ifdef CONFIG_SMP
17484+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17485+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17486+#endif
17487 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17488 this_cpu_write(cpu_tlbstate.active_mm, next);
17489 #endif
17490 cpumask_set_cpu(cpu, mm_cpumask(next));
17491
17492 /* Re-load page tables */
17493+#ifdef CONFIG_PAX_PER_CPU_PGD
17494+ pax_open_kernel();
17495+
17496+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17497+ if (static_cpu_has(X86_FEATURE_PCID))
17498+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17499+ else
17500+#endif
17501+
17502+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17503+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17504+ pax_close_kernel();
17505+ 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));
17506+
17507+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17508+ if (static_cpu_has(X86_FEATURE_PCID)) {
17509+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17510+ u64 descriptor[2];
17511+ descriptor[0] = PCID_USER;
17512+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17513+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17514+ descriptor[0] = PCID_KERNEL;
17515+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17516+ }
17517+ } else {
17518+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17519+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17520+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17521+ else
17522+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17523+ }
17524+ } else
17525+#endif
17526+
17527+ load_cr3(get_cpu_pgd(cpu, kernel));
17528+#else
17529 load_cr3(next->pgd);
17530+#endif
17531 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17532
17533 /* Stop flush ipis for the previous mm */
17534@@ -64,9 +121,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17535 */
17536 if (unlikely(prev->context.ldt != next->context.ldt))
17537 load_LDT_nolock(&next->context);
17538+
17539+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17540+ if (!(__supported_pte_mask & _PAGE_NX)) {
17541+ smp_mb__before_atomic();
17542+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17543+ smp_mb__after_atomic();
17544+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17545+ }
17546+#endif
17547+
17548+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17549+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17550+ prev->context.user_cs_limit != next->context.user_cs_limit))
17551+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17552+#ifdef CONFIG_SMP
17553+ else if (unlikely(tlbstate != TLBSTATE_OK))
17554+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17555+#endif
17556+#endif
17557+
17558 }
17559+ else {
17560+
17561+#ifdef CONFIG_PAX_PER_CPU_PGD
17562+ pax_open_kernel();
17563+
17564+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17565+ if (static_cpu_has(X86_FEATURE_PCID))
17566+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17567+ else
17568+#endif
17569+
17570+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17571+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17572+ pax_close_kernel();
17573+ 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));
17574+
17575+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17576+ if (static_cpu_has(X86_FEATURE_PCID)) {
17577+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17578+ u64 descriptor[2];
17579+ descriptor[0] = PCID_USER;
17580+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17581+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17582+ descriptor[0] = PCID_KERNEL;
17583+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17584+ }
17585+ } else {
17586+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17587+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17588+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17589+ else
17590+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17591+ }
17592+ } else
17593+#endif
17594+
17595+ load_cr3(get_cpu_pgd(cpu, kernel));
17596+#endif
17597+
17598 #ifdef CONFIG_SMP
17599- else {
17600 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17601 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17602
17603@@ -83,12 +198,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17604 * tlb flush IPI delivery. We must reload CR3
17605 * to make sure to use no freed page tables.
17606 */
17607+
17608+#ifndef CONFIG_PAX_PER_CPU_PGD
17609 load_cr3(next->pgd);
17610 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17611+#endif
17612+
17613 load_LDT_nolock(&next->context);
17614+
17615+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17616+ if (!(__supported_pte_mask & _PAGE_NX))
17617+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17618+#endif
17619+
17620+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17621+#ifdef CONFIG_PAX_PAGEEXEC
17622+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17623+#endif
17624+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17625+#endif
17626+
17627 }
17628+#endif
17629 }
17630-#endif
17631 }
17632
17633 #define activate_mm(prev, next) \
17634diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17635index e3b7819..b257c64 100644
17636--- a/arch/x86/include/asm/module.h
17637+++ b/arch/x86/include/asm/module.h
17638@@ -5,6 +5,7 @@
17639
17640 #ifdef CONFIG_X86_64
17641 /* X86_64 does not define MODULE_PROC_FAMILY */
17642+#define MODULE_PROC_FAMILY ""
17643 #elif defined CONFIG_M486
17644 #define MODULE_PROC_FAMILY "486 "
17645 #elif defined CONFIG_M586
17646@@ -57,8 +58,20 @@
17647 #error unknown processor family
17648 #endif
17649
17650-#ifdef CONFIG_X86_32
17651-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17652+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17653+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17654+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17655+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17656+#else
17657+#define MODULE_PAX_KERNEXEC ""
17658 #endif
17659
17660+#ifdef CONFIG_PAX_MEMORY_UDEREF
17661+#define MODULE_PAX_UDEREF "UDEREF "
17662+#else
17663+#define MODULE_PAX_UDEREF ""
17664+#endif
17665+
17666+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17667+
17668 #endif /* _ASM_X86_MODULE_H */
17669diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17670index 5f2fc44..106caa6 100644
17671--- a/arch/x86/include/asm/nmi.h
17672+++ b/arch/x86/include/asm/nmi.h
17673@@ -36,26 +36,35 @@ enum {
17674
17675 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17676
17677+struct nmiaction;
17678+
17679+struct nmiwork {
17680+ const struct nmiaction *action;
17681+ u64 max_duration;
17682+ struct irq_work irq_work;
17683+};
17684+
17685 struct nmiaction {
17686 struct list_head list;
17687 nmi_handler_t handler;
17688- u64 max_duration;
17689- struct irq_work irq_work;
17690 unsigned long flags;
17691 const char *name;
17692-};
17693+ struct nmiwork *work;
17694+} __do_const;
17695
17696 #define register_nmi_handler(t, fn, fg, n, init...) \
17697 ({ \
17698- static struct nmiaction init fn##_na = { \
17699+ static struct nmiwork fn##_nw; \
17700+ static const struct nmiaction init fn##_na = { \
17701 .handler = (fn), \
17702 .name = (n), \
17703 .flags = (fg), \
17704+ .work = &fn##_nw, \
17705 }; \
17706 __register_nmi_handler((t), &fn##_na); \
17707 })
17708
17709-int __register_nmi_handler(unsigned int, struct nmiaction *);
17710+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17711
17712 void unregister_nmi_handler(unsigned int, const char *);
17713
17714diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17715index 802dde3..9183e68 100644
17716--- a/arch/x86/include/asm/page.h
17717+++ b/arch/x86/include/asm/page.h
17718@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17719 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17720
17721 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17722+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17723
17724 #define __boot_va(x) __va(x)
17725 #define __boot_pa(x) __pa(x)
17726@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17727 * virt_to_page(kaddr) returns a valid pointer if and only if
17728 * virt_addr_valid(kaddr) returns true.
17729 */
17730-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17731 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17732 extern bool __virt_addr_valid(unsigned long kaddr);
17733 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17734
17735+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17736+#define virt_to_page(kaddr) \
17737+ ({ \
17738+ const void *__kaddr = (const void *)(kaddr); \
17739+ BUG_ON(!virt_addr_valid(__kaddr)); \
17740+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17741+ })
17742+#else
17743+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17744+#endif
17745+
17746 #endif /* __ASSEMBLY__ */
17747
17748 #include <asm-generic/memory_model.h>
17749diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17750index b3bebf9..13ac22e 100644
17751--- a/arch/x86/include/asm/page_64.h
17752+++ b/arch/x86/include/asm/page_64.h
17753@@ -7,9 +7,9 @@
17754
17755 /* duplicated to the one in bootmem.h */
17756 extern unsigned long max_pfn;
17757-extern unsigned long phys_base;
17758+extern const unsigned long phys_base;
17759
17760-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17761+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17762 {
17763 unsigned long y = x - __START_KERNEL_map;
17764
17765@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17766 }
17767
17768 #ifdef CONFIG_DEBUG_VIRTUAL
17769-extern unsigned long __phys_addr(unsigned long);
17770-extern unsigned long __phys_addr_symbol(unsigned long);
17771+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17772+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17773 #else
17774 #define __phys_addr(x) __phys_addr_nodebug(x)
17775 #define __phys_addr_symbol(x) \
17776diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17777index 32444ae..1a1624b 100644
17778--- a/arch/x86/include/asm/paravirt.h
17779+++ b/arch/x86/include/asm/paravirt.h
17780@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17781 return (pmd_t) { ret };
17782 }
17783
17784-static inline pmdval_t pmd_val(pmd_t pmd)
17785+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17786 {
17787 pmdval_t ret;
17788
17789@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17790 val);
17791 }
17792
17793+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17794+{
17795+ pgdval_t val = native_pgd_val(pgd);
17796+
17797+ if (sizeof(pgdval_t) > sizeof(long))
17798+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17799+ val, (u64)val >> 32);
17800+ else
17801+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17802+ val);
17803+}
17804+
17805 static inline void pgd_clear(pgd_t *pgdp)
17806 {
17807 set_pgd(pgdp, __pgd(0));
17808@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17809 pv_mmu_ops.set_fixmap(idx, phys, flags);
17810 }
17811
17812+#ifdef CONFIG_PAX_KERNEXEC
17813+static inline unsigned long pax_open_kernel(void)
17814+{
17815+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17816+}
17817+
17818+static inline unsigned long pax_close_kernel(void)
17819+{
17820+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17821+}
17822+#else
17823+static inline unsigned long pax_open_kernel(void) { return 0; }
17824+static inline unsigned long pax_close_kernel(void) { return 0; }
17825+#endif
17826+
17827 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17828
17829 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17830@@ -906,7 +933,7 @@ extern void default_banner(void);
17831
17832 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17833 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17834-#define PARA_INDIRECT(addr) *%cs:addr
17835+#define PARA_INDIRECT(addr) *%ss:addr
17836 #endif
17837
17838 #define INTERRUPT_RETURN \
17839@@ -981,6 +1008,21 @@ extern void default_banner(void);
17840 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17841 CLBR_NONE, \
17842 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17843+
17844+#define GET_CR0_INTO_RDI \
17845+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17846+ mov %rax,%rdi
17847+
17848+#define SET_RDI_INTO_CR0 \
17849+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17850+
17851+#define GET_CR3_INTO_RDI \
17852+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17853+ mov %rax,%rdi
17854+
17855+#define SET_RDI_INTO_CR3 \
17856+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17857+
17858 #endif /* CONFIG_X86_32 */
17859
17860 #endif /* __ASSEMBLY__ */
17861diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17862index 7549b8b..f0edfda 100644
17863--- a/arch/x86/include/asm/paravirt_types.h
17864+++ b/arch/x86/include/asm/paravirt_types.h
17865@@ -84,7 +84,7 @@ struct pv_init_ops {
17866 */
17867 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17868 unsigned long addr, unsigned len);
17869-};
17870+} __no_const __no_randomize_layout;
17871
17872
17873 struct pv_lazy_ops {
17874@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17875 void (*enter)(void);
17876 void (*leave)(void);
17877 void (*flush)(void);
17878-};
17879+} __no_randomize_layout;
17880
17881 struct pv_time_ops {
17882 unsigned long long (*sched_clock)(void);
17883 unsigned long long (*steal_clock)(int cpu);
17884 unsigned long (*get_tsc_khz)(void);
17885-};
17886+} __no_const __no_randomize_layout;
17887
17888 struct pv_cpu_ops {
17889 /* hooks for various privileged instructions */
17890@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17891
17892 void (*start_context_switch)(struct task_struct *prev);
17893 void (*end_context_switch)(struct task_struct *next);
17894-};
17895+} __no_const __no_randomize_layout;
17896
17897 struct pv_irq_ops {
17898 /*
17899@@ -215,7 +215,7 @@ struct pv_irq_ops {
17900 #ifdef CONFIG_X86_64
17901 void (*adjust_exception_frame)(void);
17902 #endif
17903-};
17904+} __no_randomize_layout;
17905
17906 struct pv_apic_ops {
17907 #ifdef CONFIG_X86_LOCAL_APIC
17908@@ -223,7 +223,7 @@ struct pv_apic_ops {
17909 unsigned long start_eip,
17910 unsigned long start_esp);
17911 #endif
17912-};
17913+} __no_const __no_randomize_layout;
17914
17915 struct pv_mmu_ops {
17916 unsigned long (*read_cr2)(void);
17917@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17918 struct paravirt_callee_save make_pud;
17919
17920 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17921+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17922 #endif /* PAGETABLE_LEVELS == 4 */
17923 #endif /* PAGETABLE_LEVELS >= 3 */
17924
17925@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17926 an mfn. We can tell which is which from the index. */
17927 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17928 phys_addr_t phys, pgprot_t flags);
17929-};
17930+
17931+#ifdef CONFIG_PAX_KERNEXEC
17932+ unsigned long (*pax_open_kernel)(void);
17933+ unsigned long (*pax_close_kernel)(void);
17934+#endif
17935+
17936+} __no_randomize_layout;
17937
17938 struct arch_spinlock;
17939 #ifdef CONFIG_SMP
17940@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17941 struct pv_lock_ops {
17942 struct paravirt_callee_save lock_spinning;
17943 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17944-};
17945+} __no_randomize_layout;
17946
17947 /* This contains all the paravirt structures: we get a convenient
17948 * number for each function using the offset which we use to indicate
17949- * what to patch. */
17950+ * what to patch.
17951+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17952+ */
17953+
17954 struct paravirt_patch_template {
17955 struct pv_init_ops pv_init_ops;
17956 struct pv_time_ops pv_time_ops;
17957@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17958 struct pv_apic_ops pv_apic_ops;
17959 struct pv_mmu_ops pv_mmu_ops;
17960 struct pv_lock_ops pv_lock_ops;
17961-};
17962+} __no_randomize_layout;
17963
17964 extern struct pv_info pv_info;
17965 extern struct pv_init_ops pv_init_ops;
17966diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17967index c4412e9..90e88c5 100644
17968--- a/arch/x86/include/asm/pgalloc.h
17969+++ b/arch/x86/include/asm/pgalloc.h
17970@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17971 pmd_t *pmd, pte_t *pte)
17972 {
17973 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17974+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17975+}
17976+
17977+static inline void pmd_populate_user(struct mm_struct *mm,
17978+ pmd_t *pmd, pte_t *pte)
17979+{
17980+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17981 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17982 }
17983
17984@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17985
17986 #ifdef CONFIG_X86_PAE
17987 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17988+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17989+{
17990+ pud_populate(mm, pudp, pmd);
17991+}
17992 #else /* !CONFIG_X86_PAE */
17993 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17994 {
17995 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17996 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17997 }
17998+
17999+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
18000+{
18001+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
18002+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
18003+}
18004 #endif /* CONFIG_X86_PAE */
18005
18006 #if PAGETABLE_LEVELS > 3
18007@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
18008 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
18009 }
18010
18011+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
18012+{
18013+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
18014+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
18015+}
18016+
18017 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
18018 {
18019 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
18020diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
18021index 206a87f..1623b06 100644
18022--- a/arch/x86/include/asm/pgtable-2level.h
18023+++ b/arch/x86/include/asm/pgtable-2level.h
18024@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
18025
18026 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18027 {
18028+ pax_open_kernel();
18029 *pmdp = pmd;
18030+ pax_close_kernel();
18031 }
18032
18033 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18034diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
18035index 81bb91b..9392125 100644
18036--- a/arch/x86/include/asm/pgtable-3level.h
18037+++ b/arch/x86/include/asm/pgtable-3level.h
18038@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18039
18040 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18041 {
18042+ pax_open_kernel();
18043 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
18044+ pax_close_kernel();
18045 }
18046
18047 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18048 {
18049+ pax_open_kernel();
18050 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
18051+ pax_close_kernel();
18052 }
18053
18054 /*
18055diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
18056index e8a5454..1539359 100644
18057--- a/arch/x86/include/asm/pgtable.h
18058+++ b/arch/x86/include/asm/pgtable.h
18059@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18060
18061 #ifndef __PAGETABLE_PUD_FOLDED
18062 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18063+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18064 #define pgd_clear(pgd) native_pgd_clear(pgd)
18065 #endif
18066
18067@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18068
18069 #define arch_end_context_switch(prev) do {} while(0)
18070
18071+#define pax_open_kernel() native_pax_open_kernel()
18072+#define pax_close_kernel() native_pax_close_kernel()
18073 #endif /* CONFIG_PARAVIRT */
18074
18075+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18076+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18077+
18078+#ifdef CONFIG_PAX_KERNEXEC
18079+static inline unsigned long native_pax_open_kernel(void)
18080+{
18081+ unsigned long cr0;
18082+
18083+ preempt_disable();
18084+ barrier();
18085+ cr0 = read_cr0() ^ X86_CR0_WP;
18086+ BUG_ON(cr0 & X86_CR0_WP);
18087+ write_cr0(cr0);
18088+ barrier();
18089+ return cr0 ^ X86_CR0_WP;
18090+}
18091+
18092+static inline unsigned long native_pax_close_kernel(void)
18093+{
18094+ unsigned long cr0;
18095+
18096+ barrier();
18097+ cr0 = read_cr0() ^ X86_CR0_WP;
18098+ BUG_ON(!(cr0 & X86_CR0_WP));
18099+ write_cr0(cr0);
18100+ barrier();
18101+ preempt_enable_no_resched();
18102+ return cr0 ^ X86_CR0_WP;
18103+}
18104+#else
18105+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18106+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18107+#endif
18108+
18109 /*
18110 * The following only work if pte_present() is true.
18111 * Undefined behaviour if not..
18112 */
18113+static inline int pte_user(pte_t pte)
18114+{
18115+ return pte_val(pte) & _PAGE_USER;
18116+}
18117+
18118 static inline int pte_dirty(pte_t pte)
18119 {
18120 return pte_flags(pte) & _PAGE_DIRTY;
18121@@ -161,6 +203,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18122 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18123 }
18124
18125+static inline unsigned long pgd_pfn(pgd_t pgd)
18126+{
18127+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18128+}
18129+
18130 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18131
18132 static inline int pmd_large(pmd_t pte)
18133@@ -214,9 +261,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18134 return pte_clear_flags(pte, _PAGE_RW);
18135 }
18136
18137+static inline pte_t pte_mkread(pte_t pte)
18138+{
18139+ return __pte(pte_val(pte) | _PAGE_USER);
18140+}
18141+
18142 static inline pte_t pte_mkexec(pte_t pte)
18143 {
18144- return pte_clear_flags(pte, _PAGE_NX);
18145+#ifdef CONFIG_X86_PAE
18146+ if (__supported_pte_mask & _PAGE_NX)
18147+ return pte_clear_flags(pte, _PAGE_NX);
18148+ else
18149+#endif
18150+ return pte_set_flags(pte, _PAGE_USER);
18151+}
18152+
18153+static inline pte_t pte_exprotect(pte_t pte)
18154+{
18155+#ifdef CONFIG_X86_PAE
18156+ if (__supported_pte_mask & _PAGE_NX)
18157+ return pte_set_flags(pte, _PAGE_NX);
18158+ else
18159+#endif
18160+ return pte_clear_flags(pte, _PAGE_USER);
18161 }
18162
18163 static inline pte_t pte_mkdirty(pte_t pte)
18164@@ -446,6 +513,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18165 #endif
18166
18167 #ifndef __ASSEMBLY__
18168+
18169+#ifdef CONFIG_PAX_PER_CPU_PGD
18170+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18171+enum cpu_pgd_type {kernel = 0, user = 1};
18172+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18173+{
18174+ return cpu_pgd[cpu][type];
18175+}
18176+#endif
18177+
18178 #include <linux/mm_types.h>
18179 #include <linux/mmdebug.h>
18180 #include <linux/log2.h>
18181@@ -592,7 +669,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18182 * Currently stuck as a macro due to indirect forward reference to
18183 * linux/mmzone.h's __section_mem_map_addr() definition:
18184 */
18185-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18186+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18187
18188 /* Find an entry in the second-level page table.. */
18189 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18190@@ -632,7 +709,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18191 * Currently stuck as a macro due to indirect forward reference to
18192 * linux/mmzone.h's __section_mem_map_addr() definition:
18193 */
18194-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18195+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18196
18197 /* to find an entry in a page-table-directory. */
18198 static inline unsigned long pud_index(unsigned long address)
18199@@ -647,7 +724,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18200
18201 static inline int pgd_bad(pgd_t pgd)
18202 {
18203- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18204+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18205 }
18206
18207 static inline int pgd_none(pgd_t pgd)
18208@@ -670,7 +747,12 @@ static inline int pgd_none(pgd_t pgd)
18209 * pgd_offset() returns a (pgd_t *)
18210 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18211 */
18212-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18213+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18214+
18215+#ifdef CONFIG_PAX_PER_CPU_PGD
18216+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18217+#endif
18218+
18219 /*
18220 * a shortcut which implies the use of the kernel's pgd, instead
18221 * of a process's
18222@@ -681,6 +763,23 @@ static inline int pgd_none(pgd_t pgd)
18223 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18224 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18225
18226+#ifdef CONFIG_X86_32
18227+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18228+#else
18229+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18230+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18231+
18232+#ifdef CONFIG_PAX_MEMORY_UDEREF
18233+#ifdef __ASSEMBLY__
18234+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18235+#else
18236+extern unsigned long pax_user_shadow_base;
18237+extern pgdval_t clone_pgd_mask;
18238+#endif
18239+#endif
18240+
18241+#endif
18242+
18243 #ifndef __ASSEMBLY__
18244
18245 extern int direct_gbpages;
18246@@ -847,11 +946,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18247 * dst and src can be on the same page, but the range must not overlap,
18248 * and must not cross a page boundary.
18249 */
18250-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18251+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18252 {
18253- memcpy(dst, src, count * sizeof(pgd_t));
18254+ pax_open_kernel();
18255+ while (count--)
18256+ *dst++ = *src++;
18257+ pax_close_kernel();
18258 }
18259
18260+#ifdef CONFIG_PAX_PER_CPU_PGD
18261+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18262+#endif
18263+
18264+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18265+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18266+#else
18267+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18268+#endif
18269+
18270 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18271 static inline int page_level_shift(enum pg_level level)
18272 {
18273diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18274index b6c0b40..3535d47 100644
18275--- a/arch/x86/include/asm/pgtable_32.h
18276+++ b/arch/x86/include/asm/pgtable_32.h
18277@@ -25,9 +25,6 @@
18278 struct mm_struct;
18279 struct vm_area_struct;
18280
18281-extern pgd_t swapper_pg_dir[1024];
18282-extern pgd_t initial_page_table[1024];
18283-
18284 static inline void pgtable_cache_init(void) { }
18285 static inline void check_pgt_cache(void) { }
18286 void paging_init(void);
18287@@ -45,6 +42,12 @@ void paging_init(void);
18288 # include <asm/pgtable-2level.h>
18289 #endif
18290
18291+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18292+extern pgd_t initial_page_table[PTRS_PER_PGD];
18293+#ifdef CONFIG_X86_PAE
18294+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18295+#endif
18296+
18297 #if defined(CONFIG_HIGHPTE)
18298 #define pte_offset_map(dir, address) \
18299 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18300@@ -59,12 +62,17 @@ void paging_init(void);
18301 /* Clear a kernel PTE and flush it from the TLB */
18302 #define kpte_clear_flush(ptep, vaddr) \
18303 do { \
18304+ pax_open_kernel(); \
18305 pte_clear(&init_mm, (vaddr), (ptep)); \
18306+ pax_close_kernel(); \
18307 __flush_tlb_one((vaddr)); \
18308 } while (0)
18309
18310 #endif /* !__ASSEMBLY__ */
18311
18312+#define HAVE_ARCH_UNMAPPED_AREA
18313+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18314+
18315 /*
18316 * kern_addr_valid() is (1) for FLATMEM and (0) for
18317 * SPARSEMEM and DISCONTIGMEM
18318diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18319index 9fb2f2b..b04b4bf 100644
18320--- a/arch/x86/include/asm/pgtable_32_types.h
18321+++ b/arch/x86/include/asm/pgtable_32_types.h
18322@@ -8,7 +8,7 @@
18323 */
18324 #ifdef CONFIG_X86_PAE
18325 # include <asm/pgtable-3level_types.h>
18326-# define PMD_SIZE (1UL << PMD_SHIFT)
18327+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18328 # define PMD_MASK (~(PMD_SIZE - 1))
18329 #else
18330 # include <asm/pgtable-2level_types.h>
18331@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18332 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18333 #endif
18334
18335+#ifdef CONFIG_PAX_KERNEXEC
18336+#ifndef __ASSEMBLY__
18337+extern unsigned char MODULES_EXEC_VADDR[];
18338+extern unsigned char MODULES_EXEC_END[];
18339+#endif
18340+#include <asm/boot.h>
18341+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18342+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18343+#else
18344+#define ktla_ktva(addr) (addr)
18345+#define ktva_ktla(addr) (addr)
18346+#endif
18347+
18348 #define MODULES_VADDR VMALLOC_START
18349 #define MODULES_END VMALLOC_END
18350 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18351diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18352index 4572b2f..4430113 100644
18353--- a/arch/x86/include/asm/pgtable_64.h
18354+++ b/arch/x86/include/asm/pgtable_64.h
18355@@ -16,11 +16,16 @@
18356
18357 extern pud_t level3_kernel_pgt[512];
18358 extern pud_t level3_ident_pgt[512];
18359+extern pud_t level3_vmalloc_start_pgt[512];
18360+extern pud_t level3_vmalloc_end_pgt[512];
18361+extern pud_t level3_vmemmap_pgt[512];
18362+extern pud_t level2_vmemmap_pgt[512];
18363 extern pmd_t level2_kernel_pgt[512];
18364 extern pmd_t level2_fixmap_pgt[512];
18365-extern pmd_t level2_ident_pgt[512];
18366+extern pmd_t level2_ident_pgt[512*2];
18367 extern pte_t level1_fixmap_pgt[512];
18368-extern pgd_t init_level4_pgt[];
18369+extern pte_t level1_vsyscall_pgt[512];
18370+extern pgd_t init_level4_pgt[512];
18371
18372 #define swapper_pg_dir init_level4_pgt
18373
18374@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18375
18376 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18377 {
18378+ pax_open_kernel();
18379 *pmdp = pmd;
18380+ pax_close_kernel();
18381 }
18382
18383 static inline void native_pmd_clear(pmd_t *pmd)
18384@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18385
18386 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18387 {
18388+ pax_open_kernel();
18389 *pudp = pud;
18390+ pax_close_kernel();
18391 }
18392
18393 static inline void native_pud_clear(pud_t *pud)
18394@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18395
18396 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18397 {
18398+ pax_open_kernel();
18399+ *pgdp = pgd;
18400+ pax_close_kernel();
18401+}
18402+
18403+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18404+{
18405 *pgdp = pgd;
18406 }
18407
18408diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18409index 602b602..acb53ed 100644
18410--- a/arch/x86/include/asm/pgtable_64_types.h
18411+++ b/arch/x86/include/asm/pgtable_64_types.h
18412@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18413 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18414 #define MODULES_END _AC(0xffffffffff000000, UL)
18415 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18416+#define MODULES_EXEC_VADDR MODULES_VADDR
18417+#define MODULES_EXEC_END MODULES_END
18418 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18419 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18420 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18421 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18422
18423+#define ktla_ktva(addr) (addr)
18424+#define ktva_ktla(addr) (addr)
18425+
18426 #define EARLY_DYNAMIC_PAGE_TABLES 64
18427
18428 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18429diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18430index 25bcd4a..bf3f815 100644
18431--- a/arch/x86/include/asm/pgtable_types.h
18432+++ b/arch/x86/include/asm/pgtable_types.h
18433@@ -110,8 +110,10 @@
18434
18435 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18436 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18437-#else
18438+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18439 #define _PAGE_NX (_AT(pteval_t, 0))
18440+#else
18441+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18442 #endif
18443
18444 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18445@@ -167,6 +169,9 @@ enum page_cache_mode {
18446 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18447 _PAGE_ACCESSED)
18448
18449+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18450+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18451+
18452 #define __PAGE_KERNEL_EXEC \
18453 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18454 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18455@@ -174,7 +179,7 @@ enum page_cache_mode {
18456 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18457 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18458 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18459-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18460+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18461 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18462 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18463 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18464@@ -220,7 +225,7 @@ enum page_cache_mode {
18465 #ifdef CONFIG_X86_64
18466 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18467 #else
18468-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18469+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18470 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18471 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18472 #endif
18473@@ -259,7 +264,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18474 {
18475 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18476 }
18477+#endif
18478
18479+#if PAGETABLE_LEVELS == 3
18480+#include <asm-generic/pgtable-nopud.h>
18481+#endif
18482+
18483+#if PAGETABLE_LEVELS == 2
18484+#include <asm-generic/pgtable-nopmd.h>
18485+#endif
18486+
18487+#ifndef __ASSEMBLY__
18488 #if PAGETABLE_LEVELS > 3
18489 typedef struct { pudval_t pud; } pud_t;
18490
18491@@ -273,8 +288,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18492 return pud.pud;
18493 }
18494 #else
18495-#include <asm-generic/pgtable-nopud.h>
18496-
18497 static inline pudval_t native_pud_val(pud_t pud)
18498 {
18499 return native_pgd_val(pud.pgd);
18500@@ -294,8 +307,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18501 return pmd.pmd;
18502 }
18503 #else
18504-#include <asm-generic/pgtable-nopmd.h>
18505-
18506 static inline pmdval_t native_pmd_val(pmd_t pmd)
18507 {
18508 return native_pgd_val(pmd.pud.pgd);
18509@@ -402,7 +413,6 @@ typedef struct page *pgtable_t;
18510
18511 extern pteval_t __supported_pte_mask;
18512 extern void set_nx(void);
18513-extern int nx_enabled;
18514
18515 #define pgprot_writecombine pgprot_writecombine
18516 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18517diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18518index 8f327184..368fb29 100644
18519--- a/arch/x86/include/asm/preempt.h
18520+++ b/arch/x86/include/asm/preempt.h
18521@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18522 */
18523 static __always_inline bool __preempt_count_dec_and_test(void)
18524 {
18525- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18526+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18527 }
18528
18529 /*
18530diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18531index a092a0c..8e9640b 100644
18532--- a/arch/x86/include/asm/processor.h
18533+++ b/arch/x86/include/asm/processor.h
18534@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18535 /* Index into per_cpu list: */
18536 u16 cpu_index;
18537 u32 microcode;
18538-};
18539+} __randomize_layout;
18540
18541 #define X86_VENDOR_INTEL 0
18542 #define X86_VENDOR_CYRIX 1
18543@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18544 : "memory");
18545 }
18546
18547+/* invpcid (%rdx),%rax */
18548+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18549+
18550+#define INVPCID_SINGLE_ADDRESS 0UL
18551+#define INVPCID_SINGLE_CONTEXT 1UL
18552+#define INVPCID_ALL_GLOBAL 2UL
18553+#define INVPCID_ALL_NONGLOBAL 3UL
18554+
18555+#define PCID_KERNEL 0UL
18556+#define PCID_USER 1UL
18557+#define PCID_NOFLUSH (1UL << 63)
18558+
18559 static inline void load_cr3(pgd_t *pgdir)
18560 {
18561- write_cr3(__pa(pgdir));
18562+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18563 }
18564
18565 #ifdef CONFIG_X86_32
18566@@ -282,7 +294,7 @@ struct tss_struct {
18567
18568 } ____cacheline_aligned;
18569
18570-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18571+extern struct tss_struct init_tss[NR_CPUS];
18572
18573 /*
18574 * Save the original ist values for checking stack pointers during debugging
18575@@ -479,6 +491,7 @@ struct thread_struct {
18576 unsigned short ds;
18577 unsigned short fsindex;
18578 unsigned short gsindex;
18579+ unsigned short ss;
18580 #endif
18581 #ifdef CONFIG_X86_32
18582 unsigned long ip;
18583@@ -588,29 +601,8 @@ static inline void load_sp0(struct tss_struct *tss,
18584 extern unsigned long mmu_cr4_features;
18585 extern u32 *trampoline_cr4_features;
18586
18587-static inline void set_in_cr4(unsigned long mask)
18588-{
18589- unsigned long cr4;
18590-
18591- mmu_cr4_features |= mask;
18592- if (trampoline_cr4_features)
18593- *trampoline_cr4_features = mmu_cr4_features;
18594- cr4 = read_cr4();
18595- cr4 |= mask;
18596- write_cr4(cr4);
18597-}
18598-
18599-static inline void clear_in_cr4(unsigned long mask)
18600-{
18601- unsigned long cr4;
18602-
18603- mmu_cr4_features &= ~mask;
18604- if (trampoline_cr4_features)
18605- *trampoline_cr4_features = mmu_cr4_features;
18606- cr4 = read_cr4();
18607- cr4 &= ~mask;
18608- write_cr4(cr4);
18609-}
18610+extern void set_in_cr4(unsigned long mask);
18611+extern void clear_in_cr4(unsigned long mask);
18612
18613 typedef struct {
18614 unsigned long seg;
18615@@ -838,11 +830,18 @@ static inline void spin_lock_prefetch(const void *x)
18616 */
18617 #define TASK_SIZE PAGE_OFFSET
18618 #define TASK_SIZE_MAX TASK_SIZE
18619+
18620+#ifdef CONFIG_PAX_SEGMEXEC
18621+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18622+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18623+#else
18624 #define STACK_TOP TASK_SIZE
18625-#define STACK_TOP_MAX STACK_TOP
18626+#endif
18627+
18628+#define STACK_TOP_MAX TASK_SIZE
18629
18630 #define INIT_THREAD { \
18631- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18632+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18633 .vm86_info = NULL, \
18634 .sysenter_cs = __KERNEL_CS, \
18635 .io_bitmap_ptr = NULL, \
18636@@ -856,7 +855,7 @@ static inline void spin_lock_prefetch(const void *x)
18637 */
18638 #define INIT_TSS { \
18639 .x86_tss = { \
18640- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18641+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18642 .ss0 = __KERNEL_DS, \
18643 .ss1 = __KERNEL_CS, \
18644 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18645@@ -867,11 +866,7 @@ static inline void spin_lock_prefetch(const void *x)
18646 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18647
18648 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18649-#define KSTK_TOP(info) \
18650-({ \
18651- unsigned long *__ptr = (unsigned long *)(info); \
18652- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18653-})
18654+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18655
18656 /*
18657 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18658@@ -886,7 +881,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18659 #define task_pt_regs(task) \
18660 ({ \
18661 struct pt_regs *__regs__; \
18662- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18663+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18664 __regs__ - 1; \
18665 })
18666
18667@@ -902,13 +897,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18668 * particular problem by preventing anything from being mapped
18669 * at the maximum canonical address.
18670 */
18671-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18672+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18673
18674 /* This decides where the kernel will search for a free chunk of vm
18675 * space during mmap's.
18676 */
18677 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18678- 0xc0000000 : 0xFFFFe000)
18679+ 0xc0000000 : 0xFFFFf000)
18680
18681 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18682 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18683@@ -919,11 +914,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18684 #define STACK_TOP_MAX TASK_SIZE_MAX
18685
18686 #define INIT_THREAD { \
18687- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18688+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18689 }
18690
18691 #define INIT_TSS { \
18692- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18693+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18694 }
18695
18696 /*
18697@@ -951,6 +946,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18698 */
18699 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18700
18701+#ifdef CONFIG_PAX_SEGMEXEC
18702+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18703+#endif
18704+
18705 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18706
18707 /* Get/set a process' ability to use the timestamp counter instruction */
18708@@ -995,7 +994,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18709 return 0;
18710 }
18711
18712-extern unsigned long arch_align_stack(unsigned long sp);
18713+#define arch_align_stack(x) ((x) & ~0xfUL)
18714 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18715
18716 void default_idle(void);
18717@@ -1005,6 +1004,6 @@ bool xen_set_default_idle(void);
18718 #define xen_set_default_idle 0
18719 #endif
18720
18721-void stop_this_cpu(void *dummy);
18722+void stop_this_cpu(void *dummy) __noreturn;
18723 void df_debug(struct pt_regs *regs, long error_code);
18724 #endif /* _ASM_X86_PROCESSOR_H */
18725diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18726index 86fc2bb..bd5049a 100644
18727--- a/arch/x86/include/asm/ptrace.h
18728+++ b/arch/x86/include/asm/ptrace.h
18729@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18730 }
18731
18732 /*
18733- * user_mode_vm(regs) determines whether a register set came from user mode.
18734+ * user_mode(regs) determines whether a register set came from user mode.
18735 * This is true if V8086 mode was enabled OR if the register set was from
18736 * protected mode with RPL-3 CS value. This tricky test checks that with
18737 * one comparison. Many places in the kernel can bypass this full check
18738- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18739+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18740+ * be used.
18741 */
18742-static inline int user_mode(struct pt_regs *regs)
18743+static inline int user_mode_novm(struct pt_regs *regs)
18744 {
18745 #ifdef CONFIG_X86_32
18746 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18747 #else
18748- return !!(regs->cs & 3);
18749+ return !!(regs->cs & SEGMENT_RPL_MASK);
18750 #endif
18751 }
18752
18753-static inline int user_mode_vm(struct pt_regs *regs)
18754+static inline int user_mode(struct pt_regs *regs)
18755 {
18756 #ifdef CONFIG_X86_32
18757 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18758 USER_RPL;
18759 #else
18760- return user_mode(regs);
18761+ return user_mode_novm(regs);
18762 #endif
18763 }
18764
18765@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18766 #ifdef CONFIG_X86_64
18767 static inline bool user_64bit_mode(struct pt_regs *regs)
18768 {
18769+ unsigned long cs = regs->cs & 0xffff;
18770 #ifndef CONFIG_PARAVIRT
18771 /*
18772 * On non-paravirt systems, this is the only long mode CPL 3
18773 * selector. We do not allow long mode selectors in the LDT.
18774 */
18775- return regs->cs == __USER_CS;
18776+ return cs == __USER_CS;
18777 #else
18778 /* Headers are too twisted for this to go in paravirt.h. */
18779- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18780+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18781 #endif
18782 }
18783
18784@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18785 * Traps from the kernel do not save sp and ss.
18786 * Use the helper function to retrieve sp.
18787 */
18788- if (offset == offsetof(struct pt_regs, sp) &&
18789- regs->cs == __KERNEL_CS)
18790- return kernel_stack_pointer(regs);
18791+ if (offset == offsetof(struct pt_regs, sp)) {
18792+ unsigned long cs = regs->cs & 0xffff;
18793+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18794+ return kernel_stack_pointer(regs);
18795+ }
18796 #endif
18797 return *(unsigned long *)((unsigned long)regs + offset);
18798 }
18799diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18800index ae0e241..e80b10b 100644
18801--- a/arch/x86/include/asm/qrwlock.h
18802+++ b/arch/x86/include/asm/qrwlock.h
18803@@ -7,8 +7,8 @@
18804 #define queue_write_unlock queue_write_unlock
18805 static inline void queue_write_unlock(struct qrwlock *lock)
18806 {
18807- barrier();
18808- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18809+ barrier();
18810+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18811 }
18812 #endif
18813
18814diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18815index 9c6b890..5305f53 100644
18816--- a/arch/x86/include/asm/realmode.h
18817+++ b/arch/x86/include/asm/realmode.h
18818@@ -22,16 +22,14 @@ struct real_mode_header {
18819 #endif
18820 /* APM/BIOS reboot */
18821 u32 machine_real_restart_asm;
18822-#ifdef CONFIG_X86_64
18823 u32 machine_real_restart_seg;
18824-#endif
18825 };
18826
18827 /* This must match data at trampoline_32/64.S */
18828 struct trampoline_header {
18829 #ifdef CONFIG_X86_32
18830 u32 start;
18831- u16 gdt_pad;
18832+ u16 boot_cs;
18833 u16 gdt_limit;
18834 u32 gdt_base;
18835 #else
18836diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18837index a82c4f1..ac45053 100644
18838--- a/arch/x86/include/asm/reboot.h
18839+++ b/arch/x86/include/asm/reboot.h
18840@@ -6,13 +6,13 @@
18841 struct pt_regs;
18842
18843 struct machine_ops {
18844- void (*restart)(char *cmd);
18845- void (*halt)(void);
18846- void (*power_off)(void);
18847+ void (* __noreturn restart)(char *cmd);
18848+ void (* __noreturn halt)(void);
18849+ void (* __noreturn power_off)(void);
18850 void (*shutdown)(void);
18851 void (*crash_shutdown)(struct pt_regs *);
18852- void (*emergency_restart)(void);
18853-};
18854+ void (* __noreturn emergency_restart)(void);
18855+} __no_const;
18856
18857 extern struct machine_ops machine_ops;
18858
18859diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18860index 8f7866a..e442f20 100644
18861--- a/arch/x86/include/asm/rmwcc.h
18862+++ b/arch/x86/include/asm/rmwcc.h
18863@@ -3,7 +3,34 @@
18864
18865 #ifdef CC_HAVE_ASM_GOTO
18866
18867-#define __GEN_RMWcc(fullop, var, cc, ...) \
18868+#ifdef CONFIG_PAX_REFCOUNT
18869+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18870+do { \
18871+ asm_volatile_goto (fullop \
18872+ ";jno 0f\n" \
18873+ fullantiop \
18874+ ";int $4\n0:\n" \
18875+ _ASM_EXTABLE(0b, 0b) \
18876+ ";j" cc " %l[cc_label]" \
18877+ : : "m" (var), ## __VA_ARGS__ \
18878+ : "memory" : cc_label); \
18879+ return 0; \
18880+cc_label: \
18881+ return 1; \
18882+} while (0)
18883+#else
18884+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18885+do { \
18886+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18887+ : : "m" (var), ## __VA_ARGS__ \
18888+ : "memory" : cc_label); \
18889+ return 0; \
18890+cc_label: \
18891+ return 1; \
18892+} while (0)
18893+#endif
18894+
18895+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18896 do { \
18897 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18898 : : "m" (var), ## __VA_ARGS__ \
18899@@ -13,15 +40,46 @@ cc_label: \
18900 return 1; \
18901 } while (0)
18902
18903-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18904- __GEN_RMWcc(op " " arg0, var, cc)
18905+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18906+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18907
18908-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18909- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18910+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18911+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18912+
18913+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18914+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18915+
18916+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18917+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18918
18919 #else /* !CC_HAVE_ASM_GOTO */
18920
18921-#define __GEN_RMWcc(fullop, var, cc, ...) \
18922+#ifdef CONFIG_PAX_REFCOUNT
18923+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18924+do { \
18925+ char c; \
18926+ asm volatile (fullop \
18927+ ";jno 0f\n" \
18928+ fullantiop \
18929+ ";int $4\n0:\n" \
18930+ _ASM_EXTABLE(0b, 0b) \
18931+ "; set" cc " %1" \
18932+ : "+m" (var), "=qm" (c) \
18933+ : __VA_ARGS__ : "memory"); \
18934+ return c != 0; \
18935+} while (0)
18936+#else
18937+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18938+do { \
18939+ char c; \
18940+ asm volatile (fullop "; set" cc " %1" \
18941+ : "+m" (var), "=qm" (c) \
18942+ : __VA_ARGS__ : "memory"); \
18943+ return c != 0; \
18944+} while (0)
18945+#endif
18946+
18947+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18948 do { \
18949 char c; \
18950 asm volatile (fullop "; set" cc " %1" \
18951@@ -30,11 +88,17 @@ do { \
18952 return c != 0; \
18953 } while (0)
18954
18955-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18956- __GEN_RMWcc(op " " arg0, var, cc)
18957+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18958+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18959+
18960+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18961+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18962+
18963+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18964+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18965
18966-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18967- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18968+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18969+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18970
18971 #endif /* CC_HAVE_ASM_GOTO */
18972
18973diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18974index cad82c9..2e5c5c1 100644
18975--- a/arch/x86/include/asm/rwsem.h
18976+++ b/arch/x86/include/asm/rwsem.h
18977@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18978 {
18979 asm volatile("# beginning down_read\n\t"
18980 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18981+
18982+#ifdef CONFIG_PAX_REFCOUNT
18983+ "jno 0f\n"
18984+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18985+ "int $4\n0:\n"
18986+ _ASM_EXTABLE(0b, 0b)
18987+#endif
18988+
18989 /* adds 0x00000001 */
18990 " jns 1f\n"
18991 " call call_rwsem_down_read_failed\n"
18992@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18993 "1:\n\t"
18994 " mov %1,%2\n\t"
18995 " add %3,%2\n\t"
18996+
18997+#ifdef CONFIG_PAX_REFCOUNT
18998+ "jno 0f\n"
18999+ "sub %3,%2\n"
19000+ "int $4\n0:\n"
19001+ _ASM_EXTABLE(0b, 0b)
19002+#endif
19003+
19004 " jle 2f\n\t"
19005 LOCK_PREFIX " cmpxchg %2,%0\n\t"
19006 " jnz 1b\n\t"
19007@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
19008 long tmp;
19009 asm volatile("# beginning down_write\n\t"
19010 LOCK_PREFIX " xadd %1,(%2)\n\t"
19011+
19012+#ifdef CONFIG_PAX_REFCOUNT
19013+ "jno 0f\n"
19014+ "mov %1,(%2)\n"
19015+ "int $4\n0:\n"
19016+ _ASM_EXTABLE(0b, 0b)
19017+#endif
19018+
19019 /* adds 0xffff0001, returns the old value */
19020 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
19021 /* was the active mask 0 before? */
19022@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
19023 long tmp;
19024 asm volatile("# beginning __up_read\n\t"
19025 LOCK_PREFIX " xadd %1,(%2)\n\t"
19026+
19027+#ifdef CONFIG_PAX_REFCOUNT
19028+ "jno 0f\n"
19029+ "mov %1,(%2)\n"
19030+ "int $4\n0:\n"
19031+ _ASM_EXTABLE(0b, 0b)
19032+#endif
19033+
19034 /* subtracts 1, returns the old value */
19035 " jns 1f\n\t"
19036 " call call_rwsem_wake\n" /* expects old value in %edx */
19037@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
19038 long tmp;
19039 asm volatile("# beginning __up_write\n\t"
19040 LOCK_PREFIX " xadd %1,(%2)\n\t"
19041+
19042+#ifdef CONFIG_PAX_REFCOUNT
19043+ "jno 0f\n"
19044+ "mov %1,(%2)\n"
19045+ "int $4\n0:\n"
19046+ _ASM_EXTABLE(0b, 0b)
19047+#endif
19048+
19049 /* subtracts 0xffff0001, returns the old value */
19050 " jns 1f\n\t"
19051 " call call_rwsem_wake\n" /* expects old value in %edx */
19052@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19053 {
19054 asm volatile("# beginning __downgrade_write\n\t"
19055 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
19056+
19057+#ifdef CONFIG_PAX_REFCOUNT
19058+ "jno 0f\n"
19059+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
19060+ "int $4\n0:\n"
19061+ _ASM_EXTABLE(0b, 0b)
19062+#endif
19063+
19064 /*
19065 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
19066 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
19067@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19068 */
19069 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19070 {
19071- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
19072+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
19073+
19074+#ifdef CONFIG_PAX_REFCOUNT
19075+ "jno 0f\n"
19076+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
19077+ "int $4\n0:\n"
19078+ _ASM_EXTABLE(0b, 0b)
19079+#endif
19080+
19081 : "+m" (sem->count)
19082 : "er" (delta));
19083 }
19084@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19085 */
19086 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
19087 {
19088- return delta + xadd(&sem->count, delta);
19089+ return delta + xadd_check_overflow(&sem->count, delta);
19090 }
19091
19092 #endif /* __KERNEL__ */
19093diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19094index db257a5..b91bc77 100644
19095--- a/arch/x86/include/asm/segment.h
19096+++ b/arch/x86/include/asm/segment.h
19097@@ -73,10 +73,15 @@
19098 * 26 - ESPFIX small SS
19099 * 27 - per-cpu [ offset to per-cpu data area ]
19100 * 28 - stack_canary-20 [ for stack protector ]
19101- * 29 - unused
19102- * 30 - unused
19103+ * 29 - PCI BIOS CS
19104+ * 30 - PCI BIOS DS
19105 * 31 - TSS for double fault handler
19106 */
19107+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19108+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19109+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19110+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19111+
19112 #define GDT_ENTRY_TLS_MIN 6
19113 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19114
19115@@ -88,6 +93,8 @@
19116
19117 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19118
19119+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19120+
19121 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19122
19123 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19124@@ -113,6 +120,12 @@
19125 #define __KERNEL_STACK_CANARY 0
19126 #endif
19127
19128+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19129+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19130+
19131+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19132+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19133+
19134 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19135
19136 /*
19137@@ -140,7 +153,7 @@
19138 */
19139
19140 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19141-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19142+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19143
19144
19145 #else
19146@@ -164,6 +177,8 @@
19147 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19148 #define __USER32_DS __USER_DS
19149
19150+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19151+
19152 #define GDT_ENTRY_TSS 8 /* needs two entries */
19153 #define GDT_ENTRY_LDT 10 /* needs two entries */
19154 #define GDT_ENTRY_TLS_MIN 12
19155@@ -172,6 +187,8 @@
19156 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19157 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19158
19159+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19160+
19161 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19162 #define FS_TLS 0
19163 #define GS_TLS 1
19164@@ -179,12 +196,14 @@
19165 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19166 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19167
19168-#define GDT_ENTRIES 16
19169+#define GDT_ENTRIES 17
19170
19171 #endif
19172
19173 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19174+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19175 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19176+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19177 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19178 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19179 #ifndef CONFIG_PARAVIRT
19180@@ -256,7 +275,7 @@ static inline unsigned long get_limit(unsigned long segment)
19181 {
19182 unsigned long __limit;
19183 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19184- return __limit + 1;
19185+ return __limit;
19186 }
19187
19188 #endif /* !__ASSEMBLY__ */
19189diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19190index 8d3120f..352b440 100644
19191--- a/arch/x86/include/asm/smap.h
19192+++ b/arch/x86/include/asm/smap.h
19193@@ -25,11 +25,40 @@
19194
19195 #include <asm/alternative-asm.h>
19196
19197+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19198+#define ASM_PAX_OPEN_USERLAND \
19199+ 661: jmp 663f; \
19200+ .pushsection .altinstr_replacement, "a" ; \
19201+ 662: pushq %rax; nop; \
19202+ .popsection ; \
19203+ .pushsection .altinstructions, "a" ; \
19204+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19205+ .popsection ; \
19206+ call __pax_open_userland; \
19207+ popq %rax; \
19208+ 663:
19209+
19210+#define ASM_PAX_CLOSE_USERLAND \
19211+ 661: jmp 663f; \
19212+ .pushsection .altinstr_replacement, "a" ; \
19213+ 662: pushq %rax; nop; \
19214+ .popsection; \
19215+ .pushsection .altinstructions, "a" ; \
19216+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19217+ .popsection; \
19218+ call __pax_close_userland; \
19219+ popq %rax; \
19220+ 663:
19221+#else
19222+#define ASM_PAX_OPEN_USERLAND
19223+#define ASM_PAX_CLOSE_USERLAND
19224+#endif
19225+
19226 #ifdef CONFIG_X86_SMAP
19227
19228 #define ASM_CLAC \
19229 661: ASM_NOP3 ; \
19230- .pushsection .altinstr_replacement, "ax" ; \
19231+ .pushsection .altinstr_replacement, "a" ; \
19232 662: __ASM_CLAC ; \
19233 .popsection ; \
19234 .pushsection .altinstructions, "a" ; \
19235@@ -38,7 +67,7 @@
19236
19237 #define ASM_STAC \
19238 661: ASM_NOP3 ; \
19239- .pushsection .altinstr_replacement, "ax" ; \
19240+ .pushsection .altinstr_replacement, "a" ; \
19241 662: __ASM_STAC ; \
19242 .popsection ; \
19243 .pushsection .altinstructions, "a" ; \
19244@@ -56,6 +85,37 @@
19245
19246 #include <asm/alternative.h>
19247
19248+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19249+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19250+
19251+extern void __pax_open_userland(void);
19252+static __always_inline unsigned long pax_open_userland(void)
19253+{
19254+
19255+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19256+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19257+ :
19258+ : [open] "i" (__pax_open_userland)
19259+ : "memory", "rax");
19260+#endif
19261+
19262+ return 0;
19263+}
19264+
19265+extern void __pax_close_userland(void);
19266+static __always_inline unsigned long pax_close_userland(void)
19267+{
19268+
19269+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19270+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19271+ :
19272+ : [close] "i" (__pax_close_userland)
19273+ : "memory", "rax");
19274+#endif
19275+
19276+ return 0;
19277+}
19278+
19279 #ifdef CONFIG_X86_SMAP
19280
19281 static __always_inline void clac(void)
19282diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19283index 8cd1cc3..827e09e 100644
19284--- a/arch/x86/include/asm/smp.h
19285+++ b/arch/x86/include/asm/smp.h
19286@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19287 /* cpus sharing the last level cache: */
19288 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19289 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19290-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19291+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19292
19293 static inline struct cpumask *cpu_sibling_mask(int cpu)
19294 {
19295@@ -78,7 +78,7 @@ struct smp_ops {
19296
19297 void (*send_call_func_ipi)(const struct cpumask *mask);
19298 void (*send_call_func_single_ipi)(int cpu);
19299-};
19300+} __no_const;
19301
19302 /* Globals due to paravirt */
19303 extern void set_cpu_sibling_map(int cpu);
19304@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19305 extern int safe_smp_processor_id(void);
19306
19307 #elif defined(CONFIG_X86_64_SMP)
19308-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19309-
19310-#define stack_smp_processor_id() \
19311-({ \
19312- struct thread_info *ti; \
19313- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19314- ti->cpu; \
19315-})
19316+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19317+#define stack_smp_processor_id() raw_smp_processor_id()
19318 #define safe_smp_processor_id() smp_processor_id()
19319
19320 #endif
19321diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19322index 6a99859..03cb807 100644
19323--- a/arch/x86/include/asm/stackprotector.h
19324+++ b/arch/x86/include/asm/stackprotector.h
19325@@ -47,7 +47,7 @@
19326 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19327 */
19328 #define GDT_STACK_CANARY_INIT \
19329- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19330+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19331
19332 /*
19333 * Initialize the stackprotector canary value.
19334@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19335
19336 static inline void load_stack_canary_segment(void)
19337 {
19338-#ifdef CONFIG_X86_32
19339+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19340 asm volatile ("mov %0, %%gs" : : "r" (0));
19341 #endif
19342 }
19343diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19344index 70bbe39..4ae2bd4 100644
19345--- a/arch/x86/include/asm/stacktrace.h
19346+++ b/arch/x86/include/asm/stacktrace.h
19347@@ -11,28 +11,20 @@
19348
19349 extern int kstack_depth_to_print;
19350
19351-struct thread_info;
19352+struct task_struct;
19353 struct stacktrace_ops;
19354
19355-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19356- unsigned long *stack,
19357- unsigned long bp,
19358- const struct stacktrace_ops *ops,
19359- void *data,
19360- unsigned long *end,
19361- int *graph);
19362+typedef unsigned long walk_stack_t(struct task_struct *task,
19363+ void *stack_start,
19364+ unsigned long *stack,
19365+ unsigned long bp,
19366+ const struct stacktrace_ops *ops,
19367+ void *data,
19368+ unsigned long *end,
19369+ int *graph);
19370
19371-extern unsigned long
19372-print_context_stack(struct thread_info *tinfo,
19373- unsigned long *stack, unsigned long bp,
19374- const struct stacktrace_ops *ops, void *data,
19375- unsigned long *end, int *graph);
19376-
19377-extern unsigned long
19378-print_context_stack_bp(struct thread_info *tinfo,
19379- unsigned long *stack, unsigned long bp,
19380- const struct stacktrace_ops *ops, void *data,
19381- unsigned long *end, int *graph);
19382+extern walk_stack_t print_context_stack;
19383+extern walk_stack_t print_context_stack_bp;
19384
19385 /* Generic stack tracer with callbacks */
19386
19387@@ -40,7 +32,7 @@ struct stacktrace_ops {
19388 void (*address)(void *data, unsigned long address, int reliable);
19389 /* On negative return stop dumping */
19390 int (*stack)(void *data, char *name);
19391- walk_stack_t walk_stack;
19392+ walk_stack_t *walk_stack;
19393 };
19394
19395 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19396diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19397index 751bf4b..a1278b5 100644
19398--- a/arch/x86/include/asm/switch_to.h
19399+++ b/arch/x86/include/asm/switch_to.h
19400@@ -112,7 +112,7 @@ do { \
19401 "call __switch_to\n\t" \
19402 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19403 __switch_canary \
19404- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19405+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19406 "movq %%rax,%%rdi\n\t" \
19407 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19408 "jnz ret_from_fork\n\t" \
19409@@ -123,7 +123,7 @@ do { \
19410 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19411 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19412 [_tif_fork] "i" (_TIF_FORK), \
19413- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19414+ [thread_info] "m" (current_tinfo), \
19415 [current_task] "m" (current_task) \
19416 __switch_canary_iparam \
19417 : "memory", "cc" __EXTRA_CLOBBER)
19418diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19419index 547e344..6be1175 100644
19420--- a/arch/x86/include/asm/thread_info.h
19421+++ b/arch/x86/include/asm/thread_info.h
19422@@ -24,7 +24,6 @@ struct exec_domain;
19423 #include <linux/atomic.h>
19424
19425 struct thread_info {
19426- struct task_struct *task; /* main task structure */
19427 struct exec_domain *exec_domain; /* execution domain */
19428 __u32 flags; /* low level flags */
19429 __u32 status; /* thread synchronous flags */
19430@@ -33,13 +32,13 @@ struct thread_info {
19431 mm_segment_t addr_limit;
19432 struct restart_block restart_block;
19433 void __user *sysenter_return;
19434+ unsigned long lowest_stack;
19435 unsigned int sig_on_uaccess_error:1;
19436 unsigned int uaccess_err:1; /* uaccess failed */
19437 };
19438
19439-#define INIT_THREAD_INFO(tsk) \
19440+#define INIT_THREAD_INFO \
19441 { \
19442- .task = &tsk, \
19443 .exec_domain = &default_exec_domain, \
19444 .flags = 0, \
19445 .cpu = 0, \
19446@@ -50,7 +49,7 @@ struct thread_info {
19447 }, \
19448 }
19449
19450-#define init_thread_info (init_thread_union.thread_info)
19451+#define init_thread_info (init_thread_union.stack)
19452 #define init_stack (init_thread_union.stack)
19453
19454 #else /* !__ASSEMBLY__ */
19455@@ -91,6 +90,7 @@ struct thread_info {
19456 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19457 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19458 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19459+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19460
19461 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19462 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19463@@ -115,17 +115,18 @@ struct thread_info {
19464 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19465 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19466 #define _TIF_X32 (1 << TIF_X32)
19467+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19468
19469 /* work to do in syscall_trace_enter() */
19470 #define _TIF_WORK_SYSCALL_ENTRY \
19471 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19472 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19473- _TIF_NOHZ)
19474+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19475
19476 /* work to do in syscall_trace_leave() */
19477 #define _TIF_WORK_SYSCALL_EXIT \
19478 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19479- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19480+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19481
19482 /* work to do on interrupt/exception return */
19483 #define _TIF_WORK_MASK \
19484@@ -136,7 +137,7 @@ struct thread_info {
19485 /* work to do on any return to user space */
19486 #define _TIF_ALLWORK_MASK \
19487 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19488- _TIF_NOHZ)
19489+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19490
19491 /* Only used for 64 bit */
19492 #define _TIF_DO_NOTIFY_MASK \
19493@@ -151,7 +152,6 @@ struct thread_info {
19494 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19495
19496 #define STACK_WARN (THREAD_SIZE/8)
19497-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19498
19499 /*
19500 * macros/functions for gaining access to the thread information structure
19501@@ -162,26 +162,18 @@ struct thread_info {
19502
19503 DECLARE_PER_CPU(unsigned long, kernel_stack);
19504
19505+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19506+
19507 static inline struct thread_info *current_thread_info(void)
19508 {
19509- struct thread_info *ti;
19510- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19511- KERNEL_STACK_OFFSET - THREAD_SIZE);
19512- return ti;
19513+ return this_cpu_read_stable(current_tinfo);
19514 }
19515
19516 #else /* !__ASSEMBLY__ */
19517
19518 /* how to get the thread information struct from ASM */
19519 #define GET_THREAD_INFO(reg) \
19520- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19521- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19522-
19523-/*
19524- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19525- * a certain register (to be used in assembler memory operands).
19526- */
19527-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19528+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19529
19530 #endif
19531
19532@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19533 extern void arch_task_cache_init(void);
19534 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19535 extern void arch_release_task_struct(struct task_struct *tsk);
19536+
19537+#define __HAVE_THREAD_FUNCTIONS
19538+#define task_thread_info(task) (&(task)->tinfo)
19539+#define task_stack_page(task) ((task)->stack)
19540+#define setup_thread_stack(p, org) do {} while (0)
19541+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19542+
19543 #endif
19544 #endif /* _ASM_X86_THREAD_INFO_H */
19545diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19546index 04905bf..1178cdf 100644
19547--- a/arch/x86/include/asm/tlbflush.h
19548+++ b/arch/x86/include/asm/tlbflush.h
19549@@ -17,18 +17,44 @@
19550
19551 static inline void __native_flush_tlb(void)
19552 {
19553+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19554+ u64 descriptor[2];
19555+
19556+ descriptor[0] = PCID_KERNEL;
19557+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19558+ return;
19559+ }
19560+
19561+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19562+ if (static_cpu_has(X86_FEATURE_PCID)) {
19563+ unsigned int cpu = raw_get_cpu();
19564+
19565+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19566+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19567+ raw_put_cpu_no_resched();
19568+ return;
19569+ }
19570+#endif
19571+
19572 native_write_cr3(native_read_cr3());
19573 }
19574
19575 static inline void __native_flush_tlb_global_irq_disabled(void)
19576 {
19577- unsigned long cr4;
19578+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19579+ u64 descriptor[2];
19580
19581- cr4 = native_read_cr4();
19582- /* clear PGE */
19583- native_write_cr4(cr4 & ~X86_CR4_PGE);
19584- /* write old PGE again and flush TLBs */
19585- native_write_cr4(cr4);
19586+ descriptor[0] = PCID_KERNEL;
19587+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19588+ } else {
19589+ unsigned long cr4;
19590+
19591+ cr4 = native_read_cr4();
19592+ /* clear PGE */
19593+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19594+ /* write old PGE again and flush TLBs */
19595+ native_write_cr4(cr4);
19596+ }
19597 }
19598
19599 static inline void __native_flush_tlb_global(void)
19600@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19601
19602 static inline void __native_flush_tlb_single(unsigned long addr)
19603 {
19604+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19605+ u64 descriptor[2];
19606+
19607+ descriptor[0] = PCID_KERNEL;
19608+ descriptor[1] = addr;
19609+
19610+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19611+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19612+ if (addr < TASK_SIZE_MAX)
19613+ descriptor[1] += pax_user_shadow_base;
19614+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19615+ }
19616+
19617+ descriptor[0] = PCID_USER;
19618+ descriptor[1] = addr;
19619+#endif
19620+
19621+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19622+ return;
19623+ }
19624+
19625+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19626+ if (static_cpu_has(X86_FEATURE_PCID)) {
19627+ unsigned int cpu = raw_get_cpu();
19628+
19629+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19630+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19631+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19632+ raw_put_cpu_no_resched();
19633+
19634+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19635+ addr += pax_user_shadow_base;
19636+ }
19637+#endif
19638+
19639 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19640 }
19641
19642diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19643index 0d592e0..cbc90a3 100644
19644--- a/arch/x86/include/asm/uaccess.h
19645+++ b/arch/x86/include/asm/uaccess.h
19646@@ -7,6 +7,7 @@
19647 #include <linux/compiler.h>
19648 #include <linux/thread_info.h>
19649 #include <linux/string.h>
19650+#include <linux/spinlock.h>
19651 #include <asm/asm.h>
19652 #include <asm/page.h>
19653 #include <asm/smap.h>
19654@@ -29,7 +30,12 @@
19655
19656 #define get_ds() (KERNEL_DS)
19657 #define get_fs() (current_thread_info()->addr_limit)
19658+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19659+void __set_fs(mm_segment_t x);
19660+void set_fs(mm_segment_t x);
19661+#else
19662 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19663+#endif
19664
19665 #define segment_eq(a, b) ((a).seg == (b).seg)
19666
19667@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19668 * checks that the pointer is in the user space range - after calling
19669 * this function, memory access functions may still return -EFAULT.
19670 */
19671-#define access_ok(type, addr, size) \
19672- likely(!__range_not_ok(addr, size, user_addr_max()))
19673+extern int _cond_resched(void);
19674+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19675+#define access_ok(type, addr, size) \
19676+({ \
19677+ unsigned long __size = size; \
19678+ unsigned long __addr = (unsigned long)addr; \
19679+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19680+ if (__ret_ao && __size) { \
19681+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19682+ unsigned long __end_ao = __addr + __size - 1; \
19683+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19684+ while (__addr_ao <= __end_ao) { \
19685+ char __c_ao; \
19686+ __addr_ao += PAGE_SIZE; \
19687+ if (__size > PAGE_SIZE) \
19688+ _cond_resched(); \
19689+ if (__get_user(__c_ao, (char __user *)__addr)) \
19690+ break; \
19691+ if (type != VERIFY_WRITE) { \
19692+ __addr = __addr_ao; \
19693+ continue; \
19694+ } \
19695+ if (__put_user(__c_ao, (char __user *)__addr)) \
19696+ break; \
19697+ __addr = __addr_ao; \
19698+ } \
19699+ } \
19700+ } \
19701+ __ret_ao; \
19702+})
19703
19704 /*
19705 * The exception table consists of pairs of addresses relative to the
19706@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19707 extern int __get_user_bad(void);
19708
19709 /*
19710- * This is a type: either unsigned long, if the argument fits into
19711- * that type, or otherwise unsigned long long.
19712+ * This is a type: either (un)signed int, if the argument fits into
19713+ * that type, or otherwise (un)signed long long.
19714 */
19715 #define __inttype(x) \
19716-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19717+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19718+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19719+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19720
19721 /**
19722 * get_user: - Get a simple variable from user space.
19723@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19724 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19725 __chk_user_ptr(ptr); \
19726 might_fault(); \
19727+ pax_open_userland(); \
19728 asm volatile("call __get_user_%P3" \
19729 : "=a" (__ret_gu), "=r" (__val_gu) \
19730 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19731 (x) = (__typeof__(*(ptr))) __val_gu; \
19732+ pax_close_userland(); \
19733 __ret_gu; \
19734 })
19735
19736@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19737 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19738 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19739
19740-
19741+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19742+#define __copyuser_seg "gs;"
19743+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19744+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19745+#else
19746+#define __copyuser_seg
19747+#define __COPYUSER_SET_ES
19748+#define __COPYUSER_RESTORE_ES
19749+#endif
19750
19751 #ifdef CONFIG_X86_32
19752 #define __put_user_asm_u64(x, addr, err, errret) \
19753 asm volatile(ASM_STAC "\n" \
19754- "1: movl %%eax,0(%2)\n" \
19755- "2: movl %%edx,4(%2)\n" \
19756+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19757+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19758 "3: " ASM_CLAC "\n" \
19759 ".section .fixup,\"ax\"\n" \
19760 "4: movl %3,%0\n" \
19761@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19762
19763 #define __put_user_asm_ex_u64(x, addr) \
19764 asm volatile(ASM_STAC "\n" \
19765- "1: movl %%eax,0(%1)\n" \
19766- "2: movl %%edx,4(%1)\n" \
19767+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19768+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19769 "3: " ASM_CLAC "\n" \
19770 _ASM_EXTABLE_EX(1b, 2b) \
19771 _ASM_EXTABLE_EX(2b, 3b) \
19772@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19773 __typeof__(*(ptr)) __pu_val; \
19774 __chk_user_ptr(ptr); \
19775 might_fault(); \
19776- __pu_val = x; \
19777+ __pu_val = (x); \
19778+ pax_open_userland(); \
19779 switch (sizeof(*(ptr))) { \
19780 case 1: \
19781 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19782@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19783 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19784 break; \
19785 } \
19786+ pax_close_userland(); \
19787 __ret_pu; \
19788 })
19789
19790@@ -355,8 +403,10 @@ do { \
19791 } while (0)
19792
19793 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19794+do { \
19795+ pax_open_userland(); \
19796 asm volatile(ASM_STAC "\n" \
19797- "1: mov"itype" %2,%"rtype"1\n" \
19798+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19799 "2: " ASM_CLAC "\n" \
19800 ".section .fixup,\"ax\"\n" \
19801 "3: mov %3,%0\n" \
19802@@ -364,8 +414,10 @@ do { \
19803 " jmp 2b\n" \
19804 ".previous\n" \
19805 _ASM_EXTABLE(1b, 3b) \
19806- : "=r" (err), ltype(x) \
19807- : "m" (__m(addr)), "i" (errret), "0" (err))
19808+ : "=r" (err), ltype (x) \
19809+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19810+ pax_close_userland(); \
19811+} while (0)
19812
19813 #define __get_user_size_ex(x, ptr, size) \
19814 do { \
19815@@ -389,7 +441,7 @@ do { \
19816 } while (0)
19817
19818 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19819- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19820+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19821 "2:\n" \
19822 _ASM_EXTABLE_EX(1b, 2b) \
19823 : ltype(x) : "m" (__m(addr)))
19824@@ -406,13 +458,24 @@ do { \
19825 int __gu_err; \
19826 unsigned long __gu_val; \
19827 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19828- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19829+ (x) = (__typeof__(*(ptr)))__gu_val; \
19830 __gu_err; \
19831 })
19832
19833 /* FIXME: this hack is definitely wrong -AK */
19834 struct __large_struct { unsigned long buf[100]; };
19835-#define __m(x) (*(struct __large_struct __user *)(x))
19836+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19837+#define ____m(x) \
19838+({ \
19839+ unsigned long ____x = (unsigned long)(x); \
19840+ if (____x < pax_user_shadow_base) \
19841+ ____x += pax_user_shadow_base; \
19842+ (typeof(x))____x; \
19843+})
19844+#else
19845+#define ____m(x) (x)
19846+#endif
19847+#define __m(x) (*(struct __large_struct __user *)____m(x))
19848
19849 /*
19850 * Tell gcc we read from memory instead of writing: this is because
19851@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19852 * aliasing issues.
19853 */
19854 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19855+do { \
19856+ pax_open_userland(); \
19857 asm volatile(ASM_STAC "\n" \
19858- "1: mov"itype" %"rtype"1,%2\n" \
19859+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19860 "2: " ASM_CLAC "\n" \
19861 ".section .fixup,\"ax\"\n" \
19862 "3: mov %3,%0\n" \
19863@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19864 ".previous\n" \
19865 _ASM_EXTABLE(1b, 3b) \
19866 : "=r"(err) \
19867- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19868+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19869+ pax_close_userland(); \
19870+} while (0)
19871
19872 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19873- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19874+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19875 "2:\n" \
19876 _ASM_EXTABLE_EX(1b, 2b) \
19877 : : ltype(x), "m" (__m(addr)))
19878@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19879 */
19880 #define uaccess_try do { \
19881 current_thread_info()->uaccess_err = 0; \
19882+ pax_open_userland(); \
19883 stac(); \
19884 barrier();
19885
19886 #define uaccess_catch(err) \
19887 clac(); \
19888+ pax_close_userland(); \
19889 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19890 } while (0)
19891
19892@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19893 * On error, the variable @x is set to zero.
19894 */
19895
19896+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19897+#define __get_user(x, ptr) get_user((x), (ptr))
19898+#else
19899 #define __get_user(x, ptr) \
19900 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19901+#endif
19902
19903 /**
19904 * __put_user: - Write a simple value into user space, with less checking.
19905@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19906 * Returns zero on success, or -EFAULT on error.
19907 */
19908
19909+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19910+#define __put_user(x, ptr) put_user((x), (ptr))
19911+#else
19912 #define __put_user(x, ptr) \
19913 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19914+#endif
19915
19916 #define __get_user_unaligned __get_user
19917 #define __put_user_unaligned __put_user
19918@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19919 #define get_user_ex(x, ptr) do { \
19920 unsigned long __gue_val; \
19921 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19922- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19923+ (x) = (__typeof__(*(ptr)))__gue_val; \
19924 } while (0)
19925
19926 #define put_user_try uaccess_try
19927@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19928 extern __must_check long strnlen_user(const char __user *str, long n);
19929
19930 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19931-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19932+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19933
19934 extern void __cmpxchg_wrong_size(void)
19935 __compiletime_error("Bad argument size for cmpxchg");
19936@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19937 __typeof__(ptr) __uval = (uval); \
19938 __typeof__(*(ptr)) __old = (old); \
19939 __typeof__(*(ptr)) __new = (new); \
19940+ pax_open_userland(); \
19941 switch (size) { \
19942 case 1: \
19943 { \
19944 asm volatile("\t" ASM_STAC "\n" \
19945- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19946+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19947 "2:\t" ASM_CLAC "\n" \
19948 "\t.section .fixup, \"ax\"\n" \
19949 "3:\tmov %3, %0\n" \
19950 "\tjmp 2b\n" \
19951 "\t.previous\n" \
19952 _ASM_EXTABLE(1b, 3b) \
19953- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19954+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19955 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19956 : "memory" \
19957 ); \
19958@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19959 case 2: \
19960 { \
19961 asm volatile("\t" ASM_STAC "\n" \
19962- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19963+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19964 "2:\t" ASM_CLAC "\n" \
19965 "\t.section .fixup, \"ax\"\n" \
19966 "3:\tmov %3, %0\n" \
19967 "\tjmp 2b\n" \
19968 "\t.previous\n" \
19969 _ASM_EXTABLE(1b, 3b) \
19970- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19971+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19972 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19973 : "memory" \
19974 ); \
19975@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19976 case 4: \
19977 { \
19978 asm volatile("\t" ASM_STAC "\n" \
19979- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19980+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19981 "2:\t" ASM_CLAC "\n" \
19982 "\t.section .fixup, \"ax\"\n" \
19983 "3:\tmov %3, %0\n" \
19984 "\tjmp 2b\n" \
19985 "\t.previous\n" \
19986 _ASM_EXTABLE(1b, 3b) \
19987- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19988+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19989 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19990 : "memory" \
19991 ); \
19992@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19993 __cmpxchg_wrong_size(); \
19994 \
19995 asm volatile("\t" ASM_STAC "\n" \
19996- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19997+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19998 "2:\t" ASM_CLAC "\n" \
19999 "\t.section .fixup, \"ax\"\n" \
20000 "3:\tmov %3, %0\n" \
20001 "\tjmp 2b\n" \
20002 "\t.previous\n" \
20003 _ASM_EXTABLE(1b, 3b) \
20004- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
20005+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
20006 : "i" (-EFAULT), "r" (__new), "1" (__old) \
20007 : "memory" \
20008 ); \
20009@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
20010 default: \
20011 __cmpxchg_wrong_size(); \
20012 } \
20013+ pax_close_userland(); \
20014 *__uval = __old; \
20015 __ret; \
20016 })
20017@@ -636,17 +715,6 @@ extern struct movsl_mask {
20018
20019 #define ARCH_HAS_NOCACHE_UACCESS 1
20020
20021-#ifdef CONFIG_X86_32
20022-# include <asm/uaccess_32.h>
20023-#else
20024-# include <asm/uaccess_64.h>
20025-#endif
20026-
20027-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
20028- unsigned n);
20029-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
20030- unsigned n);
20031-
20032 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
20033 # define copy_user_diag __compiletime_error
20034 #else
20035@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
20036 extern void copy_user_diag("copy_from_user() buffer size is too small")
20037 copy_from_user_overflow(void);
20038 extern void copy_user_diag("copy_to_user() buffer size is too small")
20039-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
20040+copy_to_user_overflow(void);
20041
20042 #undef copy_user_diag
20043
20044@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
20045
20046 extern void
20047 __compiletime_warning("copy_to_user() buffer size is not provably correct")
20048-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
20049+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
20050 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
20051
20052 #else
20053@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
20054
20055 #endif
20056
20057+#ifdef CONFIG_X86_32
20058+# include <asm/uaccess_32.h>
20059+#else
20060+# include <asm/uaccess_64.h>
20061+#endif
20062+
20063 static inline unsigned long __must_check
20064 copy_from_user(void *to, const void __user *from, unsigned long n)
20065 {
20066- int sz = __compiletime_object_size(to);
20067+ size_t sz = __compiletime_object_size(to);
20068
20069 might_fault();
20070
20071@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20072 * case, and do only runtime checking for non-constant sizes.
20073 */
20074
20075- if (likely(sz < 0 || sz >= n))
20076- n = _copy_from_user(to, from, n);
20077- else if(__builtin_constant_p(n))
20078- copy_from_user_overflow();
20079- else
20080- __copy_from_user_overflow(sz, n);
20081+ if (likely(sz != (size_t)-1 && sz < n)) {
20082+ if(__builtin_constant_p(n))
20083+ copy_from_user_overflow();
20084+ else
20085+ __copy_from_user_overflow(sz, n);
20086+ } else if (access_ok(VERIFY_READ, from, n))
20087+ n = __copy_from_user(to, from, n);
20088+ else if ((long)n > 0)
20089+ memset(to, 0, n);
20090
20091 return n;
20092 }
20093@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20094 static inline unsigned long __must_check
20095 copy_to_user(void __user *to, const void *from, unsigned long n)
20096 {
20097- int sz = __compiletime_object_size(from);
20098+ size_t sz = __compiletime_object_size(from);
20099
20100 might_fault();
20101
20102 /* See the comment in copy_from_user() above. */
20103- if (likely(sz < 0 || sz >= n))
20104- n = _copy_to_user(to, from, n);
20105- else if(__builtin_constant_p(n))
20106- copy_to_user_overflow();
20107- else
20108- __copy_to_user_overflow(sz, n);
20109+ if (likely(sz != (size_t)-1 && sz < n)) {
20110+ if(__builtin_constant_p(n))
20111+ copy_to_user_overflow();
20112+ else
20113+ __copy_to_user_overflow(sz, n);
20114+ } else if (access_ok(VERIFY_WRITE, to, n))
20115+ n = __copy_to_user(to, from, n);
20116
20117 return n;
20118 }
20119diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20120index 3c03a5d..edb68ae 100644
20121--- a/arch/x86/include/asm/uaccess_32.h
20122+++ b/arch/x86/include/asm/uaccess_32.h
20123@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20124 * anything, so this is accurate.
20125 */
20126
20127-static __always_inline unsigned long __must_check
20128+static __always_inline __size_overflow(3) unsigned long __must_check
20129 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20130 {
20131+ if ((long)n < 0)
20132+ return n;
20133+
20134+ check_object_size(from, n, true);
20135+
20136 if (__builtin_constant_p(n)) {
20137 unsigned long ret;
20138
20139@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20140 __copy_to_user(void __user *to, const void *from, unsigned long n)
20141 {
20142 might_fault();
20143+
20144 return __copy_to_user_inatomic(to, from, n);
20145 }
20146
20147-static __always_inline unsigned long
20148+static __always_inline __size_overflow(3) unsigned long
20149 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20150 {
20151+ if ((long)n < 0)
20152+ return n;
20153+
20154 /* Avoid zeroing the tail if the copy fails..
20155 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20156 * but as the zeroing behaviour is only significant when n is not
20157@@ -137,6 +146,12 @@ static __always_inline unsigned long
20158 __copy_from_user(void *to, const void __user *from, unsigned long n)
20159 {
20160 might_fault();
20161+
20162+ if ((long)n < 0)
20163+ return n;
20164+
20165+ check_object_size(to, n, false);
20166+
20167 if (__builtin_constant_p(n)) {
20168 unsigned long ret;
20169
20170@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20171 const void __user *from, unsigned long n)
20172 {
20173 might_fault();
20174+
20175+ if ((long)n < 0)
20176+ return n;
20177+
20178 if (__builtin_constant_p(n)) {
20179 unsigned long ret;
20180
20181@@ -181,7 +200,10 @@ static __always_inline unsigned long
20182 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20183 unsigned long n)
20184 {
20185- return __copy_from_user_ll_nocache_nozero(to, from, n);
20186+ if ((long)n < 0)
20187+ return n;
20188+
20189+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20190 }
20191
20192 #endif /* _ASM_X86_UACCESS_32_H */
20193diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20194index 12a26b9..c36fff5 100644
20195--- a/arch/x86/include/asm/uaccess_64.h
20196+++ b/arch/x86/include/asm/uaccess_64.h
20197@@ -10,6 +10,9 @@
20198 #include <asm/alternative.h>
20199 #include <asm/cpufeature.h>
20200 #include <asm/page.h>
20201+#include <asm/pgtable.h>
20202+
20203+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20204
20205 /*
20206 * Copy To/From Userspace
20207@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20208 __must_check unsigned long
20209 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20210
20211-static __always_inline __must_check unsigned long
20212-copy_user_generic(void *to, const void *from, unsigned len)
20213+static __always_inline __must_check __size_overflow(3) unsigned long
20214+copy_user_generic(void *to, const void *from, unsigned long len)
20215 {
20216 unsigned ret;
20217
20218@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20219 }
20220
20221 __must_check unsigned long
20222-copy_in_user(void __user *to, const void __user *from, unsigned len);
20223+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20224
20225 static __always_inline __must_check
20226-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20227+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20228 {
20229- int ret = 0;
20230+ size_t sz = __compiletime_object_size(dst);
20231+ unsigned ret = 0;
20232+
20233+ if (size > INT_MAX)
20234+ return size;
20235+
20236+ check_object_size(dst, size, false);
20237+
20238+#ifdef CONFIG_PAX_MEMORY_UDEREF
20239+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20240+ return size;
20241+#endif
20242+
20243+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20244+ if(__builtin_constant_p(size))
20245+ copy_from_user_overflow();
20246+ else
20247+ __copy_from_user_overflow(sz, size);
20248+ return size;
20249+ }
20250
20251 if (!__builtin_constant_p(size))
20252- return copy_user_generic(dst, (__force void *)src, size);
20253+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20254 switch (size) {
20255- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20256+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20257 ret, "b", "b", "=q", 1);
20258 return ret;
20259- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20260+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20261 ret, "w", "w", "=r", 2);
20262 return ret;
20263- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20264+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20265 ret, "l", "k", "=r", 4);
20266 return ret;
20267- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20268+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20269 ret, "q", "", "=r", 8);
20270 return ret;
20271 case 10:
20272- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20273+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20274 ret, "q", "", "=r", 10);
20275 if (unlikely(ret))
20276 return ret;
20277 __get_user_asm(*(u16 *)(8 + (char *)dst),
20278- (u16 __user *)(8 + (char __user *)src),
20279+ (const u16 __user *)(8 + (const char __user *)src),
20280 ret, "w", "w", "=r", 2);
20281 return ret;
20282 case 16:
20283- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20284+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20285 ret, "q", "", "=r", 16);
20286 if (unlikely(ret))
20287 return ret;
20288 __get_user_asm(*(u64 *)(8 + (char *)dst),
20289- (u64 __user *)(8 + (char __user *)src),
20290+ (const u64 __user *)(8 + (const char __user *)src),
20291 ret, "q", "", "=r", 8);
20292 return ret;
20293 default:
20294- return copy_user_generic(dst, (__force void *)src, size);
20295+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20296 }
20297 }
20298
20299 static __always_inline __must_check
20300-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20301+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20302 {
20303 might_fault();
20304 return __copy_from_user_nocheck(dst, src, size);
20305 }
20306
20307 static __always_inline __must_check
20308-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20309+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20310 {
20311- int ret = 0;
20312+ size_t sz = __compiletime_object_size(src);
20313+ unsigned ret = 0;
20314+
20315+ if (size > INT_MAX)
20316+ return size;
20317+
20318+ check_object_size(src, size, true);
20319+
20320+#ifdef CONFIG_PAX_MEMORY_UDEREF
20321+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20322+ return size;
20323+#endif
20324+
20325+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20326+ if(__builtin_constant_p(size))
20327+ copy_to_user_overflow();
20328+ else
20329+ __copy_to_user_overflow(sz, size);
20330+ return size;
20331+ }
20332
20333 if (!__builtin_constant_p(size))
20334- return copy_user_generic((__force void *)dst, src, size);
20335+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20336 switch (size) {
20337- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20338+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20339 ret, "b", "b", "iq", 1);
20340 return ret;
20341- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20342+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20343 ret, "w", "w", "ir", 2);
20344 return ret;
20345- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20346+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20347 ret, "l", "k", "ir", 4);
20348 return ret;
20349- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20350+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20351 ret, "q", "", "er", 8);
20352 return ret;
20353 case 10:
20354- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20355+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20356 ret, "q", "", "er", 10);
20357 if (unlikely(ret))
20358 return ret;
20359 asm("":::"memory");
20360- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20361+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20362 ret, "w", "w", "ir", 2);
20363 return ret;
20364 case 16:
20365- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20366+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20367 ret, "q", "", "er", 16);
20368 if (unlikely(ret))
20369 return ret;
20370 asm("":::"memory");
20371- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20372+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20373 ret, "q", "", "er", 8);
20374 return ret;
20375 default:
20376- return copy_user_generic((__force void *)dst, src, size);
20377+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20378 }
20379 }
20380
20381 static __always_inline __must_check
20382-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20383+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20384 {
20385 might_fault();
20386 return __copy_to_user_nocheck(dst, src, size);
20387 }
20388
20389 static __always_inline __must_check
20390-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20391+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20392 {
20393- int ret = 0;
20394+ unsigned ret = 0;
20395
20396 might_fault();
20397+
20398+ if (size > INT_MAX)
20399+ return size;
20400+
20401+#ifdef CONFIG_PAX_MEMORY_UDEREF
20402+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20403+ return size;
20404+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20405+ return size;
20406+#endif
20407+
20408 if (!__builtin_constant_p(size))
20409- return copy_user_generic((__force void *)dst,
20410- (__force void *)src, size);
20411+ return copy_user_generic((__force_kernel void *)____m(dst),
20412+ (__force_kernel const void *)____m(src), size);
20413 switch (size) {
20414 case 1: {
20415 u8 tmp;
20416- __get_user_asm(tmp, (u8 __user *)src,
20417+ __get_user_asm(tmp, (const u8 __user *)src,
20418 ret, "b", "b", "=q", 1);
20419 if (likely(!ret))
20420 __put_user_asm(tmp, (u8 __user *)dst,
20421@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20422 }
20423 case 2: {
20424 u16 tmp;
20425- __get_user_asm(tmp, (u16 __user *)src,
20426+ __get_user_asm(tmp, (const u16 __user *)src,
20427 ret, "w", "w", "=r", 2);
20428 if (likely(!ret))
20429 __put_user_asm(tmp, (u16 __user *)dst,
20430@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20431
20432 case 4: {
20433 u32 tmp;
20434- __get_user_asm(tmp, (u32 __user *)src,
20435+ __get_user_asm(tmp, (const u32 __user *)src,
20436 ret, "l", "k", "=r", 4);
20437 if (likely(!ret))
20438 __put_user_asm(tmp, (u32 __user *)dst,
20439@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20440 }
20441 case 8: {
20442 u64 tmp;
20443- __get_user_asm(tmp, (u64 __user *)src,
20444+ __get_user_asm(tmp, (const u64 __user *)src,
20445 ret, "q", "", "=r", 8);
20446 if (likely(!ret))
20447 __put_user_asm(tmp, (u64 __user *)dst,
20448@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20449 return ret;
20450 }
20451 default:
20452- return copy_user_generic((__force void *)dst,
20453- (__force void *)src, size);
20454+ return copy_user_generic((__force_kernel void *)____m(dst),
20455+ (__force_kernel const void *)____m(src), size);
20456 }
20457 }
20458
20459-static __must_check __always_inline int
20460-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20461+static __must_check __always_inline unsigned long
20462+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20463 {
20464 return __copy_from_user_nocheck(dst, src, size);
20465 }
20466
20467-static __must_check __always_inline int
20468-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20469+static __must_check __always_inline unsigned long
20470+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20471 {
20472 return __copy_to_user_nocheck(dst, src, size);
20473 }
20474
20475-extern long __copy_user_nocache(void *dst, const void __user *src,
20476- unsigned size, int zerorest);
20477+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20478+ unsigned long size, int zerorest);
20479
20480-static inline int
20481-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20482+static inline unsigned long
20483+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20484 {
20485 might_fault();
20486+
20487+ if (size > INT_MAX)
20488+ return size;
20489+
20490+#ifdef CONFIG_PAX_MEMORY_UDEREF
20491+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20492+ return size;
20493+#endif
20494+
20495 return __copy_user_nocache(dst, src, size, 1);
20496 }
20497
20498-static inline int
20499+static inline unsigned long
20500 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20501- unsigned size)
20502+ unsigned long size)
20503 {
20504+ if (size > INT_MAX)
20505+ return size;
20506+
20507+#ifdef CONFIG_PAX_MEMORY_UDEREF
20508+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20509+ return size;
20510+#endif
20511+
20512 return __copy_user_nocache(dst, src, size, 0);
20513 }
20514
20515 unsigned long
20516-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20517+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20518
20519 #endif /* _ASM_X86_UACCESS_64_H */
20520diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20521index 5b238981..77fdd78 100644
20522--- a/arch/x86/include/asm/word-at-a-time.h
20523+++ b/arch/x86/include/asm/word-at-a-time.h
20524@@ -11,7 +11,7 @@
20525 * and shift, for example.
20526 */
20527 struct word_at_a_time {
20528- const unsigned long one_bits, high_bits;
20529+ unsigned long one_bits, high_bits;
20530 };
20531
20532 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20533diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20534index f58a9c7..dc378042a 100644
20535--- a/arch/x86/include/asm/x86_init.h
20536+++ b/arch/x86/include/asm/x86_init.h
20537@@ -129,7 +129,7 @@ struct x86_init_ops {
20538 struct x86_init_timers timers;
20539 struct x86_init_iommu iommu;
20540 struct x86_init_pci pci;
20541-};
20542+} __no_const;
20543
20544 /**
20545 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20546@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20547 void (*setup_percpu_clockev)(void);
20548 void (*early_percpu_clock_init)(void);
20549 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20550-};
20551+} __no_const;
20552
20553 struct timespec;
20554
20555@@ -168,7 +168,7 @@ struct x86_platform_ops {
20556 void (*save_sched_clock_state)(void);
20557 void (*restore_sched_clock_state)(void);
20558 void (*apic_post_init)(void);
20559-};
20560+} __no_const;
20561
20562 struct pci_dev;
20563 struct msi_msg;
20564@@ -182,7 +182,7 @@ struct x86_msi_ops {
20565 void (*teardown_msi_irqs)(struct pci_dev *dev);
20566 void (*restore_msi_irqs)(struct pci_dev *dev);
20567 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20568-};
20569+} __no_const;
20570
20571 struct IO_APIC_route_entry;
20572 struct io_apic_irq_attr;
20573@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20574 unsigned int destination, int vector,
20575 struct io_apic_irq_attr *attr);
20576 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20577-};
20578+} __no_const;
20579
20580 extern struct x86_init_ops x86_init;
20581 extern struct x86_cpuinit_ops x86_cpuinit;
20582diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20583index 5eea099..ff7ef8d 100644
20584--- a/arch/x86/include/asm/xen/page.h
20585+++ b/arch/x86/include/asm/xen/page.h
20586@@ -83,7 +83,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20587 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20588 * cases needing an extended handling.
20589 */
20590-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20591+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20592 {
20593 unsigned long mfn;
20594
20595diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20596index c9a6d68..cb57f42 100644
20597--- a/arch/x86/include/asm/xsave.h
20598+++ b/arch/x86/include/asm/xsave.h
20599@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20600 if (unlikely(err))
20601 return -EFAULT;
20602
20603+ pax_open_userland();
20604 __asm__ __volatile__(ASM_STAC "\n"
20605- "1:"XSAVE"\n"
20606+ "1:"
20607+ __copyuser_seg
20608+ XSAVE"\n"
20609 "2: " ASM_CLAC "\n"
20610 xstate_fault
20611 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20612 : "memory");
20613+ pax_close_userland();
20614 return err;
20615 }
20616
20617@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20618 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20619 {
20620 int err = 0;
20621- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20622+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20623 u32 lmask = mask;
20624 u32 hmask = mask >> 32;
20625
20626+ pax_open_userland();
20627 __asm__ __volatile__(ASM_STAC "\n"
20628- "1:"XRSTOR"\n"
20629+ "1:"
20630+ __copyuser_seg
20631+ XRSTOR"\n"
20632 "2: " ASM_CLAC "\n"
20633 xstate_fault
20634 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20635 : "memory"); /* memory required? */
20636+ pax_close_userland();
20637 return err;
20638 }
20639
20640diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20641index d993e33..8db1b18 100644
20642--- a/arch/x86/include/uapi/asm/e820.h
20643+++ b/arch/x86/include/uapi/asm/e820.h
20644@@ -58,7 +58,7 @@ struct e820map {
20645 #define ISA_START_ADDRESS 0xa0000
20646 #define ISA_END_ADDRESS 0x100000
20647
20648-#define BIOS_BEGIN 0x000a0000
20649+#define BIOS_BEGIN 0x000c0000
20650 #define BIOS_END 0x00100000
20651
20652 #define BIOS_ROM_BASE 0xffe00000
20653diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20654index 7b0a55a..ad115bf 100644
20655--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20656+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20657@@ -49,7 +49,6 @@
20658 #define EFLAGS 144
20659 #define RSP 152
20660 #define SS 160
20661-#define ARGOFFSET R11
20662 #endif /* __ASSEMBLY__ */
20663
20664 /* top of stack page */
20665diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20666index 5d4502c..a567e09 100644
20667--- a/arch/x86/kernel/Makefile
20668+++ b/arch/x86/kernel/Makefile
20669@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20670 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20671 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20672 obj-y += probe_roms.o
20673-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20674+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20675 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20676 obj-$(CONFIG_X86_64) += mcount_64.o
20677 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20678diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20679index b5ddc96..490b4e4 100644
20680--- a/arch/x86/kernel/acpi/boot.c
20681+++ b/arch/x86/kernel/acpi/boot.c
20682@@ -1351,7 +1351,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20683 * If your system is blacklisted here, but you find that acpi=force
20684 * works for you, please contact linux-acpi@vger.kernel.org
20685 */
20686-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20687+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20688 /*
20689 * Boxes that need ACPI disabled
20690 */
20691@@ -1426,7 +1426,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20692 };
20693
20694 /* second table for DMI checks that should run after early-quirks */
20695-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20696+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20697 /*
20698 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20699 * which includes some code which overrides all temperature
20700diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20701index 3136820..e2c6577 100644
20702--- a/arch/x86/kernel/acpi/sleep.c
20703+++ b/arch/x86/kernel/acpi/sleep.c
20704@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20705 #else /* CONFIG_64BIT */
20706 #ifdef CONFIG_SMP
20707 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20708+
20709+ pax_open_kernel();
20710 early_gdt_descr.address =
20711 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20712+ pax_close_kernel();
20713+
20714 initial_gs = per_cpu_offset(smp_processor_id());
20715 #endif
20716 initial_code = (unsigned long)wakeup_long64;
20717diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20718index 665c6b7..eae4d56 100644
20719--- a/arch/x86/kernel/acpi/wakeup_32.S
20720+++ b/arch/x86/kernel/acpi/wakeup_32.S
20721@@ -29,13 +29,11 @@ wakeup_pmode_return:
20722 # and restore the stack ... but you need gdt for this to work
20723 movl saved_context_esp, %esp
20724
20725- movl %cs:saved_magic, %eax
20726- cmpl $0x12345678, %eax
20727+ cmpl $0x12345678, saved_magic
20728 jne bogus_magic
20729
20730 # jump to place where we left off
20731- movl saved_eip, %eax
20732- jmp *%eax
20733+ jmp *(saved_eip)
20734
20735 bogus_magic:
20736 jmp bogus_magic
20737diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20738index 703130f..27a155d 100644
20739--- a/arch/x86/kernel/alternative.c
20740+++ b/arch/x86/kernel/alternative.c
20741@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20742 */
20743 for (a = start; a < end; a++) {
20744 instr = (u8 *)&a->instr_offset + a->instr_offset;
20745+
20746+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20747+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20748+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20749+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20750+#endif
20751+
20752 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20753 BUG_ON(a->replacementlen > a->instrlen);
20754 BUG_ON(a->instrlen > sizeof(insnbuf));
20755@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20756 add_nops(insnbuf + a->replacementlen,
20757 a->instrlen - a->replacementlen);
20758
20759+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20760+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20761+ instr = ktva_ktla(instr);
20762+#endif
20763+
20764 text_poke_early(instr, insnbuf, a->instrlen);
20765 }
20766 }
20767@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20768 for (poff = start; poff < end; poff++) {
20769 u8 *ptr = (u8 *)poff + *poff;
20770
20771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20772+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20773+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20774+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20775+#endif
20776+
20777 if (!*poff || ptr < text || ptr >= text_end)
20778 continue;
20779 /* turn DS segment override prefix into lock prefix */
20780- if (*ptr == 0x3e)
20781+ if (*ktla_ktva(ptr) == 0x3e)
20782 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20783 }
20784 mutex_unlock(&text_mutex);
20785@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20786 for (poff = start; poff < end; poff++) {
20787 u8 *ptr = (u8 *)poff + *poff;
20788
20789+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20790+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20791+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20792+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20793+#endif
20794+
20795 if (!*poff || ptr < text || ptr >= text_end)
20796 continue;
20797 /* turn lock prefix into DS segment override prefix */
20798- if (*ptr == 0xf0)
20799+ if (*ktla_ktva(ptr) == 0xf0)
20800 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20801 }
20802 mutex_unlock(&text_mutex);
20803@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20804
20805 BUG_ON(p->len > MAX_PATCH_LEN);
20806 /* prep the buffer with the original instructions */
20807- memcpy(insnbuf, p->instr, p->len);
20808+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20809 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20810 (unsigned long)p->instr, p->len);
20811
20812@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20813 if (!uniproc_patched || num_possible_cpus() == 1)
20814 free_init_pages("SMP alternatives",
20815 (unsigned long)__smp_locks,
20816- (unsigned long)__smp_locks_end);
20817+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20818 #endif
20819
20820 apply_paravirt(__parainstructions, __parainstructions_end);
20821@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20822 * instructions. And on the local CPU you need to be protected again NMI or MCE
20823 * handlers seeing an inconsistent instruction while you patch.
20824 */
20825-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20826+void *__kprobes text_poke_early(void *addr, const void *opcode,
20827 size_t len)
20828 {
20829 unsigned long flags;
20830 local_irq_save(flags);
20831- memcpy(addr, opcode, len);
20832+
20833+ pax_open_kernel();
20834+ memcpy(ktla_ktva(addr), opcode, len);
20835 sync_core();
20836+ pax_close_kernel();
20837+
20838 local_irq_restore(flags);
20839 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20840 that causes hangs on some VIA CPUs. */
20841@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20842 */
20843 void *text_poke(void *addr, const void *opcode, size_t len)
20844 {
20845- unsigned long flags;
20846- char *vaddr;
20847+ unsigned char *vaddr = ktla_ktva(addr);
20848 struct page *pages[2];
20849- int i;
20850+ size_t i;
20851
20852 if (!core_kernel_text((unsigned long)addr)) {
20853- pages[0] = vmalloc_to_page(addr);
20854- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20855+ pages[0] = vmalloc_to_page(vaddr);
20856+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20857 } else {
20858- pages[0] = virt_to_page(addr);
20859+ pages[0] = virt_to_page(vaddr);
20860 WARN_ON(!PageReserved(pages[0]));
20861- pages[1] = virt_to_page(addr + PAGE_SIZE);
20862+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20863 }
20864 BUG_ON(!pages[0]);
20865- local_irq_save(flags);
20866- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20867- if (pages[1])
20868- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20869- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20870- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20871- clear_fixmap(FIX_TEXT_POKE0);
20872- if (pages[1])
20873- clear_fixmap(FIX_TEXT_POKE1);
20874- local_flush_tlb();
20875- sync_core();
20876- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20877- that causes hangs on some VIA CPUs. */
20878+ text_poke_early(addr, opcode, len);
20879 for (i = 0; i < len; i++)
20880- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20881- local_irq_restore(flags);
20882+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20883 return addr;
20884 }
20885
20886@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20887 if (likely(!bp_patching_in_progress))
20888 return 0;
20889
20890- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20891+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20892 return 0;
20893
20894 /* set up the specified breakpoint handler */
20895@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20896 */
20897 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20898 {
20899- unsigned char int3 = 0xcc;
20900+ const unsigned char int3 = 0xcc;
20901
20902 bp_int3_handler = handler;
20903 bp_int3_addr = (u8 *)addr + sizeof(int3);
20904diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20905index 29b5b18..3bdfc29 100644
20906--- a/arch/x86/kernel/apic/apic.c
20907+++ b/arch/x86/kernel/apic/apic.c
20908@@ -201,7 +201,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20909 /*
20910 * Debug level, exported for io_apic.c
20911 */
20912-unsigned int apic_verbosity;
20913+int apic_verbosity;
20914
20915 int pic_mode;
20916
20917@@ -1991,7 +1991,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20918 apic_write(APIC_ESR, 0);
20919 v = apic_read(APIC_ESR);
20920 ack_APIC_irq();
20921- atomic_inc(&irq_err_count);
20922+ atomic_inc_unchecked(&irq_err_count);
20923
20924 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20925 smp_processor_id(), v);
20926diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20927index de918c4..32eed23 100644
20928--- a/arch/x86/kernel/apic/apic_flat_64.c
20929+++ b/arch/x86/kernel/apic/apic_flat_64.c
20930@@ -154,7 +154,7 @@ static int flat_probe(void)
20931 return 1;
20932 }
20933
20934-static struct apic apic_flat = {
20935+static struct apic apic_flat __read_only = {
20936 .name = "flat",
20937 .probe = flat_probe,
20938 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20939@@ -260,7 +260,7 @@ static int physflat_probe(void)
20940 return 0;
20941 }
20942
20943-static struct apic apic_physflat = {
20944+static struct apic apic_physflat __read_only = {
20945
20946 .name = "physical flat",
20947 .probe = physflat_probe,
20948diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20949index b205cdb..d8503ff 100644
20950--- a/arch/x86/kernel/apic/apic_noop.c
20951+++ b/arch/x86/kernel/apic/apic_noop.c
20952@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20953 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20954 }
20955
20956-struct apic apic_noop = {
20957+struct apic apic_noop __read_only = {
20958 .name = "noop",
20959 .probe = noop_probe,
20960 .acpi_madt_oem_check = NULL,
20961diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20962index c4a8d63..fe893ac 100644
20963--- a/arch/x86/kernel/apic/bigsmp_32.c
20964+++ b/arch/x86/kernel/apic/bigsmp_32.c
20965@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20966 return dmi_bigsmp;
20967 }
20968
20969-static struct apic apic_bigsmp = {
20970+static struct apic apic_bigsmp __read_only = {
20971
20972 .name = "bigsmp",
20973 .probe = probe_bigsmp,
20974diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20975index 3f5f604..07a35cf 100644
20976--- a/arch/x86/kernel/apic/io_apic.c
20977+++ b/arch/x86/kernel/apic/io_apic.c
20978@@ -1859,7 +1859,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20979 return ret;
20980 }
20981
20982-atomic_t irq_mis_count;
20983+atomic_unchecked_t irq_mis_count;
20984
20985 #ifdef CONFIG_GENERIC_PENDING_IRQ
20986 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20987@@ -2000,7 +2000,7 @@ static void ack_ioapic_level(struct irq_data *data)
20988 * at the cpu.
20989 */
20990 if (!(v & (1 << (i & 0x1f)))) {
20991- atomic_inc(&irq_mis_count);
20992+ atomic_inc_unchecked(&irq_mis_count);
20993
20994 eoi_ioapic_irq(irq, cfg);
20995 }
20996@@ -2008,7 +2008,7 @@ static void ack_ioapic_level(struct irq_data *data)
20997 ioapic_irqd_unmask(data, cfg, masked);
20998 }
20999
21000-static struct irq_chip ioapic_chip __read_mostly = {
21001+static struct irq_chip ioapic_chip = {
21002 .name = "IO-APIC",
21003 .irq_startup = startup_ioapic_irq,
21004 .irq_mask = mask_ioapic_irq,
21005@@ -2067,7 +2067,7 @@ static void ack_lapic_irq(struct irq_data *data)
21006 ack_APIC_irq();
21007 }
21008
21009-static struct irq_chip lapic_chip __read_mostly = {
21010+static struct irq_chip lapic_chip = {
21011 .name = "local-APIC",
21012 .irq_mask = mask_lapic_irq,
21013 .irq_unmask = unmask_lapic_irq,
21014diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
21015index bda4886..f9c7195 100644
21016--- a/arch/x86/kernel/apic/probe_32.c
21017+++ b/arch/x86/kernel/apic/probe_32.c
21018@@ -72,7 +72,7 @@ static int probe_default(void)
21019 return 1;
21020 }
21021
21022-static struct apic apic_default = {
21023+static struct apic apic_default __read_only = {
21024
21025 .name = "default",
21026 .probe = probe_default,
21027diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
21028index 6cedd79..023ff8e 100644
21029--- a/arch/x86/kernel/apic/vector.c
21030+++ b/arch/x86/kernel/apic/vector.c
21031@@ -21,7 +21,7 @@
21032
21033 static DEFINE_RAW_SPINLOCK(vector_lock);
21034
21035-void lock_vector_lock(void)
21036+void lock_vector_lock(void) __acquires(vector_lock)
21037 {
21038 /* Used to the online set of cpus does not change
21039 * during assign_irq_vector.
21040@@ -29,7 +29,7 @@ void lock_vector_lock(void)
21041 raw_spin_lock(&vector_lock);
21042 }
21043
21044-void unlock_vector_lock(void)
21045+void unlock_vector_lock(void) __releases(vector_lock)
21046 {
21047 raw_spin_unlock(&vector_lock);
21048 }
21049diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
21050index e658f21..b695a1a 100644
21051--- a/arch/x86/kernel/apic/x2apic_cluster.c
21052+++ b/arch/x86/kernel/apic/x2apic_cluster.c
21053@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
21054 return notifier_from_errno(err);
21055 }
21056
21057-static struct notifier_block __refdata x2apic_cpu_notifier = {
21058+static struct notifier_block x2apic_cpu_notifier = {
21059 .notifier_call = update_clusterinfo,
21060 };
21061
21062@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
21063 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
21064 }
21065
21066-static struct apic apic_x2apic_cluster = {
21067+static struct apic apic_x2apic_cluster __read_only = {
21068
21069 .name = "cluster x2apic",
21070 .probe = x2apic_cluster_probe,
21071diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
21072index 6fae733..5ca17af 100644
21073--- a/arch/x86/kernel/apic/x2apic_phys.c
21074+++ b/arch/x86/kernel/apic/x2apic_phys.c
21075@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
21076 return apic == &apic_x2apic_phys;
21077 }
21078
21079-static struct apic apic_x2apic_phys = {
21080+static struct apic apic_x2apic_phys __read_only = {
21081
21082 .name = "physical x2apic",
21083 .probe = x2apic_phys_probe,
21084diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
21085index 8e9dcfd..c61b3e4 100644
21086--- a/arch/x86/kernel/apic/x2apic_uv_x.c
21087+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
21088@@ -348,7 +348,7 @@ static int uv_probe(void)
21089 return apic == &apic_x2apic_uv_x;
21090 }
21091
21092-static struct apic __refdata apic_x2apic_uv_x = {
21093+static struct apic apic_x2apic_uv_x __read_only = {
21094
21095 .name = "UV large system",
21096 .probe = uv_probe,
21097diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
21098index 927ec92..de68f32 100644
21099--- a/arch/x86/kernel/apm_32.c
21100+++ b/arch/x86/kernel/apm_32.c
21101@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
21102 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21103 * even though they are called in protected mode.
21104 */
21105-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21106+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21107 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21108
21109 static const char driver_version[] = "1.16ac"; /* no spaces */
21110@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21111 BUG_ON(cpu != 0);
21112 gdt = get_cpu_gdt_table(cpu);
21113 save_desc_40 = gdt[0x40 / 8];
21114+
21115+ pax_open_kernel();
21116 gdt[0x40 / 8] = bad_bios_desc;
21117+ pax_close_kernel();
21118
21119 apm_irq_save(flags);
21120 APM_DO_SAVE_SEGS;
21121@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21122 &call->esi);
21123 APM_DO_RESTORE_SEGS;
21124 apm_irq_restore(flags);
21125+
21126+ pax_open_kernel();
21127 gdt[0x40 / 8] = save_desc_40;
21128+ pax_close_kernel();
21129+
21130 put_cpu();
21131
21132 return call->eax & 0xff;
21133@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21134 BUG_ON(cpu != 0);
21135 gdt = get_cpu_gdt_table(cpu);
21136 save_desc_40 = gdt[0x40 / 8];
21137+
21138+ pax_open_kernel();
21139 gdt[0x40 / 8] = bad_bios_desc;
21140+ pax_close_kernel();
21141
21142 apm_irq_save(flags);
21143 APM_DO_SAVE_SEGS;
21144@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21145 &call->eax);
21146 APM_DO_RESTORE_SEGS;
21147 apm_irq_restore(flags);
21148+
21149+ pax_open_kernel();
21150 gdt[0x40 / 8] = save_desc_40;
21151+ pax_close_kernel();
21152+
21153 put_cpu();
21154 return error;
21155 }
21156@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21157 return 0;
21158 }
21159
21160-static struct dmi_system_id __initdata apm_dmi_table[] = {
21161+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21162 {
21163 print_if_true,
21164 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21165@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21166 * code to that CPU.
21167 */
21168 gdt = get_cpu_gdt_table(0);
21169+
21170+ pax_open_kernel();
21171 set_desc_base(&gdt[APM_CS >> 3],
21172 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21173 set_desc_base(&gdt[APM_CS_16 >> 3],
21174 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21175 set_desc_base(&gdt[APM_DS >> 3],
21176 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21177+ pax_close_kernel();
21178
21179 proc_create("apm", 0, NULL, &apm_file_ops);
21180
21181diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21182index 9f6b934..cf5ffb3 100644
21183--- a/arch/x86/kernel/asm-offsets.c
21184+++ b/arch/x86/kernel/asm-offsets.c
21185@@ -32,6 +32,8 @@ void common(void) {
21186 OFFSET(TI_flags, thread_info, flags);
21187 OFFSET(TI_status, thread_info, status);
21188 OFFSET(TI_addr_limit, thread_info, addr_limit);
21189+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21190+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21191
21192 BLANK();
21193 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21194@@ -52,8 +54,26 @@ void common(void) {
21195 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21196 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21197 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21198+
21199+#ifdef CONFIG_PAX_KERNEXEC
21200+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21201 #endif
21202
21203+#ifdef CONFIG_PAX_MEMORY_UDEREF
21204+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21205+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21206+#ifdef CONFIG_X86_64
21207+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21208+#endif
21209+#endif
21210+
21211+#endif
21212+
21213+ BLANK();
21214+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21215+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21216+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21217+
21218 #ifdef CONFIG_XEN
21219 BLANK();
21220 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21221diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21222index fdcbb4d..036dd93 100644
21223--- a/arch/x86/kernel/asm-offsets_64.c
21224+++ b/arch/x86/kernel/asm-offsets_64.c
21225@@ -80,6 +80,7 @@ int main(void)
21226 BLANK();
21227 #undef ENTRY
21228
21229+ DEFINE(TSS_size, sizeof(struct tss_struct));
21230 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21231 BLANK();
21232
21233diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21234index 80091ae..0c5184f 100644
21235--- a/arch/x86/kernel/cpu/Makefile
21236+++ b/arch/x86/kernel/cpu/Makefile
21237@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21238 CFLAGS_REMOVE_perf_event.o = -pg
21239 endif
21240
21241-# Make sure load_percpu_segment has no stackprotector
21242-nostackp := $(call cc-option, -fno-stack-protector)
21243-CFLAGS_common.o := $(nostackp)
21244-
21245 obj-y := intel_cacheinfo.o scattered.o topology.o
21246 obj-y += common.o
21247 obj-y += rdrand.o
21248diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21249index 15c5df9..d9a604a 100644
21250--- a/arch/x86/kernel/cpu/amd.c
21251+++ b/arch/x86/kernel/cpu/amd.c
21252@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21253 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21254 {
21255 /* AMD errata T13 (order #21922) */
21256- if ((c->x86 == 6)) {
21257+ if (c->x86 == 6) {
21258 /* Duron Rev A0 */
21259 if (c->x86_model == 3 && c->x86_mask == 0)
21260 size = 64;
21261diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21262index c604965..1558f4a 100644
21263--- a/arch/x86/kernel/cpu/common.c
21264+++ b/arch/x86/kernel/cpu/common.c
21265@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21266
21267 static const struct cpu_dev *this_cpu = &default_cpu;
21268
21269-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21270-#ifdef CONFIG_X86_64
21271- /*
21272- * We need valid kernel segments for data and code in long mode too
21273- * IRET will check the segment types kkeil 2000/10/28
21274- * Also sysret mandates a special GDT layout
21275- *
21276- * TLS descriptors are currently at a different place compared to i386.
21277- * Hopefully nobody expects them at a fixed place (Wine?)
21278- */
21279- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21280- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21281- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21282- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21283- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21284- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21285-#else
21286- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21287- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21288- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21289- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21290- /*
21291- * Segments used for calling PnP BIOS have byte granularity.
21292- * They code segments and data segments have fixed 64k limits,
21293- * the transfer segment sizes are set at run time.
21294- */
21295- /* 32-bit code */
21296- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21297- /* 16-bit code */
21298- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21299- /* 16-bit data */
21300- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21301- /* 16-bit data */
21302- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21303- /* 16-bit data */
21304- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21305- /*
21306- * The APM segments have byte granularity and their bases
21307- * are set at run time. All have 64k limits.
21308- */
21309- /* 32-bit code */
21310- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21311- /* 16-bit code */
21312- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21313- /* data */
21314- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21315-
21316- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21317- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21318- GDT_STACK_CANARY_INIT
21319-#endif
21320-} };
21321-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21322-
21323 static int __init x86_xsave_setup(char *s)
21324 {
21325 if (strlen(s))
21326@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21327 }
21328 }
21329
21330+#ifdef CONFIG_X86_64
21331+static __init int setup_disable_pcid(char *arg)
21332+{
21333+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21334+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21335+
21336+#ifdef CONFIG_PAX_MEMORY_UDEREF
21337+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21338+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21339+#endif
21340+
21341+ return 1;
21342+}
21343+__setup("nopcid", setup_disable_pcid);
21344+
21345+static void setup_pcid(struct cpuinfo_x86 *c)
21346+{
21347+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21348+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21349+
21350+#ifdef CONFIG_PAX_MEMORY_UDEREF
21351+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21352+ pax_open_kernel();
21353+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21354+ pax_close_kernel();
21355+ printk("PAX: slow and weak UDEREF enabled\n");
21356+ } else
21357+ printk("PAX: UDEREF disabled\n");
21358+#endif
21359+
21360+ return;
21361+ }
21362+
21363+ printk("PAX: PCID detected\n");
21364+ set_in_cr4(X86_CR4_PCIDE);
21365+
21366+#ifdef CONFIG_PAX_MEMORY_UDEREF
21367+ pax_open_kernel();
21368+ clone_pgd_mask = ~(pgdval_t)0UL;
21369+ pax_close_kernel();
21370+ if (pax_user_shadow_base)
21371+ printk("PAX: weak UDEREF enabled\n");
21372+ else {
21373+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21374+ printk("PAX: strong UDEREF enabled\n");
21375+ }
21376+#endif
21377+
21378+ if (cpu_has(c, X86_FEATURE_INVPCID))
21379+ printk("PAX: INVPCID detected\n");
21380+}
21381+#endif
21382+
21383 /*
21384 * Some CPU features depend on higher CPUID levels, which may not always
21385 * be available due to CPUID level capping or broken virtualization
21386@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21387 {
21388 struct desc_ptr gdt_descr;
21389
21390- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21391+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21392 gdt_descr.size = GDT_SIZE - 1;
21393 load_gdt(&gdt_descr);
21394 /* Reload the per-cpu base */
21395@@ -895,6 +894,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21396 setup_smep(c);
21397 setup_smap(c);
21398
21399+#ifdef CONFIG_X86_32
21400+#ifdef CONFIG_PAX_PAGEEXEC
21401+ if (!(__supported_pte_mask & _PAGE_NX))
21402+ clear_cpu_cap(c, X86_FEATURE_PSE);
21403+#endif
21404+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21405+ clear_cpu_cap(c, X86_FEATURE_SEP);
21406+#endif
21407+#endif
21408+
21409+#ifdef CONFIG_X86_64
21410+ setup_pcid(c);
21411+#endif
21412+
21413 /*
21414 * The vendor-specific functions might have changed features.
21415 * Now we do "generic changes."
21416@@ -977,7 +990,7 @@ static void syscall32_cpu_init(void)
21417 void enable_sep_cpu(void)
21418 {
21419 int cpu = get_cpu();
21420- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21421+ struct tss_struct *tss = init_tss + cpu;
21422
21423 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21424 put_cpu();
21425@@ -1115,14 +1128,16 @@ static __init int setup_disablecpuid(char *arg)
21426 }
21427 __setup("clearcpuid=", setup_disablecpuid);
21428
21429+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21430+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21431+
21432 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21433- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21434+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21435 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21436
21437 #ifdef CONFIG_X86_64
21438-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21439-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21440- (unsigned long) debug_idt_table };
21441+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21442+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21443
21444 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21445 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21446@@ -1299,7 +1314,7 @@ void cpu_init(void)
21447 */
21448 load_ucode_ap();
21449
21450- t = &per_cpu(init_tss, cpu);
21451+ t = init_tss + cpu;
21452 oist = &per_cpu(orig_ist, cpu);
21453
21454 #ifdef CONFIG_NUMA
21455@@ -1331,7 +1346,6 @@ void cpu_init(void)
21456 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21457 barrier();
21458
21459- x86_configure_nx();
21460 enable_x2apic();
21461
21462 /*
21463@@ -1383,7 +1397,7 @@ void cpu_init(void)
21464 {
21465 int cpu = smp_processor_id();
21466 struct task_struct *curr = current;
21467- struct tss_struct *t = &per_cpu(init_tss, cpu);
21468+ struct tss_struct *t = init_tss + cpu;
21469 struct thread_struct *thread = &curr->thread;
21470
21471 wait_for_master_cpu(cpu);
21472diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21473index c703507..28535e3 100644
21474--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21475+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21476@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21477 };
21478
21479 #ifdef CONFIG_AMD_NB
21480+static struct attribute *default_attrs_amd_nb[] = {
21481+ &type.attr,
21482+ &level.attr,
21483+ &coherency_line_size.attr,
21484+ &physical_line_partition.attr,
21485+ &ways_of_associativity.attr,
21486+ &number_of_sets.attr,
21487+ &size.attr,
21488+ &shared_cpu_map.attr,
21489+ &shared_cpu_list.attr,
21490+ NULL,
21491+ NULL,
21492+ NULL,
21493+ NULL
21494+};
21495+
21496 static struct attribute **amd_l3_attrs(void)
21497 {
21498 static struct attribute **attrs;
21499@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21500
21501 n = ARRAY_SIZE(default_attrs);
21502
21503- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21504- n += 2;
21505-
21506- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21507- n += 1;
21508-
21509- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21510- if (attrs == NULL)
21511- return attrs = default_attrs;
21512-
21513- for (n = 0; default_attrs[n]; n++)
21514- attrs[n] = default_attrs[n];
21515+ attrs = default_attrs_amd_nb;
21516
21517 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21518 attrs[n++] = &cache_disable_0.attr;
21519@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21520 .default_attrs = default_attrs,
21521 };
21522
21523+#ifdef CONFIG_AMD_NB
21524+static struct kobj_type ktype_cache_amd_nb = {
21525+ .sysfs_ops = &sysfs_ops,
21526+ .default_attrs = default_attrs_amd_nb,
21527+};
21528+#endif
21529+
21530 static struct kobj_type ktype_percpu_entry = {
21531 .sysfs_ops = &sysfs_ops,
21532 };
21533@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21534 return retval;
21535 }
21536
21537+#ifdef CONFIG_AMD_NB
21538+ amd_l3_attrs();
21539+#endif
21540+
21541 for (i = 0; i < num_cache_leaves; i++) {
21542+ struct kobj_type *ktype;
21543+
21544 this_object = INDEX_KOBJECT_PTR(cpu, i);
21545 this_object->cpu = cpu;
21546 this_object->index = i;
21547
21548 this_leaf = CPUID4_INFO_IDX(cpu, i);
21549
21550- ktype_cache.default_attrs = default_attrs;
21551+ ktype = &ktype_cache;
21552 #ifdef CONFIG_AMD_NB
21553 if (this_leaf->base.nb)
21554- ktype_cache.default_attrs = amd_l3_attrs();
21555+ ktype = &ktype_cache_amd_nb;
21556 #endif
21557 retval = kobject_init_and_add(&(this_object->kobj),
21558- &ktype_cache,
21559+ ktype,
21560 per_cpu(ici_cache_kobject, cpu),
21561 "index%1lu", i);
21562 if (unlikely(retval)) {
21563diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21564index d2c6116..62fd7aa 100644
21565--- a/arch/x86/kernel/cpu/mcheck/mce.c
21566+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21567@@ -45,6 +45,7 @@
21568 #include <asm/processor.h>
21569 #include <asm/mce.h>
21570 #include <asm/msr.h>
21571+#include <asm/local.h>
21572
21573 #include "mce-internal.h"
21574
21575@@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21576 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21577 m->cs, m->ip);
21578
21579- if (m->cs == __KERNEL_CS)
21580+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21581 print_symbol("{%s}", m->ip);
21582 pr_cont("\n");
21583 }
21584@@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21585
21586 #define PANIC_TIMEOUT 5 /* 5 seconds */
21587
21588-static atomic_t mce_panicked;
21589+static atomic_unchecked_t mce_panicked;
21590
21591 static int fake_panic;
21592-static atomic_t mce_fake_panicked;
21593+static atomic_unchecked_t mce_fake_panicked;
21594
21595 /* Panic in progress. Enable interrupts and wait for final IPI */
21596 static void wait_for_panic(void)
21597@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21598 /*
21599 * Make sure only one CPU runs in machine check panic
21600 */
21601- if (atomic_inc_return(&mce_panicked) > 1)
21602+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21603 wait_for_panic();
21604 barrier();
21605
21606@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21607 console_verbose();
21608 } else {
21609 /* Don't log too much for fake panic */
21610- if (atomic_inc_return(&mce_fake_panicked) > 1)
21611+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21612 return;
21613 }
21614 /* First print corrected ones that are still unlogged */
21615@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21616 if (!fake_panic) {
21617 if (panic_timeout == 0)
21618 panic_timeout = mca_cfg.panic_timeout;
21619- panic(msg);
21620+ panic("%s", msg);
21621 } else
21622 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21623 }
21624@@ -744,7 +745,7 @@ static int mce_timed_out(u64 *t)
21625 * might have been modified by someone else.
21626 */
21627 rmb();
21628- if (atomic_read(&mce_panicked))
21629+ if (atomic_read_unchecked(&mce_panicked))
21630 wait_for_panic();
21631 if (!mca_cfg.monarch_timeout)
21632 goto out;
21633@@ -1722,7 +1723,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21634 }
21635
21636 /* Call the installed machine check handler for this CPU setup. */
21637-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21638+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21639 unexpected_machine_check;
21640
21641 /*
21642@@ -1745,7 +1746,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21643 return;
21644 }
21645
21646+ pax_open_kernel();
21647 machine_check_vector = do_machine_check;
21648+ pax_close_kernel();
21649
21650 __mcheck_cpu_init_generic();
21651 __mcheck_cpu_init_vendor(c);
21652@@ -1759,7 +1762,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21653 */
21654
21655 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21656-static int mce_chrdev_open_count; /* #times opened */
21657+static local_t mce_chrdev_open_count; /* #times opened */
21658 static int mce_chrdev_open_exclu; /* already open exclusive? */
21659
21660 static int mce_chrdev_open(struct inode *inode, struct file *file)
21661@@ -1767,7 +1770,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21662 spin_lock(&mce_chrdev_state_lock);
21663
21664 if (mce_chrdev_open_exclu ||
21665- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21666+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21667 spin_unlock(&mce_chrdev_state_lock);
21668
21669 return -EBUSY;
21670@@ -1775,7 +1778,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21671
21672 if (file->f_flags & O_EXCL)
21673 mce_chrdev_open_exclu = 1;
21674- mce_chrdev_open_count++;
21675+ local_inc(&mce_chrdev_open_count);
21676
21677 spin_unlock(&mce_chrdev_state_lock);
21678
21679@@ -1786,7 +1789,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21680 {
21681 spin_lock(&mce_chrdev_state_lock);
21682
21683- mce_chrdev_open_count--;
21684+ local_dec(&mce_chrdev_open_count);
21685 mce_chrdev_open_exclu = 0;
21686
21687 spin_unlock(&mce_chrdev_state_lock);
21688@@ -2461,7 +2464,7 @@ static __init void mce_init_banks(void)
21689
21690 for (i = 0; i < mca_cfg.banks; i++) {
21691 struct mce_bank *b = &mce_banks[i];
21692- struct device_attribute *a = &b->attr;
21693+ device_attribute_no_const *a = &b->attr;
21694
21695 sysfs_attr_init(&a->attr);
21696 a->attr.name = b->attrname;
21697@@ -2568,7 +2571,7 @@ struct dentry *mce_get_debugfs_dir(void)
21698 static void mce_reset(void)
21699 {
21700 cpu_missing = 0;
21701- atomic_set(&mce_fake_panicked, 0);
21702+ atomic_set_unchecked(&mce_fake_panicked, 0);
21703 atomic_set(&mce_executing, 0);
21704 atomic_set(&mce_callin, 0);
21705 atomic_set(&global_nwo, 0);
21706diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21707index a304298..49b6d06 100644
21708--- a/arch/x86/kernel/cpu/mcheck/p5.c
21709+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21710@@ -10,6 +10,7 @@
21711 #include <asm/processor.h>
21712 #include <asm/mce.h>
21713 #include <asm/msr.h>
21714+#include <asm/pgtable.h>
21715
21716 /* By default disabled */
21717 int mce_p5_enabled __read_mostly;
21718@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21719 if (!cpu_has(c, X86_FEATURE_MCE))
21720 return;
21721
21722+ pax_open_kernel();
21723 machine_check_vector = pentium_machine_check;
21724+ pax_close_kernel();
21725 /* Make sure the vector pointer is visible before we enable MCEs: */
21726 wmb();
21727
21728diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21729index 7dc5564..1273569 100644
21730--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21731+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21732@@ -9,6 +9,7 @@
21733 #include <asm/processor.h>
21734 #include <asm/mce.h>
21735 #include <asm/msr.h>
21736+#include <asm/pgtable.h>
21737
21738 /* Machine check handler for WinChip C6: */
21739 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21740@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21741 {
21742 u32 lo, hi;
21743
21744+ pax_open_kernel();
21745 machine_check_vector = winchip_machine_check;
21746+ pax_close_kernel();
21747 /* Make sure the vector pointer is visible before we enable MCEs: */
21748 wmb();
21749
21750diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21751index 36a8361..e7058c2 100644
21752--- a/arch/x86/kernel/cpu/microcode/core.c
21753+++ b/arch/x86/kernel/cpu/microcode/core.c
21754@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21755 return NOTIFY_OK;
21756 }
21757
21758-static struct notifier_block __refdata mc_cpu_notifier = {
21759+static struct notifier_block mc_cpu_notifier = {
21760 .notifier_call = mc_cpu_callback,
21761 };
21762
21763diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21764index c6826d1..8dc677e 100644
21765--- a/arch/x86/kernel/cpu/microcode/intel.c
21766+++ b/arch/x86/kernel/cpu/microcode/intel.c
21767@@ -196,6 +196,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
21768 struct microcode_header_intel mc_header;
21769 unsigned int mc_size;
21770
21771+ if (leftover < sizeof(mc_header)) {
21772+ pr_err("error! Truncated header in microcode data file\n");
21773+ break;
21774+ }
21775+
21776 if (get_ucode_data(&mc_header, ucode_ptr, sizeof(mc_header)))
21777 break;
21778
21779@@ -293,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21780
21781 static int get_ucode_user(void *to, const void *from, size_t n)
21782 {
21783- return copy_from_user(to, from, n);
21784+ return copy_from_user(to, (const void __force_user *)from, n);
21785 }
21786
21787 static enum ucode_state
21788 request_microcode_user(int cpu, const void __user *buf, size_t size)
21789 {
21790- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21791+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21792 }
21793
21794 static void microcode_fini_cpu(int cpu)
21795diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
21796index ec9df6f..420eb93 100644
21797--- a/arch/x86/kernel/cpu/microcode/intel_early.c
21798+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
21799@@ -321,7 +321,11 @@ get_matching_model_microcode(int cpu, unsigned long start,
21800 unsigned int mc_saved_count = mc_saved_data->mc_saved_count;
21801 int i;
21802
21803- while (leftover) {
21804+ while (leftover && mc_saved_count < ARRAY_SIZE(mc_saved_tmp)) {
21805+
21806+ if (leftover < sizeof(mc_header))
21807+ break;
21808+
21809 mc_header = (struct microcode_header_intel *)ucode_ptr;
21810
21811 mc_size = get_totalsize(mc_header);
21812diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21813index ea5f363..cb0e905 100644
21814--- a/arch/x86/kernel/cpu/mtrr/main.c
21815+++ b/arch/x86/kernel/cpu/mtrr/main.c
21816@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21817 u64 size_or_mask, size_and_mask;
21818 static bool mtrr_aps_delayed_init;
21819
21820-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21821+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21822
21823 const struct mtrr_ops *mtrr_if;
21824
21825diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21826index df5e41f..816c719 100644
21827--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21828+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21829@@ -25,7 +25,7 @@ struct mtrr_ops {
21830 int (*validate_add_page)(unsigned long base, unsigned long size,
21831 unsigned int type);
21832 int (*have_wrcomb)(void);
21833-};
21834+} __do_const;
21835
21836 extern int generic_get_free_region(unsigned long base, unsigned long size,
21837 int replace_reg);
21838diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21839index 143e5f5..5825081 100644
21840--- a/arch/x86/kernel/cpu/perf_event.c
21841+++ b/arch/x86/kernel/cpu/perf_event.c
21842@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21843
21844 }
21845
21846-static struct attribute_group x86_pmu_format_group = {
21847+static attribute_group_no_const x86_pmu_format_group = {
21848 .name = "format",
21849 .attrs = NULL,
21850 };
21851@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21852 NULL,
21853 };
21854
21855-static struct attribute_group x86_pmu_events_group = {
21856+static attribute_group_no_const x86_pmu_events_group = {
21857 .name = "events",
21858 .attrs = events_attr,
21859 };
21860@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21861 if (idx > GDT_ENTRIES)
21862 return 0;
21863
21864- desc = raw_cpu_ptr(gdt_page.gdt);
21865+ desc = get_cpu_gdt_table(smp_processor_id());
21866 }
21867
21868 return get_desc_base(desc + idx);
21869@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21870 break;
21871
21872 perf_callchain_store(entry, frame.return_address);
21873- fp = frame.next_frame;
21874+ fp = (const void __force_user *)frame.next_frame;
21875 }
21876 }
21877
21878diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21879index 97242a9..cf9c30e 100644
21880--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21881+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21882@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21883 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21884 {
21885 struct attribute **attrs;
21886- struct attribute_group *attr_group;
21887+ attribute_group_no_const *attr_group;
21888 int i = 0, j;
21889
21890 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21891diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21892index 498b6d9..4126515 100644
21893--- a/arch/x86/kernel/cpu/perf_event_intel.c
21894+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21895@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21896 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21897
21898 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21899- u64 capabilities;
21900+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21901
21902- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21903- x86_pmu.intel_cap.capabilities = capabilities;
21904+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21905+ x86_pmu.intel_cap.capabilities = capabilities;
21906 }
21907
21908 intel_ds_init();
21909diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21910index c4bb8b8..9f7384d 100644
21911--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21912+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21913@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21914 NULL,
21915 };
21916
21917-static struct attribute_group rapl_pmu_events_group = {
21918+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21919 .name = "events",
21920 .attrs = NULL, /* patched at runtime */
21921 };
21922diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21923index c635b8b..b78835e 100644
21924--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21925+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21926@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21927 static int __init uncore_type_init(struct intel_uncore_type *type)
21928 {
21929 struct intel_uncore_pmu *pmus;
21930- struct attribute_group *attr_group;
21931+ attribute_group_no_const *attr_group;
21932 struct attribute **attrs;
21933 int i, j;
21934
21935diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21936index 6c8c1e7..515b98a 100644
21937--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21938+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21939@@ -114,7 +114,7 @@ struct intel_uncore_box {
21940 struct uncore_event_desc {
21941 struct kobj_attribute attr;
21942 const char *config;
21943-};
21944+} __do_const;
21945
21946 ssize_t uncore_event_show(struct kobject *kobj,
21947 struct kobj_attribute *attr, char *buf);
21948diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21949index 83741a7..bd3507d 100644
21950--- a/arch/x86/kernel/cpuid.c
21951+++ b/arch/x86/kernel/cpuid.c
21952@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21953 return notifier_from_errno(err);
21954 }
21955
21956-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21957+static struct notifier_block cpuid_class_cpu_notifier =
21958 {
21959 .notifier_call = cpuid_class_cpu_callback,
21960 };
21961diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21962index aceb2f9..c76d3e3 100644
21963--- a/arch/x86/kernel/crash.c
21964+++ b/arch/x86/kernel/crash.c
21965@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21966 #ifdef CONFIG_X86_32
21967 struct pt_regs fixed_regs;
21968
21969- if (!user_mode_vm(regs)) {
21970+ if (!user_mode(regs)) {
21971 crash_fixup_ss_esp(&fixed_regs, regs);
21972 regs = &fixed_regs;
21973 }
21974diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21975index afa64ad..dce67dd 100644
21976--- a/arch/x86/kernel/crash_dump_64.c
21977+++ b/arch/x86/kernel/crash_dump_64.c
21978@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21979 return -ENOMEM;
21980
21981 if (userbuf) {
21982- if (copy_to_user(buf, vaddr + offset, csize)) {
21983+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21984 iounmap(vaddr);
21985 return -EFAULT;
21986 }
21987diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21988index f6dfd93..892ade4 100644
21989--- a/arch/x86/kernel/doublefault.c
21990+++ b/arch/x86/kernel/doublefault.c
21991@@ -12,7 +12,7 @@
21992
21993 #define DOUBLEFAULT_STACKSIZE (1024)
21994 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21995-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21996+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21997
21998 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21999
22000@@ -22,7 +22,7 @@ static void doublefault_fn(void)
22001 unsigned long gdt, tss;
22002
22003 native_store_gdt(&gdt_desc);
22004- gdt = gdt_desc.address;
22005+ gdt = (unsigned long)gdt_desc.address;
22006
22007 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
22008
22009@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
22010 /* 0x2 bit is always set */
22011 .flags = X86_EFLAGS_SF | 0x2,
22012 .sp = STACK_START,
22013- .es = __USER_DS,
22014+ .es = __KERNEL_DS,
22015 .cs = __KERNEL_CS,
22016 .ss = __KERNEL_DS,
22017- .ds = __USER_DS,
22018+ .ds = __KERNEL_DS,
22019 .fs = __KERNEL_PERCPU,
22020
22021 .__cr3 = __pa_nodebug(swapper_pg_dir),
22022diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
22023index b74ebc7..2c95874 100644
22024--- a/arch/x86/kernel/dumpstack.c
22025+++ b/arch/x86/kernel/dumpstack.c
22026@@ -2,6 +2,9 @@
22027 * Copyright (C) 1991, 1992 Linus Torvalds
22028 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
22029 */
22030+#ifdef CONFIG_GRKERNSEC_HIDESYM
22031+#define __INCLUDED_BY_HIDESYM 1
22032+#endif
22033 #include <linux/kallsyms.h>
22034 #include <linux/kprobes.h>
22035 #include <linux/uaccess.h>
22036@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
22037
22038 void printk_address(unsigned long address)
22039 {
22040- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
22041+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
22042 }
22043
22044 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
22045 static void
22046 print_ftrace_graph_addr(unsigned long addr, void *data,
22047 const struct stacktrace_ops *ops,
22048- struct thread_info *tinfo, int *graph)
22049+ struct task_struct *task, int *graph)
22050 {
22051- struct task_struct *task;
22052 unsigned long ret_addr;
22053 int index;
22054
22055 if (addr != (unsigned long)return_to_handler)
22056 return;
22057
22058- task = tinfo->task;
22059 index = task->curr_ret_stack;
22060
22061 if (!task->ret_stack || index < *graph)
22062@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22063 static inline void
22064 print_ftrace_graph_addr(unsigned long addr, void *data,
22065 const struct stacktrace_ops *ops,
22066- struct thread_info *tinfo, int *graph)
22067+ struct task_struct *task, int *graph)
22068 { }
22069 #endif
22070
22071@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22072 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
22073 */
22074
22075-static inline int valid_stack_ptr(struct thread_info *tinfo,
22076- void *p, unsigned int size, void *end)
22077+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
22078 {
22079- void *t = tinfo;
22080 if (end) {
22081 if (p < end && p >= (end-THREAD_SIZE))
22082 return 1;
22083@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
22084 }
22085
22086 unsigned long
22087-print_context_stack(struct thread_info *tinfo,
22088+print_context_stack(struct task_struct *task, void *stack_start,
22089 unsigned long *stack, unsigned long bp,
22090 const struct stacktrace_ops *ops, void *data,
22091 unsigned long *end, int *graph)
22092 {
22093 struct stack_frame *frame = (struct stack_frame *)bp;
22094
22095- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
22096+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
22097 unsigned long addr;
22098
22099 addr = *stack;
22100@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
22101 } else {
22102 ops->address(data, addr, 0);
22103 }
22104- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22105+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22106 }
22107 stack++;
22108 }
22109@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
22110 EXPORT_SYMBOL_GPL(print_context_stack);
22111
22112 unsigned long
22113-print_context_stack_bp(struct thread_info *tinfo,
22114+print_context_stack_bp(struct task_struct *task, void *stack_start,
22115 unsigned long *stack, unsigned long bp,
22116 const struct stacktrace_ops *ops, void *data,
22117 unsigned long *end, int *graph)
22118@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22119 struct stack_frame *frame = (struct stack_frame *)bp;
22120 unsigned long *ret_addr = &frame->return_address;
22121
22122- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22123+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22124 unsigned long addr = *ret_addr;
22125
22126 if (!__kernel_text_address(addr))
22127@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22128 ops->address(data, addr, 1);
22129 frame = frame->next_frame;
22130 ret_addr = &frame->return_address;
22131- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22132+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22133 }
22134
22135 return (unsigned long)frame;
22136@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
22137 static void print_trace_address(void *data, unsigned long addr, int reliable)
22138 {
22139 touch_nmi_watchdog();
22140- printk(data);
22141+ printk("%s", (char *)data);
22142 printk_stack_address(addr, reliable);
22143 }
22144
22145@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22146 EXPORT_SYMBOL_GPL(oops_begin);
22147 NOKPROBE_SYMBOL(oops_begin);
22148
22149+extern void gr_handle_kernel_exploit(void);
22150+
22151 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22152 {
22153 if (regs && kexec_should_crash(current))
22154@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22155 panic("Fatal exception in interrupt");
22156 if (panic_on_oops)
22157 panic("Fatal exception");
22158- do_exit(signr);
22159+
22160+ gr_handle_kernel_exploit();
22161+
22162+ do_group_exit(signr);
22163 }
22164 NOKPROBE_SYMBOL(oops_end);
22165
22166@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22167 print_modules();
22168 show_regs(regs);
22169 #ifdef CONFIG_X86_32
22170- if (user_mode_vm(regs)) {
22171+ if (user_mode(regs)) {
22172 sp = regs->sp;
22173 ss = regs->ss & 0xffff;
22174 } else {
22175@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22176 unsigned long flags = oops_begin();
22177 int sig = SIGSEGV;
22178
22179- if (!user_mode_vm(regs))
22180+ if (!user_mode(regs))
22181 report_bug(regs->ip, regs);
22182
22183 if (__die(str, regs, err))
22184diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22185index 5abd4cd..c65733b 100644
22186--- a/arch/x86/kernel/dumpstack_32.c
22187+++ b/arch/x86/kernel/dumpstack_32.c
22188@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22189 bp = stack_frame(task, regs);
22190
22191 for (;;) {
22192- struct thread_info *context;
22193+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22194 void *end_stack;
22195
22196 end_stack = is_hardirq_stack(stack, cpu);
22197 if (!end_stack)
22198 end_stack = is_softirq_stack(stack, cpu);
22199
22200- context = task_thread_info(task);
22201- bp = ops->walk_stack(context, stack, bp, ops, data,
22202+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22203 end_stack, &graph);
22204
22205 /* Stop if not on irq stack */
22206@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22207 int i;
22208
22209 show_regs_print_info(KERN_EMERG);
22210- __show_regs(regs, !user_mode_vm(regs));
22211+ __show_regs(regs, !user_mode(regs));
22212
22213 /*
22214 * When in-kernel, we also print out the stack and code at the
22215 * time of the fault..
22216 */
22217- if (!user_mode_vm(regs)) {
22218+ if (!user_mode(regs)) {
22219 unsigned int code_prologue = code_bytes * 43 / 64;
22220 unsigned int code_len = code_bytes;
22221 unsigned char c;
22222 u8 *ip;
22223+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22224
22225 pr_emerg("Stack:\n");
22226 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22227
22228 pr_emerg("Code:");
22229
22230- ip = (u8 *)regs->ip - code_prologue;
22231+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22232 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22233 /* try starting at IP */
22234- ip = (u8 *)regs->ip;
22235+ ip = (u8 *)regs->ip + cs_base;
22236 code_len = code_len - code_prologue + 1;
22237 }
22238 for (i = 0; i < code_len; i++, ip++) {
22239@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22240 pr_cont(" Bad EIP value.");
22241 break;
22242 }
22243- if (ip == (u8 *)regs->ip)
22244+ if (ip == (u8 *)regs->ip + cs_base)
22245 pr_cont(" <%02x>", c);
22246 else
22247 pr_cont(" %02x", c);
22248@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22249 {
22250 unsigned short ud2;
22251
22252+ ip = ktla_ktva(ip);
22253 if (ip < PAGE_OFFSET)
22254 return 0;
22255 if (probe_kernel_address((unsigned short *)ip, ud2))
22256@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22257
22258 return ud2 == 0x0b0f;
22259 }
22260+
22261+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22262+void pax_check_alloca(unsigned long size)
22263+{
22264+ unsigned long sp = (unsigned long)&sp, stack_left;
22265+
22266+ /* all kernel stacks are of the same size */
22267+ stack_left = sp & (THREAD_SIZE - 1);
22268+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22269+}
22270+EXPORT_SYMBOL(pax_check_alloca);
22271+#endif
22272diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22273index ff86f19..73eabf4 100644
22274--- a/arch/x86/kernel/dumpstack_64.c
22275+++ b/arch/x86/kernel/dumpstack_64.c
22276@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22277 const struct stacktrace_ops *ops, void *data)
22278 {
22279 const unsigned cpu = get_cpu();
22280- struct thread_info *tinfo;
22281 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22282 unsigned long dummy;
22283 unsigned used = 0;
22284 int graph = 0;
22285 int done = 0;
22286+ void *stack_start;
22287
22288 if (!task)
22289 task = current;
22290@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22291 * current stack address. If the stacks consist of nested
22292 * exceptions
22293 */
22294- tinfo = task_thread_info(task);
22295 while (!done) {
22296 unsigned long *stack_end;
22297 enum stack_type stype;
22298@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22299 if (ops->stack(data, id) < 0)
22300 break;
22301
22302- bp = ops->walk_stack(tinfo, stack, bp, ops,
22303+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22304 data, stack_end, &graph);
22305 ops->stack(data, "<EOE>");
22306 /*
22307@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22308 * second-to-last pointer (index -2 to end) in the
22309 * exception stack:
22310 */
22311+ if ((u16)stack_end[-1] != __KERNEL_DS)
22312+ goto out;
22313 stack = (unsigned long *) stack_end[-2];
22314 done = 0;
22315 break;
22316@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22317
22318 if (ops->stack(data, "IRQ") < 0)
22319 break;
22320- bp = ops->walk_stack(tinfo, stack, bp,
22321+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22322 ops, data, stack_end, &graph);
22323 /*
22324 * We link to the next stack (which would be
22325@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22326 /*
22327 * This handles the process stack:
22328 */
22329- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22330+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22331+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22332+out:
22333 put_cpu();
22334 }
22335 EXPORT_SYMBOL(dump_trace);
22336@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22337 {
22338 unsigned short ud2;
22339
22340- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22341+ if (probe_kernel_address((unsigned short *)ip, ud2))
22342 return 0;
22343
22344 return ud2 == 0x0b0f;
22345 }
22346+
22347+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22348+void pax_check_alloca(unsigned long size)
22349+{
22350+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22351+ unsigned cpu, used;
22352+ char *id;
22353+
22354+ /* check the process stack first */
22355+ stack_start = (unsigned long)task_stack_page(current);
22356+ stack_end = stack_start + THREAD_SIZE;
22357+ if (likely(stack_start <= sp && sp < stack_end)) {
22358+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22359+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22360+ return;
22361+ }
22362+
22363+ cpu = get_cpu();
22364+
22365+ /* check the irq stacks */
22366+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22367+ stack_start = stack_end - IRQ_STACK_SIZE;
22368+ if (stack_start <= sp && sp < stack_end) {
22369+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22370+ put_cpu();
22371+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22372+ return;
22373+ }
22374+
22375+ /* check the exception stacks */
22376+ used = 0;
22377+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22378+ stack_start = stack_end - EXCEPTION_STKSZ;
22379+ if (stack_end && stack_start <= sp && sp < stack_end) {
22380+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22381+ put_cpu();
22382+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22383+ return;
22384+ }
22385+
22386+ put_cpu();
22387+
22388+ /* unknown stack */
22389+ BUG();
22390+}
22391+EXPORT_SYMBOL(pax_check_alloca);
22392+#endif
22393diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22394index dd2f07a..845dc05 100644
22395--- a/arch/x86/kernel/e820.c
22396+++ b/arch/x86/kernel/e820.c
22397@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22398
22399 static void early_panic(char *msg)
22400 {
22401- early_printk(msg);
22402- panic(msg);
22403+ early_printk("%s", msg);
22404+ panic("%s", msg);
22405 }
22406
22407 static int userdef __initdata;
22408diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22409index 01d1c18..8073693 100644
22410--- a/arch/x86/kernel/early_printk.c
22411+++ b/arch/x86/kernel/early_printk.c
22412@@ -7,6 +7,7 @@
22413 #include <linux/pci_regs.h>
22414 #include <linux/pci_ids.h>
22415 #include <linux/errno.h>
22416+#include <linux/sched.h>
22417 #include <asm/io.h>
22418 #include <asm/processor.h>
22419 #include <asm/fcntl.h>
22420diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22421index 000d419..8f66802 100644
22422--- a/arch/x86/kernel/entry_32.S
22423+++ b/arch/x86/kernel/entry_32.S
22424@@ -177,13 +177,154 @@
22425 /*CFI_REL_OFFSET gs, PT_GS*/
22426 .endm
22427 .macro SET_KERNEL_GS reg
22428+
22429+#ifdef CONFIG_CC_STACKPROTECTOR
22430 movl $(__KERNEL_STACK_CANARY), \reg
22431+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22432+ movl $(__USER_DS), \reg
22433+#else
22434+ xorl \reg, \reg
22435+#endif
22436+
22437 movl \reg, %gs
22438 .endm
22439
22440 #endif /* CONFIG_X86_32_LAZY_GS */
22441
22442-.macro SAVE_ALL
22443+.macro pax_enter_kernel
22444+#ifdef CONFIG_PAX_KERNEXEC
22445+ call pax_enter_kernel
22446+#endif
22447+.endm
22448+
22449+.macro pax_exit_kernel
22450+#ifdef CONFIG_PAX_KERNEXEC
22451+ call pax_exit_kernel
22452+#endif
22453+.endm
22454+
22455+#ifdef CONFIG_PAX_KERNEXEC
22456+ENTRY(pax_enter_kernel)
22457+#ifdef CONFIG_PARAVIRT
22458+ pushl %eax
22459+ pushl %ecx
22460+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22461+ mov %eax, %esi
22462+#else
22463+ mov %cr0, %esi
22464+#endif
22465+ bts $16, %esi
22466+ jnc 1f
22467+ mov %cs, %esi
22468+ cmp $__KERNEL_CS, %esi
22469+ jz 3f
22470+ ljmp $__KERNEL_CS, $3f
22471+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22472+2:
22473+#ifdef CONFIG_PARAVIRT
22474+ mov %esi, %eax
22475+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22476+#else
22477+ mov %esi, %cr0
22478+#endif
22479+3:
22480+#ifdef CONFIG_PARAVIRT
22481+ popl %ecx
22482+ popl %eax
22483+#endif
22484+ ret
22485+ENDPROC(pax_enter_kernel)
22486+
22487+ENTRY(pax_exit_kernel)
22488+#ifdef CONFIG_PARAVIRT
22489+ pushl %eax
22490+ pushl %ecx
22491+#endif
22492+ mov %cs, %esi
22493+ cmp $__KERNEXEC_KERNEL_CS, %esi
22494+ jnz 2f
22495+#ifdef CONFIG_PARAVIRT
22496+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22497+ mov %eax, %esi
22498+#else
22499+ mov %cr0, %esi
22500+#endif
22501+ btr $16, %esi
22502+ ljmp $__KERNEL_CS, $1f
22503+1:
22504+#ifdef CONFIG_PARAVIRT
22505+ mov %esi, %eax
22506+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22507+#else
22508+ mov %esi, %cr0
22509+#endif
22510+2:
22511+#ifdef CONFIG_PARAVIRT
22512+ popl %ecx
22513+ popl %eax
22514+#endif
22515+ ret
22516+ENDPROC(pax_exit_kernel)
22517+#endif
22518+
22519+ .macro pax_erase_kstack
22520+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22521+ call pax_erase_kstack
22522+#endif
22523+ .endm
22524+
22525+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22526+/*
22527+ * ebp: thread_info
22528+ */
22529+ENTRY(pax_erase_kstack)
22530+ pushl %edi
22531+ pushl %ecx
22532+ pushl %eax
22533+
22534+ mov TI_lowest_stack(%ebp), %edi
22535+ mov $-0xBEEF, %eax
22536+ std
22537+
22538+1: mov %edi, %ecx
22539+ and $THREAD_SIZE_asm - 1, %ecx
22540+ shr $2, %ecx
22541+ repne scasl
22542+ jecxz 2f
22543+
22544+ cmp $2*16, %ecx
22545+ jc 2f
22546+
22547+ mov $2*16, %ecx
22548+ repe scasl
22549+ jecxz 2f
22550+ jne 1b
22551+
22552+2: cld
22553+ or $2*4, %edi
22554+ mov %esp, %ecx
22555+ sub %edi, %ecx
22556+
22557+ cmp $THREAD_SIZE_asm, %ecx
22558+ jb 3f
22559+ ud2
22560+3:
22561+
22562+ shr $2, %ecx
22563+ rep stosl
22564+
22565+ mov TI_task_thread_sp0(%ebp), %edi
22566+ sub $128, %edi
22567+ mov %edi, TI_lowest_stack(%ebp)
22568+
22569+ popl %eax
22570+ popl %ecx
22571+ popl %edi
22572+ ret
22573+ENDPROC(pax_erase_kstack)
22574+#endif
22575+
22576+.macro __SAVE_ALL _DS
22577 cld
22578 PUSH_GS
22579 pushl_cfi %fs
22580@@ -206,7 +347,7 @@
22581 CFI_REL_OFFSET ecx, 0
22582 pushl_cfi %ebx
22583 CFI_REL_OFFSET ebx, 0
22584- movl $(__USER_DS), %edx
22585+ movl $\_DS, %edx
22586 movl %edx, %ds
22587 movl %edx, %es
22588 movl $(__KERNEL_PERCPU), %edx
22589@@ -214,6 +355,15 @@
22590 SET_KERNEL_GS %edx
22591 .endm
22592
22593+.macro SAVE_ALL
22594+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22595+ __SAVE_ALL __KERNEL_DS
22596+ pax_enter_kernel
22597+#else
22598+ __SAVE_ALL __USER_DS
22599+#endif
22600+.endm
22601+
22602 .macro RESTORE_INT_REGS
22603 popl_cfi %ebx
22604 CFI_RESTORE ebx
22605@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22606 popfl_cfi
22607 jmp syscall_exit
22608 CFI_ENDPROC
22609-END(ret_from_fork)
22610+ENDPROC(ret_from_fork)
22611
22612 ENTRY(ret_from_kernel_thread)
22613 CFI_STARTPROC
22614@@ -340,7 +490,15 @@ ret_from_intr:
22615 andl $SEGMENT_RPL_MASK, %eax
22616 #endif
22617 cmpl $USER_RPL, %eax
22618+
22619+#ifdef CONFIG_PAX_KERNEXEC
22620+ jae resume_userspace
22621+
22622+ pax_exit_kernel
22623+ jmp resume_kernel
22624+#else
22625 jb resume_kernel # not returning to v8086 or userspace
22626+#endif
22627
22628 ENTRY(resume_userspace)
22629 LOCKDEP_SYS_EXIT
22630@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22631 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22632 # int/exception return?
22633 jne work_pending
22634- jmp restore_all
22635-END(ret_from_exception)
22636+ jmp restore_all_pax
22637+ENDPROC(ret_from_exception)
22638
22639 #ifdef CONFIG_PREEMPT
22640 ENTRY(resume_kernel)
22641@@ -365,7 +523,7 @@ need_resched:
22642 jz restore_all
22643 call preempt_schedule_irq
22644 jmp need_resched
22645-END(resume_kernel)
22646+ENDPROC(resume_kernel)
22647 #endif
22648 CFI_ENDPROC
22649
22650@@ -395,30 +553,45 @@ sysenter_past_esp:
22651 /*CFI_REL_OFFSET cs, 0*/
22652 /*
22653 * Push current_thread_info()->sysenter_return to the stack.
22654- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22655- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22656 */
22657- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22658+ pushl_cfi $0
22659 CFI_REL_OFFSET eip, 0
22660
22661 pushl_cfi %eax
22662 SAVE_ALL
22663+ GET_THREAD_INFO(%ebp)
22664+ movl TI_sysenter_return(%ebp),%ebp
22665+ movl %ebp,PT_EIP(%esp)
22666 ENABLE_INTERRUPTS(CLBR_NONE)
22667
22668 /*
22669 * Load the potential sixth argument from user stack.
22670 * Careful about security.
22671 */
22672+ movl PT_OLDESP(%esp),%ebp
22673+
22674+#ifdef CONFIG_PAX_MEMORY_UDEREF
22675+ mov PT_OLDSS(%esp),%ds
22676+1: movl %ds:(%ebp),%ebp
22677+ push %ss
22678+ pop %ds
22679+#else
22680 cmpl $__PAGE_OFFSET-3,%ebp
22681 jae syscall_fault
22682 ASM_STAC
22683 1: movl (%ebp),%ebp
22684 ASM_CLAC
22685+#endif
22686+
22687 movl %ebp,PT_EBP(%esp)
22688 _ASM_EXTABLE(1b,syscall_fault)
22689
22690 GET_THREAD_INFO(%ebp)
22691
22692+#ifdef CONFIG_PAX_RANDKSTACK
22693+ pax_erase_kstack
22694+#endif
22695+
22696 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22697 jnz sysenter_audit
22698 sysenter_do_call:
22699@@ -434,12 +607,24 @@ sysenter_after_call:
22700 testl $_TIF_ALLWORK_MASK, %ecx
22701 jne sysexit_audit
22702 sysenter_exit:
22703+
22704+#ifdef CONFIG_PAX_RANDKSTACK
22705+ pushl_cfi %eax
22706+ movl %esp, %eax
22707+ call pax_randomize_kstack
22708+ popl_cfi %eax
22709+#endif
22710+
22711+ pax_erase_kstack
22712+
22713 /* if something modifies registers it must also disable sysexit */
22714 movl PT_EIP(%esp), %edx
22715 movl PT_OLDESP(%esp), %ecx
22716 xorl %ebp,%ebp
22717 TRACE_IRQS_ON
22718 1: mov PT_FS(%esp), %fs
22719+2: mov PT_DS(%esp), %ds
22720+3: mov PT_ES(%esp), %es
22721 PTGS_TO_GS
22722 ENABLE_INTERRUPTS_SYSEXIT
22723
22724@@ -453,6 +638,9 @@ sysenter_audit:
22725 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22726 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22727 call __audit_syscall_entry
22728+
22729+ pax_erase_kstack
22730+
22731 popl_cfi %ecx /* get that remapped edx off the stack */
22732 popl_cfi %ecx /* get that remapped esi off the stack */
22733 movl PT_EAX(%esp),%eax /* reload syscall number */
22734@@ -479,10 +667,16 @@ sysexit_audit:
22735
22736 CFI_ENDPROC
22737 .pushsection .fixup,"ax"
22738-2: movl $0,PT_FS(%esp)
22739+4: movl $0,PT_FS(%esp)
22740+ jmp 1b
22741+5: movl $0,PT_DS(%esp)
22742+ jmp 1b
22743+6: movl $0,PT_ES(%esp)
22744 jmp 1b
22745 .popsection
22746- _ASM_EXTABLE(1b,2b)
22747+ _ASM_EXTABLE(1b,4b)
22748+ _ASM_EXTABLE(2b,5b)
22749+ _ASM_EXTABLE(3b,6b)
22750 PTGS_TO_GS_EX
22751 ENDPROC(ia32_sysenter_target)
22752
22753@@ -493,6 +687,11 @@ ENTRY(system_call)
22754 pushl_cfi %eax # save orig_eax
22755 SAVE_ALL
22756 GET_THREAD_INFO(%ebp)
22757+
22758+#ifdef CONFIG_PAX_RANDKSTACK
22759+ pax_erase_kstack
22760+#endif
22761+
22762 # system call tracing in operation / emulation
22763 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22764 jnz syscall_trace_entry
22765@@ -512,6 +711,15 @@ syscall_exit:
22766 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22767 jne syscall_exit_work
22768
22769+restore_all_pax:
22770+
22771+#ifdef CONFIG_PAX_RANDKSTACK
22772+ movl %esp, %eax
22773+ call pax_randomize_kstack
22774+#endif
22775+
22776+ pax_erase_kstack
22777+
22778 restore_all:
22779 TRACE_IRQS_IRET
22780 restore_all_notrace:
22781@@ -566,14 +774,34 @@ ldt_ss:
22782 * compensating for the offset by changing to the ESPFIX segment with
22783 * a base address that matches for the difference.
22784 */
22785-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22786+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22787 mov %esp, %edx /* load kernel esp */
22788 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22789 mov %dx, %ax /* eax: new kernel esp */
22790 sub %eax, %edx /* offset (low word is 0) */
22791+#ifdef CONFIG_SMP
22792+ movl PER_CPU_VAR(cpu_number), %ebx
22793+ shll $PAGE_SHIFT_asm, %ebx
22794+ addl $cpu_gdt_table, %ebx
22795+#else
22796+ movl $cpu_gdt_table, %ebx
22797+#endif
22798 shr $16, %edx
22799- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22800- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22801+
22802+#ifdef CONFIG_PAX_KERNEXEC
22803+ mov %cr0, %esi
22804+ btr $16, %esi
22805+ mov %esi, %cr0
22806+#endif
22807+
22808+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22809+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22810+
22811+#ifdef CONFIG_PAX_KERNEXEC
22812+ bts $16, %esi
22813+ mov %esi, %cr0
22814+#endif
22815+
22816 pushl_cfi $__ESPFIX_SS
22817 pushl_cfi %eax /* new kernel esp */
22818 /* Disable interrupts, but do not irqtrace this section: we
22819@@ -603,20 +831,18 @@ work_resched:
22820 movl TI_flags(%ebp), %ecx
22821 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22822 # than syscall tracing?
22823- jz restore_all
22824+ jz restore_all_pax
22825 testb $_TIF_NEED_RESCHED, %cl
22826 jnz work_resched
22827
22828 work_notifysig: # deal with pending signals and
22829 # notify-resume requests
22830+ movl %esp, %eax
22831 #ifdef CONFIG_VM86
22832 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22833- movl %esp, %eax
22834 jne work_notifysig_v86 # returning to kernel-space or
22835 # vm86-space
22836 1:
22837-#else
22838- movl %esp, %eax
22839 #endif
22840 TRACE_IRQS_ON
22841 ENABLE_INTERRUPTS(CLBR_NONE)
22842@@ -637,7 +863,7 @@ work_notifysig_v86:
22843 movl %eax, %esp
22844 jmp 1b
22845 #endif
22846-END(work_pending)
22847+ENDPROC(work_pending)
22848
22849 # perform syscall exit tracing
22850 ALIGN
22851@@ -645,11 +871,14 @@ syscall_trace_entry:
22852 movl $-ENOSYS,PT_EAX(%esp)
22853 movl %esp, %eax
22854 call syscall_trace_enter
22855+
22856+ pax_erase_kstack
22857+
22858 /* What it returned is what we'll actually use. */
22859 cmpl $(NR_syscalls), %eax
22860 jnae syscall_call
22861 jmp syscall_exit
22862-END(syscall_trace_entry)
22863+ENDPROC(syscall_trace_entry)
22864
22865 # perform syscall exit tracing
22866 ALIGN
22867@@ -662,26 +891,30 @@ syscall_exit_work:
22868 movl %esp, %eax
22869 call syscall_trace_leave
22870 jmp resume_userspace
22871-END(syscall_exit_work)
22872+ENDPROC(syscall_exit_work)
22873 CFI_ENDPROC
22874
22875 RING0_INT_FRAME # can't unwind into user space anyway
22876 syscall_fault:
22877+#ifdef CONFIG_PAX_MEMORY_UDEREF
22878+ push %ss
22879+ pop %ds
22880+#endif
22881 ASM_CLAC
22882 GET_THREAD_INFO(%ebp)
22883 movl $-EFAULT,PT_EAX(%esp)
22884 jmp resume_userspace
22885-END(syscall_fault)
22886+ENDPROC(syscall_fault)
22887
22888 syscall_badsys:
22889 movl $-ENOSYS,%eax
22890 jmp syscall_after_call
22891-END(syscall_badsys)
22892+ENDPROC(syscall_badsys)
22893
22894 sysenter_badsys:
22895 movl $-ENOSYS,%eax
22896 jmp sysenter_after_call
22897-END(sysenter_badsys)
22898+ENDPROC(sysenter_badsys)
22899 CFI_ENDPROC
22900
22901 .macro FIXUP_ESPFIX_STACK
22902@@ -694,8 +927,15 @@ END(sysenter_badsys)
22903 */
22904 #ifdef CONFIG_X86_ESPFIX32
22905 /* fixup the stack */
22906- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22907- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22908+#ifdef CONFIG_SMP
22909+ movl PER_CPU_VAR(cpu_number), %ebx
22910+ shll $PAGE_SHIFT_asm, %ebx
22911+ addl $cpu_gdt_table, %ebx
22912+#else
22913+ movl $cpu_gdt_table, %ebx
22914+#endif
22915+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22916+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22917 shl $16, %eax
22918 addl %esp, %eax /* the adjusted stack pointer */
22919 pushl_cfi $__KERNEL_DS
22920@@ -751,7 +991,7 @@ vector=vector+1
22921 .endr
22922 2: jmp common_interrupt
22923 .endr
22924-END(irq_entries_start)
22925+ENDPROC(irq_entries_start)
22926
22927 .previous
22928 END(interrupt)
22929@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22930 pushl_cfi $do_coprocessor_error
22931 jmp error_code
22932 CFI_ENDPROC
22933-END(coprocessor_error)
22934+ENDPROC(coprocessor_error)
22935
22936 ENTRY(simd_coprocessor_error)
22937 RING0_INT_FRAME
22938@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22939 .section .altinstructions,"a"
22940 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22941 .previous
22942-.section .altinstr_replacement,"ax"
22943+.section .altinstr_replacement,"a"
22944 663: pushl $do_simd_coprocessor_error
22945 664:
22946 .previous
22947@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22948 #endif
22949 jmp error_code
22950 CFI_ENDPROC
22951-END(simd_coprocessor_error)
22952+ENDPROC(simd_coprocessor_error)
22953
22954 ENTRY(device_not_available)
22955 RING0_INT_FRAME
22956@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22957 pushl_cfi $do_device_not_available
22958 jmp error_code
22959 CFI_ENDPROC
22960-END(device_not_available)
22961+ENDPROC(device_not_available)
22962
22963 #ifdef CONFIG_PARAVIRT
22964 ENTRY(native_iret)
22965 iret
22966 _ASM_EXTABLE(native_iret, iret_exc)
22967-END(native_iret)
22968+ENDPROC(native_iret)
22969
22970 ENTRY(native_irq_enable_sysexit)
22971 sti
22972 sysexit
22973-END(native_irq_enable_sysexit)
22974+ENDPROC(native_irq_enable_sysexit)
22975 #endif
22976
22977 ENTRY(overflow)
22978@@ -860,7 +1100,7 @@ ENTRY(overflow)
22979 pushl_cfi $do_overflow
22980 jmp error_code
22981 CFI_ENDPROC
22982-END(overflow)
22983+ENDPROC(overflow)
22984
22985 ENTRY(bounds)
22986 RING0_INT_FRAME
22987@@ -869,7 +1109,7 @@ ENTRY(bounds)
22988 pushl_cfi $do_bounds
22989 jmp error_code
22990 CFI_ENDPROC
22991-END(bounds)
22992+ENDPROC(bounds)
22993
22994 ENTRY(invalid_op)
22995 RING0_INT_FRAME
22996@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22997 pushl_cfi $do_invalid_op
22998 jmp error_code
22999 CFI_ENDPROC
23000-END(invalid_op)
23001+ENDPROC(invalid_op)
23002
23003 ENTRY(coprocessor_segment_overrun)
23004 RING0_INT_FRAME
23005@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
23006 pushl_cfi $do_coprocessor_segment_overrun
23007 jmp error_code
23008 CFI_ENDPROC
23009-END(coprocessor_segment_overrun)
23010+ENDPROC(coprocessor_segment_overrun)
23011
23012 ENTRY(invalid_TSS)
23013 RING0_EC_FRAME
23014@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
23015 pushl_cfi $do_invalid_TSS
23016 jmp error_code
23017 CFI_ENDPROC
23018-END(invalid_TSS)
23019+ENDPROC(invalid_TSS)
23020
23021 ENTRY(segment_not_present)
23022 RING0_EC_FRAME
23023@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
23024 pushl_cfi $do_segment_not_present
23025 jmp error_code
23026 CFI_ENDPROC
23027-END(segment_not_present)
23028+ENDPROC(segment_not_present)
23029
23030 ENTRY(stack_segment)
23031 RING0_EC_FRAME
23032@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
23033 pushl_cfi $do_stack_segment
23034 jmp error_code
23035 CFI_ENDPROC
23036-END(stack_segment)
23037+ENDPROC(stack_segment)
23038
23039 ENTRY(alignment_check)
23040 RING0_EC_FRAME
23041@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
23042 pushl_cfi $do_alignment_check
23043 jmp error_code
23044 CFI_ENDPROC
23045-END(alignment_check)
23046+ENDPROC(alignment_check)
23047
23048 ENTRY(divide_error)
23049 RING0_INT_FRAME
23050@@ -928,7 +1168,7 @@ ENTRY(divide_error)
23051 pushl_cfi $do_divide_error
23052 jmp error_code
23053 CFI_ENDPROC
23054-END(divide_error)
23055+ENDPROC(divide_error)
23056
23057 #ifdef CONFIG_X86_MCE
23058 ENTRY(machine_check)
23059@@ -938,7 +1178,7 @@ ENTRY(machine_check)
23060 pushl_cfi machine_check_vector
23061 jmp error_code
23062 CFI_ENDPROC
23063-END(machine_check)
23064+ENDPROC(machine_check)
23065 #endif
23066
23067 ENTRY(spurious_interrupt_bug)
23068@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
23069 pushl_cfi $do_spurious_interrupt_bug
23070 jmp error_code
23071 CFI_ENDPROC
23072-END(spurious_interrupt_bug)
23073+ENDPROC(spurious_interrupt_bug)
23074
23075 #ifdef CONFIG_XEN
23076 /* Xen doesn't set %esp to be precisely what the normal sysenter
23077@@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
23078
23079 ENTRY(mcount)
23080 ret
23081-END(mcount)
23082+ENDPROC(mcount)
23083
23084 ENTRY(ftrace_caller)
23085 pushl %eax
23086@@ -1084,7 +1324,7 @@ ftrace_graph_call:
23087 .globl ftrace_stub
23088 ftrace_stub:
23089 ret
23090-END(ftrace_caller)
23091+ENDPROC(ftrace_caller)
23092
23093 ENTRY(ftrace_regs_caller)
23094 pushf /* push flags before compare (in cs location) */
23095@@ -1182,7 +1422,7 @@ trace:
23096 popl %ecx
23097 popl %eax
23098 jmp ftrace_stub
23099-END(mcount)
23100+ENDPROC(mcount)
23101 #endif /* CONFIG_DYNAMIC_FTRACE */
23102 #endif /* CONFIG_FUNCTION_TRACER */
23103
23104@@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
23105 popl %ecx
23106 popl %eax
23107 ret
23108-END(ftrace_graph_caller)
23109+ENDPROC(ftrace_graph_caller)
23110
23111 .globl return_to_handler
23112 return_to_handler:
23113@@ -1261,15 +1501,18 @@ error_code:
23114 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
23115 REG_TO_PTGS %ecx
23116 SET_KERNEL_GS %ecx
23117- movl $(__USER_DS), %ecx
23118+ movl $(__KERNEL_DS), %ecx
23119 movl %ecx, %ds
23120 movl %ecx, %es
23121+
23122+ pax_enter_kernel
23123+
23124 TRACE_IRQS_OFF
23125 movl %esp,%eax # pt_regs pointer
23126 call *%edi
23127 jmp ret_from_exception
23128 CFI_ENDPROC
23129-END(page_fault)
23130+ENDPROC(page_fault)
23131
23132 /*
23133 * Debug traps and NMI can happen at the one SYSENTER instruction
23134@@ -1312,7 +1555,7 @@ debug_stack_correct:
23135 call do_debug
23136 jmp ret_from_exception
23137 CFI_ENDPROC
23138-END(debug)
23139+ENDPROC(debug)
23140
23141 /*
23142 * NMI is doubly nasty. It can happen _while_ we're handling
23143@@ -1352,6 +1595,9 @@ nmi_stack_correct:
23144 xorl %edx,%edx # zero error code
23145 movl %esp,%eax # pt_regs pointer
23146 call do_nmi
23147+
23148+ pax_exit_kernel
23149+
23150 jmp restore_all_notrace
23151 CFI_ENDPROC
23152
23153@@ -1389,13 +1635,16 @@ nmi_espfix_stack:
23154 FIXUP_ESPFIX_STACK # %eax == %esp
23155 xorl %edx,%edx # zero error code
23156 call do_nmi
23157+
23158+ pax_exit_kernel
23159+
23160 RESTORE_REGS
23161 lss 12+4(%esp), %esp # back to espfix stack
23162 CFI_ADJUST_CFA_OFFSET -24
23163 jmp irq_return
23164 #endif
23165 CFI_ENDPROC
23166-END(nmi)
23167+ENDPROC(nmi)
23168
23169 ENTRY(int3)
23170 RING0_INT_FRAME
23171@@ -1408,14 +1657,14 @@ ENTRY(int3)
23172 call do_int3
23173 jmp ret_from_exception
23174 CFI_ENDPROC
23175-END(int3)
23176+ENDPROC(int3)
23177
23178 ENTRY(general_protection)
23179 RING0_EC_FRAME
23180 pushl_cfi $do_general_protection
23181 jmp error_code
23182 CFI_ENDPROC
23183-END(general_protection)
23184+ENDPROC(general_protection)
23185
23186 #ifdef CONFIG_KVM_GUEST
23187 ENTRY(async_page_fault)
23188@@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
23189 pushl_cfi $do_async_page_fault
23190 jmp error_code
23191 CFI_ENDPROC
23192-END(async_page_fault)
23193+ENDPROC(async_page_fault)
23194 #endif
23195
23196diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23197index 4ee9a23..c786610 100644
23198--- a/arch/x86/kernel/entry_64.S
23199+++ b/arch/x86/kernel/entry_64.S
23200@@ -59,6 +59,8 @@
23201 #include <asm/smap.h>
23202 #include <asm/pgtable_types.h>
23203 #include <linux/err.h>
23204+#include <asm/pgtable.h>
23205+#include <asm/alternative-asm.h>
23206
23207 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23208 #include <linux/elf-em.h>
23209@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23210 ENDPROC(native_usergs_sysret64)
23211 #endif /* CONFIG_PARAVIRT */
23212
23213+ .macro ljmpq sel, off
23214+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23215+ .byte 0x48; ljmp *1234f(%rip)
23216+ .pushsection .rodata
23217+ .align 16
23218+ 1234: .quad \off; .word \sel
23219+ .popsection
23220+#else
23221+ pushq $\sel
23222+ pushq $\off
23223+ lretq
23224+#endif
23225+ .endm
23226+
23227+ .macro pax_enter_kernel
23228+ pax_set_fptr_mask
23229+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23230+ call pax_enter_kernel
23231+#endif
23232+ .endm
23233+
23234+ .macro pax_exit_kernel
23235+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23236+ call pax_exit_kernel
23237+#endif
23238+
23239+ .endm
23240+
23241+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23242+ENTRY(pax_enter_kernel)
23243+ pushq %rdi
23244+
23245+#ifdef CONFIG_PARAVIRT
23246+ PV_SAVE_REGS(CLBR_RDI)
23247+#endif
23248+
23249+#ifdef CONFIG_PAX_KERNEXEC
23250+ GET_CR0_INTO_RDI
23251+ bts $16,%rdi
23252+ jnc 3f
23253+ mov %cs,%edi
23254+ cmp $__KERNEL_CS,%edi
23255+ jnz 2f
23256+1:
23257+#endif
23258+
23259+#ifdef CONFIG_PAX_MEMORY_UDEREF
23260+ 661: jmp 111f
23261+ .pushsection .altinstr_replacement, "a"
23262+ 662: ASM_NOP2
23263+ .popsection
23264+ .pushsection .altinstructions, "a"
23265+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23266+ .popsection
23267+ GET_CR3_INTO_RDI
23268+ cmp $0,%dil
23269+ jnz 112f
23270+ mov $__KERNEL_DS,%edi
23271+ mov %edi,%ss
23272+ jmp 111f
23273+112: cmp $1,%dil
23274+ jz 113f
23275+ ud2
23276+113: sub $4097,%rdi
23277+ bts $63,%rdi
23278+ SET_RDI_INTO_CR3
23279+ mov $__UDEREF_KERNEL_DS,%edi
23280+ mov %edi,%ss
23281+111:
23282+#endif
23283+
23284+#ifdef CONFIG_PARAVIRT
23285+ PV_RESTORE_REGS(CLBR_RDI)
23286+#endif
23287+
23288+ popq %rdi
23289+ pax_force_retaddr
23290+ retq
23291+
23292+#ifdef CONFIG_PAX_KERNEXEC
23293+2: ljmpq __KERNEL_CS,1b
23294+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23295+4: SET_RDI_INTO_CR0
23296+ jmp 1b
23297+#endif
23298+ENDPROC(pax_enter_kernel)
23299+
23300+ENTRY(pax_exit_kernel)
23301+ pushq %rdi
23302+
23303+#ifdef CONFIG_PARAVIRT
23304+ PV_SAVE_REGS(CLBR_RDI)
23305+#endif
23306+
23307+#ifdef CONFIG_PAX_KERNEXEC
23308+ mov %cs,%rdi
23309+ cmp $__KERNEXEC_KERNEL_CS,%edi
23310+ jz 2f
23311+ GET_CR0_INTO_RDI
23312+ bts $16,%rdi
23313+ jnc 4f
23314+1:
23315+#endif
23316+
23317+#ifdef CONFIG_PAX_MEMORY_UDEREF
23318+ 661: jmp 111f
23319+ .pushsection .altinstr_replacement, "a"
23320+ 662: ASM_NOP2
23321+ .popsection
23322+ .pushsection .altinstructions, "a"
23323+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23324+ .popsection
23325+ mov %ss,%edi
23326+ cmp $__UDEREF_KERNEL_DS,%edi
23327+ jnz 111f
23328+ GET_CR3_INTO_RDI
23329+ cmp $0,%dil
23330+ jz 112f
23331+ ud2
23332+112: add $4097,%rdi
23333+ bts $63,%rdi
23334+ SET_RDI_INTO_CR3
23335+ mov $__KERNEL_DS,%edi
23336+ mov %edi,%ss
23337+111:
23338+#endif
23339+
23340+#ifdef CONFIG_PARAVIRT
23341+ PV_RESTORE_REGS(CLBR_RDI);
23342+#endif
23343+
23344+ popq %rdi
23345+ pax_force_retaddr
23346+ retq
23347+
23348+#ifdef CONFIG_PAX_KERNEXEC
23349+2: GET_CR0_INTO_RDI
23350+ btr $16,%rdi
23351+ jnc 4f
23352+ ljmpq __KERNEL_CS,3f
23353+3: SET_RDI_INTO_CR0
23354+ jmp 1b
23355+4: ud2
23356+ jmp 4b
23357+#endif
23358+ENDPROC(pax_exit_kernel)
23359+#endif
23360+
23361+ .macro pax_enter_kernel_user
23362+ pax_set_fptr_mask
23363+#ifdef CONFIG_PAX_MEMORY_UDEREF
23364+ call pax_enter_kernel_user
23365+#endif
23366+ .endm
23367+
23368+ .macro pax_exit_kernel_user
23369+#ifdef CONFIG_PAX_MEMORY_UDEREF
23370+ call pax_exit_kernel_user
23371+#endif
23372+#ifdef CONFIG_PAX_RANDKSTACK
23373+ pushq %rax
23374+ pushq %r11
23375+ call pax_randomize_kstack
23376+ popq %r11
23377+ popq %rax
23378+#endif
23379+ .endm
23380+
23381+#ifdef CONFIG_PAX_MEMORY_UDEREF
23382+ENTRY(pax_enter_kernel_user)
23383+ pushq %rdi
23384+ pushq %rbx
23385+
23386+#ifdef CONFIG_PARAVIRT
23387+ PV_SAVE_REGS(CLBR_RDI)
23388+#endif
23389+
23390+ 661: jmp 111f
23391+ .pushsection .altinstr_replacement, "a"
23392+ 662: ASM_NOP2
23393+ .popsection
23394+ .pushsection .altinstructions, "a"
23395+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23396+ .popsection
23397+ GET_CR3_INTO_RDI
23398+ cmp $1,%dil
23399+ jnz 4f
23400+ sub $4097,%rdi
23401+ bts $63,%rdi
23402+ SET_RDI_INTO_CR3
23403+ jmp 3f
23404+111:
23405+
23406+ GET_CR3_INTO_RDI
23407+ mov %rdi,%rbx
23408+ add $__START_KERNEL_map,%rbx
23409+ sub phys_base(%rip),%rbx
23410+
23411+#ifdef CONFIG_PARAVIRT
23412+ cmpl $0, pv_info+PARAVIRT_enabled
23413+ jz 1f
23414+ pushq %rdi
23415+ i = 0
23416+ .rept USER_PGD_PTRS
23417+ mov i*8(%rbx),%rsi
23418+ mov $0,%sil
23419+ lea i*8(%rbx),%rdi
23420+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23421+ i = i + 1
23422+ .endr
23423+ popq %rdi
23424+ jmp 2f
23425+1:
23426+#endif
23427+
23428+ i = 0
23429+ .rept USER_PGD_PTRS
23430+ movb $0,i*8(%rbx)
23431+ i = i + 1
23432+ .endr
23433+
23434+2: SET_RDI_INTO_CR3
23435+
23436+#ifdef CONFIG_PAX_KERNEXEC
23437+ GET_CR0_INTO_RDI
23438+ bts $16,%rdi
23439+ SET_RDI_INTO_CR0
23440+#endif
23441+
23442+3:
23443+
23444+#ifdef CONFIG_PARAVIRT
23445+ PV_RESTORE_REGS(CLBR_RDI)
23446+#endif
23447+
23448+ popq %rbx
23449+ popq %rdi
23450+ pax_force_retaddr
23451+ retq
23452+4: ud2
23453+ENDPROC(pax_enter_kernel_user)
23454+
23455+ENTRY(pax_exit_kernel_user)
23456+ pushq %rdi
23457+ pushq %rbx
23458+
23459+#ifdef CONFIG_PARAVIRT
23460+ PV_SAVE_REGS(CLBR_RDI)
23461+#endif
23462+
23463+ GET_CR3_INTO_RDI
23464+ 661: jmp 1f
23465+ .pushsection .altinstr_replacement, "a"
23466+ 662: ASM_NOP2
23467+ .popsection
23468+ .pushsection .altinstructions, "a"
23469+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23470+ .popsection
23471+ cmp $0,%dil
23472+ jnz 3f
23473+ add $4097,%rdi
23474+ bts $63,%rdi
23475+ SET_RDI_INTO_CR3
23476+ jmp 2f
23477+1:
23478+
23479+ mov %rdi,%rbx
23480+
23481+#ifdef CONFIG_PAX_KERNEXEC
23482+ GET_CR0_INTO_RDI
23483+ btr $16,%rdi
23484+ jnc 3f
23485+ SET_RDI_INTO_CR0
23486+#endif
23487+
23488+ add $__START_KERNEL_map,%rbx
23489+ sub phys_base(%rip),%rbx
23490+
23491+#ifdef CONFIG_PARAVIRT
23492+ cmpl $0, pv_info+PARAVIRT_enabled
23493+ jz 1f
23494+ i = 0
23495+ .rept USER_PGD_PTRS
23496+ mov i*8(%rbx),%rsi
23497+ mov $0x67,%sil
23498+ lea i*8(%rbx),%rdi
23499+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23500+ i = i + 1
23501+ .endr
23502+ jmp 2f
23503+1:
23504+#endif
23505+
23506+ i = 0
23507+ .rept USER_PGD_PTRS
23508+ movb $0x67,i*8(%rbx)
23509+ i = i + 1
23510+ .endr
23511+2:
23512+
23513+#ifdef CONFIG_PARAVIRT
23514+ PV_RESTORE_REGS(CLBR_RDI)
23515+#endif
23516+
23517+ popq %rbx
23518+ popq %rdi
23519+ pax_force_retaddr
23520+ retq
23521+3: ud2
23522+ENDPROC(pax_exit_kernel_user)
23523+#endif
23524+
23525+ .macro pax_enter_kernel_nmi
23526+ pax_set_fptr_mask
23527+
23528+#ifdef CONFIG_PAX_KERNEXEC
23529+ GET_CR0_INTO_RDI
23530+ bts $16,%rdi
23531+ jc 110f
23532+ SET_RDI_INTO_CR0
23533+ or $2,%ebx
23534+110:
23535+#endif
23536+
23537+#ifdef CONFIG_PAX_MEMORY_UDEREF
23538+ 661: jmp 111f
23539+ .pushsection .altinstr_replacement, "a"
23540+ 662: ASM_NOP2
23541+ .popsection
23542+ .pushsection .altinstructions, "a"
23543+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23544+ .popsection
23545+ GET_CR3_INTO_RDI
23546+ cmp $0,%dil
23547+ jz 111f
23548+ sub $4097,%rdi
23549+ or $4,%ebx
23550+ bts $63,%rdi
23551+ SET_RDI_INTO_CR3
23552+ mov $__UDEREF_KERNEL_DS,%edi
23553+ mov %edi,%ss
23554+111:
23555+#endif
23556+ .endm
23557+
23558+ .macro pax_exit_kernel_nmi
23559+#ifdef CONFIG_PAX_KERNEXEC
23560+ btr $1,%ebx
23561+ jnc 110f
23562+ GET_CR0_INTO_RDI
23563+ btr $16,%rdi
23564+ SET_RDI_INTO_CR0
23565+110:
23566+#endif
23567+
23568+#ifdef CONFIG_PAX_MEMORY_UDEREF
23569+ btr $2,%ebx
23570+ jnc 111f
23571+ GET_CR3_INTO_RDI
23572+ add $4097,%rdi
23573+ bts $63,%rdi
23574+ SET_RDI_INTO_CR3
23575+ mov $__KERNEL_DS,%edi
23576+ mov %edi,%ss
23577+111:
23578+#endif
23579+ .endm
23580+
23581+ .macro pax_erase_kstack
23582+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23583+ call pax_erase_kstack
23584+#endif
23585+ .endm
23586+
23587+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23588+ENTRY(pax_erase_kstack)
23589+ pushq %rdi
23590+ pushq %rcx
23591+ pushq %rax
23592+ pushq %r11
23593+
23594+ GET_THREAD_INFO(%r11)
23595+ mov TI_lowest_stack(%r11), %rdi
23596+ mov $-0xBEEF, %rax
23597+ std
23598+
23599+1: mov %edi, %ecx
23600+ and $THREAD_SIZE_asm - 1, %ecx
23601+ shr $3, %ecx
23602+ repne scasq
23603+ jecxz 2f
23604+
23605+ cmp $2*8, %ecx
23606+ jc 2f
23607+
23608+ mov $2*8, %ecx
23609+ repe scasq
23610+ jecxz 2f
23611+ jne 1b
23612+
23613+2: cld
23614+ or $2*8, %rdi
23615+ mov %esp, %ecx
23616+ sub %edi, %ecx
23617+
23618+ cmp $THREAD_SIZE_asm, %rcx
23619+ jb 3f
23620+ ud2
23621+3:
23622+
23623+ shr $3, %ecx
23624+ rep stosq
23625+
23626+ mov TI_task_thread_sp0(%r11), %rdi
23627+ sub $256, %rdi
23628+ mov %rdi, TI_lowest_stack(%r11)
23629+
23630+ popq %r11
23631+ popq %rax
23632+ popq %rcx
23633+ popq %rdi
23634+ pax_force_retaddr
23635+ ret
23636+ENDPROC(pax_erase_kstack)
23637+#endif
23638
23639 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23640 #ifdef CONFIG_TRACE_IRQFLAGS
23641@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23642 .endm
23643
23644 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23645- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23646+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23647 jnc 1f
23648 TRACE_IRQS_ON_DEBUG
23649 1:
23650@@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
23651 movq \tmp,R11+\offset(%rsp)
23652 .endm
23653
23654- .macro FAKE_STACK_FRAME child_rip
23655- /* push in order ss, rsp, eflags, cs, rip */
23656- xorl %eax, %eax
23657- pushq_cfi $__KERNEL_DS /* ss */
23658- /*CFI_REL_OFFSET ss,0*/
23659- pushq_cfi %rax /* rsp */
23660- CFI_REL_OFFSET rsp,0
23661- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23662- /*CFI_REL_OFFSET rflags,0*/
23663- pushq_cfi $__KERNEL_CS /* cs */
23664- /*CFI_REL_OFFSET cs,0*/
23665- pushq_cfi \child_rip /* rip */
23666- CFI_REL_OFFSET rip,0
23667- pushq_cfi %rax /* orig rax */
23668- .endm
23669-
23670- .macro UNFAKE_STACK_FRAME
23671- addq $8*6, %rsp
23672- CFI_ADJUST_CFA_OFFSET -(6*8)
23673- .endm
23674-
23675 /*
23676 * initial frame state for interrupts (and exceptions without error code)
23677 */
23678@@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
23679 /* save partial stack frame */
23680 .macro SAVE_ARGS_IRQ
23681 cld
23682- /* start from rbp in pt_regs and jump over */
23683- movq_cfi rdi, (RDI-RBP)
23684- movq_cfi rsi, (RSI-RBP)
23685- movq_cfi rdx, (RDX-RBP)
23686- movq_cfi rcx, (RCX-RBP)
23687- movq_cfi rax, (RAX-RBP)
23688- movq_cfi r8, (R8-RBP)
23689- movq_cfi r9, (R9-RBP)
23690- movq_cfi r10, (R10-RBP)
23691- movq_cfi r11, (R11-RBP)
23692+ /* start from r15 in pt_regs and jump over */
23693+ movq_cfi rdi, RDI
23694+ movq_cfi rsi, RSI
23695+ movq_cfi rdx, RDX
23696+ movq_cfi rcx, RCX
23697+ movq_cfi rax, RAX
23698+ movq_cfi r8, R8
23699+ movq_cfi r9, R9
23700+ movq_cfi r10, R10
23701+ movq_cfi r11, R11
23702+ movq_cfi r12, R12
23703
23704 /* Save rbp so that we can unwind from get_irq_regs() */
23705- movq_cfi rbp, 0
23706+ movq_cfi rbp, RBP
23707
23708 /* Save previous stack value */
23709 movq %rsp, %rsi
23710
23711- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23712- testl $3, CS-RBP(%rsi)
23713+ movq %rsp,%rdi /* arg1 for handler */
23714+ testb $3, CS(%rsi)
23715 je 1f
23716 SWAPGS
23717 /*
23718@@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
23719 0x06 /* DW_OP_deref */, \
23720 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23721 0x22 /* DW_OP_plus */
23722+
23723+#ifdef CONFIG_PAX_MEMORY_UDEREF
23724+ testb $3, CS(%rdi)
23725+ jnz 1f
23726+ pax_enter_kernel
23727+ jmp 2f
23728+1: pax_enter_kernel_user
23729+2:
23730+#else
23731+ pax_enter_kernel
23732+#endif
23733+
23734 /* We entered an interrupt context - irqs are off: */
23735 TRACE_IRQS_OFF
23736 .endm
23737@@ -308,9 +727,52 @@ ENTRY(save_paranoid)
23738 js 1f /* negative -> in kernel */
23739 SWAPGS
23740 xorl %ebx,%ebx
23741-1: ret
23742+1:
23743+#ifdef CONFIG_PAX_MEMORY_UDEREF
23744+ testb $3, CS+8(%rsp)
23745+ jnz 1f
23746+ pax_enter_kernel
23747+ jmp 2f
23748+1: pax_enter_kernel_user
23749+2:
23750+#else
23751+ pax_enter_kernel
23752+#endif
23753+ pax_force_retaddr
23754+ ret
23755 CFI_ENDPROC
23756-END(save_paranoid)
23757+ENDPROC(save_paranoid)
23758+
23759+ENTRY(save_paranoid_nmi)
23760+ XCPT_FRAME 1 RDI+8
23761+ cld
23762+ movq_cfi rdi, RDI+8
23763+ movq_cfi rsi, RSI+8
23764+ movq_cfi rdx, RDX+8
23765+ movq_cfi rcx, RCX+8
23766+ movq_cfi rax, RAX+8
23767+ movq_cfi r8, R8+8
23768+ movq_cfi r9, R9+8
23769+ movq_cfi r10, R10+8
23770+ movq_cfi r11, R11+8
23771+ movq_cfi rbx, RBX+8
23772+ movq_cfi rbp, RBP+8
23773+ movq_cfi r12, R12+8
23774+ movq_cfi r13, R13+8
23775+ movq_cfi r14, R14+8
23776+ movq_cfi r15, R15+8
23777+ movl $1,%ebx
23778+ movl $MSR_GS_BASE,%ecx
23779+ rdmsr
23780+ testl %edx,%edx
23781+ js 1f /* negative -> in kernel */
23782+ SWAPGS
23783+ xorl %ebx,%ebx
23784+1: pax_enter_kernel_nmi
23785+ pax_force_retaddr
23786+ ret
23787+ CFI_ENDPROC
23788+ENDPROC(save_paranoid_nmi)
23789
23790 /*
23791 * A newly forked process directly context switches into this address.
23792@@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
23793
23794 RESTORE_REST
23795
23796- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23797+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23798 jz 1f
23799
23800 /*
23801@@ -344,15 +806,13 @@ ENTRY(ret_from_fork)
23802 jmp int_ret_from_sys_call
23803
23804 1:
23805- subq $REST_SKIP, %rsp # leave space for volatiles
23806- CFI_ADJUST_CFA_OFFSET REST_SKIP
23807 movq %rbp, %rdi
23808 call *%rbx
23809 movl $0, RAX(%rsp)
23810 RESTORE_REST
23811 jmp int_ret_from_sys_call
23812 CFI_ENDPROC
23813-END(ret_from_fork)
23814+ENDPROC(ret_from_fork)
23815
23816 /*
23817 * System call entry. Up to 6 arguments in registers are supported.
23818@@ -389,7 +849,7 @@ END(ret_from_fork)
23819 ENTRY(system_call)
23820 CFI_STARTPROC simple
23821 CFI_SIGNAL_FRAME
23822- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23823+ CFI_DEF_CFA rsp,0
23824 CFI_REGISTER rip,rcx
23825 /*CFI_REGISTER rflags,r11*/
23826 SWAPGS_UNSAFE_STACK
23827@@ -402,16 +862,23 @@ GLOBAL(system_call_after_swapgs)
23828
23829 movq %rsp,PER_CPU_VAR(old_rsp)
23830 movq PER_CPU_VAR(kernel_stack),%rsp
23831+ SAVE_ARGS 8*6, 0, rax_enosys=1
23832+ pax_enter_kernel_user
23833+
23834+#ifdef CONFIG_PAX_RANDKSTACK
23835+ pax_erase_kstack
23836+#endif
23837+
23838 /*
23839 * No need to follow this irqs off/on section - it's straight
23840 * and short:
23841 */
23842 ENABLE_INTERRUPTS(CLBR_NONE)
23843- SAVE_ARGS 8, 0, rax_enosys=1
23844 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23845 movq %rcx,RIP-ARGOFFSET(%rsp)
23846 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23847- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23848+ GET_THREAD_INFO(%rcx)
23849+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23850 jnz tracesys
23851 system_call_fastpath:
23852 #if __SYSCALL_MASK == ~0
23853@@ -435,10 +902,13 @@ sysret_check:
23854 LOCKDEP_SYS_EXIT
23855 DISABLE_INTERRUPTS(CLBR_NONE)
23856 TRACE_IRQS_OFF
23857- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23858+ GET_THREAD_INFO(%rcx)
23859+ movl TI_flags(%rcx),%edx
23860 andl %edi,%edx
23861 jnz sysret_careful
23862 CFI_REMEMBER_STATE
23863+ pax_exit_kernel_user
23864+ pax_erase_kstack
23865 /*
23866 * sysretq will re-enable interrupts:
23867 */
23868@@ -497,12 +967,15 @@ sysret_audit:
23869
23870 /* Do syscall tracing */
23871 tracesys:
23872- leaq -REST_SKIP(%rsp), %rdi
23873+ movq %rsp, %rdi
23874 movq $AUDIT_ARCH_X86_64, %rsi
23875 call syscall_trace_enter_phase1
23876 test %rax, %rax
23877 jnz tracesys_phase2 /* if needed, run the slow path */
23878- LOAD_ARGS 0 /* else restore clobbered regs */
23879+
23880+ pax_erase_kstack
23881+
23882+ LOAD_ARGS /* else restore clobbered regs */
23883 jmp system_call_fastpath /* and return to the fast path */
23884
23885 tracesys_phase2:
23886@@ -513,12 +986,14 @@ tracesys_phase2:
23887 movq %rax,%rdx
23888 call syscall_trace_enter_phase2
23889
23890+ pax_erase_kstack
23891+
23892 /*
23893 * Reload arg registers from stack in case ptrace changed them.
23894 * We don't reload %rax because syscall_trace_entry_phase2() returned
23895 * the value it wants us to use in the table lookup.
23896 */
23897- LOAD_ARGS ARGOFFSET, 1
23898+ LOAD_ARGS 1
23899 RESTORE_REST
23900 #if __SYSCALL_MASK == ~0
23901 cmpq $__NR_syscall_max,%rax
23902@@ -548,7 +1023,9 @@ GLOBAL(int_with_check)
23903 andl %edi,%edx
23904 jnz int_careful
23905 andl $~TS_COMPAT,TI_status(%rcx)
23906- jmp retint_swapgs
23907+ pax_exit_kernel_user
23908+ pax_erase_kstack
23909+ jmp retint_swapgs_pax
23910
23911 /* Either reschedule or signal or syscall exit tracking needed. */
23912 /* First do a reschedule test. */
23913@@ -594,7 +1071,7 @@ int_restore_rest:
23914 TRACE_IRQS_OFF
23915 jmp int_with_check
23916 CFI_ENDPROC
23917-END(system_call)
23918+ENDPROC(system_call)
23919
23920 .macro FORK_LIKE func
23921 ENTRY(stub_\func)
23922@@ -607,9 +1084,10 @@ ENTRY(stub_\func)
23923 DEFAULT_FRAME 0 8 /* offset 8: return address */
23924 call sys_\func
23925 RESTORE_TOP_OF_STACK %r11, 8
23926- ret $REST_SKIP /* pop extended registers */
23927+ pax_force_retaddr
23928+ ret
23929 CFI_ENDPROC
23930-END(stub_\func)
23931+ENDPROC(stub_\func)
23932 .endm
23933
23934 .macro FIXED_FRAME label,func
23935@@ -619,9 +1097,10 @@ ENTRY(\label)
23936 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23937 call \func
23938 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23939+ pax_force_retaddr
23940 ret
23941 CFI_ENDPROC
23942-END(\label)
23943+ENDPROC(\label)
23944 .endm
23945
23946 FORK_LIKE clone
23947@@ -629,19 +1108,6 @@ END(\label)
23948 FORK_LIKE vfork
23949 FIXED_FRAME stub_iopl, sys_iopl
23950
23951-ENTRY(ptregscall_common)
23952- DEFAULT_FRAME 1 8 /* offset 8: return address */
23953- RESTORE_TOP_OF_STACK %r11, 8
23954- movq_cfi_restore R15+8, r15
23955- movq_cfi_restore R14+8, r14
23956- movq_cfi_restore R13+8, r13
23957- movq_cfi_restore R12+8, r12
23958- movq_cfi_restore RBP+8, rbp
23959- movq_cfi_restore RBX+8, rbx
23960- ret $REST_SKIP /* pop extended registers */
23961- CFI_ENDPROC
23962-END(ptregscall_common)
23963-
23964 ENTRY(stub_execve)
23965 CFI_STARTPROC
23966 addq $8, %rsp
23967@@ -653,7 +1119,7 @@ ENTRY(stub_execve)
23968 RESTORE_REST
23969 jmp int_ret_from_sys_call
23970 CFI_ENDPROC
23971-END(stub_execve)
23972+ENDPROC(stub_execve)
23973
23974 ENTRY(stub_execveat)
23975 CFI_STARTPROC
23976@@ -667,7 +1133,7 @@ ENTRY(stub_execveat)
23977 RESTORE_REST
23978 jmp int_ret_from_sys_call
23979 CFI_ENDPROC
23980-END(stub_execveat)
23981+ENDPROC(stub_execveat)
23982
23983 /*
23984 * sigreturn is special because it needs to restore all registers on return.
23985@@ -684,7 +1150,7 @@ ENTRY(stub_rt_sigreturn)
23986 RESTORE_REST
23987 jmp int_ret_from_sys_call
23988 CFI_ENDPROC
23989-END(stub_rt_sigreturn)
23990+ENDPROC(stub_rt_sigreturn)
23991
23992 #ifdef CONFIG_X86_X32_ABI
23993 ENTRY(stub_x32_rt_sigreturn)
23994@@ -698,7 +1164,7 @@ ENTRY(stub_x32_rt_sigreturn)
23995 RESTORE_REST
23996 jmp int_ret_from_sys_call
23997 CFI_ENDPROC
23998-END(stub_x32_rt_sigreturn)
23999+ENDPROC(stub_x32_rt_sigreturn)
24000
24001 ENTRY(stub_x32_execve)
24002 CFI_STARTPROC
24003@@ -763,7 +1229,7 @@ vector=vector+1
24004 2: jmp common_interrupt
24005 .endr
24006 CFI_ENDPROC
24007-END(irq_entries_start)
24008+ENDPROC(irq_entries_start)
24009
24010 .previous
24011 END(interrupt)
24012@@ -780,8 +1246,8 @@ END(interrupt)
24013 /* 0(%rsp): ~(interrupt number) */
24014 .macro interrupt func
24015 /* reserve pt_regs for scratch regs and rbp */
24016- subq $ORIG_RAX-RBP, %rsp
24017- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
24018+ subq $ORIG_RAX, %rsp
24019+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
24020 SAVE_ARGS_IRQ
24021 call \func
24022 .endm
24023@@ -804,14 +1270,14 @@ ret_from_intr:
24024
24025 /* Restore saved previous stack */
24026 popq %rsi
24027- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
24028- leaq ARGOFFSET-RBP(%rsi), %rsp
24029+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
24030+ movq %rsi, %rsp
24031 CFI_DEF_CFA_REGISTER rsp
24032- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
24033+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
24034
24035 exit_intr:
24036 GET_THREAD_INFO(%rcx)
24037- testl $3,CS-ARGOFFSET(%rsp)
24038+ testb $3,CS-ARGOFFSET(%rsp)
24039 je retint_kernel
24040
24041 /* Interrupt came from user space */
24042@@ -833,12 +1299,35 @@ retint_swapgs: /* return to user-space */
24043 * The iretq could re-enable interrupts:
24044 */
24045 DISABLE_INTERRUPTS(CLBR_ANY)
24046+ pax_exit_kernel_user
24047+retint_swapgs_pax:
24048 TRACE_IRQS_IRETQ
24049 SWAPGS
24050 jmp restore_args
24051
24052 retint_restore_args: /* return to kernel space */
24053 DISABLE_INTERRUPTS(CLBR_ANY)
24054+ pax_exit_kernel
24055+
24056+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
24057+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
24058+ * namely calling EFI runtime services with a phys mapping. We're
24059+ * starting off with NOPs and patch in the real instrumentation
24060+ * (BTS/OR) before starting any userland process; even before starting
24061+ * up the APs.
24062+ */
24063+ .pushsection .altinstr_replacement, "a"
24064+ 601: pax_force_retaddr (RIP-ARGOFFSET)
24065+ 602:
24066+ .popsection
24067+ 603: .fill 602b-601b, 1, 0x90
24068+ .pushsection .altinstructions, "a"
24069+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
24070+ .popsection
24071+#else
24072+ pax_force_retaddr (RIP-ARGOFFSET)
24073+#endif
24074+
24075 /*
24076 * The iretq could re-enable interrupts:
24077 */
24078@@ -876,15 +1365,15 @@ native_irq_return_ldt:
24079 SWAPGS
24080 movq PER_CPU_VAR(espfix_waddr),%rdi
24081 movq %rax,(0*8)(%rdi) /* RAX */
24082- movq (2*8)(%rsp),%rax /* RIP */
24083+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
24084 movq %rax,(1*8)(%rdi)
24085- movq (3*8)(%rsp),%rax /* CS */
24086+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
24087 movq %rax,(2*8)(%rdi)
24088- movq (4*8)(%rsp),%rax /* RFLAGS */
24089+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
24090 movq %rax,(3*8)(%rdi)
24091- movq (6*8)(%rsp),%rax /* SS */
24092+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
24093 movq %rax,(5*8)(%rdi)
24094- movq (5*8)(%rsp),%rax /* RSP */
24095+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
24096 movq %rax,(4*8)(%rdi)
24097 andl $0xffff0000,%eax
24098 popq_cfi %rdi
24099@@ -938,7 +1427,7 @@ ENTRY(retint_kernel)
24100 jmp exit_intr
24101 #endif
24102 CFI_ENDPROC
24103-END(common_interrupt)
24104+ENDPROC(common_interrupt)
24105
24106 /*
24107 * APIC interrupts.
24108@@ -952,7 +1441,7 @@ ENTRY(\sym)
24109 interrupt \do_sym
24110 jmp ret_from_intr
24111 CFI_ENDPROC
24112-END(\sym)
24113+ENDPROC(\sym)
24114 .endm
24115
24116 #ifdef CONFIG_TRACING
24117@@ -1025,7 +1514,7 @@ apicinterrupt IRQ_WORK_VECTOR \
24118 /*
24119 * Exception entry points.
24120 */
24121-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
24122+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
24123
24124 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
24125 ENTRY(\sym)
24126@@ -1076,6 +1565,12 @@ ENTRY(\sym)
24127 .endif
24128
24129 .if \shift_ist != -1
24130+#ifdef CONFIG_SMP
24131+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
24132+ lea init_tss(%r13), %r13
24133+#else
24134+ lea init_tss(%rip), %r13
24135+#endif
24136 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
24137 .endif
24138
24139@@ -1092,7 +1587,7 @@ ENTRY(\sym)
24140 .endif
24141
24142 CFI_ENDPROC
24143-END(\sym)
24144+ENDPROC(\sym)
24145 .endm
24146
24147 #ifdef CONFIG_TRACING
24148@@ -1133,9 +1628,10 @@ gs_change:
24149 2: mfence /* workaround */
24150 SWAPGS
24151 popfq_cfi
24152+ pax_force_retaddr
24153 ret
24154 CFI_ENDPROC
24155-END(native_load_gs_index)
24156+ENDPROC(native_load_gs_index)
24157
24158 _ASM_EXTABLE(gs_change,bad_gs)
24159 .section .fixup,"ax"
24160@@ -1163,9 +1659,10 @@ ENTRY(do_softirq_own_stack)
24161 CFI_DEF_CFA_REGISTER rsp
24162 CFI_ADJUST_CFA_OFFSET -8
24163 decl PER_CPU_VAR(irq_count)
24164+ pax_force_retaddr
24165 ret
24166 CFI_ENDPROC
24167-END(do_softirq_own_stack)
24168+ENDPROC(do_softirq_own_stack)
24169
24170 #ifdef CONFIG_XEN
24171 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24172@@ -1203,7 +1700,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24173 decl PER_CPU_VAR(irq_count)
24174 jmp error_exit
24175 CFI_ENDPROC
24176-END(xen_do_hypervisor_callback)
24177+ENDPROC(xen_do_hypervisor_callback)
24178
24179 /*
24180 * Hypervisor uses this for application faults while it executes.
24181@@ -1262,7 +1759,7 @@ ENTRY(xen_failsafe_callback)
24182 SAVE_ALL
24183 jmp error_exit
24184 CFI_ENDPROC
24185-END(xen_failsafe_callback)
24186+ENDPROC(xen_failsafe_callback)
24187
24188 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24189 xen_hvm_callback_vector xen_evtchn_do_upcall
24190@@ -1309,18 +1806,33 @@ ENTRY(paranoid_exit)
24191 DEFAULT_FRAME
24192 DISABLE_INTERRUPTS(CLBR_NONE)
24193 TRACE_IRQS_OFF_DEBUG
24194- testl %ebx,%ebx /* swapgs needed? */
24195+ testl $1,%ebx /* swapgs needed? */
24196 jnz paranoid_restore
24197- testl $3,CS(%rsp)
24198+ testb $3,CS(%rsp)
24199 jnz paranoid_userspace
24200+#ifdef CONFIG_PAX_MEMORY_UDEREF
24201+ pax_exit_kernel
24202+ TRACE_IRQS_IRETQ 0
24203+ SWAPGS_UNSAFE_STACK
24204+ RESTORE_ALL 8
24205+ pax_force_retaddr_bts
24206+ jmp irq_return
24207+#endif
24208 paranoid_swapgs:
24209+#ifdef CONFIG_PAX_MEMORY_UDEREF
24210+ pax_exit_kernel_user
24211+#else
24212+ pax_exit_kernel
24213+#endif
24214 TRACE_IRQS_IRETQ 0
24215 SWAPGS_UNSAFE_STACK
24216 RESTORE_ALL 8
24217 jmp irq_return
24218 paranoid_restore:
24219+ pax_exit_kernel
24220 TRACE_IRQS_IRETQ_DEBUG 0
24221 RESTORE_ALL 8
24222+ pax_force_retaddr_bts
24223 jmp irq_return
24224 paranoid_userspace:
24225 GET_THREAD_INFO(%rcx)
24226@@ -1349,7 +1861,7 @@ paranoid_schedule:
24227 TRACE_IRQS_OFF
24228 jmp paranoid_userspace
24229 CFI_ENDPROC
24230-END(paranoid_exit)
24231+ENDPROC(paranoid_exit)
24232
24233 /*
24234 * Exception entry point. This expects an error code/orig_rax on the stack.
24235@@ -1376,12 +1888,23 @@ ENTRY(error_entry)
24236 movq %r14, R14+8(%rsp)
24237 movq %r15, R15+8(%rsp)
24238 xorl %ebx,%ebx
24239- testl $3,CS+8(%rsp)
24240+ testb $3,CS+8(%rsp)
24241 je error_kernelspace
24242 error_swapgs:
24243 SWAPGS
24244 error_sti:
24245+#ifdef CONFIG_PAX_MEMORY_UDEREF
24246+ testb $3, CS+8(%rsp)
24247+ jnz 1f
24248+ pax_enter_kernel
24249+ jmp 2f
24250+1: pax_enter_kernel_user
24251+2:
24252+#else
24253+ pax_enter_kernel
24254+#endif
24255 TRACE_IRQS_OFF
24256+ pax_force_retaddr
24257 ret
24258
24259 /*
24260@@ -1416,7 +1939,7 @@ error_bad_iret:
24261 decl %ebx /* Return to usergs */
24262 jmp error_sti
24263 CFI_ENDPROC
24264-END(error_entry)
24265+ENDPROC(error_entry)
24266
24267
24268 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24269@@ -1427,7 +1950,7 @@ ENTRY(error_exit)
24270 DISABLE_INTERRUPTS(CLBR_NONE)
24271 TRACE_IRQS_OFF
24272 GET_THREAD_INFO(%rcx)
24273- testl %eax,%eax
24274+ testl $1,%eax
24275 jne retint_kernel
24276 LOCKDEP_SYS_EXIT_IRQ
24277 movl TI_flags(%rcx),%edx
24278@@ -1436,7 +1959,7 @@ ENTRY(error_exit)
24279 jnz retint_careful
24280 jmp retint_swapgs
24281 CFI_ENDPROC
24282-END(error_exit)
24283+ENDPROC(error_exit)
24284
24285 /*
24286 * Test if a given stack is an NMI stack or not.
24287@@ -1494,9 +2017,11 @@ ENTRY(nmi)
24288 * If %cs was not the kernel segment, then the NMI triggered in user
24289 * space, which means it is definitely not nested.
24290 */
24291+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24292+ je 1f
24293 cmpl $__KERNEL_CS, 16(%rsp)
24294 jne first_nmi
24295-
24296+1:
24297 /*
24298 * Check the special variable on the stack to see if NMIs are
24299 * executing.
24300@@ -1530,8 +2055,7 @@ nested_nmi:
24301
24302 1:
24303 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24304- leaq -1*8(%rsp), %rdx
24305- movq %rdx, %rsp
24306+ subq $8, %rsp
24307 CFI_ADJUST_CFA_OFFSET 1*8
24308 leaq -10*8(%rsp), %rdx
24309 pushq_cfi $__KERNEL_DS
24310@@ -1549,6 +2073,7 @@ nested_nmi_out:
24311 CFI_RESTORE rdx
24312
24313 /* No need to check faults here */
24314+# pax_force_retaddr_bts
24315 INTERRUPT_RETURN
24316
24317 CFI_RESTORE_STATE
24318@@ -1645,13 +2170,13 @@ end_repeat_nmi:
24319 subq $ORIG_RAX-R15, %rsp
24320 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24321 /*
24322- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24323+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24324 * as we should not be calling schedule in NMI context.
24325 * Even with normal interrupts enabled. An NMI should not be
24326 * setting NEED_RESCHED or anything that normal interrupts and
24327 * exceptions might do.
24328 */
24329- call save_paranoid
24330+ call save_paranoid_nmi
24331 DEFAULT_FRAME 0
24332
24333 /*
24334@@ -1661,9 +2186,9 @@ end_repeat_nmi:
24335 * NMI itself takes a page fault, the page fault that was preempted
24336 * will read the information from the NMI page fault and not the
24337 * origin fault. Save it off and restore it if it changes.
24338- * Use the r12 callee-saved register.
24339+ * Use the r13 callee-saved register.
24340 */
24341- movq %cr2, %r12
24342+ movq %cr2, %r13
24343
24344 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24345 movq %rsp,%rdi
24346@@ -1672,29 +2197,34 @@ end_repeat_nmi:
24347
24348 /* Did the NMI take a page fault? Restore cr2 if it did */
24349 movq %cr2, %rcx
24350- cmpq %rcx, %r12
24351+ cmpq %rcx, %r13
24352 je 1f
24353- movq %r12, %cr2
24354+ movq %r13, %cr2
24355 1:
24356
24357- testl %ebx,%ebx /* swapgs needed? */
24358+ testl $1,%ebx /* swapgs needed? */
24359 jnz nmi_restore
24360 nmi_swapgs:
24361 SWAPGS_UNSAFE_STACK
24362 nmi_restore:
24363+ pax_exit_kernel_nmi
24364 /* Pop the extra iret frame at once */
24365 RESTORE_ALL 6*8
24366+ testb $3, 8(%rsp)
24367+ jnz 1f
24368+ pax_force_retaddr_bts
24369+1:
24370
24371 /* Clear the NMI executing stack variable */
24372 movq $0, 5*8(%rsp)
24373 jmp irq_return
24374 CFI_ENDPROC
24375-END(nmi)
24376+ENDPROC(nmi)
24377
24378 ENTRY(ignore_sysret)
24379 CFI_STARTPROC
24380 mov $-ENOSYS,%eax
24381 sysret
24382 CFI_ENDPROC
24383-END(ignore_sysret)
24384+ENDPROC(ignore_sysret)
24385
24386diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24387index f5d0730..5bce89c 100644
24388--- a/arch/x86/kernel/espfix_64.c
24389+++ b/arch/x86/kernel/espfix_64.c
24390@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24391 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24392 static void *espfix_pages[ESPFIX_MAX_PAGES];
24393
24394-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24395- __aligned(PAGE_SIZE);
24396+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24397
24398 static unsigned int page_random, slot_random;
24399
24400@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24401 void __init init_espfix_bsp(void)
24402 {
24403 pgd_t *pgd_p;
24404+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24405
24406 /* Install the espfix pud into the kernel page directory */
24407- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24408+ pgd_p = &init_level4_pgt[index];
24409 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24410
24411+#ifdef CONFIG_PAX_PER_CPU_PGD
24412+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24413+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24414+#endif
24415+
24416 /* Randomize the locations */
24417 init_espfix_random();
24418
24419@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24420 set_pte(&pte_p[n*PTE_STRIDE], pte);
24421
24422 /* Job is done for this CPU and any CPU which shares this page */
24423- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24424+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24425
24426 unlock_done:
24427 mutex_unlock(&espfix_init_mutex);
24428diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24429index 8b7b0a5..2395f29 100644
24430--- a/arch/x86/kernel/ftrace.c
24431+++ b/arch/x86/kernel/ftrace.c
24432@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24433 * kernel identity mapping to modify code.
24434 */
24435 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24436- ip = (unsigned long)__va(__pa_symbol(ip));
24437+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24438
24439 return ip;
24440 }
24441@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24442 {
24443 unsigned char replaced[MCOUNT_INSN_SIZE];
24444
24445+ ip = ktla_ktva(ip);
24446+
24447 /*
24448 * Note: Due to modules and __init, code can
24449 * disappear and change, we need to protect against faulting
24450@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24451 unsigned char old[MCOUNT_INSN_SIZE];
24452 int ret;
24453
24454- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24455+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24456
24457 ftrace_update_func = ip;
24458 /* Make sure the breakpoints see the ftrace_update_func update */
24459@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24460 unsigned char replaced[MCOUNT_INSN_SIZE];
24461 unsigned char brk = BREAKPOINT_INSTRUCTION;
24462
24463- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24464+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24465 return -EFAULT;
24466
24467 /* Make sure it is what we expect it to be */
24468diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24469index eda1a86..8f6df48 100644
24470--- a/arch/x86/kernel/head64.c
24471+++ b/arch/x86/kernel/head64.c
24472@@ -67,12 +67,12 @@ again:
24473 pgd = *pgd_p;
24474
24475 /*
24476- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24477- * critical -- __PAGE_OFFSET would point us back into the dynamic
24478+ * The use of __early_va rather than __va here is critical:
24479+ * __va would point us back into the dynamic
24480 * range and we might end up looping forever...
24481 */
24482 if (pgd)
24483- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24484+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24485 else {
24486 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24487 reset_early_page_tables();
24488@@ -82,13 +82,13 @@ again:
24489 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24490 for (i = 0; i < PTRS_PER_PUD; i++)
24491 pud_p[i] = 0;
24492- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24493+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24494 }
24495 pud_p += pud_index(address);
24496 pud = *pud_p;
24497
24498 if (pud)
24499- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24500+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24501 else {
24502 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24503 reset_early_page_tables();
24504@@ -98,7 +98,7 @@ again:
24505 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24506 for (i = 0; i < PTRS_PER_PMD; i++)
24507 pmd_p[i] = 0;
24508- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24509+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24510 }
24511 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24512 pmd_p[pmd_index(address)] = pmd;
24513@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24514 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24515 early_printk("Kernel alive\n");
24516
24517- clear_page(init_level4_pgt);
24518 /* set init_level4_pgt kernel high mapping*/
24519 init_level4_pgt[511] = early_level4_pgt[511];
24520
24521diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24522index f36bd42..0ab4474 100644
24523--- a/arch/x86/kernel/head_32.S
24524+++ b/arch/x86/kernel/head_32.S
24525@@ -26,6 +26,12 @@
24526 /* Physical address */
24527 #define pa(X) ((X) - __PAGE_OFFSET)
24528
24529+#ifdef CONFIG_PAX_KERNEXEC
24530+#define ta(X) (X)
24531+#else
24532+#define ta(X) ((X) - __PAGE_OFFSET)
24533+#endif
24534+
24535 /*
24536 * References to members of the new_cpu_data structure.
24537 */
24538@@ -55,11 +61,7 @@
24539 * and small than max_low_pfn, otherwise will waste some page table entries
24540 */
24541
24542-#if PTRS_PER_PMD > 1
24543-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24544-#else
24545-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24546-#endif
24547+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24548
24549 /* Number of possible pages in the lowmem region */
24550 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24551@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24552 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24553
24554 /*
24555+ * Real beginning of normal "text" segment
24556+ */
24557+ENTRY(stext)
24558+ENTRY(_stext)
24559+
24560+/*
24561 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24562 * %esi points to the real-mode code as a 32-bit pointer.
24563 * CS and DS must be 4 GB flat segments, but we don't depend on
24564@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24565 * can.
24566 */
24567 __HEAD
24568+
24569+#ifdef CONFIG_PAX_KERNEXEC
24570+ jmp startup_32
24571+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24572+.fill PAGE_SIZE-5,1,0xcc
24573+#endif
24574+
24575 ENTRY(startup_32)
24576 movl pa(stack_start),%ecx
24577
24578@@ -106,6 +121,59 @@ ENTRY(startup_32)
24579 2:
24580 leal -__PAGE_OFFSET(%ecx),%esp
24581
24582+#ifdef CONFIG_SMP
24583+ movl $pa(cpu_gdt_table),%edi
24584+ movl $__per_cpu_load,%eax
24585+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24586+ rorl $16,%eax
24587+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24588+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24589+ movl $__per_cpu_end - 1,%eax
24590+ subl $__per_cpu_start,%eax
24591+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24592+#endif
24593+
24594+#ifdef CONFIG_PAX_MEMORY_UDEREF
24595+ movl $NR_CPUS,%ecx
24596+ movl $pa(cpu_gdt_table),%edi
24597+1:
24598+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24599+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24600+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24601+ addl $PAGE_SIZE_asm,%edi
24602+ loop 1b
24603+#endif
24604+
24605+#ifdef CONFIG_PAX_KERNEXEC
24606+ movl $pa(boot_gdt),%edi
24607+ movl $__LOAD_PHYSICAL_ADDR,%eax
24608+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24609+ rorl $16,%eax
24610+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24611+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24612+ rorl $16,%eax
24613+
24614+ ljmp $(__BOOT_CS),$1f
24615+1:
24616+
24617+ movl $NR_CPUS,%ecx
24618+ movl $pa(cpu_gdt_table),%edi
24619+ addl $__PAGE_OFFSET,%eax
24620+1:
24621+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24622+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24623+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24624+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24625+ rorl $16,%eax
24626+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24627+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24628+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24629+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24630+ rorl $16,%eax
24631+ addl $PAGE_SIZE_asm,%edi
24632+ loop 1b
24633+#endif
24634+
24635 /*
24636 * Clear BSS first so that there are no surprises...
24637 */
24638@@ -201,8 +269,11 @@ ENTRY(startup_32)
24639 movl %eax, pa(max_pfn_mapped)
24640
24641 /* Do early initialization of the fixmap area */
24642- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24643- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24644+#ifdef CONFIG_COMPAT_VDSO
24645+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24646+#else
24647+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24648+#endif
24649 #else /* Not PAE */
24650
24651 page_pde_offset = (__PAGE_OFFSET >> 20);
24652@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24653 movl %eax, pa(max_pfn_mapped)
24654
24655 /* Do early initialization of the fixmap area */
24656- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24657- movl %eax,pa(initial_page_table+0xffc)
24658+#ifdef CONFIG_COMPAT_VDSO
24659+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24660+#else
24661+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24662+#endif
24663 #endif
24664
24665 #ifdef CONFIG_PARAVIRT
24666@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24667 cmpl $num_subarch_entries, %eax
24668 jae bad_subarch
24669
24670- movl pa(subarch_entries)(,%eax,4), %eax
24671- subl $__PAGE_OFFSET, %eax
24672- jmp *%eax
24673+ jmp *pa(subarch_entries)(,%eax,4)
24674
24675 bad_subarch:
24676 WEAK(lguest_entry)
24677@@ -261,10 +333,10 @@ WEAK(xen_entry)
24678 __INITDATA
24679
24680 subarch_entries:
24681- .long default_entry /* normal x86/PC */
24682- .long lguest_entry /* lguest hypervisor */
24683- .long xen_entry /* Xen hypervisor */
24684- .long default_entry /* Moorestown MID */
24685+ .long ta(default_entry) /* normal x86/PC */
24686+ .long ta(lguest_entry) /* lguest hypervisor */
24687+ .long ta(xen_entry) /* Xen hypervisor */
24688+ .long ta(default_entry) /* Moorestown MID */
24689 num_subarch_entries = (. - subarch_entries) / 4
24690 .previous
24691 #else
24692@@ -354,6 +426,7 @@ default_entry:
24693 movl pa(mmu_cr4_features),%eax
24694 movl %eax,%cr4
24695
24696+#ifdef CONFIG_X86_PAE
24697 testb $X86_CR4_PAE, %al # check if PAE is enabled
24698 jz enable_paging
24699
24700@@ -382,6 +455,9 @@ default_entry:
24701 /* Make changes effective */
24702 wrmsr
24703
24704+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24705+#endif
24706+
24707 enable_paging:
24708
24709 /*
24710@@ -449,14 +525,20 @@ is486:
24711 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24712 movl %eax,%ss # after changing gdt.
24713
24714- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24715+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24716 movl %eax,%ds
24717 movl %eax,%es
24718
24719 movl $(__KERNEL_PERCPU), %eax
24720 movl %eax,%fs # set this cpu's percpu
24721
24722+#ifdef CONFIG_CC_STACKPROTECTOR
24723 movl $(__KERNEL_STACK_CANARY),%eax
24724+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24725+ movl $(__USER_DS),%eax
24726+#else
24727+ xorl %eax,%eax
24728+#endif
24729 movl %eax,%gs
24730
24731 xorl %eax,%eax # Clear LDT
24732@@ -512,8 +594,11 @@ setup_once:
24733 * relocation. Manually set base address in stack canary
24734 * segment descriptor.
24735 */
24736- movl $gdt_page,%eax
24737+ movl $cpu_gdt_table,%eax
24738 movl $stack_canary,%ecx
24739+#ifdef CONFIG_SMP
24740+ addl $__per_cpu_load,%ecx
24741+#endif
24742 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24743 shrl $16, %ecx
24744 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24745@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24746 cmpl $2,(%esp) # X86_TRAP_NMI
24747 je is_nmi # Ignore NMI
24748
24749- cmpl $2,%ss:early_recursion_flag
24750+ cmpl $1,%ss:early_recursion_flag
24751 je hlt_loop
24752 incl %ss:early_recursion_flag
24753
24754@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24755 pushl (20+6*4)(%esp) /* trapno */
24756 pushl $fault_msg
24757 call printk
24758-#endif
24759 call dump_stack
24760+#endif
24761 hlt_loop:
24762 hlt
24763 jmp hlt_loop
24764@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24765 /* This is the default interrupt "handler" :-) */
24766 ALIGN
24767 ignore_int:
24768- cld
24769 #ifdef CONFIG_PRINTK
24770+ cmpl $2,%ss:early_recursion_flag
24771+ je hlt_loop
24772+ incl %ss:early_recursion_flag
24773+ cld
24774 pushl %eax
24775 pushl %ecx
24776 pushl %edx
24777@@ -617,9 +705,6 @@ ignore_int:
24778 movl $(__KERNEL_DS),%eax
24779 movl %eax,%ds
24780 movl %eax,%es
24781- cmpl $2,early_recursion_flag
24782- je hlt_loop
24783- incl early_recursion_flag
24784 pushl 16(%esp)
24785 pushl 24(%esp)
24786 pushl 32(%esp)
24787@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24788 /*
24789 * BSS section
24790 */
24791-__PAGE_ALIGNED_BSS
24792- .align PAGE_SIZE
24793 #ifdef CONFIG_X86_PAE
24794+.section .initial_pg_pmd,"a",@progbits
24795 initial_pg_pmd:
24796 .fill 1024*KPMDS,4,0
24797 #else
24798+.section .initial_page_table,"a",@progbits
24799 ENTRY(initial_page_table)
24800 .fill 1024,4,0
24801 #endif
24802+.section .initial_pg_fixmap,"a",@progbits
24803 initial_pg_fixmap:
24804 .fill 1024,4,0
24805+.section .empty_zero_page,"a",@progbits
24806 ENTRY(empty_zero_page)
24807 .fill 4096,1,0
24808+.section .swapper_pg_dir,"a",@progbits
24809 ENTRY(swapper_pg_dir)
24810+#ifdef CONFIG_X86_PAE
24811+ .fill 4,8,0
24812+#else
24813 .fill 1024,4,0
24814+#endif
24815
24816 /*
24817 * This starts the data section.
24818 */
24819 #ifdef CONFIG_X86_PAE
24820-__PAGE_ALIGNED_DATA
24821- /* Page-aligned for the benefit of paravirt? */
24822- .align PAGE_SIZE
24823+.section .initial_page_table,"a",@progbits
24824 ENTRY(initial_page_table)
24825 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24826 # if KPMDS == 3
24827@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24828 # error "Kernel PMDs should be 1, 2 or 3"
24829 # endif
24830 .align PAGE_SIZE /* needs to be page-sized too */
24831+
24832+#ifdef CONFIG_PAX_PER_CPU_PGD
24833+ENTRY(cpu_pgd)
24834+ .rept 2*NR_CPUS
24835+ .fill 4,8,0
24836+ .endr
24837+#endif
24838+
24839 #endif
24840
24841 .data
24842 .balign 4
24843 ENTRY(stack_start)
24844- .long init_thread_union+THREAD_SIZE
24845+ .long init_thread_union+THREAD_SIZE-8
24846
24847 __INITRODATA
24848 int_msg:
24849@@ -727,7 +825,7 @@ fault_msg:
24850 * segment size, and 32-bit linear address value:
24851 */
24852
24853- .data
24854+.section .rodata,"a",@progbits
24855 .globl boot_gdt_descr
24856 .globl idt_descr
24857
24858@@ -736,7 +834,7 @@ fault_msg:
24859 .word 0 # 32 bit align gdt_desc.address
24860 boot_gdt_descr:
24861 .word __BOOT_DS+7
24862- .long boot_gdt - __PAGE_OFFSET
24863+ .long pa(boot_gdt)
24864
24865 .word 0 # 32-bit align idt_desc.address
24866 idt_descr:
24867@@ -747,7 +845,7 @@ idt_descr:
24868 .word 0 # 32 bit align gdt_desc.address
24869 ENTRY(early_gdt_descr)
24870 .word GDT_ENTRIES*8-1
24871- .long gdt_page /* Overwritten for secondary CPUs */
24872+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24873
24874 /*
24875 * The boot_gdt must mirror the equivalent in setup.S and is
24876@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24877 .align L1_CACHE_BYTES
24878 ENTRY(boot_gdt)
24879 .fill GDT_ENTRY_BOOT_CS,8,0
24880- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24881- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24882+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24883+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24884+
24885+ .align PAGE_SIZE_asm
24886+ENTRY(cpu_gdt_table)
24887+ .rept NR_CPUS
24888+ .quad 0x0000000000000000 /* NULL descriptor */
24889+ .quad 0x0000000000000000 /* 0x0b reserved */
24890+ .quad 0x0000000000000000 /* 0x13 reserved */
24891+ .quad 0x0000000000000000 /* 0x1b reserved */
24892+
24893+#ifdef CONFIG_PAX_KERNEXEC
24894+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24895+#else
24896+ .quad 0x0000000000000000 /* 0x20 unused */
24897+#endif
24898+
24899+ .quad 0x0000000000000000 /* 0x28 unused */
24900+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24901+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24902+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24903+ .quad 0x0000000000000000 /* 0x4b reserved */
24904+ .quad 0x0000000000000000 /* 0x53 reserved */
24905+ .quad 0x0000000000000000 /* 0x5b reserved */
24906+
24907+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24908+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24909+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24910+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24911+
24912+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24913+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24914+
24915+ /*
24916+ * Segments used for calling PnP BIOS have byte granularity.
24917+ * The code segments and data segments have fixed 64k limits,
24918+ * the transfer segment sizes are set at run time.
24919+ */
24920+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24921+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24922+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24923+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24924+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24925+
24926+ /*
24927+ * The APM segments have byte granularity and their bases
24928+ * are set at run time. All have 64k limits.
24929+ */
24930+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24931+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24932+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24933+
24934+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24935+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24936+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24937+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24938+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24939+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24940+
24941+ /* Be sure this is zeroed to avoid false validations in Xen */
24942+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24943+ .endr
24944diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24945index a468c0a..8b5a879 100644
24946--- a/arch/x86/kernel/head_64.S
24947+++ b/arch/x86/kernel/head_64.S
24948@@ -20,6 +20,8 @@
24949 #include <asm/processor-flags.h>
24950 #include <asm/percpu.h>
24951 #include <asm/nops.h>
24952+#include <asm/cpufeature.h>
24953+#include <asm/alternative-asm.h>
24954
24955 #ifdef CONFIG_PARAVIRT
24956 #include <asm/asm-offsets.h>
24957@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24958 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24959 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24960 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24961+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24962+L3_VMALLOC_START = pud_index(VMALLOC_START)
24963+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24964+L3_VMALLOC_END = pud_index(VMALLOC_END)
24965+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24966+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24967
24968 .text
24969 __HEAD
24970@@ -89,11 +97,24 @@ startup_64:
24971 * Fixup the physical addresses in the page table
24972 */
24973 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24974+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24975+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24976+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24977+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24978+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24979
24980- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24981- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24982+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24983+#ifndef CONFIG_XEN
24984+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24985+#endif
24986+
24987+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24988+
24989+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24990+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24991
24992 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24993+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24994
24995 /*
24996 * Set up the identity mapping for the switchover. These
24997@@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24998 * after the boot processor executes this code.
24999 */
25000
25001+ orq $-1, %rbp
25002 movq $(init_level4_pgt - __START_KERNEL_map), %rax
25003 1:
25004
25005- /* Enable PAE mode and PGE */
25006- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
25007+ /* Enable PAE mode and PSE/PGE */
25008+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
25009 movq %rcx, %cr4
25010
25011 /* Setup early boot stage 4 level pagetables. */
25012@@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
25013 movl $MSR_EFER, %ecx
25014 rdmsr
25015 btsl $_EFER_SCE, %eax /* Enable System Call */
25016- btl $20,%edi /* No Execute supported? */
25017+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
25018 jnc 1f
25019 btsl $_EFER_NX, %eax
25020+ cmpq $-1, %rbp
25021+ je 1f
25022 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
25023+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
25024+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
25025+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
25026+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
25027+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
25028+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
25029+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
25030 1: wrmsr /* Make changes effective */
25031
25032 /* Setup cr0 */
25033@@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
25034 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
25035 * address given in m16:64.
25036 */
25037+ pax_set_fptr_mask
25038 movq initial_code(%rip),%rax
25039 pushq $0 # fake return address to stop unwinder
25040 pushq $__KERNEL_CS # set correct cs
25041@@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
25042 .quad INIT_PER_CPU_VAR(irq_stack_union)
25043
25044 GLOBAL(stack_start)
25045- .quad init_thread_union+THREAD_SIZE-8
25046+ .quad init_thread_union+THREAD_SIZE-16
25047 .word 0
25048 __FINITDATA
25049
25050@@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
25051 call dump_stack
25052 #ifdef CONFIG_KALLSYMS
25053 leaq early_idt_ripmsg(%rip),%rdi
25054- movq 40(%rsp),%rsi # %rip again
25055+ movq 88(%rsp),%rsi # %rip again
25056 call __print_symbol
25057 #endif
25058 #endif /* EARLY_PRINTK */
25059@@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
25060 early_recursion_flag:
25061 .long 0
25062
25063+ .section .rodata,"a",@progbits
25064 #ifdef CONFIG_EARLY_PRINTK
25065 early_idt_msg:
25066 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
25067@@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
25068 NEXT_PAGE(early_dynamic_pgts)
25069 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
25070
25071- .data
25072+ .section .rodata,"a",@progbits
25073
25074-#ifndef CONFIG_XEN
25075 NEXT_PAGE(init_level4_pgt)
25076- .fill 512,8,0
25077-#else
25078-NEXT_PAGE(init_level4_pgt)
25079- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25080 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
25081 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25082+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
25083+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
25084+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
25085+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
25086+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
25087+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25088 .org init_level4_pgt + L4_START_KERNEL*8, 0
25089 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
25090 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
25091
25092+#ifdef CONFIG_PAX_PER_CPU_PGD
25093+NEXT_PAGE(cpu_pgd)
25094+ .rept 2*NR_CPUS
25095+ .fill 512,8,0
25096+ .endr
25097+#endif
25098+
25099 NEXT_PAGE(level3_ident_pgt)
25100 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25101+#ifdef CONFIG_XEN
25102 .fill 511, 8, 0
25103+#else
25104+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
25105+ .fill 510,8,0
25106+#endif
25107+
25108+NEXT_PAGE(level3_vmalloc_start_pgt)
25109+ .fill 512,8,0
25110+
25111+NEXT_PAGE(level3_vmalloc_end_pgt)
25112+ .fill 512,8,0
25113+
25114+NEXT_PAGE(level3_vmemmap_pgt)
25115+ .fill L3_VMEMMAP_START,8,0
25116+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25117+
25118 NEXT_PAGE(level2_ident_pgt)
25119- /* Since I easily can, map the first 1G.
25120+ /* Since I easily can, map the first 2G.
25121 * Don't set NX because code runs from these pages.
25122 */
25123- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25124-#endif
25125+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25126
25127 NEXT_PAGE(level3_kernel_pgt)
25128 .fill L3_START_KERNEL,8,0
25129@@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
25130 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25131 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25132
25133+NEXT_PAGE(level2_vmemmap_pgt)
25134+ .fill 512,8,0
25135+
25136 NEXT_PAGE(level2_kernel_pgt)
25137 /*
25138 * 512 MB kernel mapping. We spend a full page on this pagetable
25139@@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
25140 NEXT_PAGE(level2_fixmap_pgt)
25141 .fill 506,8,0
25142 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25143- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25144- .fill 5,8,0
25145+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25146+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25147+ .fill 4,8,0
25148
25149 NEXT_PAGE(level1_fixmap_pgt)
25150 .fill 512,8,0
25151
25152+NEXT_PAGE(level1_vsyscall_pgt)
25153+ .fill 512,8,0
25154+
25155 #undef PMDS
25156
25157- .data
25158+ .align PAGE_SIZE
25159+ENTRY(cpu_gdt_table)
25160+ .rept NR_CPUS
25161+ .quad 0x0000000000000000 /* NULL descriptor */
25162+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25163+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25164+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25165+ .quad 0x00cffb000000ffff /* __USER32_CS */
25166+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25167+ .quad 0x00affb000000ffff /* __USER_CS */
25168+
25169+#ifdef CONFIG_PAX_KERNEXEC
25170+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25171+#else
25172+ .quad 0x0 /* unused */
25173+#endif
25174+
25175+ .quad 0,0 /* TSS */
25176+ .quad 0,0 /* LDT */
25177+ .quad 0,0,0 /* three TLS descriptors */
25178+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25179+ /* asm/segment.h:GDT_ENTRIES must match this */
25180+
25181+#ifdef CONFIG_PAX_MEMORY_UDEREF
25182+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25183+#else
25184+ .quad 0x0 /* unused */
25185+#endif
25186+
25187+ /* zero the remaining page */
25188+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25189+ .endr
25190+
25191 .align 16
25192 .globl early_gdt_descr
25193 early_gdt_descr:
25194 .word GDT_ENTRIES*8-1
25195 early_gdt_descr_base:
25196- .quad INIT_PER_CPU_VAR(gdt_page)
25197+ .quad cpu_gdt_table
25198
25199 ENTRY(phys_base)
25200 /* This must match the first entry in level2_kernel_pgt */
25201 .quad 0x0000000000000000
25202
25203 #include "../../x86/xen/xen-head.S"
25204-
25205- __PAGE_ALIGNED_BSS
25206+
25207+ .section .rodata,"a",@progbits
25208 NEXT_PAGE(empty_zero_page)
25209 .skip PAGE_SIZE
25210diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25211index 05fd74f..c3548b1 100644
25212--- a/arch/x86/kernel/i386_ksyms_32.c
25213+++ b/arch/x86/kernel/i386_ksyms_32.c
25214@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25215 EXPORT_SYMBOL(cmpxchg8b_emu);
25216 #endif
25217
25218+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25219+
25220 /* Networking helper routines. */
25221 EXPORT_SYMBOL(csum_partial_copy_generic);
25222+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25223+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25224
25225 EXPORT_SYMBOL(__get_user_1);
25226 EXPORT_SYMBOL(__get_user_2);
25227@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25228 EXPORT_SYMBOL(___preempt_schedule_context);
25229 #endif
25230 #endif
25231+
25232+#ifdef CONFIG_PAX_KERNEXEC
25233+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25234+#endif
25235+
25236+#ifdef CONFIG_PAX_PER_CPU_PGD
25237+EXPORT_SYMBOL(cpu_pgd);
25238+#endif
25239diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25240index a9a4229..6f4d476 100644
25241--- a/arch/x86/kernel/i387.c
25242+++ b/arch/x86/kernel/i387.c
25243@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25244 static inline bool interrupted_user_mode(void)
25245 {
25246 struct pt_regs *regs = get_irq_regs();
25247- return regs && user_mode_vm(regs);
25248+ return regs && user_mode(regs);
25249 }
25250
25251 /*
25252diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25253index e7cc537..67d7372 100644
25254--- a/arch/x86/kernel/i8259.c
25255+++ b/arch/x86/kernel/i8259.c
25256@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25257 static void make_8259A_irq(unsigned int irq)
25258 {
25259 disable_irq_nosync(irq);
25260- io_apic_irqs &= ~(1<<irq);
25261+ io_apic_irqs &= ~(1UL<<irq);
25262 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25263 enable_irq(irq);
25264 }
25265@@ -208,7 +208,7 @@ spurious_8259A_irq:
25266 "spurious 8259A interrupt: IRQ%d.\n", irq);
25267 spurious_irq_mask |= irqmask;
25268 }
25269- atomic_inc(&irq_err_count);
25270+ atomic_inc_unchecked(&irq_err_count);
25271 /*
25272 * Theoretically we do not have to handle this IRQ,
25273 * but in Linux this does not cause problems and is
25274@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25275 /* (slave's support for AEOI in flat mode is to be investigated) */
25276 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25277
25278+ pax_open_kernel();
25279 if (auto_eoi)
25280 /*
25281 * In AEOI mode we just have to mask the interrupt
25282 * when acking.
25283 */
25284- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25285+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25286 else
25287- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25288+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25289+ pax_close_kernel();
25290
25291 udelay(100); /* wait for 8259A to initialize */
25292
25293diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25294index a979b5b..1d6db75 100644
25295--- a/arch/x86/kernel/io_delay.c
25296+++ b/arch/x86/kernel/io_delay.c
25297@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25298 * Quirk table for systems that misbehave (lock up, etc.) if port
25299 * 0x80 is used:
25300 */
25301-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25302+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25303 {
25304 .callback = dmi_io_delay_0xed_port,
25305 .ident = "Compaq Presario V6000",
25306diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25307index 4ddaf66..49d5c18 100644
25308--- a/arch/x86/kernel/ioport.c
25309+++ b/arch/x86/kernel/ioport.c
25310@@ -6,6 +6,7 @@
25311 #include <linux/sched.h>
25312 #include <linux/kernel.h>
25313 #include <linux/capability.h>
25314+#include <linux/security.h>
25315 #include <linux/errno.h>
25316 #include <linux/types.h>
25317 #include <linux/ioport.h>
25318@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25319 return -EINVAL;
25320 if (turn_on && !capable(CAP_SYS_RAWIO))
25321 return -EPERM;
25322+#ifdef CONFIG_GRKERNSEC_IO
25323+ if (turn_on && grsec_disable_privio) {
25324+ gr_handle_ioperm();
25325+ return -ENODEV;
25326+ }
25327+#endif
25328
25329 /*
25330 * If it's the first ioperm() call in this thread's lifetime, set the
25331@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25332 * because the ->io_bitmap_max value must match the bitmap
25333 * contents:
25334 */
25335- tss = &per_cpu(init_tss, get_cpu());
25336+ tss = init_tss + get_cpu();
25337
25338 if (turn_on)
25339 bitmap_clear(t->io_bitmap_ptr, from, num);
25340@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25341 if (level > old) {
25342 if (!capable(CAP_SYS_RAWIO))
25343 return -EPERM;
25344+#ifdef CONFIG_GRKERNSEC_IO
25345+ if (grsec_disable_privio) {
25346+ gr_handle_iopl();
25347+ return -ENODEV;
25348+ }
25349+#endif
25350 }
25351 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25352 t->iopl = level << 12;
25353diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25354index 705ef8d..8672c9d 100644
25355--- a/arch/x86/kernel/irq.c
25356+++ b/arch/x86/kernel/irq.c
25357@@ -22,7 +22,7 @@
25358 #define CREATE_TRACE_POINTS
25359 #include <asm/trace/irq_vectors.h>
25360
25361-atomic_t irq_err_count;
25362+atomic_unchecked_t irq_err_count;
25363
25364 /* Function pointer for generic interrupt vector handling */
25365 void (*x86_platform_ipi_callback)(void) = NULL;
25366@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25367 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25368 seq_puts(p, " Hypervisor callback interrupts\n");
25369 #endif
25370- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25371+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25372 #if defined(CONFIG_X86_IO_APIC)
25373- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25374+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25375 #endif
25376 return 0;
25377 }
25378@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25379
25380 u64 arch_irq_stat(void)
25381 {
25382- u64 sum = atomic_read(&irq_err_count);
25383+ u64 sum = atomic_read_unchecked(&irq_err_count);
25384 return sum;
25385 }
25386
25387diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25388index 63ce838..2ea3e06 100644
25389--- a/arch/x86/kernel/irq_32.c
25390+++ b/arch/x86/kernel/irq_32.c
25391@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25392
25393 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25394
25395+extern void gr_handle_kernel_exploit(void);
25396+
25397 int sysctl_panic_on_stackoverflow __read_mostly;
25398
25399 /* Debugging check for stack overflow: is there less than 1KB free? */
25400@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25401 __asm__ __volatile__("andl %%esp,%0" :
25402 "=r" (sp) : "0" (THREAD_SIZE - 1));
25403
25404- return sp < (sizeof(struct thread_info) + STACK_WARN);
25405+ return sp < STACK_WARN;
25406 }
25407
25408 static void print_stack_overflow(void)
25409 {
25410 printk(KERN_WARNING "low stack detected by irq handler\n");
25411 dump_stack();
25412+ gr_handle_kernel_exploit();
25413 if (sysctl_panic_on_stackoverflow)
25414 panic("low stack detected by irq handler - check messages\n");
25415 }
25416@@ -84,10 +87,9 @@ static inline void *current_stack(void)
25417 static inline int
25418 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25419 {
25420- struct irq_stack *curstk, *irqstk;
25421+ struct irq_stack *irqstk;
25422 u32 *isp, *prev_esp, arg1, arg2;
25423
25424- curstk = (struct irq_stack *) current_stack();
25425 irqstk = __this_cpu_read(hardirq_stack);
25426
25427 /*
25428@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25429 * handler) we can't do that and just have to keep using the
25430 * current stack (which is the irq stack already after all)
25431 */
25432- if (unlikely(curstk == irqstk))
25433+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25434 return 0;
25435
25436- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25437+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25438
25439 /* Save the next esp at the bottom of the stack */
25440 prev_esp = (u32 *)irqstk;
25441 *prev_esp = current_stack_pointer;
25442
25443+#ifdef CONFIG_PAX_MEMORY_UDEREF
25444+ __set_fs(MAKE_MM_SEG(0));
25445+#endif
25446+
25447 if (unlikely(overflow))
25448 call_on_stack(print_stack_overflow, isp);
25449
25450@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25451 : "0" (irq), "1" (desc), "2" (isp),
25452 "D" (desc->handle_irq)
25453 : "memory", "cc", "ecx");
25454+
25455+#ifdef CONFIG_PAX_MEMORY_UDEREF
25456+ __set_fs(current_thread_info()->addr_limit);
25457+#endif
25458+
25459 return 1;
25460 }
25461
25462@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25463 */
25464 void irq_ctx_init(int cpu)
25465 {
25466- struct irq_stack *irqstk;
25467-
25468 if (per_cpu(hardirq_stack, cpu))
25469 return;
25470
25471- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25472- THREADINFO_GFP,
25473- THREAD_SIZE_ORDER));
25474- per_cpu(hardirq_stack, cpu) = irqstk;
25475-
25476- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25477- THREADINFO_GFP,
25478- THREAD_SIZE_ORDER));
25479- per_cpu(softirq_stack, cpu) = irqstk;
25480-
25481- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25482- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25483+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25484+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25485 }
25486
25487 void do_softirq_own_stack(void)
25488 {
25489- struct thread_info *curstk;
25490 struct irq_stack *irqstk;
25491 u32 *isp, *prev_esp;
25492
25493- curstk = current_stack();
25494 irqstk = __this_cpu_read(softirq_stack);
25495
25496 /* build the stack frame on the softirq stack */
25497@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25498 prev_esp = (u32 *)irqstk;
25499 *prev_esp = current_stack_pointer;
25500
25501+#ifdef CONFIG_PAX_MEMORY_UDEREF
25502+ __set_fs(MAKE_MM_SEG(0));
25503+#endif
25504+
25505 call_on_stack(__do_softirq, isp);
25506+
25507+#ifdef CONFIG_PAX_MEMORY_UDEREF
25508+ __set_fs(current_thread_info()->addr_limit);
25509+#endif
25510+
25511 }
25512
25513 bool handle_irq(unsigned irq, struct pt_regs *regs)
25514@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25515 if (unlikely(!desc))
25516 return false;
25517
25518- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25519+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25520 if (unlikely(overflow))
25521 print_stack_overflow();
25522 desc->handle_irq(irq, desc);
25523diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25524index e4b503d..824fce8 100644
25525--- a/arch/x86/kernel/irq_64.c
25526+++ b/arch/x86/kernel/irq_64.c
25527@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25528 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25529 EXPORT_PER_CPU_SYMBOL(irq_regs);
25530
25531+extern void gr_handle_kernel_exploit(void);
25532+
25533 int sysctl_panic_on_stackoverflow;
25534
25535 /*
25536@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25537 u64 estack_top, estack_bottom;
25538 u64 curbase = (u64)task_stack_page(current);
25539
25540- if (user_mode_vm(regs))
25541+ if (user_mode(regs))
25542 return;
25543
25544 if (regs->sp >= curbase + sizeof(struct thread_info) +
25545@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25546 irq_stack_top, irq_stack_bottom,
25547 estack_top, estack_bottom);
25548
25549+ gr_handle_kernel_exploit();
25550+
25551 if (sysctl_panic_on_stackoverflow)
25552 panic("low stack detected by irq handler - check messages\n");
25553 #endif
25554diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25555index 26d5a55..a01160a 100644
25556--- a/arch/x86/kernel/jump_label.c
25557+++ b/arch/x86/kernel/jump_label.c
25558@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25559 * Jump label is enabled for the first time.
25560 * So we expect a default_nop...
25561 */
25562- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25563+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25564 != 0))
25565 bug_at((void *)entry->code, __LINE__);
25566 } else {
25567@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25568 * ...otherwise expect an ideal_nop. Otherwise
25569 * something went horribly wrong.
25570 */
25571- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25572+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25573 != 0))
25574 bug_at((void *)entry->code, __LINE__);
25575 }
25576@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25577 * are converting the default nop to the ideal nop.
25578 */
25579 if (init) {
25580- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25581+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25582 bug_at((void *)entry->code, __LINE__);
25583 } else {
25584 code.jump = 0xe9;
25585 code.offset = entry->target -
25586 (entry->code + JUMP_LABEL_NOP_SIZE);
25587- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25588+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25589 bug_at((void *)entry->code, __LINE__);
25590 }
25591 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25592diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25593index 7ec1d5f..5a7d130 100644
25594--- a/arch/x86/kernel/kgdb.c
25595+++ b/arch/x86/kernel/kgdb.c
25596@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25597 #ifdef CONFIG_X86_32
25598 switch (regno) {
25599 case GDB_SS:
25600- if (!user_mode_vm(regs))
25601+ if (!user_mode(regs))
25602 *(unsigned long *)mem = __KERNEL_DS;
25603 break;
25604 case GDB_SP:
25605- if (!user_mode_vm(regs))
25606+ if (!user_mode(regs))
25607 *(unsigned long *)mem = kernel_stack_pointer(regs);
25608 break;
25609 case GDB_GS:
25610@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25611 bp->attr.bp_addr = breakinfo[breakno].addr;
25612 bp->attr.bp_len = breakinfo[breakno].len;
25613 bp->attr.bp_type = breakinfo[breakno].type;
25614- info->address = breakinfo[breakno].addr;
25615+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25616+ info->address = ktla_ktva(breakinfo[breakno].addr);
25617+ else
25618+ info->address = breakinfo[breakno].addr;
25619 info->len = breakinfo[breakno].len;
25620 info->type = breakinfo[breakno].type;
25621 val = arch_install_hw_breakpoint(bp);
25622@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25623 case 'k':
25624 /* clear the trace bit */
25625 linux_regs->flags &= ~X86_EFLAGS_TF;
25626- atomic_set(&kgdb_cpu_doing_single_step, -1);
25627+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25628
25629 /* set the trace bit if we're stepping */
25630 if (remcomInBuffer[0] == 's') {
25631 linux_regs->flags |= X86_EFLAGS_TF;
25632- atomic_set(&kgdb_cpu_doing_single_step,
25633+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25634 raw_smp_processor_id());
25635 }
25636
25637@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25638
25639 switch (cmd) {
25640 case DIE_DEBUG:
25641- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25642+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25643 if (user_mode(regs))
25644 return single_step_cont(regs, args);
25645 break;
25646@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25647 #endif /* CONFIG_DEBUG_RODATA */
25648
25649 bpt->type = BP_BREAKPOINT;
25650- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25651+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25652 BREAK_INSTR_SIZE);
25653 if (err)
25654 return err;
25655- err = probe_kernel_write((char *)bpt->bpt_addr,
25656+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25657 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25658 #ifdef CONFIG_DEBUG_RODATA
25659 if (!err)
25660@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25661 return -EBUSY;
25662 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25663 BREAK_INSTR_SIZE);
25664- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25665+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25666 if (err)
25667 return err;
25668 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25669@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25670 if (mutex_is_locked(&text_mutex))
25671 goto knl_write;
25672 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25673- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25674+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25675 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25676 goto knl_write;
25677 return err;
25678 knl_write:
25679 #endif /* CONFIG_DEBUG_RODATA */
25680- return probe_kernel_write((char *)bpt->bpt_addr,
25681+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25682 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25683 }
25684
25685diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25686index 98f654d..ac04352 100644
25687--- a/arch/x86/kernel/kprobes/core.c
25688+++ b/arch/x86/kernel/kprobes/core.c
25689@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25690 s32 raddr;
25691 } __packed *insn;
25692
25693- insn = (struct __arch_relative_insn *)from;
25694+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25695+
25696+ pax_open_kernel();
25697 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25698 insn->op = op;
25699+ pax_close_kernel();
25700 }
25701
25702 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25703@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25704 kprobe_opcode_t opcode;
25705 kprobe_opcode_t *orig_opcodes = opcodes;
25706
25707- if (search_exception_tables((unsigned long)opcodes))
25708+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25709 return 0; /* Page fault may occur on this address. */
25710
25711 retry:
25712@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25713 * for the first byte, we can recover the original instruction
25714 * from it and kp->opcode.
25715 */
25716- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25717+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25718 buf[0] = kp->opcode;
25719- return (unsigned long)buf;
25720+ return ktva_ktla((unsigned long)buf);
25721 }
25722
25723 /*
25724@@ -338,7 +341,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25725 /* Another subsystem puts a breakpoint, failed to recover */
25726 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25727 return 0;
25728+ pax_open_kernel();
25729 memcpy(dest, insn.kaddr, insn.length);
25730+ pax_close_kernel();
25731
25732 #ifdef CONFIG_X86_64
25733 if (insn_rip_relative(&insn)) {
25734@@ -365,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25735 return 0;
25736 }
25737 disp = (u8 *) dest + insn_offset_displacement(&insn);
25738+ pax_open_kernel();
25739 *(s32 *) disp = (s32) newdisp;
25740+ pax_close_kernel();
25741 }
25742 #endif
25743 return insn.length;
25744@@ -507,7 +514,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25745 * nor set current_kprobe, because it doesn't use single
25746 * stepping.
25747 */
25748- regs->ip = (unsigned long)p->ainsn.insn;
25749+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25750 preempt_enable_no_resched();
25751 return;
25752 }
25753@@ -524,9 +531,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25754 regs->flags &= ~X86_EFLAGS_IF;
25755 /* single step inline if the instruction is an int3 */
25756 if (p->opcode == BREAKPOINT_INSTRUCTION)
25757- regs->ip = (unsigned long)p->addr;
25758+ regs->ip = ktla_ktva((unsigned long)p->addr);
25759 else
25760- regs->ip = (unsigned long)p->ainsn.insn;
25761+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25762 }
25763 NOKPROBE_SYMBOL(setup_singlestep);
25764
25765@@ -576,7 +583,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25766 struct kprobe *p;
25767 struct kprobe_ctlblk *kcb;
25768
25769- if (user_mode_vm(regs))
25770+ if (user_mode(regs))
25771 return 0;
25772
25773 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25774@@ -611,7 +618,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25775 setup_singlestep(p, regs, kcb, 0);
25776 return 1;
25777 }
25778- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25779+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25780 /*
25781 * The breakpoint instruction was removed right
25782 * after we hit it. Another cpu has removed
25783@@ -658,6 +665,9 @@ static void __used kretprobe_trampoline_holder(void)
25784 " movq %rax, 152(%rsp)\n"
25785 RESTORE_REGS_STRING
25786 " popfq\n"
25787+#ifdef KERNEXEC_PLUGIN
25788+ " btsq $63,(%rsp)\n"
25789+#endif
25790 #else
25791 " pushf\n"
25792 SAVE_REGS_STRING
25793@@ -798,7 +808,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25794 struct kprobe_ctlblk *kcb)
25795 {
25796 unsigned long *tos = stack_addr(regs);
25797- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25798+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25799 unsigned long orig_ip = (unsigned long)p->addr;
25800 kprobe_opcode_t *insn = p->ainsn.insn;
25801
25802@@ -981,7 +991,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25803 struct die_args *args = data;
25804 int ret = NOTIFY_DONE;
25805
25806- if (args->regs && user_mode_vm(args->regs))
25807+ if (args->regs && user_mode(args->regs))
25808 return ret;
25809
25810 if (val == DIE_GPF) {
25811diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25812index 7c523bb..01b051b 100644
25813--- a/arch/x86/kernel/kprobes/opt.c
25814+++ b/arch/x86/kernel/kprobes/opt.c
25815@@ -79,6 +79,7 @@ found:
25816 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25817 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25818 {
25819+ pax_open_kernel();
25820 #ifdef CONFIG_X86_64
25821 *addr++ = 0x48;
25822 *addr++ = 0xbf;
25823@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25824 *addr++ = 0xb8;
25825 #endif
25826 *(unsigned long *)addr = val;
25827+ pax_close_kernel();
25828 }
25829
25830 asm (
25831@@ -339,7 +341,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25832 * Verify if the address gap is in 2GB range, because this uses
25833 * a relative jump.
25834 */
25835- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25836+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25837 if (abs(rel) > 0x7fffffff) {
25838 __arch_remove_optimized_kprobe(op, 0);
25839 return -ERANGE;
25840@@ -356,16 +358,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25841 op->optinsn.size = ret;
25842
25843 /* Copy arch-dep-instance from template */
25844- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25845+ pax_open_kernel();
25846+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25847+ pax_close_kernel();
25848
25849 /* Set probe information */
25850 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25851
25852 /* Set probe function call */
25853- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25854+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25855
25856 /* Set returning jmp instruction at the tail of out-of-line buffer */
25857- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25858+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25859 (u8 *)op->kp.addr + op->optinsn.size);
25860
25861 flush_icache_range((unsigned long) buf,
25862@@ -390,7 +394,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25863 WARN_ON(kprobe_disabled(&op->kp));
25864
25865 /* Backup instructions which will be replaced by jump address */
25866- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25867+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25868 RELATIVE_ADDR_SIZE);
25869
25870 insn_buf[0] = RELATIVEJUMP_OPCODE;
25871@@ -438,7 +442,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25872 /* This kprobe is really able to run optimized path. */
25873 op = container_of(p, struct optimized_kprobe, kp);
25874 /* Detour through copied instructions */
25875- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25876+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25877 if (!reenter)
25878 reset_current_kprobe();
25879 preempt_enable_no_resched();
25880diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25881index c2bedae..25e7ab60 100644
25882--- a/arch/x86/kernel/ksysfs.c
25883+++ b/arch/x86/kernel/ksysfs.c
25884@@ -184,7 +184,7 @@ out:
25885
25886 static struct kobj_attribute type_attr = __ATTR_RO(type);
25887
25888-static struct bin_attribute data_attr = {
25889+static bin_attribute_no_const data_attr __read_only = {
25890 .attr = {
25891 .name = "data",
25892 .mode = S_IRUGO,
25893diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25894index c37886d..d851d32 100644
25895--- a/arch/x86/kernel/ldt.c
25896+++ b/arch/x86/kernel/ldt.c
25897@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25898 if (reload) {
25899 #ifdef CONFIG_SMP
25900 preempt_disable();
25901- load_LDT(pc);
25902+ load_LDT_nolock(pc);
25903 if (!cpumask_equal(mm_cpumask(current->mm),
25904 cpumask_of(smp_processor_id())))
25905 smp_call_function(flush_ldt, current->mm, 1);
25906 preempt_enable();
25907 #else
25908- load_LDT(pc);
25909+ load_LDT_nolock(pc);
25910 #endif
25911 }
25912 if (oldsize) {
25913@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25914 return err;
25915
25916 for (i = 0; i < old->size; i++)
25917- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25918+ write_ldt_entry(new->ldt, i, old->ldt + i);
25919 return 0;
25920 }
25921
25922@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25923 retval = copy_ldt(&mm->context, &old_mm->context);
25924 mutex_unlock(&old_mm->context.lock);
25925 }
25926+
25927+ if (tsk == current) {
25928+ mm->context.vdso = 0;
25929+
25930+#ifdef CONFIG_X86_32
25931+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25932+ mm->context.user_cs_base = 0UL;
25933+ mm->context.user_cs_limit = ~0UL;
25934+
25935+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25936+ cpus_clear(mm->context.cpu_user_cs_mask);
25937+#endif
25938+
25939+#endif
25940+#endif
25941+
25942+ }
25943+
25944 return retval;
25945 }
25946
25947@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25948 }
25949 }
25950
25951+#ifdef CONFIG_PAX_SEGMEXEC
25952+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25953+ error = -EINVAL;
25954+ goto out_unlock;
25955+ }
25956+#endif
25957+
25958 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25959 error = -EINVAL;
25960 goto out_unlock;
25961diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25962index 469b23d..5449cfe 100644
25963--- a/arch/x86/kernel/machine_kexec_32.c
25964+++ b/arch/x86/kernel/machine_kexec_32.c
25965@@ -26,7 +26,7 @@
25966 #include <asm/cacheflush.h>
25967 #include <asm/debugreg.h>
25968
25969-static void set_idt(void *newidt, __u16 limit)
25970+static void set_idt(struct desc_struct *newidt, __u16 limit)
25971 {
25972 struct desc_ptr curidt;
25973
25974@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25975 }
25976
25977
25978-static void set_gdt(void *newgdt, __u16 limit)
25979+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25980 {
25981 struct desc_ptr curgdt;
25982
25983@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25984 }
25985
25986 control_page = page_address(image->control_code_page);
25987- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25988+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25989
25990 relocate_kernel_ptr = control_page;
25991 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25992diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25993index 94ea120..4154cea 100644
25994--- a/arch/x86/kernel/mcount_64.S
25995+++ b/arch/x86/kernel/mcount_64.S
25996@@ -7,7 +7,7 @@
25997 #include <linux/linkage.h>
25998 #include <asm/ptrace.h>
25999 #include <asm/ftrace.h>
26000-
26001+#include <asm/alternative-asm.h>
26002
26003 .code64
26004 .section .entry.text, "ax"
26005@@ -148,8 +148,9 @@
26006 #ifdef CONFIG_DYNAMIC_FTRACE
26007
26008 ENTRY(function_hook)
26009+ pax_force_retaddr
26010 retq
26011-END(function_hook)
26012+ENDPROC(function_hook)
26013
26014 ENTRY(ftrace_caller)
26015 /* save_mcount_regs fills in first two parameters */
26016@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
26017 #endif
26018
26019 GLOBAL(ftrace_stub)
26020+ pax_force_retaddr
26021 retq
26022-END(ftrace_caller)
26023+ENDPROC(ftrace_caller)
26024
26025 ENTRY(ftrace_regs_caller)
26026 /* Save the current flags before any operations that can change them */
26027@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
26028
26029 jmp ftrace_return
26030
26031-END(ftrace_regs_caller)
26032+ENDPROC(ftrace_regs_caller)
26033
26034
26035 #else /* ! CONFIG_DYNAMIC_FTRACE */
26036@@ -272,18 +274,20 @@ fgraph_trace:
26037 #endif
26038
26039 GLOBAL(ftrace_stub)
26040+ pax_force_retaddr
26041 retq
26042
26043 trace:
26044 /* save_mcount_regs fills in first two parameters */
26045 save_mcount_regs
26046
26047+ pax_force_fptr ftrace_trace_function
26048 call *ftrace_trace_function
26049
26050 restore_mcount_regs
26051
26052 jmp fgraph_trace
26053-END(function_hook)
26054+ENDPROC(function_hook)
26055 #endif /* CONFIG_DYNAMIC_FTRACE */
26056 #endif /* CONFIG_FUNCTION_TRACER */
26057
26058@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
26059
26060 restore_mcount_regs
26061
26062+ pax_force_retaddr
26063 retq
26064-END(ftrace_graph_caller)
26065+ENDPROC(ftrace_graph_caller)
26066
26067 GLOBAL(return_to_handler)
26068 subq $24, %rsp
26069@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26070 movq 8(%rsp), %rdx
26071 movq (%rsp), %rax
26072 addq $24, %rsp
26073+ pax_force_fptr %rdi
26074 jmp *%rdi
26075+ENDPROC(return_to_handler)
26076 #endif
26077diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26078index e69f988..72902b7 100644
26079--- a/arch/x86/kernel/module.c
26080+++ b/arch/x86/kernel/module.c
26081@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
26082 }
26083 #endif
26084
26085-void *module_alloc(unsigned long size)
26086+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26087 {
26088- if (PAGE_ALIGN(size) > MODULES_LEN)
26089+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26090 return NULL;
26091 return __vmalloc_node_range(size, 1,
26092 MODULES_VADDR + get_module_load_offset(),
26093- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26094- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
26095+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26096+ prot, NUMA_NO_NODE,
26097 __builtin_return_address(0));
26098 }
26099
26100+void *module_alloc(unsigned long size)
26101+{
26102+
26103+#ifdef CONFIG_PAX_KERNEXEC
26104+ return __module_alloc(size, PAGE_KERNEL);
26105+#else
26106+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26107+#endif
26108+
26109+}
26110+
26111+#ifdef CONFIG_PAX_KERNEXEC
26112+#ifdef CONFIG_X86_32
26113+void *module_alloc_exec(unsigned long size)
26114+{
26115+ struct vm_struct *area;
26116+
26117+ if (size == 0)
26118+ return NULL;
26119+
26120+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26121+return area ? area->addr : NULL;
26122+}
26123+EXPORT_SYMBOL(module_alloc_exec);
26124+
26125+void module_memfree_exec(void *module_region)
26126+{
26127+ vunmap(module_region);
26128+}
26129+EXPORT_SYMBOL(module_memfree_exec);
26130+#else
26131+void module_memfree_exec(void *module_region)
26132+{
26133+ module_memfree(module_region);
26134+}
26135+EXPORT_SYMBOL(module_memfree_exec);
26136+
26137+void *module_alloc_exec(unsigned long size)
26138+{
26139+ return __module_alloc(size, PAGE_KERNEL_RX);
26140+}
26141+EXPORT_SYMBOL(module_alloc_exec);
26142+#endif
26143+#endif
26144+
26145 #ifdef CONFIG_X86_32
26146 int apply_relocate(Elf32_Shdr *sechdrs,
26147 const char *strtab,
26148@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26149 unsigned int i;
26150 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26151 Elf32_Sym *sym;
26152- uint32_t *location;
26153+ uint32_t *plocation, location;
26154
26155 DEBUGP("Applying relocate section %u to %u\n",
26156 relsec, sechdrs[relsec].sh_info);
26157 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26158 /* This is where to make the change */
26159- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26160- + rel[i].r_offset;
26161+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26162+ location = (uint32_t)plocation;
26163+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26164+ plocation = ktla_ktva((void *)plocation);
26165 /* This is the symbol it is referring to. Note that all
26166 undefined symbols have been resolved. */
26167 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26168@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26169 switch (ELF32_R_TYPE(rel[i].r_info)) {
26170 case R_386_32:
26171 /* We add the value into the location given */
26172- *location += sym->st_value;
26173+ pax_open_kernel();
26174+ *plocation += sym->st_value;
26175+ pax_close_kernel();
26176 break;
26177 case R_386_PC32:
26178 /* Add the value, subtract its position */
26179- *location += sym->st_value - (uint32_t)location;
26180+ pax_open_kernel();
26181+ *plocation += sym->st_value - location;
26182+ pax_close_kernel();
26183 break;
26184 default:
26185 pr_err("%s: Unknown relocation: %u\n",
26186@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26187 case R_X86_64_NONE:
26188 break;
26189 case R_X86_64_64:
26190+ pax_open_kernel();
26191 *(u64 *)loc = val;
26192+ pax_close_kernel();
26193 break;
26194 case R_X86_64_32:
26195+ pax_open_kernel();
26196 *(u32 *)loc = val;
26197+ pax_close_kernel();
26198 if (val != *(u32 *)loc)
26199 goto overflow;
26200 break;
26201 case R_X86_64_32S:
26202+ pax_open_kernel();
26203 *(s32 *)loc = val;
26204+ pax_close_kernel();
26205 if ((s64)val != *(s32 *)loc)
26206 goto overflow;
26207 break;
26208 case R_X86_64_PC32:
26209 val -= (u64)loc;
26210+ pax_open_kernel();
26211 *(u32 *)loc = val;
26212+ pax_close_kernel();
26213+
26214 #if 0
26215 if ((s64)val != *(s32 *)loc)
26216 goto overflow;
26217diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26218index 113e707..0a690e1 100644
26219--- a/arch/x86/kernel/msr.c
26220+++ b/arch/x86/kernel/msr.c
26221@@ -39,6 +39,7 @@
26222 #include <linux/notifier.h>
26223 #include <linux/uaccess.h>
26224 #include <linux/gfp.h>
26225+#include <linux/grsecurity.h>
26226
26227 #include <asm/processor.h>
26228 #include <asm/msr.h>
26229@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26230 int err = 0;
26231 ssize_t bytes = 0;
26232
26233+#ifdef CONFIG_GRKERNSEC_KMEM
26234+ gr_handle_msr_write();
26235+ return -EPERM;
26236+#endif
26237+
26238 if (count % 8)
26239 return -EINVAL; /* Invalid chunk size */
26240
26241@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26242 err = -EBADF;
26243 break;
26244 }
26245+#ifdef CONFIG_GRKERNSEC_KMEM
26246+ gr_handle_msr_write();
26247+ return -EPERM;
26248+#endif
26249 if (copy_from_user(&regs, uregs, sizeof regs)) {
26250 err = -EFAULT;
26251 break;
26252@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26253 return notifier_from_errno(err);
26254 }
26255
26256-static struct notifier_block __refdata msr_class_cpu_notifier = {
26257+static struct notifier_block msr_class_cpu_notifier = {
26258 .notifier_call = msr_class_cpu_callback,
26259 };
26260
26261diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26262index c3e985d..110a36a 100644
26263--- a/arch/x86/kernel/nmi.c
26264+++ b/arch/x86/kernel/nmi.c
26265@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26266
26267 static void nmi_max_handler(struct irq_work *w)
26268 {
26269- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26270+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26271 int remainder_ns, decimal_msecs;
26272- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26273+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26274
26275 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26276 decimal_msecs = remainder_ns / 1000;
26277
26278 printk_ratelimited(KERN_INFO
26279 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26280- a->handler, whole_msecs, decimal_msecs);
26281+ n->action->handler, whole_msecs, decimal_msecs);
26282 }
26283
26284 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26285@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26286 delta = sched_clock() - delta;
26287 trace_nmi_handler(a->handler, (int)delta, thishandled);
26288
26289- if (delta < nmi_longest_ns || delta < a->max_duration)
26290+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26291 continue;
26292
26293- a->max_duration = delta;
26294- irq_work_queue(&a->irq_work);
26295+ a->work->max_duration = delta;
26296+ irq_work_queue(&a->work->irq_work);
26297 }
26298
26299 rcu_read_unlock();
26300@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26301 }
26302 NOKPROBE_SYMBOL(nmi_handle);
26303
26304-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26305+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26306 {
26307 struct nmi_desc *desc = nmi_to_desc(type);
26308 unsigned long flags;
26309@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26310 if (!action->handler)
26311 return -EINVAL;
26312
26313- init_irq_work(&action->irq_work, nmi_max_handler);
26314+ action->work->action = action;
26315+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26316
26317 spin_lock_irqsave(&desc->lock, flags);
26318
26319@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26320 * event confuses some handlers (kdump uses this flag)
26321 */
26322 if (action->flags & NMI_FLAG_FIRST)
26323- list_add_rcu(&action->list, &desc->head);
26324+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26325 else
26326- list_add_tail_rcu(&action->list, &desc->head);
26327+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26328
26329 spin_unlock_irqrestore(&desc->lock, flags);
26330 return 0;
26331@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26332 if (!strcmp(n->name, name)) {
26333 WARN(in_nmi(),
26334 "Trying to free NMI (%s) from NMI context!\n", n->name);
26335- list_del_rcu(&n->list);
26336+ pax_list_del_rcu((struct list_head *)&n->list);
26337 break;
26338 }
26339 }
26340@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26341 dotraplinkage notrace void
26342 do_nmi(struct pt_regs *regs, long error_code)
26343 {
26344+
26345+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26346+ if (!user_mode(regs)) {
26347+ unsigned long cs = regs->cs & 0xFFFF;
26348+ unsigned long ip = ktva_ktla(regs->ip);
26349+
26350+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26351+ regs->ip = ip;
26352+ }
26353+#endif
26354+
26355 nmi_nesting_preprocess(regs);
26356
26357 nmi_enter();
26358diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26359index 6d9582e..f746287 100644
26360--- a/arch/x86/kernel/nmi_selftest.c
26361+++ b/arch/x86/kernel/nmi_selftest.c
26362@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26363 {
26364 /* trap all the unknown NMIs we may generate */
26365 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26366- __initdata);
26367+ __initconst);
26368 }
26369
26370 static void __init cleanup_nmi_testsuite(void)
26371@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26372 unsigned long timeout;
26373
26374 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26375- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26376+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26377 nmi_fail = FAILURE;
26378 return;
26379 }
26380diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26381index bbb6c73..24a58ef 100644
26382--- a/arch/x86/kernel/paravirt-spinlocks.c
26383+++ b/arch/x86/kernel/paravirt-spinlocks.c
26384@@ -8,7 +8,7 @@
26385
26386 #include <asm/paravirt.h>
26387
26388-struct pv_lock_ops pv_lock_ops = {
26389+struct pv_lock_ops pv_lock_ops __read_only = {
26390 #ifdef CONFIG_SMP
26391 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26392 .unlock_kick = paravirt_nop,
26393diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26394index 548d25f..f8fb99c 100644
26395--- a/arch/x86/kernel/paravirt.c
26396+++ b/arch/x86/kernel/paravirt.c
26397@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26398 {
26399 return x;
26400 }
26401+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26402+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26403+#endif
26404
26405 void __init default_banner(void)
26406 {
26407@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26408
26409 if (opfunc == NULL)
26410 /* If there's no function, patch it with a ud2a (BUG) */
26411- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26412- else if (opfunc == _paravirt_nop)
26413+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26414+ else if (opfunc == (void *)_paravirt_nop)
26415 /* If the operation is a nop, then nop the callsite */
26416 ret = paravirt_patch_nop();
26417
26418 /* identity functions just return their single argument */
26419- else if (opfunc == _paravirt_ident_32)
26420+ else if (opfunc == (void *)_paravirt_ident_32)
26421 ret = paravirt_patch_ident_32(insnbuf, len);
26422- else if (opfunc == _paravirt_ident_64)
26423+ else if (opfunc == (void *)_paravirt_ident_64)
26424 ret = paravirt_patch_ident_64(insnbuf, len);
26425+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26426+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26427+ ret = paravirt_patch_ident_64(insnbuf, len);
26428+#endif
26429
26430 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26431 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26432@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26433 if (insn_len > len || start == NULL)
26434 insn_len = len;
26435 else
26436- memcpy(insnbuf, start, insn_len);
26437+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26438
26439 return insn_len;
26440 }
26441@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26442 return this_cpu_read(paravirt_lazy_mode);
26443 }
26444
26445-struct pv_info pv_info = {
26446+struct pv_info pv_info __read_only = {
26447 .name = "bare hardware",
26448 .paravirt_enabled = 0,
26449 .kernel_rpl = 0,
26450@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26451 #endif
26452 };
26453
26454-struct pv_init_ops pv_init_ops = {
26455+struct pv_init_ops pv_init_ops __read_only = {
26456 .patch = native_patch,
26457 };
26458
26459-struct pv_time_ops pv_time_ops = {
26460+struct pv_time_ops pv_time_ops __read_only = {
26461 .sched_clock = native_sched_clock,
26462 .steal_clock = native_steal_clock,
26463 };
26464
26465-__visible struct pv_irq_ops pv_irq_ops = {
26466+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26467 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26468 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26469 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26470@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26471 #endif
26472 };
26473
26474-__visible struct pv_cpu_ops pv_cpu_ops = {
26475+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26476 .cpuid = native_cpuid,
26477 .get_debugreg = native_get_debugreg,
26478 .set_debugreg = native_set_debugreg,
26479@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26480 NOKPROBE_SYMBOL(native_set_debugreg);
26481 NOKPROBE_SYMBOL(native_load_idt);
26482
26483-struct pv_apic_ops pv_apic_ops = {
26484+struct pv_apic_ops pv_apic_ops __read_only= {
26485 #ifdef CONFIG_X86_LOCAL_APIC
26486 .startup_ipi_hook = paravirt_nop,
26487 #endif
26488 };
26489
26490-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26491+#ifdef CONFIG_X86_32
26492+#ifdef CONFIG_X86_PAE
26493+/* 64-bit pagetable entries */
26494+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26495+#else
26496 /* 32-bit pagetable entries */
26497 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26498+#endif
26499 #else
26500 /* 64-bit pagetable entries */
26501 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26502 #endif
26503
26504-struct pv_mmu_ops pv_mmu_ops = {
26505+struct pv_mmu_ops pv_mmu_ops __read_only = {
26506
26507 .read_cr2 = native_read_cr2,
26508 .write_cr2 = native_write_cr2,
26509@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26510 .make_pud = PTE_IDENT,
26511
26512 .set_pgd = native_set_pgd,
26513+ .set_pgd_batched = native_set_pgd_batched,
26514 #endif
26515 #endif /* PAGETABLE_LEVELS >= 3 */
26516
26517@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26518 },
26519
26520 .set_fixmap = native_set_fixmap,
26521+
26522+#ifdef CONFIG_PAX_KERNEXEC
26523+ .pax_open_kernel = native_pax_open_kernel,
26524+ .pax_close_kernel = native_pax_close_kernel,
26525+#endif
26526+
26527 };
26528
26529 EXPORT_SYMBOL_GPL(pv_time_ops);
26530diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26531index a1da673..b6f5831 100644
26532--- a/arch/x86/kernel/paravirt_patch_64.c
26533+++ b/arch/x86/kernel/paravirt_patch_64.c
26534@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26535 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26536 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26537 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26538+
26539+#ifndef CONFIG_PAX_MEMORY_UDEREF
26540 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26541+#endif
26542+
26543 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26544 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26545
26546@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26547 PATCH_SITE(pv_mmu_ops, read_cr3);
26548 PATCH_SITE(pv_mmu_ops, write_cr3);
26549 PATCH_SITE(pv_cpu_ops, clts);
26550+
26551+#ifndef CONFIG_PAX_MEMORY_UDEREF
26552 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26553+#endif
26554+
26555 PATCH_SITE(pv_cpu_ops, wbinvd);
26556
26557 patch_site:
26558diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26559index 0497f71..7186c0d 100644
26560--- a/arch/x86/kernel/pci-calgary_64.c
26561+++ b/arch/x86/kernel/pci-calgary_64.c
26562@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26563 tce_space = be64_to_cpu(readq(target));
26564 tce_space = tce_space & TAR_SW_BITS;
26565
26566- tce_space = tce_space & (~specified_table_size);
26567+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26568 info->tce_space = (u64 *)__va(tce_space);
26569 }
26570 }
26571diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26572index 35ccf75..7a15747 100644
26573--- a/arch/x86/kernel/pci-iommu_table.c
26574+++ b/arch/x86/kernel/pci-iommu_table.c
26575@@ -2,7 +2,7 @@
26576 #include <asm/iommu_table.h>
26577 #include <linux/string.h>
26578 #include <linux/kallsyms.h>
26579-
26580+#include <linux/sched.h>
26581
26582 #define DEBUG 1
26583
26584diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26585index 77dd0ad..9ec4723 100644
26586--- a/arch/x86/kernel/pci-swiotlb.c
26587+++ b/arch/x86/kernel/pci-swiotlb.c
26588@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26589 struct dma_attrs *attrs)
26590 {
26591 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26592- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26593+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26594 else
26595 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26596 }
26597diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26598index e127dda..94e384d 100644
26599--- a/arch/x86/kernel/process.c
26600+++ b/arch/x86/kernel/process.c
26601@@ -36,7 +36,8 @@
26602 * section. Since TSS's are completely CPU-local, we want them
26603 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26604 */
26605-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26606+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26607+EXPORT_SYMBOL(init_tss);
26608
26609 #ifdef CONFIG_X86_64
26610 static DEFINE_PER_CPU(unsigned char, is_idle);
26611@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26612 task_xstate_cachep =
26613 kmem_cache_create("task_xstate", xstate_size,
26614 __alignof__(union thread_xstate),
26615- SLAB_PANIC | SLAB_NOTRACK, NULL);
26616+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26617 setup_xstate_comp();
26618 }
26619
26620@@ -108,7 +109,7 @@ void exit_thread(void)
26621 unsigned long *bp = t->io_bitmap_ptr;
26622
26623 if (bp) {
26624- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26625+ struct tss_struct *tss = init_tss + get_cpu();
26626
26627 t->io_bitmap_ptr = NULL;
26628 clear_thread_flag(TIF_IO_BITMAP);
26629@@ -128,6 +129,9 @@ void flush_thread(void)
26630 {
26631 struct task_struct *tsk = current;
26632
26633+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26634+ loadsegment(gs, 0);
26635+#endif
26636 flush_ptrace_hw_breakpoint(tsk);
26637 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26638 drop_init_fpu(tsk);
26639@@ -274,7 +278,7 @@ static void __exit_idle(void)
26640 void exit_idle(void)
26641 {
26642 /* idle loop has pid 0 */
26643- if (current->pid)
26644+ if (task_pid_nr(current))
26645 return;
26646 __exit_idle();
26647 }
26648@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26649 return ret;
26650 }
26651 #endif
26652-void stop_this_cpu(void *dummy)
26653+__noreturn void stop_this_cpu(void *dummy)
26654 {
26655 local_irq_disable();
26656 /*
26657@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26658 }
26659 early_param("idle", idle_setup);
26660
26661-unsigned long arch_align_stack(unsigned long sp)
26662+#ifdef CONFIG_PAX_RANDKSTACK
26663+void pax_randomize_kstack(struct pt_regs *regs)
26664 {
26665- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26666- sp -= get_random_int() % 8192;
26667- return sp & ~0xf;
26668-}
26669+ struct thread_struct *thread = &current->thread;
26670+ unsigned long time;
26671
26672-unsigned long arch_randomize_brk(struct mm_struct *mm)
26673-{
26674- unsigned long range_end = mm->brk + 0x02000000;
26675- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26676-}
26677+ if (!randomize_va_space)
26678+ return;
26679+
26680+ if (v8086_mode(regs))
26681+ return;
26682
26683+ rdtscl(time);
26684+
26685+ /* P4 seems to return a 0 LSB, ignore it */
26686+#ifdef CONFIG_MPENTIUM4
26687+ time &= 0x3EUL;
26688+ time <<= 2;
26689+#elif defined(CONFIG_X86_64)
26690+ time &= 0xFUL;
26691+ time <<= 4;
26692+#else
26693+ time &= 0x1FUL;
26694+ time <<= 3;
26695+#endif
26696+
26697+ thread->sp0 ^= time;
26698+ load_sp0(init_tss + smp_processor_id(), thread);
26699+
26700+#ifdef CONFIG_X86_64
26701+ this_cpu_write(kernel_stack, thread->sp0);
26702+#endif
26703+}
26704+#endif
26705diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26706index 8f3ebfe..cbc731b 100644
26707--- a/arch/x86/kernel/process_32.c
26708+++ b/arch/x86/kernel/process_32.c
26709@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26710 unsigned long thread_saved_pc(struct task_struct *tsk)
26711 {
26712 return ((unsigned long *)tsk->thread.sp)[3];
26713+//XXX return tsk->thread.eip;
26714 }
26715
26716 void __show_regs(struct pt_regs *regs, int all)
26717@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26718 unsigned long sp;
26719 unsigned short ss, gs;
26720
26721- if (user_mode_vm(regs)) {
26722+ if (user_mode(regs)) {
26723 sp = regs->sp;
26724 ss = regs->ss & 0xffff;
26725- gs = get_user_gs(regs);
26726 } else {
26727 sp = kernel_stack_pointer(regs);
26728 savesegment(ss, ss);
26729- savesegment(gs, gs);
26730 }
26731+ gs = get_user_gs(regs);
26732
26733 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26734 (u16)regs->cs, regs->ip, regs->flags,
26735- smp_processor_id());
26736+ raw_smp_processor_id());
26737 print_symbol("EIP is at %s\n", regs->ip);
26738
26739 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26740@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26741 int copy_thread(unsigned long clone_flags, unsigned long sp,
26742 unsigned long arg, struct task_struct *p)
26743 {
26744- struct pt_regs *childregs = task_pt_regs(p);
26745+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26746 struct task_struct *tsk;
26747 int err;
26748
26749 p->thread.sp = (unsigned long) childregs;
26750 p->thread.sp0 = (unsigned long) (childregs+1);
26751+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26752 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26753
26754 if (unlikely(p->flags & PF_KTHREAD)) {
26755 /* kernel thread */
26756 memset(childregs, 0, sizeof(struct pt_regs));
26757 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26758- task_user_gs(p) = __KERNEL_STACK_CANARY;
26759- childregs->ds = __USER_DS;
26760- childregs->es = __USER_DS;
26761+ savesegment(gs, childregs->gs);
26762+ childregs->ds = __KERNEL_DS;
26763+ childregs->es = __KERNEL_DS;
26764 childregs->fs = __KERNEL_PERCPU;
26765 childregs->bx = sp; /* function */
26766 childregs->bp = arg;
26767@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26768 struct thread_struct *prev = &prev_p->thread,
26769 *next = &next_p->thread;
26770 int cpu = smp_processor_id();
26771- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26772+ struct tss_struct *tss = init_tss + cpu;
26773 fpu_switch_t fpu;
26774
26775 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26776@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26777 */
26778 lazy_save_gs(prev->gs);
26779
26780+#ifdef CONFIG_PAX_MEMORY_UDEREF
26781+ __set_fs(task_thread_info(next_p)->addr_limit);
26782+#endif
26783+
26784 /*
26785 * Load the per-thread Thread-Local Storage descriptor.
26786 */
26787@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26788 */
26789 arch_end_context_switch(next_p);
26790
26791- this_cpu_write(kernel_stack,
26792- (unsigned long)task_stack_page(next_p) +
26793- THREAD_SIZE - KERNEL_STACK_OFFSET);
26794+ this_cpu_write(current_task, next_p);
26795+ this_cpu_write(current_tinfo, &next_p->tinfo);
26796+ this_cpu_write(kernel_stack, next->sp0);
26797
26798 /*
26799 * Restore %gs if needed (which is common)
26800@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26801
26802 switch_fpu_finish(next_p, fpu);
26803
26804- this_cpu_write(current_task, next_p);
26805-
26806 return prev_p;
26807 }
26808
26809@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26810 } while (count++ < 16);
26811 return 0;
26812 }
26813-
26814diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26815index 5a2c029..ec8611d 100644
26816--- a/arch/x86/kernel/process_64.c
26817+++ b/arch/x86/kernel/process_64.c
26818@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26819 struct pt_regs *childregs;
26820 struct task_struct *me = current;
26821
26822- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26823+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26824 childregs = task_pt_regs(p);
26825 p->thread.sp = (unsigned long) childregs;
26826 p->thread.usersp = me->thread.usersp;
26827+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26828 set_tsk_thread_flag(p, TIF_FORK);
26829 p->thread.io_bitmap_ptr = NULL;
26830
26831@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26832 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26833 savesegment(es, p->thread.es);
26834 savesegment(ds, p->thread.ds);
26835+ savesegment(ss, p->thread.ss);
26836+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26837 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26838
26839 if (unlikely(p->flags & PF_KTHREAD)) {
26840@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26841 struct thread_struct *prev = &prev_p->thread;
26842 struct thread_struct *next = &next_p->thread;
26843 int cpu = smp_processor_id();
26844- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26845+ struct tss_struct *tss = init_tss + cpu;
26846 unsigned fsindex, gsindex;
26847 fpu_switch_t fpu;
26848
26849@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26850 if (unlikely(next->ds | prev->ds))
26851 loadsegment(ds, next->ds);
26852
26853+ savesegment(ss, prev->ss);
26854+ if (unlikely(next->ss != prev->ss))
26855+ loadsegment(ss, next->ss);
26856+
26857 /*
26858 * Switch FS and GS.
26859 *
26860@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26861 prev->usersp = this_cpu_read(old_rsp);
26862 this_cpu_write(old_rsp, next->usersp);
26863 this_cpu_write(current_task, next_p);
26864+ this_cpu_write(current_tinfo, &next_p->tinfo);
26865
26866 /*
26867 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26868@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26869 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26870 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26871
26872- this_cpu_write(kernel_stack,
26873- (unsigned long)task_stack_page(next_p) +
26874- THREAD_SIZE - KERNEL_STACK_OFFSET);
26875+ this_cpu_write(kernel_stack, next->sp0);
26876
26877 /*
26878 * Now maybe reload the debug registers and handle I/O bitmaps
26879@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26880 if (!p || p == current || p->state == TASK_RUNNING)
26881 return 0;
26882 stack = (unsigned long)task_stack_page(p);
26883- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26884+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26885 return 0;
26886 fp = *(u64 *)(p->thread.sp);
26887 do {
26888- if (fp < (unsigned long)stack ||
26889- fp >= (unsigned long)stack+THREAD_SIZE)
26890+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26891 return 0;
26892 ip = *(u64 *)(fp+8);
26893 if (!in_sched_functions(ip))
26894diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26895index e510618..5165ac0 100644
26896--- a/arch/x86/kernel/ptrace.c
26897+++ b/arch/x86/kernel/ptrace.c
26898@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26899 unsigned long sp = (unsigned long)&regs->sp;
26900 u32 *prev_esp;
26901
26902- if (context == (sp & ~(THREAD_SIZE - 1)))
26903+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26904 return sp;
26905
26906- prev_esp = (u32 *)(context);
26907+ prev_esp = *(u32 **)(context);
26908 if (prev_esp)
26909 return (unsigned long)prev_esp;
26910
26911@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26912 if (child->thread.gs != value)
26913 return do_arch_prctl(child, ARCH_SET_GS, value);
26914 return 0;
26915+
26916+ case offsetof(struct user_regs_struct,ip):
26917+ /*
26918+ * Protect against any attempt to set ip to an
26919+ * impossible address. There are dragons lurking if the
26920+ * address is noncanonical. (This explicitly allows
26921+ * setting ip to TASK_SIZE_MAX, because user code can do
26922+ * that all by itself by running off the end of its
26923+ * address space.
26924+ */
26925+ if (value > TASK_SIZE_MAX)
26926+ return -EIO;
26927+ break;
26928+
26929 #endif
26930 }
26931
26932@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26933 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26934 {
26935 int i;
26936- int dr7 = 0;
26937+ unsigned long dr7 = 0;
26938 struct arch_hw_breakpoint *info;
26939
26940 for (i = 0; i < HBP_NUM; i++) {
26941@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26942 unsigned long addr, unsigned long data)
26943 {
26944 int ret;
26945- unsigned long __user *datap = (unsigned long __user *)data;
26946+ unsigned long __user *datap = (__force unsigned long __user *)data;
26947
26948 switch (request) {
26949 /* read the word at location addr in the USER area. */
26950@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26951 if ((int) addr < 0)
26952 return -EIO;
26953 ret = do_get_thread_area(child, addr,
26954- (struct user_desc __user *)data);
26955+ (__force struct user_desc __user *) data);
26956 break;
26957
26958 case PTRACE_SET_THREAD_AREA:
26959 if ((int) addr < 0)
26960 return -EIO;
26961 ret = do_set_thread_area(child, addr,
26962- (struct user_desc __user *)data, 0);
26963+ (__force struct user_desc __user *) data, 0);
26964 break;
26965 #endif
26966
26967@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26968
26969 #ifdef CONFIG_X86_64
26970
26971-static struct user_regset x86_64_regsets[] __read_mostly = {
26972+static user_regset_no_const x86_64_regsets[] __read_only = {
26973 [REGSET_GENERAL] = {
26974 .core_note_type = NT_PRSTATUS,
26975 .n = sizeof(struct user_regs_struct) / sizeof(long),
26976@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26977 #endif /* CONFIG_X86_64 */
26978
26979 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26980-static struct user_regset x86_32_regsets[] __read_mostly = {
26981+static user_regset_no_const x86_32_regsets[] __read_only = {
26982 [REGSET_GENERAL] = {
26983 .core_note_type = NT_PRSTATUS,
26984 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26985@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26986 */
26987 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26988
26989-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26990+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26991 {
26992 #ifdef CONFIG_X86_64
26993 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26994@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26995 memset(info, 0, sizeof(*info));
26996 info->si_signo = SIGTRAP;
26997 info->si_code = si_code;
26998- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26999+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
27000 }
27001
27002 void user_single_step_siginfo(struct task_struct *tsk,
27003@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
27004 }
27005 }
27006
27007+#ifdef CONFIG_GRKERNSEC_SETXID
27008+extern void gr_delayed_cred_worker(void);
27009+#endif
27010+
27011 /*
27012 * We can return 0 to resume the syscall or anything else to go to phase
27013 * 2. If we resume the syscall, we need to put something appropriate in
27014@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
27015
27016 BUG_ON(regs != task_pt_regs(current));
27017
27018+#ifdef CONFIG_GRKERNSEC_SETXID
27019+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27020+ gr_delayed_cred_worker();
27021+#endif
27022+
27023 /*
27024 * If we stepped into a sysenter/syscall insn, it trapped in
27025 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
27026@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
27027 */
27028 user_exit();
27029
27030+#ifdef CONFIG_GRKERNSEC_SETXID
27031+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27032+ gr_delayed_cred_worker();
27033+#endif
27034+
27035 audit_syscall_exit(regs);
27036
27037 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
27038diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
27039index 2f355d2..e75ed0a 100644
27040--- a/arch/x86/kernel/pvclock.c
27041+++ b/arch/x86/kernel/pvclock.c
27042@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
27043 reset_hung_task_detector();
27044 }
27045
27046-static atomic64_t last_value = ATOMIC64_INIT(0);
27047+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
27048
27049 void pvclock_resume(void)
27050 {
27051- atomic64_set(&last_value, 0);
27052+ atomic64_set_unchecked(&last_value, 0);
27053 }
27054
27055 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
27056@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
27057 * updating at the same time, and one of them could be slightly behind,
27058 * making the assumption that last_value always go forward fail to hold.
27059 */
27060- last = atomic64_read(&last_value);
27061+ last = atomic64_read_unchecked(&last_value);
27062 do {
27063 if (ret < last)
27064 return last;
27065- last = atomic64_cmpxchg(&last_value, last, ret);
27066+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27067 } while (unlikely(last != ret));
27068
27069 return ret;
27070diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27071index 86db4bc..a50a54a 100644
27072--- a/arch/x86/kernel/reboot.c
27073+++ b/arch/x86/kernel/reboot.c
27074@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27075
27076 void __noreturn machine_real_restart(unsigned int type)
27077 {
27078+
27079+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27080+ struct desc_struct *gdt;
27081+#endif
27082+
27083 local_irq_disable();
27084
27085 /*
27086@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27087
27088 /* Jump to the identity-mapped low memory code */
27089 #ifdef CONFIG_X86_32
27090- asm volatile("jmpl *%0" : :
27091+
27092+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27093+ gdt = get_cpu_gdt_table(smp_processor_id());
27094+ pax_open_kernel();
27095+#ifdef CONFIG_PAX_MEMORY_UDEREF
27096+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27097+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27098+ loadsegment(ds, __KERNEL_DS);
27099+ loadsegment(es, __KERNEL_DS);
27100+ loadsegment(ss, __KERNEL_DS);
27101+#endif
27102+#ifdef CONFIG_PAX_KERNEXEC
27103+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27104+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27105+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27106+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27107+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27108+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27109+#endif
27110+ pax_close_kernel();
27111+#endif
27112+
27113+ asm volatile("ljmpl *%0" : :
27114 "rm" (real_mode_header->machine_real_restart_asm),
27115 "a" (type));
27116 #else
27117@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27118 /*
27119 * This is a single dmi_table handling all reboot quirks.
27120 */
27121-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27122+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27123
27124 /* Acer */
27125 { /* Handle reboot issue on Acer Aspire one */
27126@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27127 * This means that this function can never return, it can misbehave
27128 * by not rebooting properly and hanging.
27129 */
27130-static void native_machine_emergency_restart(void)
27131+static void __noreturn native_machine_emergency_restart(void)
27132 {
27133 int i;
27134 int attempt = 0;
27135@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27136 #endif
27137 }
27138
27139-static void __machine_emergency_restart(int emergency)
27140+static void __noreturn __machine_emergency_restart(int emergency)
27141 {
27142 reboot_emergency = emergency;
27143 machine_ops.emergency_restart();
27144 }
27145
27146-static void native_machine_restart(char *__unused)
27147+static void __noreturn native_machine_restart(char *__unused)
27148 {
27149 pr_notice("machine restart\n");
27150
27151@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27152 __machine_emergency_restart(0);
27153 }
27154
27155-static void native_machine_halt(void)
27156+static void __noreturn native_machine_halt(void)
27157 {
27158 /* Stop other cpus and apics */
27159 machine_shutdown();
27160@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27161 stop_this_cpu(NULL);
27162 }
27163
27164-static void native_machine_power_off(void)
27165+static void __noreturn native_machine_power_off(void)
27166 {
27167 if (pm_power_off) {
27168 if (!reboot_force)
27169@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27170 }
27171 /* A fallback in case there is no PM info available */
27172 tboot_shutdown(TB_SHUTDOWN_HALT);
27173+ unreachable();
27174 }
27175
27176-struct machine_ops machine_ops = {
27177+struct machine_ops machine_ops __read_only = {
27178 .power_off = native_machine_power_off,
27179 .shutdown = native_machine_shutdown,
27180 .emergency_restart = native_machine_emergency_restart,
27181diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27182index c8e41e9..64049ef 100644
27183--- a/arch/x86/kernel/reboot_fixups_32.c
27184+++ b/arch/x86/kernel/reboot_fixups_32.c
27185@@ -57,7 +57,7 @@ struct device_fixup {
27186 unsigned int vendor;
27187 unsigned int device;
27188 void (*reboot_fixup)(struct pci_dev *);
27189-};
27190+} __do_const;
27191
27192 /*
27193 * PCI ids solely used for fixups_table go here
27194diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27195index 3fd2c69..a444264 100644
27196--- a/arch/x86/kernel/relocate_kernel_64.S
27197+++ b/arch/x86/kernel/relocate_kernel_64.S
27198@@ -96,8 +96,7 @@ relocate_kernel:
27199
27200 /* jump to identity mapped page */
27201 addq $(identity_mapped - relocate_kernel), %r8
27202- pushq %r8
27203- ret
27204+ jmp *%r8
27205
27206 identity_mapped:
27207 /* set return address to 0 if not preserving context */
27208diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27209index ab4734e..c4ca0eb 100644
27210--- a/arch/x86/kernel/setup.c
27211+++ b/arch/x86/kernel/setup.c
27212@@ -110,6 +110,7 @@
27213 #include <asm/mce.h>
27214 #include <asm/alternative.h>
27215 #include <asm/prom.h>
27216+#include <asm/boot.h>
27217
27218 /*
27219 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27220@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27221 #endif
27222
27223
27224-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27225-__visible unsigned long mmu_cr4_features;
27226+#ifdef CONFIG_X86_64
27227+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27228+#elif defined(CONFIG_X86_PAE)
27229+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27230 #else
27231-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27232+__visible unsigned long mmu_cr4_features __read_only;
27233 #endif
27234
27235+void set_in_cr4(unsigned long mask)
27236+{
27237+ unsigned long cr4 = read_cr4();
27238+
27239+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27240+ return;
27241+
27242+ pax_open_kernel();
27243+ mmu_cr4_features |= mask;
27244+ pax_close_kernel();
27245+
27246+ if (trampoline_cr4_features)
27247+ *trampoline_cr4_features = mmu_cr4_features;
27248+ cr4 |= mask;
27249+ write_cr4(cr4);
27250+}
27251+EXPORT_SYMBOL(set_in_cr4);
27252+
27253+void clear_in_cr4(unsigned long mask)
27254+{
27255+ unsigned long cr4 = read_cr4();
27256+
27257+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27258+ return;
27259+
27260+ pax_open_kernel();
27261+ mmu_cr4_features &= ~mask;
27262+ pax_close_kernel();
27263+
27264+ if (trampoline_cr4_features)
27265+ *trampoline_cr4_features = mmu_cr4_features;
27266+ cr4 &= ~mask;
27267+ write_cr4(cr4);
27268+}
27269+EXPORT_SYMBOL(clear_in_cr4);
27270+
27271 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27272 int bootloader_type, bootloader_version;
27273
27274@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27275 * area (640->1Mb) as ram even though it is not.
27276 * take them out.
27277 */
27278- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27279+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27280
27281 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27282 }
27283@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27284 /* called before trim_bios_range() to spare extra sanitize */
27285 static void __init e820_add_kernel_range(void)
27286 {
27287- u64 start = __pa_symbol(_text);
27288+ u64 start = __pa_symbol(ktla_ktva(_text));
27289 u64 size = __pa_symbol(_end) - start;
27290
27291 /*
27292@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27293
27294 void __init setup_arch(char **cmdline_p)
27295 {
27296+#ifdef CONFIG_X86_32
27297+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27298+#else
27299 memblock_reserve(__pa_symbol(_text),
27300 (unsigned long)__bss_stop - (unsigned long)_text);
27301+#endif
27302
27303 early_reserve_initrd();
27304
27305@@ -955,16 +998,16 @@ void __init setup_arch(char **cmdline_p)
27306
27307 if (!boot_params.hdr.root_flags)
27308 root_mountflags &= ~MS_RDONLY;
27309- init_mm.start_code = (unsigned long) _text;
27310- init_mm.end_code = (unsigned long) _etext;
27311+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27312+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27313 init_mm.end_data = (unsigned long) _edata;
27314 init_mm.brk = _brk_end;
27315
27316 mpx_mm_init(&init_mm);
27317
27318- code_resource.start = __pa_symbol(_text);
27319- code_resource.end = __pa_symbol(_etext)-1;
27320- data_resource.start = __pa_symbol(_etext);
27321+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27322+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27323+ data_resource.start = __pa_symbol(_sdata);
27324 data_resource.end = __pa_symbol(_edata)-1;
27325 bss_resource.start = __pa_symbol(__bss_start);
27326 bss_resource.end = __pa_symbol(__bss_stop)-1;
27327diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27328index e4fcb87..9c06c55 100644
27329--- a/arch/x86/kernel/setup_percpu.c
27330+++ b/arch/x86/kernel/setup_percpu.c
27331@@ -21,19 +21,17 @@
27332 #include <asm/cpu.h>
27333 #include <asm/stackprotector.h>
27334
27335-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27336+#ifdef CONFIG_SMP
27337+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27338 EXPORT_PER_CPU_SYMBOL(cpu_number);
27339+#endif
27340
27341-#ifdef CONFIG_X86_64
27342 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27343-#else
27344-#define BOOT_PERCPU_OFFSET 0
27345-#endif
27346
27347 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27348 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27349
27350-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27351+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27352 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27353 };
27354 EXPORT_SYMBOL(__per_cpu_offset);
27355@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27356 {
27357 #ifdef CONFIG_NEED_MULTIPLE_NODES
27358 pg_data_t *last = NULL;
27359- unsigned int cpu;
27360+ int cpu;
27361
27362 for_each_possible_cpu(cpu) {
27363 int node = early_cpu_to_node(cpu);
27364@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27365 {
27366 #ifdef CONFIG_X86_32
27367 struct desc_struct gdt;
27368+ unsigned long base = per_cpu_offset(cpu);
27369
27370- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27371- 0x2 | DESCTYPE_S, 0x8);
27372- gdt.s = 1;
27373+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27374+ 0x83 | DESCTYPE_S, 0xC);
27375 write_gdt_entry(get_cpu_gdt_table(cpu),
27376 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27377 #endif
27378@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27379 /* alrighty, percpu areas up and running */
27380 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27381 for_each_possible_cpu(cpu) {
27382+#ifdef CONFIG_CC_STACKPROTECTOR
27383+#ifdef CONFIG_X86_32
27384+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27385+#endif
27386+#endif
27387 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27388 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27389 per_cpu(cpu_number, cpu) = cpu;
27390@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27391 */
27392 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27393 #endif
27394+#ifdef CONFIG_CC_STACKPROTECTOR
27395+#ifdef CONFIG_X86_32
27396+ if (!cpu)
27397+ per_cpu(stack_canary.canary, cpu) = canary;
27398+#endif
27399+#endif
27400 /*
27401 * Up to this point, the boot CPU has been using .init.data
27402 * area. Reload any changed state for the boot CPU.
27403diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27404index ed37a76..39f936e 100644
27405--- a/arch/x86/kernel/signal.c
27406+++ b/arch/x86/kernel/signal.c
27407@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27408 * Align the stack pointer according to the i386 ABI,
27409 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27410 */
27411- sp = ((sp + 4) & -16ul) - 4;
27412+ sp = ((sp - 12) & -16ul) - 4;
27413 #else /* !CONFIG_X86_32 */
27414 sp = round_down(sp, 16) - 8;
27415 #endif
27416@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27417 }
27418
27419 if (current->mm->context.vdso)
27420- restorer = current->mm->context.vdso +
27421- selected_vdso32->sym___kernel_sigreturn;
27422+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27423 else
27424- restorer = &frame->retcode;
27425+ restorer = (void __user *)&frame->retcode;
27426 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27427 restorer = ksig->ka.sa.sa_restorer;
27428
27429@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27430 * reasons and because gdb uses it as a signature to notice
27431 * signal handler stack frames.
27432 */
27433- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27434+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27435
27436 if (err)
27437 return -EFAULT;
27438@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27439 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27440
27441 /* Set up to return from userspace. */
27442- restorer = current->mm->context.vdso +
27443- selected_vdso32->sym___kernel_rt_sigreturn;
27444+ if (current->mm->context.vdso)
27445+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27446+ else
27447+ restorer = (void __user *)&frame->retcode;
27448 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27449 restorer = ksig->ka.sa.sa_restorer;
27450 put_user_ex(restorer, &frame->pretcode);
27451@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27452 * reasons and because gdb uses it as a signature to notice
27453 * signal handler stack frames.
27454 */
27455- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27456+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27457 } put_user_catch(err);
27458
27459 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27460@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27461 {
27462 int usig = signr_convert(ksig->sig);
27463 sigset_t *set = sigmask_to_save();
27464- compat_sigset_t *cset = (compat_sigset_t *) set;
27465+ sigset_t sigcopy;
27466+ compat_sigset_t *cset;
27467+
27468+ sigcopy = *set;
27469+
27470+ cset = (compat_sigset_t *) &sigcopy;
27471
27472 /* Set up the stack frame */
27473 if (is_ia32_frame()) {
27474@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27475 } else if (is_x32_frame()) {
27476 return x32_setup_rt_frame(ksig, cset, regs);
27477 } else {
27478- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27479+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27480 }
27481 }
27482
27483diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27484index be8e1bd..a3d93fa 100644
27485--- a/arch/x86/kernel/smp.c
27486+++ b/arch/x86/kernel/smp.c
27487@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27488
27489 __setup("nonmi_ipi", nonmi_ipi_setup);
27490
27491-struct smp_ops smp_ops = {
27492+struct smp_ops smp_ops __read_only = {
27493 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27494 .smp_prepare_cpus = native_smp_prepare_cpus,
27495 .smp_cpus_done = native_smp_cpus_done,
27496diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27497index 6d7022c..4feb6be 100644
27498--- a/arch/x86/kernel/smpboot.c
27499+++ b/arch/x86/kernel/smpboot.c
27500@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27501
27502 enable_start_cpu0 = 0;
27503
27504-#ifdef CONFIG_X86_32
27505+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27506+ barrier();
27507+
27508 /* switch away from the initial page table */
27509+#ifdef CONFIG_PAX_PER_CPU_PGD
27510+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27511+#else
27512 load_cr3(swapper_pg_dir);
27513+#endif
27514 __flush_tlb_all();
27515-#endif
27516
27517- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27518- barrier();
27519 /*
27520 * Check TSC synchronization with the BP:
27521 */
27522@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27523 alternatives_enable_smp();
27524
27525 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27526- (THREAD_SIZE + task_stack_page(idle))) - 1);
27527+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27528 per_cpu(current_task, cpu) = idle;
27529+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27530
27531 #ifdef CONFIG_X86_32
27532 /* Stack for startup_32 can be just as for start_secondary onwards */
27533@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27534 clear_tsk_thread_flag(idle, TIF_FORK);
27535 initial_gs = per_cpu_offset(cpu);
27536 #endif
27537- per_cpu(kernel_stack, cpu) =
27538- (unsigned long)task_stack_page(idle) -
27539- KERNEL_STACK_OFFSET + THREAD_SIZE;
27540+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27541+ pax_open_kernel();
27542 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27543+ pax_close_kernel();
27544 initial_code = (unsigned long)start_secondary;
27545 stack_start = idle->thread.sp;
27546
27547@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27548 /* the FPU context is blank, nobody can own it */
27549 __cpu_disable_lazy_restore(cpu);
27550
27551+#ifdef CONFIG_PAX_PER_CPU_PGD
27552+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27553+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27554+ KERNEL_PGD_PTRS);
27555+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27556+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27557+ KERNEL_PGD_PTRS);
27558+#endif
27559+
27560 err = do_boot_cpu(apicid, cpu, tidle);
27561 if (err) {
27562 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27563diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27564index 9b4d51d..5d28b58 100644
27565--- a/arch/x86/kernel/step.c
27566+++ b/arch/x86/kernel/step.c
27567@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27568 struct desc_struct *desc;
27569 unsigned long base;
27570
27571- seg &= ~7UL;
27572+ seg >>= 3;
27573
27574 mutex_lock(&child->mm->context.lock);
27575- if (unlikely((seg >> 3) >= child->mm->context.size))
27576+ if (unlikely(seg >= child->mm->context.size))
27577 addr = -1L; /* bogus selector, access would fault */
27578 else {
27579 desc = child->mm->context.ldt + seg;
27580@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27581 addr += base;
27582 }
27583 mutex_unlock(&child->mm->context.lock);
27584- }
27585+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27586+ addr = ktla_ktva(addr);
27587
27588 return addr;
27589 }
27590@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27591 unsigned char opcode[15];
27592 unsigned long addr = convert_ip_to_linear(child, regs);
27593
27594+ if (addr == -EINVAL)
27595+ return 0;
27596+
27597 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27598 for (i = 0; i < copied; i++) {
27599 switch (opcode[i]) {
27600diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27601new file mode 100644
27602index 0000000..5877189
27603--- /dev/null
27604+++ b/arch/x86/kernel/sys_i386_32.c
27605@@ -0,0 +1,189 @@
27606+/*
27607+ * This file contains various random system calls that
27608+ * have a non-standard calling sequence on the Linux/i386
27609+ * platform.
27610+ */
27611+
27612+#include <linux/errno.h>
27613+#include <linux/sched.h>
27614+#include <linux/mm.h>
27615+#include <linux/fs.h>
27616+#include <linux/smp.h>
27617+#include <linux/sem.h>
27618+#include <linux/msg.h>
27619+#include <linux/shm.h>
27620+#include <linux/stat.h>
27621+#include <linux/syscalls.h>
27622+#include <linux/mman.h>
27623+#include <linux/file.h>
27624+#include <linux/utsname.h>
27625+#include <linux/ipc.h>
27626+#include <linux/elf.h>
27627+
27628+#include <linux/uaccess.h>
27629+#include <linux/unistd.h>
27630+
27631+#include <asm/syscalls.h>
27632+
27633+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27634+{
27635+ unsigned long pax_task_size = TASK_SIZE;
27636+
27637+#ifdef CONFIG_PAX_SEGMEXEC
27638+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27639+ pax_task_size = SEGMEXEC_TASK_SIZE;
27640+#endif
27641+
27642+ if (flags & MAP_FIXED)
27643+ if (len > pax_task_size || addr > pax_task_size - len)
27644+ return -EINVAL;
27645+
27646+ return 0;
27647+}
27648+
27649+/*
27650+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27651+ */
27652+static unsigned long get_align_mask(void)
27653+{
27654+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27655+ return 0;
27656+
27657+ if (!(current->flags & PF_RANDOMIZE))
27658+ return 0;
27659+
27660+ return va_align.mask;
27661+}
27662+
27663+unsigned long
27664+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27665+ unsigned long len, unsigned long pgoff, unsigned long flags)
27666+{
27667+ struct mm_struct *mm = current->mm;
27668+ struct vm_area_struct *vma;
27669+ unsigned long pax_task_size = TASK_SIZE;
27670+ struct vm_unmapped_area_info info;
27671+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27672+
27673+#ifdef CONFIG_PAX_SEGMEXEC
27674+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27675+ pax_task_size = SEGMEXEC_TASK_SIZE;
27676+#endif
27677+
27678+ pax_task_size -= PAGE_SIZE;
27679+
27680+ if (len > pax_task_size)
27681+ return -ENOMEM;
27682+
27683+ if (flags & MAP_FIXED)
27684+ return addr;
27685+
27686+#ifdef CONFIG_PAX_RANDMMAP
27687+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27688+#endif
27689+
27690+ if (addr) {
27691+ addr = PAGE_ALIGN(addr);
27692+ if (pax_task_size - len >= addr) {
27693+ vma = find_vma(mm, addr);
27694+ if (check_heap_stack_gap(vma, addr, len, offset))
27695+ return addr;
27696+ }
27697+ }
27698+
27699+ info.flags = 0;
27700+ info.length = len;
27701+ info.align_mask = filp ? get_align_mask() : 0;
27702+ info.align_offset = pgoff << PAGE_SHIFT;
27703+ info.threadstack_offset = offset;
27704+
27705+#ifdef CONFIG_PAX_PAGEEXEC
27706+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27707+ info.low_limit = 0x00110000UL;
27708+ info.high_limit = mm->start_code;
27709+
27710+#ifdef CONFIG_PAX_RANDMMAP
27711+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27712+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27713+#endif
27714+
27715+ if (info.low_limit < info.high_limit) {
27716+ addr = vm_unmapped_area(&info);
27717+ if (!IS_ERR_VALUE(addr))
27718+ return addr;
27719+ }
27720+ } else
27721+#endif
27722+
27723+ info.low_limit = mm->mmap_base;
27724+ info.high_limit = pax_task_size;
27725+
27726+ return vm_unmapped_area(&info);
27727+}
27728+
27729+unsigned long
27730+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27731+ const unsigned long len, const unsigned long pgoff,
27732+ const unsigned long flags)
27733+{
27734+ struct vm_area_struct *vma;
27735+ struct mm_struct *mm = current->mm;
27736+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27737+ struct vm_unmapped_area_info info;
27738+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27739+
27740+#ifdef CONFIG_PAX_SEGMEXEC
27741+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27742+ pax_task_size = SEGMEXEC_TASK_SIZE;
27743+#endif
27744+
27745+ pax_task_size -= PAGE_SIZE;
27746+
27747+ /* requested length too big for entire address space */
27748+ if (len > pax_task_size)
27749+ return -ENOMEM;
27750+
27751+ if (flags & MAP_FIXED)
27752+ return addr;
27753+
27754+#ifdef CONFIG_PAX_PAGEEXEC
27755+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27756+ goto bottomup;
27757+#endif
27758+
27759+#ifdef CONFIG_PAX_RANDMMAP
27760+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27761+#endif
27762+
27763+ /* requesting a specific address */
27764+ if (addr) {
27765+ addr = PAGE_ALIGN(addr);
27766+ if (pax_task_size - len >= addr) {
27767+ vma = find_vma(mm, addr);
27768+ if (check_heap_stack_gap(vma, addr, len, offset))
27769+ return addr;
27770+ }
27771+ }
27772+
27773+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27774+ info.length = len;
27775+ info.low_limit = PAGE_SIZE;
27776+ info.high_limit = mm->mmap_base;
27777+ info.align_mask = filp ? get_align_mask() : 0;
27778+ info.align_offset = pgoff << PAGE_SHIFT;
27779+ info.threadstack_offset = offset;
27780+
27781+ addr = vm_unmapped_area(&info);
27782+ if (!(addr & ~PAGE_MASK))
27783+ return addr;
27784+ VM_BUG_ON(addr != -ENOMEM);
27785+
27786+bottomup:
27787+ /*
27788+ * A failed mmap() very likely causes application failure,
27789+ * so fall back to the bottom-up function here. This scenario
27790+ * can happen with large stack limits and large mmap()
27791+ * allocations.
27792+ */
27793+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27794+}
27795diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27796index 30277e2..5664a29 100644
27797--- a/arch/x86/kernel/sys_x86_64.c
27798+++ b/arch/x86/kernel/sys_x86_64.c
27799@@ -81,8 +81,8 @@ out:
27800 return error;
27801 }
27802
27803-static void find_start_end(unsigned long flags, unsigned long *begin,
27804- unsigned long *end)
27805+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27806+ unsigned long *begin, unsigned long *end)
27807 {
27808 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27809 unsigned long new_begin;
27810@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27811 *begin = new_begin;
27812 }
27813 } else {
27814- *begin = current->mm->mmap_legacy_base;
27815+ *begin = mm->mmap_legacy_base;
27816 *end = TASK_SIZE;
27817 }
27818 }
27819@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27820 struct vm_area_struct *vma;
27821 struct vm_unmapped_area_info info;
27822 unsigned long begin, end;
27823+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27824
27825 if (flags & MAP_FIXED)
27826 return addr;
27827
27828- find_start_end(flags, &begin, &end);
27829+ find_start_end(mm, flags, &begin, &end);
27830
27831 if (len > end)
27832 return -ENOMEM;
27833
27834+#ifdef CONFIG_PAX_RANDMMAP
27835+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27836+#endif
27837+
27838 if (addr) {
27839 addr = PAGE_ALIGN(addr);
27840 vma = find_vma(mm, addr);
27841- if (end - len >= addr &&
27842- (!vma || addr + len <= vma->vm_start))
27843+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27844 return addr;
27845 }
27846
27847@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27848 info.high_limit = end;
27849 info.align_mask = filp ? get_align_mask() : 0;
27850 info.align_offset = pgoff << PAGE_SHIFT;
27851+ info.threadstack_offset = offset;
27852 return vm_unmapped_area(&info);
27853 }
27854
27855@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27856 struct mm_struct *mm = current->mm;
27857 unsigned long addr = addr0;
27858 struct vm_unmapped_area_info info;
27859+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27860
27861 /* requested length too big for entire address space */
27862 if (len > TASK_SIZE)
27863@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27864 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27865 goto bottomup;
27866
27867+#ifdef CONFIG_PAX_RANDMMAP
27868+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27869+#endif
27870+
27871 /* requesting a specific address */
27872 if (addr) {
27873 addr = PAGE_ALIGN(addr);
27874 vma = find_vma(mm, addr);
27875- if (TASK_SIZE - len >= addr &&
27876- (!vma || addr + len <= vma->vm_start))
27877+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27878 return addr;
27879 }
27880
27881@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27882 info.high_limit = mm->mmap_base;
27883 info.align_mask = filp ? get_align_mask() : 0;
27884 info.align_offset = pgoff << PAGE_SHIFT;
27885+ info.threadstack_offset = offset;
27886 addr = vm_unmapped_area(&info);
27887 if (!(addr & ~PAGE_MASK))
27888 return addr;
27889diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27890index 91a4496..bb87552 100644
27891--- a/arch/x86/kernel/tboot.c
27892+++ b/arch/x86/kernel/tboot.c
27893@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27894
27895 void tboot_shutdown(u32 shutdown_type)
27896 {
27897- void (*shutdown)(void);
27898+ void (* __noreturn shutdown)(void);
27899
27900 if (!tboot_enabled())
27901 return;
27902@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27903
27904 switch_to_tboot_pt();
27905
27906- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27907+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27908 shutdown();
27909
27910 /* should not reach here */
27911@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27912 return -ENODEV;
27913 }
27914
27915-static atomic_t ap_wfs_count;
27916+static atomic_unchecked_t ap_wfs_count;
27917
27918 static int tboot_wait_for_aps(int num_aps)
27919 {
27920@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27921 {
27922 switch (action) {
27923 case CPU_DYING:
27924- atomic_inc(&ap_wfs_count);
27925+ atomic_inc_unchecked(&ap_wfs_count);
27926 if (num_online_cpus() == 1)
27927- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27928+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27929 return NOTIFY_BAD;
27930 break;
27931 }
27932@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27933
27934 tboot_create_trampoline();
27935
27936- atomic_set(&ap_wfs_count, 0);
27937+ atomic_set_unchecked(&ap_wfs_count, 0);
27938 register_hotcpu_notifier(&tboot_cpu_notifier);
27939
27940 #ifdef CONFIG_DEBUG_FS
27941diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27942index 25adc0e..1df4349 100644
27943--- a/arch/x86/kernel/time.c
27944+++ b/arch/x86/kernel/time.c
27945@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27946 {
27947 unsigned long pc = instruction_pointer(regs);
27948
27949- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27950+ if (!user_mode(regs) && in_lock_functions(pc)) {
27951 #ifdef CONFIG_FRAME_POINTER
27952- return *(unsigned long *)(regs->bp + sizeof(long));
27953+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27954 #else
27955 unsigned long *sp =
27956 (unsigned long *)kernel_stack_pointer(regs);
27957@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27958 * or above a saved flags. Eflags has bits 22-31 zero,
27959 * kernel addresses don't.
27960 */
27961+
27962+#ifdef CONFIG_PAX_KERNEXEC
27963+ return ktla_ktva(sp[0]);
27964+#else
27965 if (sp[0] >> 22)
27966 return sp[0];
27967 if (sp[1] >> 22)
27968 return sp[1];
27969 #endif
27970+
27971+#endif
27972 }
27973 return pc;
27974 }
27975diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27976index 7fc5e84..c6e445a 100644
27977--- a/arch/x86/kernel/tls.c
27978+++ b/arch/x86/kernel/tls.c
27979@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27980 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27981 return -EINVAL;
27982
27983+#ifdef CONFIG_PAX_SEGMEXEC
27984+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27985+ return -EINVAL;
27986+#endif
27987+
27988 set_tls_desc(p, idx, &info, 1);
27989
27990 return 0;
27991@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27992
27993 if (kbuf)
27994 info = kbuf;
27995- else if (__copy_from_user(infobuf, ubuf, count))
27996+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27997 return -EFAULT;
27998 else
27999 info = infobuf;
28000diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
28001index 1c113db..287b42e 100644
28002--- a/arch/x86/kernel/tracepoint.c
28003+++ b/arch/x86/kernel/tracepoint.c
28004@@ -9,11 +9,11 @@
28005 #include <linux/atomic.h>
28006
28007 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
28008-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28009+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28010 (unsigned long) trace_idt_table };
28011
28012 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28013-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
28014+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
28015
28016 static int trace_irq_vector_refcount;
28017 static DEFINE_MUTEX(irq_vector_mutex);
28018diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
28019index 89f4e64..aa4149d 100644
28020--- a/arch/x86/kernel/traps.c
28021+++ b/arch/x86/kernel/traps.c
28022@@ -68,7 +68,7 @@
28023 #include <asm/proto.h>
28024
28025 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28026-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
28027+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
28028 #else
28029 #include <asm/processor-flags.h>
28030 #include <asm/setup.h>
28031@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
28032 #endif
28033
28034 /* Must be page-aligned because the real IDT is used in a fixmap. */
28035-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
28036+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
28037
28038 DECLARE_BITMAP(used_vectors, NR_VECTORS);
28039 EXPORT_SYMBOL_GPL(used_vectors);
28040@@ -109,11 +109,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
28041 }
28042
28043 static nokprobe_inline int
28044-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28045+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
28046 struct pt_regs *regs, long error_code)
28047 {
28048 #ifdef CONFIG_X86_32
28049- if (regs->flags & X86_VM_MASK) {
28050+ if (v8086_mode(regs)) {
28051 /*
28052 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
28053 * On nmi (interrupt 2), do_trap should not be called.
28054@@ -126,12 +126,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28055 return -1;
28056 }
28057 #endif
28058- if (!user_mode(regs)) {
28059+ if (!user_mode_novm(regs)) {
28060 if (!fixup_exception(regs)) {
28061 tsk->thread.error_code = error_code;
28062 tsk->thread.trap_nr = trapnr;
28063+
28064+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28065+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28066+ str = "PAX: suspicious stack segment fault";
28067+#endif
28068+
28069 die(str, regs, error_code);
28070 }
28071+
28072+#ifdef CONFIG_PAX_REFCOUNT
28073+ if (trapnr == X86_TRAP_OF)
28074+ pax_report_refcount_overflow(regs);
28075+#endif
28076+
28077 return 0;
28078 }
28079
28080@@ -170,7 +182,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28081 }
28082
28083 static void
28084-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28085+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28086 long error_code, siginfo_t *info)
28087 {
28088 struct task_struct *tsk = current;
28089@@ -194,7 +206,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28090 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28091 printk_ratelimit()) {
28092 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28093- tsk->comm, tsk->pid, str,
28094+ tsk->comm, task_pid_nr(tsk), str,
28095 regs->ip, regs->sp, error_code);
28096 print_vma_addr(" in ", regs->ip);
28097 pr_cont("\n");
28098@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28099 tsk->thread.error_code = error_code;
28100 tsk->thread.trap_nr = X86_TRAP_DF;
28101
28102+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28103+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28104+ die("grsec: kernel stack overflow detected", regs, error_code);
28105+#endif
28106+
28107 #ifdef CONFIG_DOUBLEFAULT
28108 df_debug(regs, error_code);
28109 #endif
28110@@ -300,7 +317,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
28111 goto exit;
28112 conditional_sti(regs);
28113
28114- if (!user_mode_vm(regs))
28115+ if (!user_mode(regs))
28116 die("bounds", regs, error_code);
28117
28118 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28119@@ -379,7 +396,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28120 conditional_sti(regs);
28121
28122 #ifdef CONFIG_X86_32
28123- if (regs->flags & X86_VM_MASK) {
28124+ if (v8086_mode(regs)) {
28125 local_irq_enable();
28126 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28127 goto exit;
28128@@ -387,18 +404,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28129 #endif
28130
28131 tsk = current;
28132- if (!user_mode(regs)) {
28133+ if (!user_mode_novm(regs)) {
28134 if (fixup_exception(regs))
28135 goto exit;
28136
28137 tsk->thread.error_code = error_code;
28138 tsk->thread.trap_nr = X86_TRAP_GP;
28139 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28140- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28141+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28142+
28143+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28144+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28145+ die("PAX: suspicious general protection fault", regs, error_code);
28146+ else
28147+#endif
28148+
28149 die("general protection fault", regs, error_code);
28150+ }
28151 goto exit;
28152 }
28153
28154+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28155+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28156+ struct mm_struct *mm = tsk->mm;
28157+ unsigned long limit;
28158+
28159+ down_write(&mm->mmap_sem);
28160+ limit = mm->context.user_cs_limit;
28161+ if (limit < TASK_SIZE) {
28162+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28163+ up_write(&mm->mmap_sem);
28164+ return;
28165+ }
28166+ up_write(&mm->mmap_sem);
28167+ }
28168+#endif
28169+
28170 tsk->thread.error_code = error_code;
28171 tsk->thread.trap_nr = X86_TRAP_GP;
28172
28173@@ -510,13 +551,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28174 container_of(task_pt_regs(current),
28175 struct bad_iret_stack, regs);
28176
28177+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28178+ new_stack = s;
28179+
28180 /* Copy the IRET target to the new stack. */
28181 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28182
28183 /* Copy the remainder of the stack from the current stack. */
28184 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28185
28186- BUG_ON(!user_mode_vm(&new_stack->regs));
28187+ BUG_ON(!user_mode(&new_stack->regs));
28188 return new_stack;
28189 }
28190 NOKPROBE_SYMBOL(fixup_bad_iret);
28191@@ -566,7 +610,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28192 * then it's very likely the result of an icebp/int01 trap.
28193 * User wants a sigtrap for that.
28194 */
28195- if (!dr6 && user_mode_vm(regs))
28196+ if (!dr6 && user_mode(regs))
28197 user_icebp = 1;
28198
28199 /* Catch kmemcheck conditions first of all! */
28200@@ -602,7 +646,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28201 /* It's safe to allow irq's after DR6 has been saved */
28202 preempt_conditional_sti(regs);
28203
28204- if (regs->flags & X86_VM_MASK) {
28205+ if (v8086_mode(regs)) {
28206 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28207 X86_TRAP_DB);
28208 preempt_conditional_cli(regs);
28209@@ -617,7 +661,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28210 * We already checked v86 mode above, so we can check for kernel mode
28211 * by just checking the CPL of CS.
28212 */
28213- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28214+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28215 tsk->thread.debugreg6 &= ~DR_STEP;
28216 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28217 regs->flags &= ~X86_EFLAGS_TF;
28218@@ -650,7 +694,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28219 return;
28220 conditional_sti(regs);
28221
28222- if (!user_mode_vm(regs))
28223+ if (!user_mode(regs))
28224 {
28225 if (!fixup_exception(regs)) {
28226 task->thread.error_code = error_code;
28227diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28228index 5054497..139f8f8 100644
28229--- a/arch/x86/kernel/tsc.c
28230+++ b/arch/x86/kernel/tsc.c
28231@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28232 */
28233 smp_wmb();
28234
28235- ACCESS_ONCE(c2n->head) = data;
28236+ ACCESS_ONCE_RW(c2n->head) = data;
28237 }
28238
28239 /*
28240diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28241index 8b96a94..792b410 100644
28242--- a/arch/x86/kernel/uprobes.c
28243+++ b/arch/x86/kernel/uprobes.c
28244@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28245 int ret = NOTIFY_DONE;
28246
28247 /* We are only interested in userspace traps */
28248- if (regs && !user_mode_vm(regs))
28249+ if (regs && !user_mode(regs))
28250 return NOTIFY_DONE;
28251
28252 switch (val) {
28253@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28254
28255 if (nleft != rasize) {
28256 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28257- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28258+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28259
28260 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28261 }
28262diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28263index b9242ba..50c5edd 100644
28264--- a/arch/x86/kernel/verify_cpu.S
28265+++ b/arch/x86/kernel/verify_cpu.S
28266@@ -20,6 +20,7 @@
28267 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28268 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28269 * arch/x86/kernel/head_32.S: processor startup
28270+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28271 *
28272 * verify_cpu, returns the status of longmode and SSE in register %eax.
28273 * 0: Success 1: Failure
28274diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28275index e8edcf5..27f9344 100644
28276--- a/arch/x86/kernel/vm86_32.c
28277+++ b/arch/x86/kernel/vm86_32.c
28278@@ -44,6 +44,7 @@
28279 #include <linux/ptrace.h>
28280 #include <linux/audit.h>
28281 #include <linux/stddef.h>
28282+#include <linux/grsecurity.h>
28283
28284 #include <asm/uaccess.h>
28285 #include <asm/io.h>
28286@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28287 do_exit(SIGSEGV);
28288 }
28289
28290- tss = &per_cpu(init_tss, get_cpu());
28291+ tss = init_tss + get_cpu();
28292 current->thread.sp0 = current->thread.saved_sp0;
28293 current->thread.sysenter_cs = __KERNEL_CS;
28294 load_sp0(tss, &current->thread);
28295@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28296
28297 if (tsk->thread.saved_sp0)
28298 return -EPERM;
28299+
28300+#ifdef CONFIG_GRKERNSEC_VM86
28301+ if (!capable(CAP_SYS_RAWIO)) {
28302+ gr_handle_vm86();
28303+ return -EPERM;
28304+ }
28305+#endif
28306+
28307 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28308 offsetof(struct kernel_vm86_struct, vm86plus) -
28309 sizeof(info.regs));
28310@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28311 int tmp;
28312 struct vm86plus_struct __user *v86;
28313
28314+#ifdef CONFIG_GRKERNSEC_VM86
28315+ if (!capable(CAP_SYS_RAWIO)) {
28316+ gr_handle_vm86();
28317+ return -EPERM;
28318+ }
28319+#endif
28320+
28321 tsk = current;
28322 switch (cmd) {
28323 case VM86_REQUEST_IRQ:
28324@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28325 tsk->thread.saved_fs = info->regs32->fs;
28326 tsk->thread.saved_gs = get_user_gs(info->regs32);
28327
28328- tss = &per_cpu(init_tss, get_cpu());
28329+ tss = init_tss + get_cpu();
28330 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28331 if (cpu_has_sep)
28332 tsk->thread.sysenter_cs = 0;
28333@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28334 goto cannot_handle;
28335 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28336 goto cannot_handle;
28337- intr_ptr = (unsigned long __user *) (i << 2);
28338+ intr_ptr = (__force unsigned long __user *) (i << 2);
28339 if (get_user(segoffs, intr_ptr))
28340 goto cannot_handle;
28341 if ((segoffs >> 16) == BIOSSEG)
28342diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28343index 00bf300..129df8e 100644
28344--- a/arch/x86/kernel/vmlinux.lds.S
28345+++ b/arch/x86/kernel/vmlinux.lds.S
28346@@ -26,6 +26,13 @@
28347 #include <asm/page_types.h>
28348 #include <asm/cache.h>
28349 #include <asm/boot.h>
28350+#include <asm/segment.h>
28351+
28352+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28353+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28354+#else
28355+#define __KERNEL_TEXT_OFFSET 0
28356+#endif
28357
28358 #undef i386 /* in case the preprocessor is a 32bit one */
28359
28360@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28361
28362 PHDRS {
28363 text PT_LOAD FLAGS(5); /* R_E */
28364+#ifdef CONFIG_X86_32
28365+ module PT_LOAD FLAGS(5); /* R_E */
28366+#endif
28367+#ifdef CONFIG_XEN
28368+ rodata PT_LOAD FLAGS(5); /* R_E */
28369+#else
28370+ rodata PT_LOAD FLAGS(4); /* R__ */
28371+#endif
28372 data PT_LOAD FLAGS(6); /* RW_ */
28373-#ifdef CONFIG_X86_64
28374+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28375 #ifdef CONFIG_SMP
28376 percpu PT_LOAD FLAGS(6); /* RW_ */
28377 #endif
28378+ text.init PT_LOAD FLAGS(5); /* R_E */
28379+ text.exit PT_LOAD FLAGS(5); /* R_E */
28380 init PT_LOAD FLAGS(7); /* RWE */
28381-#endif
28382 note PT_NOTE FLAGS(0); /* ___ */
28383 }
28384
28385 SECTIONS
28386 {
28387 #ifdef CONFIG_X86_32
28388- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28389- phys_startup_32 = startup_32 - LOAD_OFFSET;
28390+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28391 #else
28392- . = __START_KERNEL;
28393- phys_startup_64 = startup_64 - LOAD_OFFSET;
28394+ . = __START_KERNEL;
28395 #endif
28396
28397 /* Text and read-only data */
28398- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28399- _text = .;
28400+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28401 /* bootstrapping code */
28402+#ifdef CONFIG_X86_32
28403+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28404+#else
28405+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28406+#endif
28407+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28408+ _text = .;
28409 HEAD_TEXT
28410 . = ALIGN(8);
28411 _stext = .;
28412@@ -104,13 +124,47 @@ SECTIONS
28413 IRQENTRY_TEXT
28414 *(.fixup)
28415 *(.gnu.warning)
28416- /* End of text section */
28417- _etext = .;
28418 } :text = 0x9090
28419
28420- NOTES :text :note
28421+ . += __KERNEL_TEXT_OFFSET;
28422
28423- EXCEPTION_TABLE(16) :text = 0x9090
28424+#ifdef CONFIG_X86_32
28425+ . = ALIGN(PAGE_SIZE);
28426+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28427+
28428+#ifdef CONFIG_PAX_KERNEXEC
28429+ MODULES_EXEC_VADDR = .;
28430+ BYTE(0)
28431+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28432+ . = ALIGN(HPAGE_SIZE) - 1;
28433+ MODULES_EXEC_END = .;
28434+#endif
28435+
28436+ } :module
28437+#endif
28438+
28439+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28440+ /* End of text section */
28441+ BYTE(0)
28442+ _etext = . - __KERNEL_TEXT_OFFSET;
28443+ }
28444+
28445+#ifdef CONFIG_X86_32
28446+ . = ALIGN(PAGE_SIZE);
28447+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28448+ . = ALIGN(PAGE_SIZE);
28449+ *(.empty_zero_page)
28450+ *(.initial_pg_fixmap)
28451+ *(.initial_pg_pmd)
28452+ *(.initial_page_table)
28453+ *(.swapper_pg_dir)
28454+ } :rodata
28455+#endif
28456+
28457+ . = ALIGN(PAGE_SIZE);
28458+ NOTES :rodata :note
28459+
28460+ EXCEPTION_TABLE(16) :rodata
28461
28462 #if defined(CONFIG_DEBUG_RODATA)
28463 /* .text should occupy whole number of pages */
28464@@ -122,16 +176,20 @@ SECTIONS
28465
28466 /* Data */
28467 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28468+
28469+#ifdef CONFIG_PAX_KERNEXEC
28470+ . = ALIGN(HPAGE_SIZE);
28471+#else
28472+ . = ALIGN(PAGE_SIZE);
28473+#endif
28474+
28475 /* Start of data section */
28476 _sdata = .;
28477
28478 /* init_task */
28479 INIT_TASK_DATA(THREAD_SIZE)
28480
28481-#ifdef CONFIG_X86_32
28482- /* 32 bit has nosave before _edata */
28483 NOSAVE_DATA
28484-#endif
28485
28486 PAGE_ALIGNED_DATA(PAGE_SIZE)
28487
28488@@ -174,12 +232,19 @@ SECTIONS
28489 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28490
28491 /* Init code and data - will be freed after init */
28492- . = ALIGN(PAGE_SIZE);
28493 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28494+ BYTE(0)
28495+
28496+#ifdef CONFIG_PAX_KERNEXEC
28497+ . = ALIGN(HPAGE_SIZE);
28498+#else
28499+ . = ALIGN(PAGE_SIZE);
28500+#endif
28501+
28502 __init_begin = .; /* paired with __init_end */
28503- }
28504+ } :init.begin
28505
28506-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28507+#ifdef CONFIG_SMP
28508 /*
28509 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28510 * output PHDR, so the next output section - .init.text - should
28511@@ -190,12 +255,27 @@ SECTIONS
28512 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28513 #endif
28514
28515- INIT_TEXT_SECTION(PAGE_SIZE)
28516-#ifdef CONFIG_X86_64
28517- :init
28518-#endif
28519+ . = ALIGN(PAGE_SIZE);
28520+ init_begin = .;
28521+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28522+ VMLINUX_SYMBOL(_sinittext) = .;
28523+ INIT_TEXT
28524+ . = ALIGN(PAGE_SIZE);
28525+ } :text.init
28526
28527- INIT_DATA_SECTION(16)
28528+ /*
28529+ * .exit.text is discard at runtime, not link time, to deal with
28530+ * references from .altinstructions and .eh_frame
28531+ */
28532+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28533+ EXIT_TEXT
28534+ VMLINUX_SYMBOL(_einittext) = .;
28535+ . = ALIGN(16);
28536+ } :text.exit
28537+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28538+
28539+ . = ALIGN(PAGE_SIZE);
28540+ INIT_DATA_SECTION(16) :init
28541
28542 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28543 __x86_cpu_dev_start = .;
28544@@ -266,19 +346,12 @@ SECTIONS
28545 }
28546
28547 . = ALIGN(8);
28548- /*
28549- * .exit.text is discard at runtime, not link time, to deal with
28550- * references from .altinstructions and .eh_frame
28551- */
28552- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28553- EXIT_TEXT
28554- }
28555
28556 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28557 EXIT_DATA
28558 }
28559
28560-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28561+#ifndef CONFIG_SMP
28562 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28563 #endif
28564
28565@@ -297,16 +370,10 @@ SECTIONS
28566 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28567 __smp_locks = .;
28568 *(.smp_locks)
28569- . = ALIGN(PAGE_SIZE);
28570 __smp_locks_end = .;
28571+ . = ALIGN(PAGE_SIZE);
28572 }
28573
28574-#ifdef CONFIG_X86_64
28575- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28576- NOSAVE_DATA
28577- }
28578-#endif
28579-
28580 /* BSS */
28581 . = ALIGN(PAGE_SIZE);
28582 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28583@@ -322,6 +389,7 @@ SECTIONS
28584 __brk_base = .;
28585 . += 64 * 1024; /* 64k alignment slop space */
28586 *(.brk_reservation) /* areas brk users have reserved */
28587+ . = ALIGN(HPAGE_SIZE);
28588 __brk_limit = .;
28589 }
28590
28591@@ -348,13 +416,12 @@ SECTIONS
28592 * for the boot processor.
28593 */
28594 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28595-INIT_PER_CPU(gdt_page);
28596 INIT_PER_CPU(irq_stack_union);
28597
28598 /*
28599 * Build-time check on the image size:
28600 */
28601-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28602+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28603 "kernel image bigger than KERNEL_IMAGE_SIZE");
28604
28605 #ifdef CONFIG_SMP
28606diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28607index 2dcc6ff..082dc7a 100644
28608--- a/arch/x86/kernel/vsyscall_64.c
28609+++ b/arch/x86/kernel/vsyscall_64.c
28610@@ -38,15 +38,13 @@
28611 #define CREATE_TRACE_POINTS
28612 #include "vsyscall_trace.h"
28613
28614-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28615+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28616
28617 static int __init vsyscall_setup(char *str)
28618 {
28619 if (str) {
28620 if (!strcmp("emulate", str))
28621 vsyscall_mode = EMULATE;
28622- else if (!strcmp("native", str))
28623- vsyscall_mode = NATIVE;
28624 else if (!strcmp("none", str))
28625 vsyscall_mode = NONE;
28626 else
28627@@ -264,8 +262,7 @@ do_ret:
28628 return true;
28629
28630 sigsegv:
28631- force_sig(SIGSEGV, current);
28632- return true;
28633+ do_group_exit(SIGKILL);
28634 }
28635
28636 /*
28637@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28638 static struct vm_area_struct gate_vma = {
28639 .vm_start = VSYSCALL_ADDR,
28640 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28641- .vm_page_prot = PAGE_READONLY_EXEC,
28642- .vm_flags = VM_READ | VM_EXEC,
28643+ .vm_page_prot = PAGE_READONLY,
28644+ .vm_flags = VM_READ,
28645 .vm_ops = &gate_vma_ops,
28646 };
28647
28648@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28649 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28650
28651 if (vsyscall_mode != NONE)
28652- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28653- vsyscall_mode == NATIVE
28654- ? PAGE_KERNEL_VSYSCALL
28655- : PAGE_KERNEL_VVAR);
28656+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28657
28658 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28659 (unsigned long)VSYSCALL_ADDR);
28660diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28661index 04068192..4d75aa6 100644
28662--- a/arch/x86/kernel/x8664_ksyms_64.c
28663+++ b/arch/x86/kernel/x8664_ksyms_64.c
28664@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28665 EXPORT_SYMBOL(copy_user_generic_unrolled);
28666 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28667 EXPORT_SYMBOL(__copy_user_nocache);
28668-EXPORT_SYMBOL(_copy_from_user);
28669-EXPORT_SYMBOL(_copy_to_user);
28670
28671 EXPORT_SYMBOL(copy_page);
28672 EXPORT_SYMBOL(clear_page);
28673@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28674 EXPORT_SYMBOL(___preempt_schedule_context);
28675 #endif
28676 #endif
28677+
28678+#ifdef CONFIG_PAX_PER_CPU_PGD
28679+EXPORT_SYMBOL(cpu_pgd);
28680+#endif
28681diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28682index 234b072..b7ab191 100644
28683--- a/arch/x86/kernel/x86_init.c
28684+++ b/arch/x86/kernel/x86_init.c
28685@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28686 static void default_nmi_init(void) { };
28687 static int default_i8042_detect(void) { return 1; };
28688
28689-struct x86_platform_ops x86_platform = {
28690+struct x86_platform_ops x86_platform __read_only = {
28691 .calibrate_tsc = native_calibrate_tsc,
28692 .get_wallclock = mach_get_cmos_time,
28693 .set_wallclock = mach_set_rtc_mmss,
28694@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28695 EXPORT_SYMBOL_GPL(x86_platform);
28696
28697 #if defined(CONFIG_PCI_MSI)
28698-struct x86_msi_ops x86_msi = {
28699+struct x86_msi_ops x86_msi __read_only = {
28700 .setup_msi_irqs = native_setup_msi_irqs,
28701 .compose_msi_msg = native_compose_msi_msg,
28702 .teardown_msi_irq = native_teardown_msi_irq,
28703@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28704 }
28705 #endif
28706
28707-struct x86_io_apic_ops x86_io_apic_ops = {
28708+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28709 .init = native_io_apic_init_mappings,
28710 .read = native_io_apic_read,
28711 .write = native_io_apic_write,
28712diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28713index 8be1e17..07dd990 100644
28714--- a/arch/x86/kernel/xsave.c
28715+++ b/arch/x86/kernel/xsave.c
28716@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28717
28718 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28719 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28720- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28721+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28722
28723 if (!use_xsave())
28724 return err;
28725
28726- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28727+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28728
28729 /*
28730 * Read the xstate_bv which we copied (directly from the cpu or
28731 * from the state in task struct) to the user buffers.
28732 */
28733- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28734+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28735
28736 /*
28737 * For legacy compatible, we always set FP/SSE bits in the bit
28738@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28739 */
28740 xstate_bv |= XSTATE_FPSSE;
28741
28742- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28743+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28744
28745 return err;
28746 }
28747@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28748 {
28749 int err;
28750
28751+ buf = (struct xsave_struct __user *)____m(buf);
28752 if (use_xsave())
28753 err = xsave_user(buf);
28754 else if (use_fxsr())
28755@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28756 */
28757 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28758 {
28759+ buf = (void __user *)____m(buf);
28760 if (use_xsave()) {
28761 if ((unsigned long)buf % 64 || fx_only) {
28762 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28763diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28764index 8a80737..bac4961 100644
28765--- a/arch/x86/kvm/cpuid.c
28766+++ b/arch/x86/kvm/cpuid.c
28767@@ -182,15 +182,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28768 struct kvm_cpuid2 *cpuid,
28769 struct kvm_cpuid_entry2 __user *entries)
28770 {
28771- int r;
28772+ int r, i;
28773
28774 r = -E2BIG;
28775 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28776 goto out;
28777 r = -EFAULT;
28778- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28779- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28780+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28781 goto out;
28782+ for (i = 0; i < cpuid->nent; ++i) {
28783+ struct kvm_cpuid_entry2 cpuid_entry;
28784+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28785+ goto out;
28786+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28787+ }
28788 vcpu->arch.cpuid_nent = cpuid->nent;
28789 kvm_apic_set_version(vcpu);
28790 kvm_x86_ops->cpuid_update(vcpu);
28791@@ -203,15 +208,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28792 struct kvm_cpuid2 *cpuid,
28793 struct kvm_cpuid_entry2 __user *entries)
28794 {
28795- int r;
28796+ int r, i;
28797
28798 r = -E2BIG;
28799 if (cpuid->nent < vcpu->arch.cpuid_nent)
28800 goto out;
28801 r = -EFAULT;
28802- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28803- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28804+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28805 goto out;
28806+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28807+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28808+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28809+ goto out;
28810+ }
28811 return 0;
28812
28813 out:
28814diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28815index b24c2d8..e1e4e259 100644
28816--- a/arch/x86/kvm/emulate.c
28817+++ b/arch/x86/kvm/emulate.c
28818@@ -3503,7 +3503,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28819 int cr = ctxt->modrm_reg;
28820 u64 efer = 0;
28821
28822- static u64 cr_reserved_bits[] = {
28823+ static const u64 cr_reserved_bits[] = {
28824 0xffffffff00000000ULL,
28825 0, 0, 0, /* CR3 checked later */
28826 CR4_RESERVED_BITS,
28827diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28828index d52dcf0..cec7e84 100644
28829--- a/arch/x86/kvm/lapic.c
28830+++ b/arch/x86/kvm/lapic.c
28831@@ -55,7 +55,7 @@
28832 #define APIC_BUS_CYCLE_NS 1
28833
28834 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28835-#define apic_debug(fmt, arg...)
28836+#define apic_debug(fmt, arg...) do {} while (0)
28837
28838 #define APIC_LVT_NUM 6
28839 /* 14 is the version for Xeon and Pentium 8.4.8*/
28840diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28841index fd49c86..77e1aa0 100644
28842--- a/arch/x86/kvm/paging_tmpl.h
28843+++ b/arch/x86/kvm/paging_tmpl.h
28844@@ -343,7 +343,7 @@ retry_walk:
28845 if (unlikely(kvm_is_error_hva(host_addr)))
28846 goto error;
28847
28848- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28849+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28850 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28851 goto error;
28852 walker->ptep_user[walker->level - 1] = ptep_user;
28853diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28854index 41dd038..de331cf 100644
28855--- a/arch/x86/kvm/svm.c
28856+++ b/arch/x86/kvm/svm.c
28857@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28858 int cpu = raw_smp_processor_id();
28859
28860 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28861+
28862+ pax_open_kernel();
28863 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28864+ pax_close_kernel();
28865+
28866 load_TR_desc();
28867 }
28868
28869@@ -3969,6 +3973,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28870 #endif
28871 #endif
28872
28873+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28874+ __set_fs(current_thread_info()->addr_limit);
28875+#endif
28876+
28877 reload_tss(vcpu);
28878
28879 local_irq_disable();
28880diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28881index 3124464..2e42ec3 100644
28882--- a/arch/x86/kvm/vmx.c
28883+++ b/arch/x86/kvm/vmx.c
28884@@ -1380,12 +1380,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28885 #endif
28886 }
28887
28888-static void vmcs_clear_bits(unsigned long field, u32 mask)
28889+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28890 {
28891 vmcs_writel(field, vmcs_readl(field) & ~mask);
28892 }
28893
28894-static void vmcs_set_bits(unsigned long field, u32 mask)
28895+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28896 {
28897 vmcs_writel(field, vmcs_readl(field) | mask);
28898 }
28899@@ -1645,7 +1645,11 @@ static void reload_tss(void)
28900 struct desc_struct *descs;
28901
28902 descs = (void *)gdt->address;
28903+
28904+ pax_open_kernel();
28905 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28906+ pax_close_kernel();
28907+
28908 load_TR_desc();
28909 }
28910
28911@@ -1881,6 +1885,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28912 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28913 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28914
28915+#ifdef CONFIG_PAX_PER_CPU_PGD
28916+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28917+#endif
28918+
28919 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28920 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28921 vmx->loaded_vmcs->cpu = cpu;
28922@@ -2170,7 +2178,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28923 * reads and returns guest's timestamp counter "register"
28924 * guest_tsc = host_tsc + tsc_offset -- 21.3
28925 */
28926-static u64 guest_read_tsc(void)
28927+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28928 {
28929 u64 host_tsc, tsc_offset;
28930
28931@@ -4255,7 +4263,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28932 unsigned long cr4;
28933
28934 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28935+
28936+#ifndef CONFIG_PAX_PER_CPU_PGD
28937 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28938+#endif
28939
28940 /* Save the most likely value for this task's CR4 in the VMCS. */
28941 cr4 = read_cr4();
28942@@ -4282,7 +4293,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28943 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28944 vmx->host_idt_base = dt.address;
28945
28946- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28947+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28948
28949 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28950 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28951@@ -5879,11 +5890,16 @@ static __init int hardware_setup(void)
28952 * page upon invalidation. No need to do anything if the
28953 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28954 */
28955- kvm_x86_ops->set_apic_access_page_addr = NULL;
28956+ pax_open_kernel();
28957+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28958+ pax_close_kernel();
28959 }
28960
28961- if (!cpu_has_vmx_tpr_shadow())
28962- kvm_x86_ops->update_cr8_intercept = NULL;
28963+ if (!cpu_has_vmx_tpr_shadow()) {
28964+ pax_open_kernel();
28965+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28966+ pax_close_kernel();
28967+ }
28968
28969 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28970 kvm_disable_largepages();
28971@@ -5894,13 +5910,15 @@ static __init int hardware_setup(void)
28972 if (!cpu_has_vmx_apicv())
28973 enable_apicv = 0;
28974
28975+ pax_open_kernel();
28976 if (enable_apicv)
28977- kvm_x86_ops->update_cr8_intercept = NULL;
28978+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28979 else {
28980- kvm_x86_ops->hwapic_irr_update = NULL;
28981- kvm_x86_ops->deliver_posted_interrupt = NULL;
28982- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28983+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28984+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28985+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28986 }
28987+ pax_close_kernel();
28988
28989 if (nested)
28990 nested_vmx_setup_ctls_msrs();
28991@@ -7849,6 +7867,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28992 "jmp 2f \n\t"
28993 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28994 "2: "
28995+
28996+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28997+ "ljmp %[cs],$3f\n\t"
28998+ "3: "
28999+#endif
29000+
29001 /* Save guest registers, load host registers, keep flags */
29002 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
29003 "pop %0 \n\t"
29004@@ -7901,6 +7925,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29005 #endif
29006 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
29007 [wordsize]"i"(sizeof(ulong))
29008+
29009+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29010+ ,[cs]"i"(__KERNEL_CS)
29011+#endif
29012+
29013 : "cc", "memory"
29014 #ifdef CONFIG_X86_64
29015 , "rax", "rbx", "rdi", "rsi"
29016@@ -7914,7 +7943,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29017 if (debugctlmsr)
29018 update_debugctlmsr(debugctlmsr);
29019
29020-#ifndef CONFIG_X86_64
29021+#ifdef CONFIG_X86_32
29022 /*
29023 * The sysexit path does not restore ds/es, so we must set them to
29024 * a reasonable value ourselves.
29025@@ -7923,8 +7952,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29026 * may be executed in interrupt context, which saves and restore segments
29027 * around it, nullifying its effect.
29028 */
29029- loadsegment(ds, __USER_DS);
29030- loadsegment(es, __USER_DS);
29031+ loadsegment(ds, __KERNEL_DS);
29032+ loadsegment(es, __KERNEL_DS);
29033+ loadsegment(ss, __KERNEL_DS);
29034+
29035+#ifdef CONFIG_PAX_KERNEXEC
29036+ loadsegment(fs, __KERNEL_PERCPU);
29037+#endif
29038+
29039+#ifdef CONFIG_PAX_MEMORY_UDEREF
29040+ __set_fs(current_thread_info()->addr_limit);
29041+#endif
29042+
29043 #endif
29044
29045 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29046diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29047index 64d76c1..e20a4c1 100644
29048--- a/arch/x86/kvm/x86.c
29049+++ b/arch/x86/kvm/x86.c
29050@@ -1882,8 +1882,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29051 {
29052 struct kvm *kvm = vcpu->kvm;
29053 int lm = is_long_mode(vcpu);
29054- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29055- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29056+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29057+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29058 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29059 : kvm->arch.xen_hvm_config.blob_size_32;
29060 u32 page_num = data & ~PAGE_MASK;
29061@@ -2809,6 +2809,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29062 if (n < msr_list.nmsrs)
29063 goto out;
29064 r = -EFAULT;
29065+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29066+ goto out;
29067 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29068 num_msrs_to_save * sizeof(u32)))
29069 goto out;
29070@@ -5745,7 +5747,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29071 };
29072 #endif
29073
29074-int kvm_arch_init(void *opaque)
29075+int kvm_arch_init(const void *opaque)
29076 {
29077 int r;
29078 struct kvm_x86_ops *ops = opaque;
29079diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29080index c1c1544..f90c9d5 100644
29081--- a/arch/x86/lguest/boot.c
29082+++ b/arch/x86/lguest/boot.c
29083@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29084 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29085 * Launcher to reboot us.
29086 */
29087-static void lguest_restart(char *reason)
29088+static __noreturn void lguest_restart(char *reason)
29089 {
29090 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29091+ BUG();
29092 }
29093
29094 /*G:050
29095diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29096index 00933d5..3a64af9 100644
29097--- a/arch/x86/lib/atomic64_386_32.S
29098+++ b/arch/x86/lib/atomic64_386_32.S
29099@@ -48,6 +48,10 @@ BEGIN(read)
29100 movl (v), %eax
29101 movl 4(v), %edx
29102 RET_ENDP
29103+BEGIN(read_unchecked)
29104+ movl (v), %eax
29105+ movl 4(v), %edx
29106+RET_ENDP
29107 #undef v
29108
29109 #define v %esi
29110@@ -55,6 +59,10 @@ BEGIN(set)
29111 movl %ebx, (v)
29112 movl %ecx, 4(v)
29113 RET_ENDP
29114+BEGIN(set_unchecked)
29115+ movl %ebx, (v)
29116+ movl %ecx, 4(v)
29117+RET_ENDP
29118 #undef v
29119
29120 #define v %esi
29121@@ -70,6 +78,20 @@ RET_ENDP
29122 BEGIN(add)
29123 addl %eax, (v)
29124 adcl %edx, 4(v)
29125+
29126+#ifdef CONFIG_PAX_REFCOUNT
29127+ jno 0f
29128+ subl %eax, (v)
29129+ sbbl %edx, 4(v)
29130+ int $4
29131+0:
29132+ _ASM_EXTABLE(0b, 0b)
29133+#endif
29134+
29135+RET_ENDP
29136+BEGIN(add_unchecked)
29137+ addl %eax, (v)
29138+ adcl %edx, 4(v)
29139 RET_ENDP
29140 #undef v
29141
29142@@ -77,6 +99,24 @@ RET_ENDP
29143 BEGIN(add_return)
29144 addl (v), %eax
29145 adcl 4(v), %edx
29146+
29147+#ifdef CONFIG_PAX_REFCOUNT
29148+ into
29149+1234:
29150+ _ASM_EXTABLE(1234b, 2f)
29151+#endif
29152+
29153+ movl %eax, (v)
29154+ movl %edx, 4(v)
29155+
29156+#ifdef CONFIG_PAX_REFCOUNT
29157+2:
29158+#endif
29159+
29160+RET_ENDP
29161+BEGIN(add_return_unchecked)
29162+ addl (v), %eax
29163+ adcl 4(v), %edx
29164 movl %eax, (v)
29165 movl %edx, 4(v)
29166 RET_ENDP
29167@@ -86,6 +126,20 @@ RET_ENDP
29168 BEGIN(sub)
29169 subl %eax, (v)
29170 sbbl %edx, 4(v)
29171+
29172+#ifdef CONFIG_PAX_REFCOUNT
29173+ jno 0f
29174+ addl %eax, (v)
29175+ adcl %edx, 4(v)
29176+ int $4
29177+0:
29178+ _ASM_EXTABLE(0b, 0b)
29179+#endif
29180+
29181+RET_ENDP
29182+BEGIN(sub_unchecked)
29183+ subl %eax, (v)
29184+ sbbl %edx, 4(v)
29185 RET_ENDP
29186 #undef v
29187
29188@@ -96,6 +150,27 @@ BEGIN(sub_return)
29189 sbbl $0, %edx
29190 addl (v), %eax
29191 adcl 4(v), %edx
29192+
29193+#ifdef CONFIG_PAX_REFCOUNT
29194+ into
29195+1234:
29196+ _ASM_EXTABLE(1234b, 2f)
29197+#endif
29198+
29199+ movl %eax, (v)
29200+ movl %edx, 4(v)
29201+
29202+#ifdef CONFIG_PAX_REFCOUNT
29203+2:
29204+#endif
29205+
29206+RET_ENDP
29207+BEGIN(sub_return_unchecked)
29208+ negl %edx
29209+ negl %eax
29210+ sbbl $0, %edx
29211+ addl (v), %eax
29212+ adcl 4(v), %edx
29213 movl %eax, (v)
29214 movl %edx, 4(v)
29215 RET_ENDP
29216@@ -105,6 +180,20 @@ RET_ENDP
29217 BEGIN(inc)
29218 addl $1, (v)
29219 adcl $0, 4(v)
29220+
29221+#ifdef CONFIG_PAX_REFCOUNT
29222+ jno 0f
29223+ subl $1, (v)
29224+ sbbl $0, 4(v)
29225+ int $4
29226+0:
29227+ _ASM_EXTABLE(0b, 0b)
29228+#endif
29229+
29230+RET_ENDP
29231+BEGIN(inc_unchecked)
29232+ addl $1, (v)
29233+ adcl $0, 4(v)
29234 RET_ENDP
29235 #undef v
29236
29237@@ -114,6 +203,26 @@ BEGIN(inc_return)
29238 movl 4(v), %edx
29239 addl $1, %eax
29240 adcl $0, %edx
29241+
29242+#ifdef CONFIG_PAX_REFCOUNT
29243+ into
29244+1234:
29245+ _ASM_EXTABLE(1234b, 2f)
29246+#endif
29247+
29248+ movl %eax, (v)
29249+ movl %edx, 4(v)
29250+
29251+#ifdef CONFIG_PAX_REFCOUNT
29252+2:
29253+#endif
29254+
29255+RET_ENDP
29256+BEGIN(inc_return_unchecked)
29257+ movl (v), %eax
29258+ movl 4(v), %edx
29259+ addl $1, %eax
29260+ adcl $0, %edx
29261 movl %eax, (v)
29262 movl %edx, 4(v)
29263 RET_ENDP
29264@@ -123,6 +232,20 @@ RET_ENDP
29265 BEGIN(dec)
29266 subl $1, (v)
29267 sbbl $0, 4(v)
29268+
29269+#ifdef CONFIG_PAX_REFCOUNT
29270+ jno 0f
29271+ addl $1, (v)
29272+ adcl $0, 4(v)
29273+ int $4
29274+0:
29275+ _ASM_EXTABLE(0b, 0b)
29276+#endif
29277+
29278+RET_ENDP
29279+BEGIN(dec_unchecked)
29280+ subl $1, (v)
29281+ sbbl $0, 4(v)
29282 RET_ENDP
29283 #undef v
29284
29285@@ -132,6 +255,26 @@ BEGIN(dec_return)
29286 movl 4(v), %edx
29287 subl $1, %eax
29288 sbbl $0, %edx
29289+
29290+#ifdef CONFIG_PAX_REFCOUNT
29291+ into
29292+1234:
29293+ _ASM_EXTABLE(1234b, 2f)
29294+#endif
29295+
29296+ movl %eax, (v)
29297+ movl %edx, 4(v)
29298+
29299+#ifdef CONFIG_PAX_REFCOUNT
29300+2:
29301+#endif
29302+
29303+RET_ENDP
29304+BEGIN(dec_return_unchecked)
29305+ movl (v), %eax
29306+ movl 4(v), %edx
29307+ subl $1, %eax
29308+ sbbl $0, %edx
29309 movl %eax, (v)
29310 movl %edx, 4(v)
29311 RET_ENDP
29312@@ -143,6 +286,13 @@ BEGIN(add_unless)
29313 adcl %edx, %edi
29314 addl (v), %eax
29315 adcl 4(v), %edx
29316+
29317+#ifdef CONFIG_PAX_REFCOUNT
29318+ into
29319+1234:
29320+ _ASM_EXTABLE(1234b, 2f)
29321+#endif
29322+
29323 cmpl %eax, %ecx
29324 je 3f
29325 1:
29326@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29327 1:
29328 addl $1, %eax
29329 adcl $0, %edx
29330+
29331+#ifdef CONFIG_PAX_REFCOUNT
29332+ into
29333+1234:
29334+ _ASM_EXTABLE(1234b, 2f)
29335+#endif
29336+
29337 movl %eax, (v)
29338 movl %edx, 4(v)
29339 movl $1, %eax
29340@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29341 movl 4(v), %edx
29342 subl $1, %eax
29343 sbbl $0, %edx
29344+
29345+#ifdef CONFIG_PAX_REFCOUNT
29346+ into
29347+1234:
29348+ _ASM_EXTABLE(1234b, 1f)
29349+#endif
29350+
29351 js 1f
29352 movl %eax, (v)
29353 movl %edx, 4(v)
29354diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29355index f5cc9eb..51fa319 100644
29356--- a/arch/x86/lib/atomic64_cx8_32.S
29357+++ b/arch/x86/lib/atomic64_cx8_32.S
29358@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29359 CFI_STARTPROC
29360
29361 read64 %ecx
29362+ pax_force_retaddr
29363 ret
29364 CFI_ENDPROC
29365 ENDPROC(atomic64_read_cx8)
29366
29367+ENTRY(atomic64_read_unchecked_cx8)
29368+ CFI_STARTPROC
29369+
29370+ read64 %ecx
29371+ pax_force_retaddr
29372+ ret
29373+ CFI_ENDPROC
29374+ENDPROC(atomic64_read_unchecked_cx8)
29375+
29376 ENTRY(atomic64_set_cx8)
29377 CFI_STARTPROC
29378
29379@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29380 cmpxchg8b (%esi)
29381 jne 1b
29382
29383+ pax_force_retaddr
29384 ret
29385 CFI_ENDPROC
29386 ENDPROC(atomic64_set_cx8)
29387
29388+ENTRY(atomic64_set_unchecked_cx8)
29389+ CFI_STARTPROC
29390+
29391+1:
29392+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29393+ * are atomic on 586 and newer */
29394+ cmpxchg8b (%esi)
29395+ jne 1b
29396+
29397+ pax_force_retaddr
29398+ ret
29399+ CFI_ENDPROC
29400+ENDPROC(atomic64_set_unchecked_cx8)
29401+
29402 ENTRY(atomic64_xchg_cx8)
29403 CFI_STARTPROC
29404
29405@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29406 cmpxchg8b (%esi)
29407 jne 1b
29408
29409+ pax_force_retaddr
29410 ret
29411 CFI_ENDPROC
29412 ENDPROC(atomic64_xchg_cx8)
29413
29414-.macro addsub_return func ins insc
29415-ENTRY(atomic64_\func\()_return_cx8)
29416+.macro addsub_return func ins insc unchecked=""
29417+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29418 CFI_STARTPROC
29419 SAVE ebp
29420 SAVE ebx
29421@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29422 movl %edx, %ecx
29423 \ins\()l %esi, %ebx
29424 \insc\()l %edi, %ecx
29425+
29426+.ifb \unchecked
29427+#ifdef CONFIG_PAX_REFCOUNT
29428+ into
29429+2:
29430+ _ASM_EXTABLE(2b, 3f)
29431+#endif
29432+.endif
29433+
29434 LOCK_PREFIX
29435 cmpxchg8b (%ebp)
29436 jne 1b
29437-
29438-10:
29439 movl %ebx, %eax
29440 movl %ecx, %edx
29441+
29442+.ifb \unchecked
29443+#ifdef CONFIG_PAX_REFCOUNT
29444+3:
29445+#endif
29446+.endif
29447+
29448 RESTORE edi
29449 RESTORE esi
29450 RESTORE ebx
29451 RESTORE ebp
29452+ pax_force_retaddr
29453 ret
29454 CFI_ENDPROC
29455-ENDPROC(atomic64_\func\()_return_cx8)
29456+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29457 .endm
29458
29459 addsub_return add add adc
29460 addsub_return sub sub sbb
29461+addsub_return add add adc _unchecked
29462+addsub_return sub sub sbb _unchecked
29463
29464-.macro incdec_return func ins insc
29465-ENTRY(atomic64_\func\()_return_cx8)
29466+.macro incdec_return func ins insc unchecked=""
29467+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29468 CFI_STARTPROC
29469 SAVE ebx
29470
29471@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29472 movl %edx, %ecx
29473 \ins\()l $1, %ebx
29474 \insc\()l $0, %ecx
29475+
29476+.ifb \unchecked
29477+#ifdef CONFIG_PAX_REFCOUNT
29478+ into
29479+2:
29480+ _ASM_EXTABLE(2b, 3f)
29481+#endif
29482+.endif
29483+
29484 LOCK_PREFIX
29485 cmpxchg8b (%esi)
29486 jne 1b
29487
29488-10:
29489 movl %ebx, %eax
29490 movl %ecx, %edx
29491+
29492+.ifb \unchecked
29493+#ifdef CONFIG_PAX_REFCOUNT
29494+3:
29495+#endif
29496+.endif
29497+
29498 RESTORE ebx
29499+ pax_force_retaddr
29500 ret
29501 CFI_ENDPROC
29502-ENDPROC(atomic64_\func\()_return_cx8)
29503+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29504 .endm
29505
29506 incdec_return inc add adc
29507 incdec_return dec sub sbb
29508+incdec_return inc add adc _unchecked
29509+incdec_return dec sub sbb _unchecked
29510
29511 ENTRY(atomic64_dec_if_positive_cx8)
29512 CFI_STARTPROC
29513@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29514 movl %edx, %ecx
29515 subl $1, %ebx
29516 sbb $0, %ecx
29517+
29518+#ifdef CONFIG_PAX_REFCOUNT
29519+ into
29520+1234:
29521+ _ASM_EXTABLE(1234b, 2f)
29522+#endif
29523+
29524 js 2f
29525 LOCK_PREFIX
29526 cmpxchg8b (%esi)
29527@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29528 movl %ebx, %eax
29529 movl %ecx, %edx
29530 RESTORE ebx
29531+ pax_force_retaddr
29532 ret
29533 CFI_ENDPROC
29534 ENDPROC(atomic64_dec_if_positive_cx8)
29535@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29536 movl %edx, %ecx
29537 addl %ebp, %ebx
29538 adcl %edi, %ecx
29539+
29540+#ifdef CONFIG_PAX_REFCOUNT
29541+ into
29542+1234:
29543+ _ASM_EXTABLE(1234b, 3f)
29544+#endif
29545+
29546 LOCK_PREFIX
29547 cmpxchg8b (%esi)
29548 jne 1b
29549@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29550 CFI_ADJUST_CFA_OFFSET -8
29551 RESTORE ebx
29552 RESTORE ebp
29553+ pax_force_retaddr
29554 ret
29555 4:
29556 cmpl %edx, 4(%esp)
29557@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29558 xorl %ecx, %ecx
29559 addl $1, %ebx
29560 adcl %edx, %ecx
29561+
29562+#ifdef CONFIG_PAX_REFCOUNT
29563+ into
29564+1234:
29565+ _ASM_EXTABLE(1234b, 3f)
29566+#endif
29567+
29568 LOCK_PREFIX
29569 cmpxchg8b (%esi)
29570 jne 1b
29571@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29572 movl $1, %eax
29573 3:
29574 RESTORE ebx
29575+ pax_force_retaddr
29576 ret
29577 CFI_ENDPROC
29578 ENDPROC(atomic64_inc_not_zero_cx8)
29579diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29580index e78b8eee..7e173a8 100644
29581--- a/arch/x86/lib/checksum_32.S
29582+++ b/arch/x86/lib/checksum_32.S
29583@@ -29,7 +29,8 @@
29584 #include <asm/dwarf2.h>
29585 #include <asm/errno.h>
29586 #include <asm/asm.h>
29587-
29588+#include <asm/segment.h>
29589+
29590 /*
29591 * computes a partial checksum, e.g. for TCP/UDP fragments
29592 */
29593@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29594
29595 #define ARGBASE 16
29596 #define FP 12
29597-
29598-ENTRY(csum_partial_copy_generic)
29599+
29600+ENTRY(csum_partial_copy_generic_to_user)
29601 CFI_STARTPROC
29602+
29603+#ifdef CONFIG_PAX_MEMORY_UDEREF
29604+ pushl_cfi %gs
29605+ popl_cfi %es
29606+ jmp csum_partial_copy_generic
29607+#endif
29608+
29609+ENTRY(csum_partial_copy_generic_from_user)
29610+
29611+#ifdef CONFIG_PAX_MEMORY_UDEREF
29612+ pushl_cfi %gs
29613+ popl_cfi %ds
29614+#endif
29615+
29616+ENTRY(csum_partial_copy_generic)
29617 subl $4,%esp
29618 CFI_ADJUST_CFA_OFFSET 4
29619 pushl_cfi %edi
29620@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29621 jmp 4f
29622 SRC(1: movw (%esi), %bx )
29623 addl $2, %esi
29624-DST( movw %bx, (%edi) )
29625+DST( movw %bx, %es:(%edi) )
29626 addl $2, %edi
29627 addw %bx, %ax
29628 adcl $0, %eax
29629@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29630 SRC(1: movl (%esi), %ebx )
29631 SRC( movl 4(%esi), %edx )
29632 adcl %ebx, %eax
29633-DST( movl %ebx, (%edi) )
29634+DST( movl %ebx, %es:(%edi) )
29635 adcl %edx, %eax
29636-DST( movl %edx, 4(%edi) )
29637+DST( movl %edx, %es:4(%edi) )
29638
29639 SRC( movl 8(%esi), %ebx )
29640 SRC( movl 12(%esi), %edx )
29641 adcl %ebx, %eax
29642-DST( movl %ebx, 8(%edi) )
29643+DST( movl %ebx, %es:8(%edi) )
29644 adcl %edx, %eax
29645-DST( movl %edx, 12(%edi) )
29646+DST( movl %edx, %es:12(%edi) )
29647
29648 SRC( movl 16(%esi), %ebx )
29649 SRC( movl 20(%esi), %edx )
29650 adcl %ebx, %eax
29651-DST( movl %ebx, 16(%edi) )
29652+DST( movl %ebx, %es:16(%edi) )
29653 adcl %edx, %eax
29654-DST( movl %edx, 20(%edi) )
29655+DST( movl %edx, %es:20(%edi) )
29656
29657 SRC( movl 24(%esi), %ebx )
29658 SRC( movl 28(%esi), %edx )
29659 adcl %ebx, %eax
29660-DST( movl %ebx, 24(%edi) )
29661+DST( movl %ebx, %es:24(%edi) )
29662 adcl %edx, %eax
29663-DST( movl %edx, 28(%edi) )
29664+DST( movl %edx, %es:28(%edi) )
29665
29666 lea 32(%esi), %esi
29667 lea 32(%edi), %edi
29668@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29669 shrl $2, %edx # This clears CF
29670 SRC(3: movl (%esi), %ebx )
29671 adcl %ebx, %eax
29672-DST( movl %ebx, (%edi) )
29673+DST( movl %ebx, %es:(%edi) )
29674 lea 4(%esi), %esi
29675 lea 4(%edi), %edi
29676 dec %edx
29677@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29678 jb 5f
29679 SRC( movw (%esi), %cx )
29680 leal 2(%esi), %esi
29681-DST( movw %cx, (%edi) )
29682+DST( movw %cx, %es:(%edi) )
29683 leal 2(%edi), %edi
29684 je 6f
29685 shll $16,%ecx
29686 SRC(5: movb (%esi), %cl )
29687-DST( movb %cl, (%edi) )
29688+DST( movb %cl, %es:(%edi) )
29689 6: addl %ecx, %eax
29690 adcl $0, %eax
29691 7:
29692@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29693
29694 6001:
29695 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29696- movl $-EFAULT, (%ebx)
29697+ movl $-EFAULT, %ss:(%ebx)
29698
29699 # zero the complete destination - computing the rest
29700 # is too much work
29701@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29702
29703 6002:
29704 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29705- movl $-EFAULT,(%ebx)
29706+ movl $-EFAULT,%ss:(%ebx)
29707 jmp 5000b
29708
29709 .previous
29710
29711+ pushl_cfi %ss
29712+ popl_cfi %ds
29713+ pushl_cfi %ss
29714+ popl_cfi %es
29715 popl_cfi %ebx
29716 CFI_RESTORE ebx
29717 popl_cfi %esi
29718@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29719 popl_cfi %ecx # equivalent to addl $4,%esp
29720 ret
29721 CFI_ENDPROC
29722-ENDPROC(csum_partial_copy_generic)
29723+ENDPROC(csum_partial_copy_generic_to_user)
29724
29725 #else
29726
29727 /* Version for PentiumII/PPro */
29728
29729 #define ROUND1(x) \
29730+ nop; nop; nop; \
29731 SRC(movl x(%esi), %ebx ) ; \
29732 addl %ebx, %eax ; \
29733- DST(movl %ebx, x(%edi) ) ;
29734+ DST(movl %ebx, %es:x(%edi)) ;
29735
29736 #define ROUND(x) \
29737+ nop; nop; nop; \
29738 SRC(movl x(%esi), %ebx ) ; \
29739 adcl %ebx, %eax ; \
29740- DST(movl %ebx, x(%edi) ) ;
29741+ DST(movl %ebx, %es:x(%edi)) ;
29742
29743 #define ARGBASE 12
29744-
29745-ENTRY(csum_partial_copy_generic)
29746+
29747+ENTRY(csum_partial_copy_generic_to_user)
29748 CFI_STARTPROC
29749+
29750+#ifdef CONFIG_PAX_MEMORY_UDEREF
29751+ pushl_cfi %gs
29752+ popl_cfi %es
29753+ jmp csum_partial_copy_generic
29754+#endif
29755+
29756+ENTRY(csum_partial_copy_generic_from_user)
29757+
29758+#ifdef CONFIG_PAX_MEMORY_UDEREF
29759+ pushl_cfi %gs
29760+ popl_cfi %ds
29761+#endif
29762+
29763+ENTRY(csum_partial_copy_generic)
29764 pushl_cfi %ebx
29765 CFI_REL_OFFSET ebx, 0
29766 pushl_cfi %edi
29767@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29768 subl %ebx, %edi
29769 lea -1(%esi),%edx
29770 andl $-32,%edx
29771- lea 3f(%ebx,%ebx), %ebx
29772+ lea 3f(%ebx,%ebx,2), %ebx
29773 testl %esi, %esi
29774 jmp *%ebx
29775 1: addl $64,%esi
29776@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29777 jb 5f
29778 SRC( movw (%esi), %dx )
29779 leal 2(%esi), %esi
29780-DST( movw %dx, (%edi) )
29781+DST( movw %dx, %es:(%edi) )
29782 leal 2(%edi), %edi
29783 je 6f
29784 shll $16,%edx
29785 5:
29786 SRC( movb (%esi), %dl )
29787-DST( movb %dl, (%edi) )
29788+DST( movb %dl, %es:(%edi) )
29789 6: addl %edx, %eax
29790 adcl $0, %eax
29791 7:
29792 .section .fixup, "ax"
29793 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29794- movl $-EFAULT, (%ebx)
29795+ movl $-EFAULT, %ss:(%ebx)
29796 # zero the complete destination (computing the rest is too much work)
29797 movl ARGBASE+8(%esp),%edi # dst
29798 movl ARGBASE+12(%esp),%ecx # len
29799@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29800 rep; stosb
29801 jmp 7b
29802 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29803- movl $-EFAULT, (%ebx)
29804+ movl $-EFAULT, %ss:(%ebx)
29805 jmp 7b
29806 .previous
29807
29808+#ifdef CONFIG_PAX_MEMORY_UDEREF
29809+ pushl_cfi %ss
29810+ popl_cfi %ds
29811+ pushl_cfi %ss
29812+ popl_cfi %es
29813+#endif
29814+
29815 popl_cfi %esi
29816 CFI_RESTORE esi
29817 popl_cfi %edi
29818@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29819 CFI_RESTORE ebx
29820 ret
29821 CFI_ENDPROC
29822-ENDPROC(csum_partial_copy_generic)
29823+ENDPROC(csum_partial_copy_generic_to_user)
29824
29825 #undef ROUND
29826 #undef ROUND1
29827diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29828index f2145cf..cea889d 100644
29829--- a/arch/x86/lib/clear_page_64.S
29830+++ b/arch/x86/lib/clear_page_64.S
29831@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29832 movl $4096/8,%ecx
29833 xorl %eax,%eax
29834 rep stosq
29835+ pax_force_retaddr
29836 ret
29837 CFI_ENDPROC
29838 ENDPROC(clear_page_c)
29839@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29840 movl $4096,%ecx
29841 xorl %eax,%eax
29842 rep stosb
29843+ pax_force_retaddr
29844 ret
29845 CFI_ENDPROC
29846 ENDPROC(clear_page_c_e)
29847@@ -43,6 +45,7 @@ ENTRY(clear_page)
29848 leaq 64(%rdi),%rdi
29849 jnz .Lloop
29850 nop
29851+ pax_force_retaddr
29852 ret
29853 CFI_ENDPROC
29854 .Lclear_page_end:
29855@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29856
29857 #include <asm/cpufeature.h>
29858
29859- .section .altinstr_replacement,"ax"
29860+ .section .altinstr_replacement,"a"
29861 1: .byte 0xeb /* jmp <disp8> */
29862 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29863 2: .byte 0xeb /* jmp <disp8> */
29864diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29865index 40a1725..5d12ac4 100644
29866--- a/arch/x86/lib/cmpxchg16b_emu.S
29867+++ b/arch/x86/lib/cmpxchg16b_emu.S
29868@@ -8,6 +8,7 @@
29869 #include <linux/linkage.h>
29870 #include <asm/dwarf2.h>
29871 #include <asm/percpu.h>
29872+#include <asm/alternative-asm.h>
29873
29874 .text
29875
29876@@ -46,12 +47,14 @@ CFI_STARTPROC
29877 CFI_REMEMBER_STATE
29878 popfq_cfi
29879 mov $1, %al
29880+ pax_force_retaddr
29881 ret
29882
29883 CFI_RESTORE_STATE
29884 .Lnot_same:
29885 popfq_cfi
29886 xor %al,%al
29887+ pax_force_retaddr
29888 ret
29889
29890 CFI_ENDPROC
29891diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29892index 176cca6..e0d658e 100644
29893--- a/arch/x86/lib/copy_page_64.S
29894+++ b/arch/x86/lib/copy_page_64.S
29895@@ -9,6 +9,7 @@ copy_page_rep:
29896 CFI_STARTPROC
29897 movl $4096/8, %ecx
29898 rep movsq
29899+ pax_force_retaddr
29900 ret
29901 CFI_ENDPROC
29902 ENDPROC(copy_page_rep)
29903@@ -24,8 +25,8 @@ ENTRY(copy_page)
29904 CFI_ADJUST_CFA_OFFSET 2*8
29905 movq %rbx, (%rsp)
29906 CFI_REL_OFFSET rbx, 0
29907- movq %r12, 1*8(%rsp)
29908- CFI_REL_OFFSET r12, 1*8
29909+ movq %r13, 1*8(%rsp)
29910+ CFI_REL_OFFSET r13, 1*8
29911
29912 movl $(4096/64)-5, %ecx
29913 .p2align 4
29914@@ -38,7 +39,7 @@ ENTRY(copy_page)
29915 movq 0x8*4(%rsi), %r9
29916 movq 0x8*5(%rsi), %r10
29917 movq 0x8*6(%rsi), %r11
29918- movq 0x8*7(%rsi), %r12
29919+ movq 0x8*7(%rsi), %r13
29920
29921 prefetcht0 5*64(%rsi)
29922
29923@@ -49,7 +50,7 @@ ENTRY(copy_page)
29924 movq %r9, 0x8*4(%rdi)
29925 movq %r10, 0x8*5(%rdi)
29926 movq %r11, 0x8*6(%rdi)
29927- movq %r12, 0x8*7(%rdi)
29928+ movq %r13, 0x8*7(%rdi)
29929
29930 leaq 64 (%rsi), %rsi
29931 leaq 64 (%rdi), %rdi
29932@@ -68,7 +69,7 @@ ENTRY(copy_page)
29933 movq 0x8*4(%rsi), %r9
29934 movq 0x8*5(%rsi), %r10
29935 movq 0x8*6(%rsi), %r11
29936- movq 0x8*7(%rsi), %r12
29937+ movq 0x8*7(%rsi), %r13
29938
29939 movq %rax, 0x8*0(%rdi)
29940 movq %rbx, 0x8*1(%rdi)
29941@@ -77,7 +78,7 @@ ENTRY(copy_page)
29942 movq %r9, 0x8*4(%rdi)
29943 movq %r10, 0x8*5(%rdi)
29944 movq %r11, 0x8*6(%rdi)
29945- movq %r12, 0x8*7(%rdi)
29946+ movq %r13, 0x8*7(%rdi)
29947
29948 leaq 64(%rdi), %rdi
29949 leaq 64(%rsi), %rsi
29950@@ -85,10 +86,11 @@ ENTRY(copy_page)
29951
29952 movq (%rsp), %rbx
29953 CFI_RESTORE rbx
29954- movq 1*8(%rsp), %r12
29955- CFI_RESTORE r12
29956+ movq 1*8(%rsp), %r13
29957+ CFI_RESTORE r13
29958 addq $2*8, %rsp
29959 CFI_ADJUST_CFA_OFFSET -2*8
29960+ pax_force_retaddr
29961 ret
29962 .Lcopy_page_end:
29963 CFI_ENDPROC
29964@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29965
29966 #include <asm/cpufeature.h>
29967
29968- .section .altinstr_replacement,"ax"
29969+ .section .altinstr_replacement,"a"
29970 1: .byte 0xeb /* jmp <disp8> */
29971 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29972 2:
29973diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29974index dee945d..a84067b 100644
29975--- a/arch/x86/lib/copy_user_64.S
29976+++ b/arch/x86/lib/copy_user_64.S
29977@@ -18,31 +18,7 @@
29978 #include <asm/alternative-asm.h>
29979 #include <asm/asm.h>
29980 #include <asm/smap.h>
29981-
29982-/*
29983- * By placing feature2 after feature1 in altinstructions section, we logically
29984- * implement:
29985- * If CPU has feature2, jmp to alt2 is used
29986- * else if CPU has feature1, jmp to alt1 is used
29987- * else jmp to orig is used.
29988- */
29989- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29990-0:
29991- .byte 0xe9 /* 32bit jump */
29992- .long \orig-1f /* by default jump to orig */
29993-1:
29994- .section .altinstr_replacement,"ax"
29995-2: .byte 0xe9 /* near jump with 32bit immediate */
29996- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29997-3: .byte 0xe9 /* near jump with 32bit immediate */
29998- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29999- .previous
30000-
30001- .section .altinstructions,"a"
30002- altinstruction_entry 0b,2b,\feature1,5,5
30003- altinstruction_entry 0b,3b,\feature2,5,5
30004- .previous
30005- .endm
30006+#include <asm/pgtable.h>
30007
30008 .macro ALIGN_DESTINATION
30009 #ifdef FIX_ALIGNMENT
30010@@ -70,52 +46,6 @@
30011 #endif
30012 .endm
30013
30014-/* Standard copy_to_user with segment limit checking */
30015-ENTRY(_copy_to_user)
30016- CFI_STARTPROC
30017- GET_THREAD_INFO(%rax)
30018- movq %rdi,%rcx
30019- addq %rdx,%rcx
30020- jc bad_to_user
30021- cmpq TI_addr_limit(%rax),%rcx
30022- ja bad_to_user
30023- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30024- copy_user_generic_unrolled,copy_user_generic_string, \
30025- copy_user_enhanced_fast_string
30026- CFI_ENDPROC
30027-ENDPROC(_copy_to_user)
30028-
30029-/* Standard copy_from_user with segment limit checking */
30030-ENTRY(_copy_from_user)
30031- CFI_STARTPROC
30032- GET_THREAD_INFO(%rax)
30033- movq %rsi,%rcx
30034- addq %rdx,%rcx
30035- jc bad_from_user
30036- cmpq TI_addr_limit(%rax),%rcx
30037- ja bad_from_user
30038- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30039- copy_user_generic_unrolled,copy_user_generic_string, \
30040- copy_user_enhanced_fast_string
30041- CFI_ENDPROC
30042-ENDPROC(_copy_from_user)
30043-
30044- .section .fixup,"ax"
30045- /* must zero dest */
30046-ENTRY(bad_from_user)
30047-bad_from_user:
30048- CFI_STARTPROC
30049- movl %edx,%ecx
30050- xorl %eax,%eax
30051- rep
30052- stosb
30053-bad_to_user:
30054- movl %edx,%eax
30055- ret
30056- CFI_ENDPROC
30057-ENDPROC(bad_from_user)
30058- .previous
30059-
30060 /*
30061 * copy_user_generic_unrolled - memory copy with exception handling.
30062 * This version is for CPUs like P4 that don't have efficient micro
30063@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
30064 */
30065 ENTRY(copy_user_generic_unrolled)
30066 CFI_STARTPROC
30067+ ASM_PAX_OPEN_USERLAND
30068 ASM_STAC
30069 cmpl $8,%edx
30070 jb 20f /* less then 8 bytes, go to byte copy loop */
30071@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
30072 jnz 21b
30073 23: xor %eax,%eax
30074 ASM_CLAC
30075+ ASM_PAX_CLOSE_USERLAND
30076+ pax_force_retaddr
30077 ret
30078
30079 .section .fixup,"ax"
30080@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
30081 */
30082 ENTRY(copy_user_generic_string)
30083 CFI_STARTPROC
30084+ ASM_PAX_OPEN_USERLAND
30085 ASM_STAC
30086 cmpl $8,%edx
30087 jb 2f /* less than 8 bytes, go to byte copy loop */
30088@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
30089 movsb
30090 xorl %eax,%eax
30091 ASM_CLAC
30092+ ASM_PAX_CLOSE_USERLAND
30093+ pax_force_retaddr
30094 ret
30095
30096 .section .fixup,"ax"
30097@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30098 */
30099 ENTRY(copy_user_enhanced_fast_string)
30100 CFI_STARTPROC
30101+ ASM_PAX_OPEN_USERLAND
30102 ASM_STAC
30103 movl %edx,%ecx
30104 1: rep
30105 movsb
30106 xorl %eax,%eax
30107 ASM_CLAC
30108+ ASM_PAX_CLOSE_USERLAND
30109+ pax_force_retaddr
30110 ret
30111
30112 .section .fixup,"ax"
30113diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30114index 6a4f43c..c70fb52 100644
30115--- a/arch/x86/lib/copy_user_nocache_64.S
30116+++ b/arch/x86/lib/copy_user_nocache_64.S
30117@@ -8,6 +8,7 @@
30118
30119 #include <linux/linkage.h>
30120 #include <asm/dwarf2.h>
30121+#include <asm/alternative-asm.h>
30122
30123 #define FIX_ALIGNMENT 1
30124
30125@@ -16,6 +17,7 @@
30126 #include <asm/thread_info.h>
30127 #include <asm/asm.h>
30128 #include <asm/smap.h>
30129+#include <asm/pgtable.h>
30130
30131 .macro ALIGN_DESTINATION
30132 #ifdef FIX_ALIGNMENT
30133@@ -49,6 +51,16 @@
30134 */
30135 ENTRY(__copy_user_nocache)
30136 CFI_STARTPROC
30137+
30138+#ifdef CONFIG_PAX_MEMORY_UDEREF
30139+ mov pax_user_shadow_base,%rcx
30140+ cmp %rcx,%rsi
30141+ jae 1f
30142+ add %rcx,%rsi
30143+1:
30144+#endif
30145+
30146+ ASM_PAX_OPEN_USERLAND
30147 ASM_STAC
30148 cmpl $8,%edx
30149 jb 20f /* less then 8 bytes, go to byte copy loop */
30150@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30151 jnz 21b
30152 23: xorl %eax,%eax
30153 ASM_CLAC
30154+ ASM_PAX_CLOSE_USERLAND
30155 sfence
30156+ pax_force_retaddr
30157 ret
30158
30159 .section .fixup,"ax"
30160diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30161index 2419d5f..fe52d0e 100644
30162--- a/arch/x86/lib/csum-copy_64.S
30163+++ b/arch/x86/lib/csum-copy_64.S
30164@@ -9,6 +9,7 @@
30165 #include <asm/dwarf2.h>
30166 #include <asm/errno.h>
30167 #include <asm/asm.h>
30168+#include <asm/alternative-asm.h>
30169
30170 /*
30171 * Checksum copy with exception handling.
30172@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30173 CFI_ADJUST_CFA_OFFSET 7*8
30174 movq %rbx, 2*8(%rsp)
30175 CFI_REL_OFFSET rbx, 2*8
30176- movq %r12, 3*8(%rsp)
30177- CFI_REL_OFFSET r12, 3*8
30178+ movq %r15, 3*8(%rsp)
30179+ CFI_REL_OFFSET r15, 3*8
30180 movq %r14, 4*8(%rsp)
30181 CFI_REL_OFFSET r14, 4*8
30182 movq %r13, 5*8(%rsp)
30183@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30184 movl %edx, %ecx
30185
30186 xorl %r9d, %r9d
30187- movq %rcx, %r12
30188+ movq %rcx, %r15
30189
30190- shrq $6, %r12
30191+ shrq $6, %r15
30192 jz .Lhandle_tail /* < 64 */
30193
30194 clc
30195
30196 /* main loop. clear in 64 byte blocks */
30197 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30198- /* r11: temp3, rdx: temp4, r12 loopcnt */
30199+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30200 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30201 .p2align 4
30202 .Lloop:
30203@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30204 adcq %r14, %rax
30205 adcq %r13, %rax
30206
30207- decl %r12d
30208+ decl %r15d
30209
30210 dest
30211 movq %rbx, (%rsi)
30212@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30213 .Lende:
30214 movq 2*8(%rsp), %rbx
30215 CFI_RESTORE rbx
30216- movq 3*8(%rsp), %r12
30217- CFI_RESTORE r12
30218+ movq 3*8(%rsp), %r15
30219+ CFI_RESTORE r15
30220 movq 4*8(%rsp), %r14
30221 CFI_RESTORE r14
30222 movq 5*8(%rsp), %r13
30223@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30224 CFI_RESTORE rbp
30225 addq $7*8, %rsp
30226 CFI_ADJUST_CFA_OFFSET -7*8
30227+ pax_force_retaddr
30228 ret
30229 CFI_RESTORE_STATE
30230
30231diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30232index 1318f75..44c30fd 100644
30233--- a/arch/x86/lib/csum-wrappers_64.c
30234+++ b/arch/x86/lib/csum-wrappers_64.c
30235@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30236 len -= 2;
30237 }
30238 }
30239+ pax_open_userland();
30240 stac();
30241- isum = csum_partial_copy_generic((__force const void *)src,
30242+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30243 dst, len, isum, errp, NULL);
30244 clac();
30245+ pax_close_userland();
30246 if (unlikely(*errp))
30247 goto out_err;
30248
30249@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30250 }
30251
30252 *errp = 0;
30253+ pax_open_userland();
30254 stac();
30255- ret = csum_partial_copy_generic(src, (void __force *)dst,
30256+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30257 len, isum, NULL, errp);
30258 clac();
30259+ pax_close_userland();
30260 return ret;
30261 }
30262 EXPORT_SYMBOL(csum_partial_copy_to_user);
30263diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30264index a451235..a74bfa3 100644
30265--- a/arch/x86/lib/getuser.S
30266+++ b/arch/x86/lib/getuser.S
30267@@ -33,17 +33,40 @@
30268 #include <asm/thread_info.h>
30269 #include <asm/asm.h>
30270 #include <asm/smap.h>
30271+#include <asm/segment.h>
30272+#include <asm/pgtable.h>
30273+#include <asm/alternative-asm.h>
30274+
30275+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30276+#define __copyuser_seg gs;
30277+#else
30278+#define __copyuser_seg
30279+#endif
30280
30281 .text
30282 ENTRY(__get_user_1)
30283 CFI_STARTPROC
30284+
30285+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30286 GET_THREAD_INFO(%_ASM_DX)
30287 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30288 jae bad_get_user
30289+
30290+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30291+ mov pax_user_shadow_base,%_ASM_DX
30292+ cmp %_ASM_DX,%_ASM_AX
30293+ jae 1234f
30294+ add %_ASM_DX,%_ASM_AX
30295+1234:
30296+#endif
30297+
30298+#endif
30299+
30300 ASM_STAC
30301-1: movzbl (%_ASM_AX),%edx
30302+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30303 xor %eax,%eax
30304 ASM_CLAC
30305+ pax_force_retaddr
30306 ret
30307 CFI_ENDPROC
30308 ENDPROC(__get_user_1)
30309@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30310 ENTRY(__get_user_2)
30311 CFI_STARTPROC
30312 add $1,%_ASM_AX
30313+
30314+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30315 jc bad_get_user
30316 GET_THREAD_INFO(%_ASM_DX)
30317 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30318 jae bad_get_user
30319+
30320+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30321+ mov pax_user_shadow_base,%_ASM_DX
30322+ cmp %_ASM_DX,%_ASM_AX
30323+ jae 1234f
30324+ add %_ASM_DX,%_ASM_AX
30325+1234:
30326+#endif
30327+
30328+#endif
30329+
30330 ASM_STAC
30331-2: movzwl -1(%_ASM_AX),%edx
30332+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30333 xor %eax,%eax
30334 ASM_CLAC
30335+ pax_force_retaddr
30336 ret
30337 CFI_ENDPROC
30338 ENDPROC(__get_user_2)
30339@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30340 ENTRY(__get_user_4)
30341 CFI_STARTPROC
30342 add $3,%_ASM_AX
30343+
30344+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30345 jc bad_get_user
30346 GET_THREAD_INFO(%_ASM_DX)
30347 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30348 jae bad_get_user
30349+
30350+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30351+ mov pax_user_shadow_base,%_ASM_DX
30352+ cmp %_ASM_DX,%_ASM_AX
30353+ jae 1234f
30354+ add %_ASM_DX,%_ASM_AX
30355+1234:
30356+#endif
30357+
30358+#endif
30359+
30360 ASM_STAC
30361-3: movl -3(%_ASM_AX),%edx
30362+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30363 xor %eax,%eax
30364 ASM_CLAC
30365+ pax_force_retaddr
30366 ret
30367 CFI_ENDPROC
30368 ENDPROC(__get_user_4)
30369@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30370 GET_THREAD_INFO(%_ASM_DX)
30371 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30372 jae bad_get_user
30373+
30374+#ifdef CONFIG_PAX_MEMORY_UDEREF
30375+ mov pax_user_shadow_base,%_ASM_DX
30376+ cmp %_ASM_DX,%_ASM_AX
30377+ jae 1234f
30378+ add %_ASM_DX,%_ASM_AX
30379+1234:
30380+#endif
30381+
30382 ASM_STAC
30383 4: movq -7(%_ASM_AX),%rdx
30384 xor %eax,%eax
30385 ASM_CLAC
30386+ pax_force_retaddr
30387 ret
30388 #else
30389 add $7,%_ASM_AX
30390@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30391 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30392 jae bad_get_user_8
30393 ASM_STAC
30394-4: movl -7(%_ASM_AX),%edx
30395-5: movl -3(%_ASM_AX),%ecx
30396+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30397+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30398 xor %eax,%eax
30399 ASM_CLAC
30400+ pax_force_retaddr
30401 ret
30402 #endif
30403 CFI_ENDPROC
30404@@ -113,6 +175,7 @@ bad_get_user:
30405 xor %edx,%edx
30406 mov $(-EFAULT),%_ASM_AX
30407 ASM_CLAC
30408+ pax_force_retaddr
30409 ret
30410 CFI_ENDPROC
30411 END(bad_get_user)
30412@@ -124,6 +187,7 @@ bad_get_user_8:
30413 xor %ecx,%ecx
30414 mov $(-EFAULT),%_ASM_AX
30415 ASM_CLAC
30416+ pax_force_retaddr
30417 ret
30418 CFI_ENDPROC
30419 END(bad_get_user_8)
30420diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30421index 1313ae6..84f25ea 100644
30422--- a/arch/x86/lib/insn.c
30423+++ b/arch/x86/lib/insn.c
30424@@ -20,8 +20,10 @@
30425
30426 #ifdef __KERNEL__
30427 #include <linux/string.h>
30428+#include <asm/pgtable_types.h>
30429 #else
30430 #include <string.h>
30431+#define ktla_ktva(addr) addr
30432 #endif
30433 #include <asm/inat.h>
30434 #include <asm/insn.h>
30435@@ -53,9 +55,9 @@
30436 void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30437 {
30438 memset(insn, 0, sizeof(*insn));
30439- insn->kaddr = kaddr;
30440- insn->end_kaddr = kaddr + buf_len;
30441- insn->next_byte = kaddr;
30442+ insn->kaddr = ktla_ktva(kaddr);
30443+ insn->end_kaddr = insn->kaddr + buf_len;
30444+ insn->next_byte = insn->kaddr;
30445 insn->x86_64 = x86_64 ? 1 : 0;
30446 insn->opnd_bytes = 4;
30447 if (x86_64)
30448diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30449index 05a95e7..326f2fa 100644
30450--- a/arch/x86/lib/iomap_copy_64.S
30451+++ b/arch/x86/lib/iomap_copy_64.S
30452@@ -17,6 +17,7 @@
30453
30454 #include <linux/linkage.h>
30455 #include <asm/dwarf2.h>
30456+#include <asm/alternative-asm.h>
30457
30458 /*
30459 * override generic version in lib/iomap_copy.c
30460@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30461 CFI_STARTPROC
30462 movl %edx,%ecx
30463 rep movsd
30464+ pax_force_retaddr
30465 ret
30466 CFI_ENDPROC
30467 ENDPROC(__iowrite32_copy)
30468diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30469index 56313a3..0db417e 100644
30470--- a/arch/x86/lib/memcpy_64.S
30471+++ b/arch/x86/lib/memcpy_64.S
30472@@ -24,7 +24,7 @@
30473 * This gets patched over the unrolled variant (below) via the
30474 * alternative instructions framework:
30475 */
30476- .section .altinstr_replacement, "ax", @progbits
30477+ .section .altinstr_replacement, "a", @progbits
30478 .Lmemcpy_c:
30479 movq %rdi, %rax
30480 movq %rdx, %rcx
30481@@ -33,6 +33,7 @@
30482 rep movsq
30483 movl %edx, %ecx
30484 rep movsb
30485+ pax_force_retaddr
30486 ret
30487 .Lmemcpy_e:
30488 .previous
30489@@ -44,11 +45,12 @@
30490 * This gets patched over the unrolled variant (below) via the
30491 * alternative instructions framework:
30492 */
30493- .section .altinstr_replacement, "ax", @progbits
30494+ .section .altinstr_replacement, "a", @progbits
30495 .Lmemcpy_c_e:
30496 movq %rdi, %rax
30497 movq %rdx, %rcx
30498 rep movsb
30499+ pax_force_retaddr
30500 ret
30501 .Lmemcpy_e_e:
30502 .previous
30503@@ -136,6 +138,7 @@ ENTRY(memcpy)
30504 movq %r9, 1*8(%rdi)
30505 movq %r10, -2*8(%rdi, %rdx)
30506 movq %r11, -1*8(%rdi, %rdx)
30507+ pax_force_retaddr
30508 retq
30509 .p2align 4
30510 .Lless_16bytes:
30511@@ -148,6 +151,7 @@ ENTRY(memcpy)
30512 movq -1*8(%rsi, %rdx), %r9
30513 movq %r8, 0*8(%rdi)
30514 movq %r9, -1*8(%rdi, %rdx)
30515+ pax_force_retaddr
30516 retq
30517 .p2align 4
30518 .Lless_8bytes:
30519@@ -161,6 +165,7 @@ ENTRY(memcpy)
30520 movl -4(%rsi, %rdx), %r8d
30521 movl %ecx, (%rdi)
30522 movl %r8d, -4(%rdi, %rdx)
30523+ pax_force_retaddr
30524 retq
30525 .p2align 4
30526 .Lless_3bytes:
30527@@ -179,6 +184,7 @@ ENTRY(memcpy)
30528 movb %cl, (%rdi)
30529
30530 .Lend:
30531+ pax_force_retaddr
30532 retq
30533 CFI_ENDPROC
30534 ENDPROC(memcpy)
30535diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30536index 65268a6..dd1de11 100644
30537--- a/arch/x86/lib/memmove_64.S
30538+++ b/arch/x86/lib/memmove_64.S
30539@@ -202,14 +202,16 @@ ENTRY(memmove)
30540 movb (%rsi), %r11b
30541 movb %r11b, (%rdi)
30542 13:
30543+ pax_force_retaddr
30544 retq
30545 CFI_ENDPROC
30546
30547- .section .altinstr_replacement,"ax"
30548+ .section .altinstr_replacement,"a"
30549 .Lmemmove_begin_forward_efs:
30550 /* Forward moving data. */
30551 movq %rdx, %rcx
30552 rep movsb
30553+ pax_force_retaddr
30554 retq
30555 .Lmemmove_end_forward_efs:
30556 .previous
30557diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30558index 2dcb380..2eb79fe 100644
30559--- a/arch/x86/lib/memset_64.S
30560+++ b/arch/x86/lib/memset_64.S
30561@@ -16,7 +16,7 @@
30562 *
30563 * rax original destination
30564 */
30565- .section .altinstr_replacement, "ax", @progbits
30566+ .section .altinstr_replacement, "a", @progbits
30567 .Lmemset_c:
30568 movq %rdi,%r9
30569 movq %rdx,%rcx
30570@@ -30,6 +30,7 @@
30571 movl %edx,%ecx
30572 rep stosb
30573 movq %r9,%rax
30574+ pax_force_retaddr
30575 ret
30576 .Lmemset_e:
30577 .previous
30578@@ -45,13 +46,14 @@
30579 *
30580 * rax original destination
30581 */
30582- .section .altinstr_replacement, "ax", @progbits
30583+ .section .altinstr_replacement, "a", @progbits
30584 .Lmemset_c_e:
30585 movq %rdi,%r9
30586 movb %sil,%al
30587 movq %rdx,%rcx
30588 rep stosb
30589 movq %r9,%rax
30590+ pax_force_retaddr
30591 ret
30592 .Lmemset_e_e:
30593 .previous
30594@@ -118,6 +120,7 @@ ENTRY(__memset)
30595
30596 .Lende:
30597 movq %r10,%rax
30598+ pax_force_retaddr
30599 ret
30600
30601 CFI_RESTORE_STATE
30602diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30603index c9f2d9b..e7fd2c0 100644
30604--- a/arch/x86/lib/mmx_32.c
30605+++ b/arch/x86/lib/mmx_32.c
30606@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30607 {
30608 void *p;
30609 int i;
30610+ unsigned long cr0;
30611
30612 if (unlikely(in_interrupt()))
30613 return __memcpy(to, from, len);
30614@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30615 kernel_fpu_begin();
30616
30617 __asm__ __volatile__ (
30618- "1: prefetch (%0)\n" /* This set is 28 bytes */
30619- " prefetch 64(%0)\n"
30620- " prefetch 128(%0)\n"
30621- " prefetch 192(%0)\n"
30622- " prefetch 256(%0)\n"
30623+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30624+ " prefetch 64(%1)\n"
30625+ " prefetch 128(%1)\n"
30626+ " prefetch 192(%1)\n"
30627+ " prefetch 256(%1)\n"
30628 "2: \n"
30629 ".section .fixup, \"ax\"\n"
30630- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30631+ "3: \n"
30632+
30633+#ifdef CONFIG_PAX_KERNEXEC
30634+ " movl %%cr0, %0\n"
30635+ " movl %0, %%eax\n"
30636+ " andl $0xFFFEFFFF, %%eax\n"
30637+ " movl %%eax, %%cr0\n"
30638+#endif
30639+
30640+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30641+
30642+#ifdef CONFIG_PAX_KERNEXEC
30643+ " movl %0, %%cr0\n"
30644+#endif
30645+
30646 " jmp 2b\n"
30647 ".previous\n"
30648 _ASM_EXTABLE(1b, 3b)
30649- : : "r" (from));
30650+ : "=&r" (cr0) : "r" (from) : "ax");
30651
30652 for ( ; i > 5; i--) {
30653 __asm__ __volatile__ (
30654- "1: prefetch 320(%0)\n"
30655- "2: movq (%0), %%mm0\n"
30656- " movq 8(%0), %%mm1\n"
30657- " movq 16(%0), %%mm2\n"
30658- " movq 24(%0), %%mm3\n"
30659- " movq %%mm0, (%1)\n"
30660- " movq %%mm1, 8(%1)\n"
30661- " movq %%mm2, 16(%1)\n"
30662- " movq %%mm3, 24(%1)\n"
30663- " movq 32(%0), %%mm0\n"
30664- " movq 40(%0), %%mm1\n"
30665- " movq 48(%0), %%mm2\n"
30666- " movq 56(%0), %%mm3\n"
30667- " movq %%mm0, 32(%1)\n"
30668- " movq %%mm1, 40(%1)\n"
30669- " movq %%mm2, 48(%1)\n"
30670- " movq %%mm3, 56(%1)\n"
30671+ "1: prefetch 320(%1)\n"
30672+ "2: movq (%1), %%mm0\n"
30673+ " movq 8(%1), %%mm1\n"
30674+ " movq 16(%1), %%mm2\n"
30675+ " movq 24(%1), %%mm3\n"
30676+ " movq %%mm0, (%2)\n"
30677+ " movq %%mm1, 8(%2)\n"
30678+ " movq %%mm2, 16(%2)\n"
30679+ " movq %%mm3, 24(%2)\n"
30680+ " movq 32(%1), %%mm0\n"
30681+ " movq 40(%1), %%mm1\n"
30682+ " movq 48(%1), %%mm2\n"
30683+ " movq 56(%1), %%mm3\n"
30684+ " movq %%mm0, 32(%2)\n"
30685+ " movq %%mm1, 40(%2)\n"
30686+ " movq %%mm2, 48(%2)\n"
30687+ " movq %%mm3, 56(%2)\n"
30688 ".section .fixup, \"ax\"\n"
30689- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30690+ "3:\n"
30691+
30692+#ifdef CONFIG_PAX_KERNEXEC
30693+ " movl %%cr0, %0\n"
30694+ " movl %0, %%eax\n"
30695+ " andl $0xFFFEFFFF, %%eax\n"
30696+ " movl %%eax, %%cr0\n"
30697+#endif
30698+
30699+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30700+
30701+#ifdef CONFIG_PAX_KERNEXEC
30702+ " movl %0, %%cr0\n"
30703+#endif
30704+
30705 " jmp 2b\n"
30706 ".previous\n"
30707 _ASM_EXTABLE(1b, 3b)
30708- : : "r" (from), "r" (to) : "memory");
30709+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30710
30711 from += 64;
30712 to += 64;
30713@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30714 static void fast_copy_page(void *to, void *from)
30715 {
30716 int i;
30717+ unsigned long cr0;
30718
30719 kernel_fpu_begin();
30720
30721@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30722 * but that is for later. -AV
30723 */
30724 __asm__ __volatile__(
30725- "1: prefetch (%0)\n"
30726- " prefetch 64(%0)\n"
30727- " prefetch 128(%0)\n"
30728- " prefetch 192(%0)\n"
30729- " prefetch 256(%0)\n"
30730+ "1: prefetch (%1)\n"
30731+ " prefetch 64(%1)\n"
30732+ " prefetch 128(%1)\n"
30733+ " prefetch 192(%1)\n"
30734+ " prefetch 256(%1)\n"
30735 "2: \n"
30736 ".section .fixup, \"ax\"\n"
30737- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30738+ "3: \n"
30739+
30740+#ifdef CONFIG_PAX_KERNEXEC
30741+ " movl %%cr0, %0\n"
30742+ " movl %0, %%eax\n"
30743+ " andl $0xFFFEFFFF, %%eax\n"
30744+ " movl %%eax, %%cr0\n"
30745+#endif
30746+
30747+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30748+
30749+#ifdef CONFIG_PAX_KERNEXEC
30750+ " movl %0, %%cr0\n"
30751+#endif
30752+
30753 " jmp 2b\n"
30754 ".previous\n"
30755- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30756+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30757
30758 for (i = 0; i < (4096-320)/64; i++) {
30759 __asm__ __volatile__ (
30760- "1: prefetch 320(%0)\n"
30761- "2: movq (%0), %%mm0\n"
30762- " movntq %%mm0, (%1)\n"
30763- " movq 8(%0), %%mm1\n"
30764- " movntq %%mm1, 8(%1)\n"
30765- " movq 16(%0), %%mm2\n"
30766- " movntq %%mm2, 16(%1)\n"
30767- " movq 24(%0), %%mm3\n"
30768- " movntq %%mm3, 24(%1)\n"
30769- " movq 32(%0), %%mm4\n"
30770- " movntq %%mm4, 32(%1)\n"
30771- " movq 40(%0), %%mm5\n"
30772- " movntq %%mm5, 40(%1)\n"
30773- " movq 48(%0), %%mm6\n"
30774- " movntq %%mm6, 48(%1)\n"
30775- " movq 56(%0), %%mm7\n"
30776- " movntq %%mm7, 56(%1)\n"
30777+ "1: prefetch 320(%1)\n"
30778+ "2: movq (%1), %%mm0\n"
30779+ " movntq %%mm0, (%2)\n"
30780+ " movq 8(%1), %%mm1\n"
30781+ " movntq %%mm1, 8(%2)\n"
30782+ " movq 16(%1), %%mm2\n"
30783+ " movntq %%mm2, 16(%2)\n"
30784+ " movq 24(%1), %%mm3\n"
30785+ " movntq %%mm3, 24(%2)\n"
30786+ " movq 32(%1), %%mm4\n"
30787+ " movntq %%mm4, 32(%2)\n"
30788+ " movq 40(%1), %%mm5\n"
30789+ " movntq %%mm5, 40(%2)\n"
30790+ " movq 48(%1), %%mm6\n"
30791+ " movntq %%mm6, 48(%2)\n"
30792+ " movq 56(%1), %%mm7\n"
30793+ " movntq %%mm7, 56(%2)\n"
30794 ".section .fixup, \"ax\"\n"
30795- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30796+ "3:\n"
30797+
30798+#ifdef CONFIG_PAX_KERNEXEC
30799+ " movl %%cr0, %0\n"
30800+ " movl %0, %%eax\n"
30801+ " andl $0xFFFEFFFF, %%eax\n"
30802+ " movl %%eax, %%cr0\n"
30803+#endif
30804+
30805+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30806+
30807+#ifdef CONFIG_PAX_KERNEXEC
30808+ " movl %0, %%cr0\n"
30809+#endif
30810+
30811 " jmp 2b\n"
30812 ".previous\n"
30813- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30814+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30815
30816 from += 64;
30817 to += 64;
30818@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30819 static void fast_copy_page(void *to, void *from)
30820 {
30821 int i;
30822+ unsigned long cr0;
30823
30824 kernel_fpu_begin();
30825
30826 __asm__ __volatile__ (
30827- "1: prefetch (%0)\n"
30828- " prefetch 64(%0)\n"
30829- " prefetch 128(%0)\n"
30830- " prefetch 192(%0)\n"
30831- " prefetch 256(%0)\n"
30832+ "1: prefetch (%1)\n"
30833+ " prefetch 64(%1)\n"
30834+ " prefetch 128(%1)\n"
30835+ " prefetch 192(%1)\n"
30836+ " prefetch 256(%1)\n"
30837 "2: \n"
30838 ".section .fixup, \"ax\"\n"
30839- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30840+ "3: \n"
30841+
30842+#ifdef CONFIG_PAX_KERNEXEC
30843+ " movl %%cr0, %0\n"
30844+ " movl %0, %%eax\n"
30845+ " andl $0xFFFEFFFF, %%eax\n"
30846+ " movl %%eax, %%cr0\n"
30847+#endif
30848+
30849+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30850+
30851+#ifdef CONFIG_PAX_KERNEXEC
30852+ " movl %0, %%cr0\n"
30853+#endif
30854+
30855 " jmp 2b\n"
30856 ".previous\n"
30857- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30858+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30859
30860 for (i = 0; i < 4096/64; i++) {
30861 __asm__ __volatile__ (
30862- "1: prefetch 320(%0)\n"
30863- "2: movq (%0), %%mm0\n"
30864- " movq 8(%0), %%mm1\n"
30865- " movq 16(%0), %%mm2\n"
30866- " movq 24(%0), %%mm3\n"
30867- " movq %%mm0, (%1)\n"
30868- " movq %%mm1, 8(%1)\n"
30869- " movq %%mm2, 16(%1)\n"
30870- " movq %%mm3, 24(%1)\n"
30871- " movq 32(%0), %%mm0\n"
30872- " movq 40(%0), %%mm1\n"
30873- " movq 48(%0), %%mm2\n"
30874- " movq 56(%0), %%mm3\n"
30875- " movq %%mm0, 32(%1)\n"
30876- " movq %%mm1, 40(%1)\n"
30877- " movq %%mm2, 48(%1)\n"
30878- " movq %%mm3, 56(%1)\n"
30879+ "1: prefetch 320(%1)\n"
30880+ "2: movq (%1), %%mm0\n"
30881+ " movq 8(%1), %%mm1\n"
30882+ " movq 16(%1), %%mm2\n"
30883+ " movq 24(%1), %%mm3\n"
30884+ " movq %%mm0, (%2)\n"
30885+ " movq %%mm1, 8(%2)\n"
30886+ " movq %%mm2, 16(%2)\n"
30887+ " movq %%mm3, 24(%2)\n"
30888+ " movq 32(%1), %%mm0\n"
30889+ " movq 40(%1), %%mm1\n"
30890+ " movq 48(%1), %%mm2\n"
30891+ " movq 56(%1), %%mm3\n"
30892+ " movq %%mm0, 32(%2)\n"
30893+ " movq %%mm1, 40(%2)\n"
30894+ " movq %%mm2, 48(%2)\n"
30895+ " movq %%mm3, 56(%2)\n"
30896 ".section .fixup, \"ax\"\n"
30897- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30898+ "3:\n"
30899+
30900+#ifdef CONFIG_PAX_KERNEXEC
30901+ " movl %%cr0, %0\n"
30902+ " movl %0, %%eax\n"
30903+ " andl $0xFFFEFFFF, %%eax\n"
30904+ " movl %%eax, %%cr0\n"
30905+#endif
30906+
30907+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30908+
30909+#ifdef CONFIG_PAX_KERNEXEC
30910+ " movl %0, %%cr0\n"
30911+#endif
30912+
30913 " jmp 2b\n"
30914 ".previous\n"
30915 _ASM_EXTABLE(1b, 3b)
30916- : : "r" (from), "r" (to) : "memory");
30917+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30918
30919 from += 64;
30920 to += 64;
30921diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30922index f6d13ee..d789440 100644
30923--- a/arch/x86/lib/msr-reg.S
30924+++ b/arch/x86/lib/msr-reg.S
30925@@ -3,6 +3,7 @@
30926 #include <asm/dwarf2.h>
30927 #include <asm/asm.h>
30928 #include <asm/msr.h>
30929+#include <asm/alternative-asm.h>
30930
30931 #ifdef CONFIG_X86_64
30932 /*
30933@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30934 movl %edi, 28(%r10)
30935 popq_cfi %rbp
30936 popq_cfi %rbx
30937+ pax_force_retaddr
30938 ret
30939 3:
30940 CFI_RESTORE_STATE
30941diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30942index fc6ba17..14ad9a5 100644
30943--- a/arch/x86/lib/putuser.S
30944+++ b/arch/x86/lib/putuser.S
30945@@ -16,7 +16,9 @@
30946 #include <asm/errno.h>
30947 #include <asm/asm.h>
30948 #include <asm/smap.h>
30949-
30950+#include <asm/segment.h>
30951+#include <asm/pgtable.h>
30952+#include <asm/alternative-asm.h>
30953
30954 /*
30955 * __put_user_X
30956@@ -30,57 +32,125 @@
30957 * as they get called from within inline assembly.
30958 */
30959
30960-#define ENTER CFI_STARTPROC ; \
30961- GET_THREAD_INFO(%_ASM_BX)
30962-#define EXIT ASM_CLAC ; \
30963- ret ; \
30964+#define ENTER CFI_STARTPROC
30965+#define EXIT ASM_CLAC ; \
30966+ pax_force_retaddr ; \
30967+ ret ; \
30968 CFI_ENDPROC
30969
30970+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30971+#define _DEST %_ASM_CX,%_ASM_BX
30972+#else
30973+#define _DEST %_ASM_CX
30974+#endif
30975+
30976+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30977+#define __copyuser_seg gs;
30978+#else
30979+#define __copyuser_seg
30980+#endif
30981+
30982 .text
30983 ENTRY(__put_user_1)
30984 ENTER
30985+
30986+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30987+ GET_THREAD_INFO(%_ASM_BX)
30988 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30989 jae bad_put_user
30990+
30991+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30992+ mov pax_user_shadow_base,%_ASM_BX
30993+ cmp %_ASM_BX,%_ASM_CX
30994+ jb 1234f
30995+ xor %ebx,%ebx
30996+1234:
30997+#endif
30998+
30999+#endif
31000+
31001 ASM_STAC
31002-1: movb %al,(%_ASM_CX)
31003+1: __copyuser_seg movb %al,(_DEST)
31004 xor %eax,%eax
31005 EXIT
31006 ENDPROC(__put_user_1)
31007
31008 ENTRY(__put_user_2)
31009 ENTER
31010+
31011+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31012+ GET_THREAD_INFO(%_ASM_BX)
31013 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31014 sub $1,%_ASM_BX
31015 cmp %_ASM_BX,%_ASM_CX
31016 jae bad_put_user
31017+
31018+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31019+ mov pax_user_shadow_base,%_ASM_BX
31020+ cmp %_ASM_BX,%_ASM_CX
31021+ jb 1234f
31022+ xor %ebx,%ebx
31023+1234:
31024+#endif
31025+
31026+#endif
31027+
31028 ASM_STAC
31029-2: movw %ax,(%_ASM_CX)
31030+2: __copyuser_seg movw %ax,(_DEST)
31031 xor %eax,%eax
31032 EXIT
31033 ENDPROC(__put_user_2)
31034
31035 ENTRY(__put_user_4)
31036 ENTER
31037+
31038+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31039+ GET_THREAD_INFO(%_ASM_BX)
31040 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31041 sub $3,%_ASM_BX
31042 cmp %_ASM_BX,%_ASM_CX
31043 jae bad_put_user
31044+
31045+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31046+ mov pax_user_shadow_base,%_ASM_BX
31047+ cmp %_ASM_BX,%_ASM_CX
31048+ jb 1234f
31049+ xor %ebx,%ebx
31050+1234:
31051+#endif
31052+
31053+#endif
31054+
31055 ASM_STAC
31056-3: movl %eax,(%_ASM_CX)
31057+3: __copyuser_seg movl %eax,(_DEST)
31058 xor %eax,%eax
31059 EXIT
31060 ENDPROC(__put_user_4)
31061
31062 ENTRY(__put_user_8)
31063 ENTER
31064+
31065+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31066+ GET_THREAD_INFO(%_ASM_BX)
31067 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31068 sub $7,%_ASM_BX
31069 cmp %_ASM_BX,%_ASM_CX
31070 jae bad_put_user
31071+
31072+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31073+ mov pax_user_shadow_base,%_ASM_BX
31074+ cmp %_ASM_BX,%_ASM_CX
31075+ jb 1234f
31076+ xor %ebx,%ebx
31077+1234:
31078+#endif
31079+
31080+#endif
31081+
31082 ASM_STAC
31083-4: mov %_ASM_AX,(%_ASM_CX)
31084+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31085 #ifdef CONFIG_X86_32
31086-5: movl %edx,4(%_ASM_CX)
31087+5: __copyuser_seg movl %edx,4(_DEST)
31088 #endif
31089 xor %eax,%eax
31090 EXIT
31091diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31092index 5dff5f0..cadebf4 100644
31093--- a/arch/x86/lib/rwsem.S
31094+++ b/arch/x86/lib/rwsem.S
31095@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31096 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31097 CFI_RESTORE __ASM_REG(dx)
31098 restore_common_regs
31099+ pax_force_retaddr
31100 ret
31101 CFI_ENDPROC
31102 ENDPROC(call_rwsem_down_read_failed)
31103@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31104 movq %rax,%rdi
31105 call rwsem_down_write_failed
31106 restore_common_regs
31107+ pax_force_retaddr
31108 ret
31109 CFI_ENDPROC
31110 ENDPROC(call_rwsem_down_write_failed)
31111@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31112 movq %rax,%rdi
31113 call rwsem_wake
31114 restore_common_regs
31115-1: ret
31116+1: pax_force_retaddr
31117+ ret
31118 CFI_ENDPROC
31119 ENDPROC(call_rwsem_wake)
31120
31121@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31122 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31123 CFI_RESTORE __ASM_REG(dx)
31124 restore_common_regs
31125+ pax_force_retaddr
31126 ret
31127 CFI_ENDPROC
31128 ENDPROC(call_rwsem_downgrade_wake)
31129diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31130index b30b5eb..2b57052 100644
31131--- a/arch/x86/lib/thunk_64.S
31132+++ b/arch/x86/lib/thunk_64.S
31133@@ -9,6 +9,7 @@
31134 #include <asm/dwarf2.h>
31135 #include <asm/calling.h>
31136 #include <asm/asm.h>
31137+#include <asm/alternative-asm.h>
31138
31139 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31140 .macro THUNK name, func, put_ret_addr_in_rdi=0
31141@@ -16,11 +17,11 @@
31142 \name:
31143 CFI_STARTPROC
31144
31145- /* this one pushes 9 elems, the next one would be %rIP */
31146- SAVE_ARGS
31147+ /* this one pushes 15+1 elems, the next one would be %rIP */
31148+ SAVE_ARGS 8
31149
31150 .if \put_ret_addr_in_rdi
31151- movq_cfi_restore 9*8, rdi
31152+ movq_cfi_restore RIP, rdi
31153 .endif
31154
31155 call \func
31156@@ -47,9 +48,10 @@
31157
31158 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31159 CFI_STARTPROC
31160- SAVE_ARGS
31161+ SAVE_ARGS 8
31162 restore:
31163- RESTORE_ARGS
31164+ RESTORE_ARGS 1,8
31165+ pax_force_retaddr
31166 ret
31167 CFI_ENDPROC
31168 _ASM_NOKPROBE(restore)
31169diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31170index e2f5e21..4b22130 100644
31171--- a/arch/x86/lib/usercopy_32.c
31172+++ b/arch/x86/lib/usercopy_32.c
31173@@ -42,11 +42,13 @@ do { \
31174 int __d0; \
31175 might_fault(); \
31176 __asm__ __volatile__( \
31177+ __COPYUSER_SET_ES \
31178 ASM_STAC "\n" \
31179 "0: rep; stosl\n" \
31180 " movl %2,%0\n" \
31181 "1: rep; stosb\n" \
31182 "2: " ASM_CLAC "\n" \
31183+ __COPYUSER_RESTORE_ES \
31184 ".section .fixup,\"ax\"\n" \
31185 "3: lea 0(%2,%0,4),%0\n" \
31186 " jmp 2b\n" \
31187@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31188
31189 #ifdef CONFIG_X86_INTEL_USERCOPY
31190 static unsigned long
31191-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31192+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31193 {
31194 int d0, d1;
31195 __asm__ __volatile__(
31196@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31197 " .align 2,0x90\n"
31198 "3: movl 0(%4), %%eax\n"
31199 "4: movl 4(%4), %%edx\n"
31200- "5: movl %%eax, 0(%3)\n"
31201- "6: movl %%edx, 4(%3)\n"
31202+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31203+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31204 "7: movl 8(%4), %%eax\n"
31205 "8: movl 12(%4),%%edx\n"
31206- "9: movl %%eax, 8(%3)\n"
31207- "10: movl %%edx, 12(%3)\n"
31208+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31209+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31210 "11: movl 16(%4), %%eax\n"
31211 "12: movl 20(%4), %%edx\n"
31212- "13: movl %%eax, 16(%3)\n"
31213- "14: movl %%edx, 20(%3)\n"
31214+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31215+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31216 "15: movl 24(%4), %%eax\n"
31217 "16: movl 28(%4), %%edx\n"
31218- "17: movl %%eax, 24(%3)\n"
31219- "18: movl %%edx, 28(%3)\n"
31220+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31221+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31222 "19: movl 32(%4), %%eax\n"
31223 "20: movl 36(%4), %%edx\n"
31224- "21: movl %%eax, 32(%3)\n"
31225- "22: movl %%edx, 36(%3)\n"
31226+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31227+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31228 "23: movl 40(%4), %%eax\n"
31229 "24: movl 44(%4), %%edx\n"
31230- "25: movl %%eax, 40(%3)\n"
31231- "26: movl %%edx, 44(%3)\n"
31232+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31233+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31234 "27: movl 48(%4), %%eax\n"
31235 "28: movl 52(%4), %%edx\n"
31236- "29: movl %%eax, 48(%3)\n"
31237- "30: movl %%edx, 52(%3)\n"
31238+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31239+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31240 "31: movl 56(%4), %%eax\n"
31241 "32: movl 60(%4), %%edx\n"
31242- "33: movl %%eax, 56(%3)\n"
31243- "34: movl %%edx, 60(%3)\n"
31244+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31245+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31246 " addl $-64, %0\n"
31247 " addl $64, %4\n"
31248 " addl $64, %3\n"
31249@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31250 " shrl $2, %0\n"
31251 " andl $3, %%eax\n"
31252 " cld\n"
31253+ __COPYUSER_SET_ES
31254 "99: rep; movsl\n"
31255 "36: movl %%eax, %0\n"
31256 "37: rep; movsb\n"
31257 "100:\n"
31258+ __COPYUSER_RESTORE_ES
31259+ ".section .fixup,\"ax\"\n"
31260+ "101: lea 0(%%eax,%0,4),%0\n"
31261+ " jmp 100b\n"
31262+ ".previous\n"
31263+ _ASM_EXTABLE(1b,100b)
31264+ _ASM_EXTABLE(2b,100b)
31265+ _ASM_EXTABLE(3b,100b)
31266+ _ASM_EXTABLE(4b,100b)
31267+ _ASM_EXTABLE(5b,100b)
31268+ _ASM_EXTABLE(6b,100b)
31269+ _ASM_EXTABLE(7b,100b)
31270+ _ASM_EXTABLE(8b,100b)
31271+ _ASM_EXTABLE(9b,100b)
31272+ _ASM_EXTABLE(10b,100b)
31273+ _ASM_EXTABLE(11b,100b)
31274+ _ASM_EXTABLE(12b,100b)
31275+ _ASM_EXTABLE(13b,100b)
31276+ _ASM_EXTABLE(14b,100b)
31277+ _ASM_EXTABLE(15b,100b)
31278+ _ASM_EXTABLE(16b,100b)
31279+ _ASM_EXTABLE(17b,100b)
31280+ _ASM_EXTABLE(18b,100b)
31281+ _ASM_EXTABLE(19b,100b)
31282+ _ASM_EXTABLE(20b,100b)
31283+ _ASM_EXTABLE(21b,100b)
31284+ _ASM_EXTABLE(22b,100b)
31285+ _ASM_EXTABLE(23b,100b)
31286+ _ASM_EXTABLE(24b,100b)
31287+ _ASM_EXTABLE(25b,100b)
31288+ _ASM_EXTABLE(26b,100b)
31289+ _ASM_EXTABLE(27b,100b)
31290+ _ASM_EXTABLE(28b,100b)
31291+ _ASM_EXTABLE(29b,100b)
31292+ _ASM_EXTABLE(30b,100b)
31293+ _ASM_EXTABLE(31b,100b)
31294+ _ASM_EXTABLE(32b,100b)
31295+ _ASM_EXTABLE(33b,100b)
31296+ _ASM_EXTABLE(34b,100b)
31297+ _ASM_EXTABLE(35b,100b)
31298+ _ASM_EXTABLE(36b,100b)
31299+ _ASM_EXTABLE(37b,100b)
31300+ _ASM_EXTABLE(99b,101b)
31301+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31302+ : "1"(to), "2"(from), "0"(size)
31303+ : "eax", "edx", "memory");
31304+ return size;
31305+}
31306+
31307+static unsigned long
31308+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31309+{
31310+ int d0, d1;
31311+ __asm__ __volatile__(
31312+ " .align 2,0x90\n"
31313+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31314+ " cmpl $67, %0\n"
31315+ " jbe 3f\n"
31316+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31317+ " .align 2,0x90\n"
31318+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31319+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31320+ "5: movl %%eax, 0(%3)\n"
31321+ "6: movl %%edx, 4(%3)\n"
31322+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31323+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31324+ "9: movl %%eax, 8(%3)\n"
31325+ "10: movl %%edx, 12(%3)\n"
31326+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31327+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31328+ "13: movl %%eax, 16(%3)\n"
31329+ "14: movl %%edx, 20(%3)\n"
31330+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31331+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31332+ "17: movl %%eax, 24(%3)\n"
31333+ "18: movl %%edx, 28(%3)\n"
31334+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31335+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31336+ "21: movl %%eax, 32(%3)\n"
31337+ "22: movl %%edx, 36(%3)\n"
31338+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31339+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31340+ "25: movl %%eax, 40(%3)\n"
31341+ "26: movl %%edx, 44(%3)\n"
31342+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31343+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31344+ "29: movl %%eax, 48(%3)\n"
31345+ "30: movl %%edx, 52(%3)\n"
31346+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31347+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31348+ "33: movl %%eax, 56(%3)\n"
31349+ "34: movl %%edx, 60(%3)\n"
31350+ " addl $-64, %0\n"
31351+ " addl $64, %4\n"
31352+ " addl $64, %3\n"
31353+ " cmpl $63, %0\n"
31354+ " ja 1b\n"
31355+ "35: movl %0, %%eax\n"
31356+ " shrl $2, %0\n"
31357+ " andl $3, %%eax\n"
31358+ " cld\n"
31359+ "99: rep; "__copyuser_seg" movsl\n"
31360+ "36: movl %%eax, %0\n"
31361+ "37: rep; "__copyuser_seg" movsb\n"
31362+ "100:\n"
31363 ".section .fixup,\"ax\"\n"
31364 "101: lea 0(%%eax,%0,4),%0\n"
31365 " jmp 100b\n"
31366@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31367 int d0, d1;
31368 __asm__ __volatile__(
31369 " .align 2,0x90\n"
31370- "0: movl 32(%4), %%eax\n"
31371+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31372 " cmpl $67, %0\n"
31373 " jbe 2f\n"
31374- "1: movl 64(%4), %%eax\n"
31375+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31376 " .align 2,0x90\n"
31377- "2: movl 0(%4), %%eax\n"
31378- "21: movl 4(%4), %%edx\n"
31379+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31380+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31381 " movl %%eax, 0(%3)\n"
31382 " movl %%edx, 4(%3)\n"
31383- "3: movl 8(%4), %%eax\n"
31384- "31: movl 12(%4),%%edx\n"
31385+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31386+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31387 " movl %%eax, 8(%3)\n"
31388 " movl %%edx, 12(%3)\n"
31389- "4: movl 16(%4), %%eax\n"
31390- "41: movl 20(%4), %%edx\n"
31391+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31392+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31393 " movl %%eax, 16(%3)\n"
31394 " movl %%edx, 20(%3)\n"
31395- "10: movl 24(%4), %%eax\n"
31396- "51: movl 28(%4), %%edx\n"
31397+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31398+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31399 " movl %%eax, 24(%3)\n"
31400 " movl %%edx, 28(%3)\n"
31401- "11: movl 32(%4), %%eax\n"
31402- "61: movl 36(%4), %%edx\n"
31403+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31404+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31405 " movl %%eax, 32(%3)\n"
31406 " movl %%edx, 36(%3)\n"
31407- "12: movl 40(%4), %%eax\n"
31408- "71: movl 44(%4), %%edx\n"
31409+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31410+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31411 " movl %%eax, 40(%3)\n"
31412 " movl %%edx, 44(%3)\n"
31413- "13: movl 48(%4), %%eax\n"
31414- "81: movl 52(%4), %%edx\n"
31415+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31416+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31417 " movl %%eax, 48(%3)\n"
31418 " movl %%edx, 52(%3)\n"
31419- "14: movl 56(%4), %%eax\n"
31420- "91: movl 60(%4), %%edx\n"
31421+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31422+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31423 " movl %%eax, 56(%3)\n"
31424 " movl %%edx, 60(%3)\n"
31425 " addl $-64, %0\n"
31426@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31427 " shrl $2, %0\n"
31428 " andl $3, %%eax\n"
31429 " cld\n"
31430- "6: rep; movsl\n"
31431+ "6: rep; "__copyuser_seg" movsl\n"
31432 " movl %%eax,%0\n"
31433- "7: rep; movsb\n"
31434+ "7: rep; "__copyuser_seg" movsb\n"
31435 "8:\n"
31436 ".section .fixup,\"ax\"\n"
31437 "9: lea 0(%%eax,%0,4),%0\n"
31438@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31439
31440 __asm__ __volatile__(
31441 " .align 2,0x90\n"
31442- "0: movl 32(%4), %%eax\n"
31443+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31444 " cmpl $67, %0\n"
31445 " jbe 2f\n"
31446- "1: movl 64(%4), %%eax\n"
31447+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31448 " .align 2,0x90\n"
31449- "2: movl 0(%4), %%eax\n"
31450- "21: movl 4(%4), %%edx\n"
31451+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31452+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31453 " movnti %%eax, 0(%3)\n"
31454 " movnti %%edx, 4(%3)\n"
31455- "3: movl 8(%4), %%eax\n"
31456- "31: movl 12(%4),%%edx\n"
31457+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31458+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31459 " movnti %%eax, 8(%3)\n"
31460 " movnti %%edx, 12(%3)\n"
31461- "4: movl 16(%4), %%eax\n"
31462- "41: movl 20(%4), %%edx\n"
31463+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31464+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31465 " movnti %%eax, 16(%3)\n"
31466 " movnti %%edx, 20(%3)\n"
31467- "10: movl 24(%4), %%eax\n"
31468- "51: movl 28(%4), %%edx\n"
31469+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31470+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31471 " movnti %%eax, 24(%3)\n"
31472 " movnti %%edx, 28(%3)\n"
31473- "11: movl 32(%4), %%eax\n"
31474- "61: movl 36(%4), %%edx\n"
31475+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31476+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31477 " movnti %%eax, 32(%3)\n"
31478 " movnti %%edx, 36(%3)\n"
31479- "12: movl 40(%4), %%eax\n"
31480- "71: movl 44(%4), %%edx\n"
31481+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31482+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31483 " movnti %%eax, 40(%3)\n"
31484 " movnti %%edx, 44(%3)\n"
31485- "13: movl 48(%4), %%eax\n"
31486- "81: movl 52(%4), %%edx\n"
31487+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31488+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31489 " movnti %%eax, 48(%3)\n"
31490 " movnti %%edx, 52(%3)\n"
31491- "14: movl 56(%4), %%eax\n"
31492- "91: movl 60(%4), %%edx\n"
31493+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31494+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31495 " movnti %%eax, 56(%3)\n"
31496 " movnti %%edx, 60(%3)\n"
31497 " addl $-64, %0\n"
31498@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31499 " shrl $2, %0\n"
31500 " andl $3, %%eax\n"
31501 " cld\n"
31502- "6: rep; movsl\n"
31503+ "6: rep; "__copyuser_seg" movsl\n"
31504 " movl %%eax,%0\n"
31505- "7: rep; movsb\n"
31506+ "7: rep; "__copyuser_seg" movsb\n"
31507 "8:\n"
31508 ".section .fixup,\"ax\"\n"
31509 "9: lea 0(%%eax,%0,4),%0\n"
31510@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31511
31512 __asm__ __volatile__(
31513 " .align 2,0x90\n"
31514- "0: movl 32(%4), %%eax\n"
31515+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31516 " cmpl $67, %0\n"
31517 " jbe 2f\n"
31518- "1: movl 64(%4), %%eax\n"
31519+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31520 " .align 2,0x90\n"
31521- "2: movl 0(%4), %%eax\n"
31522- "21: movl 4(%4), %%edx\n"
31523+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31524+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31525 " movnti %%eax, 0(%3)\n"
31526 " movnti %%edx, 4(%3)\n"
31527- "3: movl 8(%4), %%eax\n"
31528- "31: movl 12(%4),%%edx\n"
31529+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31530+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31531 " movnti %%eax, 8(%3)\n"
31532 " movnti %%edx, 12(%3)\n"
31533- "4: movl 16(%4), %%eax\n"
31534- "41: movl 20(%4), %%edx\n"
31535+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31536+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31537 " movnti %%eax, 16(%3)\n"
31538 " movnti %%edx, 20(%3)\n"
31539- "10: movl 24(%4), %%eax\n"
31540- "51: movl 28(%4), %%edx\n"
31541+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31542+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31543 " movnti %%eax, 24(%3)\n"
31544 " movnti %%edx, 28(%3)\n"
31545- "11: movl 32(%4), %%eax\n"
31546- "61: movl 36(%4), %%edx\n"
31547+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31548+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31549 " movnti %%eax, 32(%3)\n"
31550 " movnti %%edx, 36(%3)\n"
31551- "12: movl 40(%4), %%eax\n"
31552- "71: movl 44(%4), %%edx\n"
31553+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31554+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31555 " movnti %%eax, 40(%3)\n"
31556 " movnti %%edx, 44(%3)\n"
31557- "13: movl 48(%4), %%eax\n"
31558- "81: movl 52(%4), %%edx\n"
31559+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31560+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31561 " movnti %%eax, 48(%3)\n"
31562 " movnti %%edx, 52(%3)\n"
31563- "14: movl 56(%4), %%eax\n"
31564- "91: movl 60(%4), %%edx\n"
31565+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31566+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31567 " movnti %%eax, 56(%3)\n"
31568 " movnti %%edx, 60(%3)\n"
31569 " addl $-64, %0\n"
31570@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31571 " shrl $2, %0\n"
31572 " andl $3, %%eax\n"
31573 " cld\n"
31574- "6: rep; movsl\n"
31575+ "6: rep; "__copyuser_seg" movsl\n"
31576 " movl %%eax,%0\n"
31577- "7: rep; movsb\n"
31578+ "7: rep; "__copyuser_seg" movsb\n"
31579 "8:\n"
31580 ".section .fixup,\"ax\"\n"
31581 "9: lea 0(%%eax,%0,4),%0\n"
31582@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31583 */
31584 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31585 unsigned long size);
31586-unsigned long __copy_user_intel(void __user *to, const void *from,
31587+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31588+ unsigned long size);
31589+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31590 unsigned long size);
31591 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31592 const void __user *from, unsigned long size);
31593 #endif /* CONFIG_X86_INTEL_USERCOPY */
31594
31595 /* Generic arbitrary sized copy. */
31596-#define __copy_user(to, from, size) \
31597+#define __copy_user(to, from, size, prefix, set, restore) \
31598 do { \
31599 int __d0, __d1, __d2; \
31600 __asm__ __volatile__( \
31601+ set \
31602 " cmp $7,%0\n" \
31603 " jbe 1f\n" \
31604 " movl %1,%0\n" \
31605 " negl %0\n" \
31606 " andl $7,%0\n" \
31607 " subl %0,%3\n" \
31608- "4: rep; movsb\n" \
31609+ "4: rep; "prefix"movsb\n" \
31610 " movl %3,%0\n" \
31611 " shrl $2,%0\n" \
31612 " andl $3,%3\n" \
31613 " .align 2,0x90\n" \
31614- "0: rep; movsl\n" \
31615+ "0: rep; "prefix"movsl\n" \
31616 " movl %3,%0\n" \
31617- "1: rep; movsb\n" \
31618+ "1: rep; "prefix"movsb\n" \
31619 "2:\n" \
31620+ restore \
31621 ".section .fixup,\"ax\"\n" \
31622 "5: addl %3,%0\n" \
31623 " jmp 2b\n" \
31624@@ -538,14 +650,14 @@ do { \
31625 " negl %0\n" \
31626 " andl $7,%0\n" \
31627 " subl %0,%3\n" \
31628- "4: rep; movsb\n" \
31629+ "4: rep; "__copyuser_seg"movsb\n" \
31630 " movl %3,%0\n" \
31631 " shrl $2,%0\n" \
31632 " andl $3,%3\n" \
31633 " .align 2,0x90\n" \
31634- "0: rep; movsl\n" \
31635+ "0: rep; "__copyuser_seg"movsl\n" \
31636 " movl %3,%0\n" \
31637- "1: rep; movsb\n" \
31638+ "1: rep; "__copyuser_seg"movsb\n" \
31639 "2:\n" \
31640 ".section .fixup,\"ax\"\n" \
31641 "5: addl %3,%0\n" \
31642@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31643 {
31644 stac();
31645 if (movsl_is_ok(to, from, n))
31646- __copy_user(to, from, n);
31647+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31648 else
31649- n = __copy_user_intel(to, from, n);
31650+ n = __generic_copy_to_user_intel(to, from, n);
31651 clac();
31652 return n;
31653 }
31654@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31655 {
31656 stac();
31657 if (movsl_is_ok(to, from, n))
31658- __copy_user(to, from, n);
31659+ __copy_user(to, from, n, __copyuser_seg, "", "");
31660 else
31661- n = __copy_user_intel((void __user *)to,
31662- (const void *)from, n);
31663+ n = __generic_copy_from_user_intel(to, from, n);
31664 clac();
31665 return n;
31666 }
31667@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31668 if (n > 64 && cpu_has_xmm2)
31669 n = __copy_user_intel_nocache(to, from, n);
31670 else
31671- __copy_user(to, from, n);
31672+ __copy_user(to, from, n, __copyuser_seg, "", "");
31673 #else
31674- __copy_user(to, from, n);
31675+ __copy_user(to, from, n, __copyuser_seg, "", "");
31676 #endif
31677 clac();
31678 return n;
31679 }
31680 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31681
31682-/**
31683- * copy_to_user: - Copy a block of data into user space.
31684- * @to: Destination address, in user space.
31685- * @from: Source address, in kernel space.
31686- * @n: Number of bytes to copy.
31687- *
31688- * Context: User context only. This function may sleep.
31689- *
31690- * Copy data from kernel space to user space.
31691- *
31692- * Returns number of bytes that could not be copied.
31693- * On success, this will be zero.
31694- */
31695-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31696+#ifdef CONFIG_PAX_MEMORY_UDEREF
31697+void __set_fs(mm_segment_t x)
31698 {
31699- if (access_ok(VERIFY_WRITE, to, n))
31700- n = __copy_to_user(to, from, n);
31701- return n;
31702+ switch (x.seg) {
31703+ case 0:
31704+ loadsegment(gs, 0);
31705+ break;
31706+ case TASK_SIZE_MAX:
31707+ loadsegment(gs, __USER_DS);
31708+ break;
31709+ case -1UL:
31710+ loadsegment(gs, __KERNEL_DS);
31711+ break;
31712+ default:
31713+ BUG();
31714+ }
31715 }
31716-EXPORT_SYMBOL(_copy_to_user);
31717+EXPORT_SYMBOL(__set_fs);
31718
31719-/**
31720- * copy_from_user: - Copy a block of data from user space.
31721- * @to: Destination address, in kernel space.
31722- * @from: Source address, in user space.
31723- * @n: Number of bytes to copy.
31724- *
31725- * Context: User context only. This function may sleep.
31726- *
31727- * Copy data from user space to kernel space.
31728- *
31729- * Returns number of bytes that could not be copied.
31730- * On success, this will be zero.
31731- *
31732- * If some data could not be copied, this function will pad the copied
31733- * data to the requested size using zero bytes.
31734- */
31735-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31736+void set_fs(mm_segment_t x)
31737 {
31738- if (access_ok(VERIFY_READ, from, n))
31739- n = __copy_from_user(to, from, n);
31740- else
31741- memset(to, 0, n);
31742- return n;
31743+ current_thread_info()->addr_limit = x;
31744+ __set_fs(x);
31745 }
31746-EXPORT_SYMBOL(_copy_from_user);
31747+EXPORT_SYMBOL(set_fs);
31748+#endif
31749diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31750index c905e89..01ab928 100644
31751--- a/arch/x86/lib/usercopy_64.c
31752+++ b/arch/x86/lib/usercopy_64.c
31753@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31754 might_fault();
31755 /* no memory constraint because it doesn't change any memory gcc knows
31756 about */
31757+ pax_open_userland();
31758 stac();
31759 asm volatile(
31760 " testq %[size8],%[size8]\n"
31761@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31762 _ASM_EXTABLE(0b,3b)
31763 _ASM_EXTABLE(1b,2b)
31764 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31765- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31766+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31767 [zero] "r" (0UL), [eight] "r" (8UL));
31768 clac();
31769+ pax_close_userland();
31770 return size;
31771 }
31772 EXPORT_SYMBOL(__clear_user);
31773@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31774 }
31775 EXPORT_SYMBOL(clear_user);
31776
31777-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31778+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31779 {
31780- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31781- return copy_user_generic((__force void *)to, (__force void *)from, len);
31782- }
31783- return len;
31784+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31785+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31786+ return len;
31787 }
31788 EXPORT_SYMBOL(copy_in_user);
31789
31790@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31791 * it is not necessary to optimize tail handling.
31792 */
31793 __visible unsigned long
31794-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31795+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31796 {
31797 char c;
31798 unsigned zero_len;
31799
31800+ clac();
31801+ pax_close_userland();
31802 for (; len; --len, to++) {
31803 if (__get_user_nocheck(c, from++, sizeof(char)))
31804 break;
31805@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31806 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31807 if (__put_user_nocheck(c, to++, sizeof(char)))
31808 break;
31809- clac();
31810 return len;
31811 }
31812diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31813index ecfdc46..55b9309 100644
31814--- a/arch/x86/mm/Makefile
31815+++ b/arch/x86/mm/Makefile
31816@@ -32,3 +32,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31817 obj-$(CONFIG_MEMTEST) += memtest.o
31818
31819 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31820+
31821+quote:="
31822+obj-$(CONFIG_X86_64) += uderef_64.o
31823+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31824diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31825index 903ec1e..c4166b2 100644
31826--- a/arch/x86/mm/extable.c
31827+++ b/arch/x86/mm/extable.c
31828@@ -6,12 +6,24 @@
31829 static inline unsigned long
31830 ex_insn_addr(const struct exception_table_entry *x)
31831 {
31832- return (unsigned long)&x->insn + x->insn;
31833+ unsigned long reloc = 0;
31834+
31835+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31836+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31837+#endif
31838+
31839+ return (unsigned long)&x->insn + x->insn + reloc;
31840 }
31841 static inline unsigned long
31842 ex_fixup_addr(const struct exception_table_entry *x)
31843 {
31844- return (unsigned long)&x->fixup + x->fixup;
31845+ unsigned long reloc = 0;
31846+
31847+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31848+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31849+#endif
31850+
31851+ return (unsigned long)&x->fixup + x->fixup + reloc;
31852 }
31853
31854 int fixup_exception(struct pt_regs *regs)
31855@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31856 unsigned long new_ip;
31857
31858 #ifdef CONFIG_PNPBIOS
31859- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31860+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31861 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31862 extern u32 pnp_bios_is_utter_crap;
31863 pnp_bios_is_utter_crap = 1;
31864@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31865 i += 4;
31866 p->fixup -= i;
31867 i += 4;
31868+
31869+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31870+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31871+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31872+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31873+#endif
31874+
31875 }
31876 }
31877
31878diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31879index e3ff27a..f38f7c0 100644
31880--- a/arch/x86/mm/fault.c
31881+++ b/arch/x86/mm/fault.c
31882@@ -13,12 +13,19 @@
31883 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31884 #include <linux/prefetch.h> /* prefetchw */
31885 #include <linux/context_tracking.h> /* exception_enter(), ... */
31886+#include <linux/unistd.h>
31887+#include <linux/compiler.h>
31888
31889 #include <asm/traps.h> /* dotraplinkage, ... */
31890 #include <asm/pgalloc.h> /* pgd_*(), ... */
31891 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31892 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31893 #include <asm/vsyscall.h> /* emulate_vsyscall */
31894+#include <asm/tlbflush.h>
31895+
31896+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31897+#include <asm/stacktrace.h>
31898+#endif
31899
31900 #define CREATE_TRACE_POINTS
31901 #include <asm/trace/exceptions.h>
31902@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31903 int ret = 0;
31904
31905 /* kprobe_running() needs smp_processor_id() */
31906- if (kprobes_built_in() && !user_mode_vm(regs)) {
31907+ if (kprobes_built_in() && !user_mode(regs)) {
31908 preempt_disable();
31909 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31910 ret = 1;
31911@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31912 return !instr_lo || (instr_lo>>1) == 1;
31913 case 0x00:
31914 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31915- if (probe_kernel_address(instr, opcode))
31916+ if (user_mode(regs)) {
31917+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31918+ return 0;
31919+ } else if (probe_kernel_address(instr, opcode))
31920 return 0;
31921
31922 *prefetch = (instr_lo == 0xF) &&
31923@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31924 while (instr < max_instr) {
31925 unsigned char opcode;
31926
31927- if (probe_kernel_address(instr, opcode))
31928+ if (user_mode(regs)) {
31929+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31930+ break;
31931+ } else if (probe_kernel_address(instr, opcode))
31932 break;
31933
31934 instr++;
31935@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31936 force_sig_info(si_signo, &info, tsk);
31937 }
31938
31939+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31940+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31941+#endif
31942+
31943+#ifdef CONFIG_PAX_EMUTRAMP
31944+static int pax_handle_fetch_fault(struct pt_regs *regs);
31945+#endif
31946+
31947+#ifdef CONFIG_PAX_PAGEEXEC
31948+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31949+{
31950+ pgd_t *pgd;
31951+ pud_t *pud;
31952+ pmd_t *pmd;
31953+
31954+ pgd = pgd_offset(mm, address);
31955+ if (!pgd_present(*pgd))
31956+ return NULL;
31957+ pud = pud_offset(pgd, address);
31958+ if (!pud_present(*pud))
31959+ return NULL;
31960+ pmd = pmd_offset(pud, address);
31961+ if (!pmd_present(*pmd))
31962+ return NULL;
31963+ return pmd;
31964+}
31965+#endif
31966+
31967 DEFINE_SPINLOCK(pgd_lock);
31968 LIST_HEAD(pgd_list);
31969
31970@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31971 for (address = VMALLOC_START & PMD_MASK;
31972 address >= TASK_SIZE && address < FIXADDR_TOP;
31973 address += PMD_SIZE) {
31974+
31975+#ifdef CONFIG_PAX_PER_CPU_PGD
31976+ unsigned long cpu;
31977+#else
31978 struct page *page;
31979+#endif
31980
31981 spin_lock(&pgd_lock);
31982+
31983+#ifdef CONFIG_PAX_PER_CPU_PGD
31984+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31985+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31986+ pmd_t *ret;
31987+
31988+ ret = vmalloc_sync_one(pgd, address);
31989+ if (!ret)
31990+ break;
31991+ pgd = get_cpu_pgd(cpu, kernel);
31992+#else
31993 list_for_each_entry(page, &pgd_list, lru) {
31994+ pgd_t *pgd;
31995 spinlock_t *pgt_lock;
31996 pmd_t *ret;
31997
31998@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31999 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32000
32001 spin_lock(pgt_lock);
32002- ret = vmalloc_sync_one(page_address(page), address);
32003+ pgd = page_address(page);
32004+#endif
32005+
32006+ ret = vmalloc_sync_one(pgd, address);
32007+
32008+#ifndef CONFIG_PAX_PER_CPU_PGD
32009 spin_unlock(pgt_lock);
32010+#endif
32011
32012 if (!ret)
32013 break;
32014@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
32015 * an interrupt in the middle of a task switch..
32016 */
32017 pgd_paddr = read_cr3();
32018+
32019+#ifdef CONFIG_PAX_PER_CPU_PGD
32020+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32021+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32022+#endif
32023+
32024 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32025 if (!pmd_k)
32026 return -1;
32027@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32028 * happen within a race in page table update. In the later
32029 * case just flush:
32030 */
32031- pgd = pgd_offset(current->active_mm, address);
32032+
32033 pgd_ref = pgd_offset_k(address);
32034 if (pgd_none(*pgd_ref))
32035 return -1;
32036
32037+#ifdef CONFIG_PAX_PER_CPU_PGD
32038+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32039+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32040+ if (pgd_none(*pgd)) {
32041+ set_pgd(pgd, *pgd_ref);
32042+ arch_flush_lazy_mmu_mode();
32043+ } else {
32044+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32045+ }
32046+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32047+#else
32048+ pgd = pgd_offset(current->active_mm, address);
32049+#endif
32050+
32051 if (pgd_none(*pgd)) {
32052 set_pgd(pgd, *pgd_ref);
32053 arch_flush_lazy_mmu_mode();
32054@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32055 static int is_errata100(struct pt_regs *regs, unsigned long address)
32056 {
32057 #ifdef CONFIG_X86_64
32058- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32059+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32060 return 1;
32061 #endif
32062 return 0;
32063@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32064 }
32065
32066 static const char nx_warning[] = KERN_CRIT
32067-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32068+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32069 static const char smep_warning[] = KERN_CRIT
32070-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32071+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32072
32073 static void
32074 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32075@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32076 if (!oops_may_print())
32077 return;
32078
32079- if (error_code & PF_INSTR) {
32080+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32081 unsigned int level;
32082 pgd_t *pgd;
32083 pte_t *pte;
32084@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32085 pte = lookup_address_in_pgd(pgd, address, &level);
32086
32087 if (pte && pte_present(*pte) && !pte_exec(*pte))
32088- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32089+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32090 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32091 (pgd_flags(*pgd) & _PAGE_USER) &&
32092 (read_cr4() & X86_CR4_SMEP))
32093- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32094+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32095 }
32096
32097+#ifdef CONFIG_PAX_KERNEXEC
32098+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32099+ if (current->signal->curr_ip)
32100+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32101+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32102+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32103+ else
32104+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32105+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32106+ }
32107+#endif
32108+
32109 printk(KERN_ALERT "BUG: unable to handle kernel ");
32110 if (address < PAGE_SIZE)
32111 printk(KERN_CONT "NULL pointer dereference");
32112@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32113 return;
32114 }
32115 #endif
32116+
32117+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32118+ if (pax_is_fetch_fault(regs, error_code, address)) {
32119+
32120+#ifdef CONFIG_PAX_EMUTRAMP
32121+ switch (pax_handle_fetch_fault(regs)) {
32122+ case 2:
32123+ return;
32124+ }
32125+#endif
32126+
32127+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32128+ do_group_exit(SIGKILL);
32129+ }
32130+#endif
32131+
32132 /* Kernel addresses are always protection faults: */
32133 if (address >= TASK_SIZE)
32134 error_code |= PF_PROT;
32135@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32136 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32137 printk(KERN_ERR
32138 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32139- tsk->comm, tsk->pid, address);
32140+ tsk->comm, task_pid_nr(tsk), address);
32141 code = BUS_MCEERR_AR;
32142 }
32143 #endif
32144@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32145 return 1;
32146 }
32147
32148+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32149+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32150+{
32151+ pte_t *pte;
32152+ pmd_t *pmd;
32153+ spinlock_t *ptl;
32154+ unsigned char pte_mask;
32155+
32156+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32157+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32158+ return 0;
32159+
32160+ /* PaX: it's our fault, let's handle it if we can */
32161+
32162+ /* PaX: take a look at read faults before acquiring any locks */
32163+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32164+ /* instruction fetch attempt from a protected page in user mode */
32165+ up_read(&mm->mmap_sem);
32166+
32167+#ifdef CONFIG_PAX_EMUTRAMP
32168+ switch (pax_handle_fetch_fault(regs)) {
32169+ case 2:
32170+ return 1;
32171+ }
32172+#endif
32173+
32174+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32175+ do_group_exit(SIGKILL);
32176+ }
32177+
32178+ pmd = pax_get_pmd(mm, address);
32179+ if (unlikely(!pmd))
32180+ return 0;
32181+
32182+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32183+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32184+ pte_unmap_unlock(pte, ptl);
32185+ return 0;
32186+ }
32187+
32188+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32189+ /* write attempt to a protected page in user mode */
32190+ pte_unmap_unlock(pte, ptl);
32191+ return 0;
32192+ }
32193+
32194+#ifdef CONFIG_SMP
32195+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32196+#else
32197+ if (likely(address > get_limit(regs->cs)))
32198+#endif
32199+ {
32200+ set_pte(pte, pte_mkread(*pte));
32201+ __flush_tlb_one(address);
32202+ pte_unmap_unlock(pte, ptl);
32203+ up_read(&mm->mmap_sem);
32204+ return 1;
32205+ }
32206+
32207+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32208+
32209+ /*
32210+ * PaX: fill DTLB with user rights and retry
32211+ */
32212+ __asm__ __volatile__ (
32213+ "orb %2,(%1)\n"
32214+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32215+/*
32216+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32217+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32218+ * page fault when examined during a TLB load attempt. this is true not only
32219+ * for PTEs holding a non-present entry but also present entries that will
32220+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32221+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32222+ * for our target pages since their PTEs are simply not in the TLBs at all.
32223+
32224+ * the best thing in omitting it is that we gain around 15-20% speed in the
32225+ * fast path of the page fault handler and can get rid of tracing since we
32226+ * can no longer flush unintended entries.
32227+ */
32228+ "invlpg (%0)\n"
32229+#endif
32230+ __copyuser_seg"testb $0,(%0)\n"
32231+ "xorb %3,(%1)\n"
32232+ :
32233+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32234+ : "memory", "cc");
32235+ pte_unmap_unlock(pte, ptl);
32236+ up_read(&mm->mmap_sem);
32237+ return 1;
32238+}
32239+#endif
32240+
32241 /*
32242 * Handle a spurious fault caused by a stale TLB entry.
32243 *
32244@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32245 static inline int
32246 access_error(unsigned long error_code, struct vm_area_struct *vma)
32247 {
32248+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32249+ return 1;
32250+
32251 if (error_code & PF_WRITE) {
32252 /* write, present and write, not present: */
32253 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32254@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32255 if (error_code & PF_USER)
32256 return false;
32257
32258- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32259+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32260 return false;
32261
32262 return true;
32263@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32264 tsk = current;
32265 mm = tsk->mm;
32266
32267+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32268+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32269+ if (!search_exception_tables(regs->ip)) {
32270+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32271+ bad_area_nosemaphore(regs, error_code, address);
32272+ return;
32273+ }
32274+ if (address < pax_user_shadow_base) {
32275+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32276+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32277+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32278+ } else
32279+ address -= pax_user_shadow_base;
32280+ }
32281+#endif
32282+
32283 /*
32284 * Detect and handle instructions that would cause a page fault for
32285 * both a tracked kernel page and a userspace page.
32286@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32287 * User-mode registers count as a user access even for any
32288 * potential system fault or CPU buglet:
32289 */
32290- if (user_mode_vm(regs)) {
32291+ if (user_mode(regs)) {
32292 local_irq_enable();
32293 error_code |= PF_USER;
32294 flags |= FAULT_FLAG_USER;
32295@@ -1187,6 +1411,11 @@ retry:
32296 might_sleep();
32297 }
32298
32299+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32300+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32301+ return;
32302+#endif
32303+
32304 vma = find_vma(mm, address);
32305 if (unlikely(!vma)) {
32306 bad_area(regs, error_code, address);
32307@@ -1198,18 +1427,24 @@ retry:
32308 bad_area(regs, error_code, address);
32309 return;
32310 }
32311- if (error_code & PF_USER) {
32312- /*
32313- * Accessing the stack below %sp is always a bug.
32314- * The large cushion allows instructions like enter
32315- * and pusha to work. ("enter $65535, $31" pushes
32316- * 32 pointers and then decrements %sp by 65535.)
32317- */
32318- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32319- bad_area(regs, error_code, address);
32320- return;
32321- }
32322+ /*
32323+ * Accessing the stack below %sp is always a bug.
32324+ * The large cushion allows instructions like enter
32325+ * and pusha to work. ("enter $65535, $31" pushes
32326+ * 32 pointers and then decrements %sp by 65535.)
32327+ */
32328+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32329+ bad_area(regs, error_code, address);
32330+ return;
32331 }
32332+
32333+#ifdef CONFIG_PAX_SEGMEXEC
32334+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32335+ bad_area(regs, error_code, address);
32336+ return;
32337+ }
32338+#endif
32339+
32340 if (unlikely(expand_stack(vma, address))) {
32341 bad_area(regs, error_code, address);
32342 return;
32343@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32344 }
32345 NOKPROBE_SYMBOL(trace_do_page_fault);
32346 #endif /* CONFIG_TRACING */
32347+
32348+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32349+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32350+{
32351+ struct mm_struct *mm = current->mm;
32352+ unsigned long ip = regs->ip;
32353+
32354+ if (v8086_mode(regs))
32355+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32356+
32357+#ifdef CONFIG_PAX_PAGEEXEC
32358+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32359+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32360+ return true;
32361+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32362+ return true;
32363+ return false;
32364+ }
32365+#endif
32366+
32367+#ifdef CONFIG_PAX_SEGMEXEC
32368+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32369+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32370+ return true;
32371+ return false;
32372+ }
32373+#endif
32374+
32375+ return false;
32376+}
32377+#endif
32378+
32379+#ifdef CONFIG_PAX_EMUTRAMP
32380+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32381+{
32382+ int err;
32383+
32384+ do { /* PaX: libffi trampoline emulation */
32385+ unsigned char mov, jmp;
32386+ unsigned int addr1, addr2;
32387+
32388+#ifdef CONFIG_X86_64
32389+ if ((regs->ip + 9) >> 32)
32390+ break;
32391+#endif
32392+
32393+ err = get_user(mov, (unsigned char __user *)regs->ip);
32394+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32395+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32396+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32397+
32398+ if (err)
32399+ break;
32400+
32401+ if (mov == 0xB8 && jmp == 0xE9) {
32402+ regs->ax = addr1;
32403+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32404+ return 2;
32405+ }
32406+ } while (0);
32407+
32408+ do { /* PaX: gcc trampoline emulation #1 */
32409+ unsigned char mov1, mov2;
32410+ unsigned short jmp;
32411+ unsigned int addr1, addr2;
32412+
32413+#ifdef CONFIG_X86_64
32414+ if ((regs->ip + 11) >> 32)
32415+ break;
32416+#endif
32417+
32418+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32419+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32420+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32421+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32422+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32423+
32424+ if (err)
32425+ break;
32426+
32427+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32428+ regs->cx = addr1;
32429+ regs->ax = addr2;
32430+ regs->ip = addr2;
32431+ return 2;
32432+ }
32433+ } while (0);
32434+
32435+ do { /* PaX: gcc trampoline emulation #2 */
32436+ unsigned char mov, jmp;
32437+ unsigned int addr1, addr2;
32438+
32439+#ifdef CONFIG_X86_64
32440+ if ((regs->ip + 9) >> 32)
32441+ break;
32442+#endif
32443+
32444+ err = get_user(mov, (unsigned char __user *)regs->ip);
32445+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32446+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32447+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32448+
32449+ if (err)
32450+ break;
32451+
32452+ if (mov == 0xB9 && jmp == 0xE9) {
32453+ regs->cx = addr1;
32454+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32455+ return 2;
32456+ }
32457+ } while (0);
32458+
32459+ return 1; /* PaX in action */
32460+}
32461+
32462+#ifdef CONFIG_X86_64
32463+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32464+{
32465+ int err;
32466+
32467+ do { /* PaX: libffi trampoline emulation */
32468+ unsigned short mov1, mov2, jmp1;
32469+ unsigned char stcclc, jmp2;
32470+ unsigned long addr1, addr2;
32471+
32472+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32473+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32474+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32475+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32476+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32477+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32478+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32479+
32480+ if (err)
32481+ break;
32482+
32483+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32484+ regs->r11 = addr1;
32485+ regs->r10 = addr2;
32486+ if (stcclc == 0xF8)
32487+ regs->flags &= ~X86_EFLAGS_CF;
32488+ else
32489+ regs->flags |= X86_EFLAGS_CF;
32490+ regs->ip = addr1;
32491+ return 2;
32492+ }
32493+ } while (0);
32494+
32495+ do { /* PaX: gcc trampoline emulation #1 */
32496+ unsigned short mov1, mov2, jmp1;
32497+ unsigned char jmp2;
32498+ unsigned int addr1;
32499+ unsigned long addr2;
32500+
32501+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32502+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32503+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32504+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32505+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32506+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32507+
32508+ if (err)
32509+ break;
32510+
32511+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32512+ regs->r11 = addr1;
32513+ regs->r10 = addr2;
32514+ regs->ip = addr1;
32515+ return 2;
32516+ }
32517+ } while (0);
32518+
32519+ do { /* PaX: gcc trampoline emulation #2 */
32520+ unsigned short mov1, mov2, jmp1;
32521+ unsigned char jmp2;
32522+ unsigned long addr1, addr2;
32523+
32524+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32525+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32526+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32527+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32528+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32529+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32530+
32531+ if (err)
32532+ break;
32533+
32534+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32535+ regs->r11 = addr1;
32536+ regs->r10 = addr2;
32537+ regs->ip = addr1;
32538+ return 2;
32539+ }
32540+ } while (0);
32541+
32542+ return 1; /* PaX in action */
32543+}
32544+#endif
32545+
32546+/*
32547+ * PaX: decide what to do with offenders (regs->ip = fault address)
32548+ *
32549+ * returns 1 when task should be killed
32550+ * 2 when gcc trampoline was detected
32551+ */
32552+static int pax_handle_fetch_fault(struct pt_regs *regs)
32553+{
32554+ if (v8086_mode(regs))
32555+ return 1;
32556+
32557+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32558+ return 1;
32559+
32560+#ifdef CONFIG_X86_32
32561+ return pax_handle_fetch_fault_32(regs);
32562+#else
32563+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32564+ return pax_handle_fetch_fault_32(regs);
32565+ else
32566+ return pax_handle_fetch_fault_64(regs);
32567+#endif
32568+}
32569+#endif
32570+
32571+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32572+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32573+{
32574+ long i;
32575+
32576+ printk(KERN_ERR "PAX: bytes at PC: ");
32577+ for (i = 0; i < 20; i++) {
32578+ unsigned char c;
32579+ if (get_user(c, (unsigned char __force_user *)pc+i))
32580+ printk(KERN_CONT "?? ");
32581+ else
32582+ printk(KERN_CONT "%02x ", c);
32583+ }
32584+ printk("\n");
32585+
32586+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32587+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32588+ unsigned long c;
32589+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32590+#ifdef CONFIG_X86_32
32591+ printk(KERN_CONT "???????? ");
32592+#else
32593+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32594+ printk(KERN_CONT "???????? ???????? ");
32595+ else
32596+ printk(KERN_CONT "???????????????? ");
32597+#endif
32598+ } else {
32599+#ifdef CONFIG_X86_64
32600+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32601+ printk(KERN_CONT "%08x ", (unsigned int)c);
32602+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32603+ } else
32604+#endif
32605+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32606+ }
32607+ }
32608+ printk("\n");
32609+}
32610+#endif
32611+
32612+/**
32613+ * probe_kernel_write(): safely attempt to write to a location
32614+ * @dst: address to write to
32615+ * @src: pointer to the data that shall be written
32616+ * @size: size of the data chunk
32617+ *
32618+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32619+ * happens, handle that and return -EFAULT.
32620+ */
32621+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32622+{
32623+ long ret;
32624+ mm_segment_t old_fs = get_fs();
32625+
32626+ set_fs(KERNEL_DS);
32627+ pagefault_disable();
32628+ pax_open_kernel();
32629+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32630+ pax_close_kernel();
32631+ pagefault_enable();
32632+ set_fs(old_fs);
32633+
32634+ return ret ? -EFAULT : 0;
32635+}
32636diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32637index 224b142..c2c9423 100644
32638--- a/arch/x86/mm/gup.c
32639+++ b/arch/x86/mm/gup.c
32640@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32641 addr = start;
32642 len = (unsigned long) nr_pages << PAGE_SHIFT;
32643 end = start + len;
32644- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32645+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32646 (void __user *)start, len)))
32647 return 0;
32648
32649@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32650 goto slow_irqon;
32651 #endif
32652
32653+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32654+ (void __user *)start, len)))
32655+ return 0;
32656+
32657 /*
32658 * XXX: batch / limit 'nr', to avoid large irq off latency
32659 * needs some instrumenting to determine the common sizes used by
32660diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32661index 4500142..53a363c 100644
32662--- a/arch/x86/mm/highmem_32.c
32663+++ b/arch/x86/mm/highmem_32.c
32664@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32665 idx = type + KM_TYPE_NR*smp_processor_id();
32666 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32667 BUG_ON(!pte_none(*(kmap_pte-idx)));
32668+
32669+ pax_open_kernel();
32670 set_pte(kmap_pte-idx, mk_pte(page, prot));
32671+ pax_close_kernel();
32672+
32673 arch_flush_lazy_mmu_mode();
32674
32675 return (void *)vaddr;
32676diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32677index 9161f76..cbc5124 100644
32678--- a/arch/x86/mm/hugetlbpage.c
32679+++ b/arch/x86/mm/hugetlbpage.c
32680@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32681 #ifdef CONFIG_HUGETLB_PAGE
32682 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32683 unsigned long addr, unsigned long len,
32684- unsigned long pgoff, unsigned long flags)
32685+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32686 {
32687 struct hstate *h = hstate_file(file);
32688 struct vm_unmapped_area_info info;
32689-
32690+
32691 info.flags = 0;
32692 info.length = len;
32693 info.low_limit = current->mm->mmap_legacy_base;
32694 info.high_limit = TASK_SIZE;
32695 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32696 info.align_offset = 0;
32697+ info.threadstack_offset = offset;
32698 return vm_unmapped_area(&info);
32699 }
32700
32701 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32702 unsigned long addr0, unsigned long len,
32703- unsigned long pgoff, unsigned long flags)
32704+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32705 {
32706 struct hstate *h = hstate_file(file);
32707 struct vm_unmapped_area_info info;
32708@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32709 info.high_limit = current->mm->mmap_base;
32710 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32711 info.align_offset = 0;
32712+ info.threadstack_offset = offset;
32713 addr = vm_unmapped_area(&info);
32714
32715 /*
32716@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32717 VM_BUG_ON(addr != -ENOMEM);
32718 info.flags = 0;
32719 info.low_limit = TASK_UNMAPPED_BASE;
32720+
32721+#ifdef CONFIG_PAX_RANDMMAP
32722+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32723+ info.low_limit += current->mm->delta_mmap;
32724+#endif
32725+
32726 info.high_limit = TASK_SIZE;
32727 addr = vm_unmapped_area(&info);
32728 }
32729@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32730 struct hstate *h = hstate_file(file);
32731 struct mm_struct *mm = current->mm;
32732 struct vm_area_struct *vma;
32733+ unsigned long pax_task_size = TASK_SIZE;
32734+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32735
32736 if (len & ~huge_page_mask(h))
32737 return -EINVAL;
32738- if (len > TASK_SIZE)
32739+
32740+#ifdef CONFIG_PAX_SEGMEXEC
32741+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32742+ pax_task_size = SEGMEXEC_TASK_SIZE;
32743+#endif
32744+
32745+ pax_task_size -= PAGE_SIZE;
32746+
32747+ if (len > pax_task_size)
32748 return -ENOMEM;
32749
32750 if (flags & MAP_FIXED) {
32751@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32752 return addr;
32753 }
32754
32755+#ifdef CONFIG_PAX_RANDMMAP
32756+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32757+#endif
32758+
32759 if (addr) {
32760 addr = ALIGN(addr, huge_page_size(h));
32761 vma = find_vma(mm, addr);
32762- if (TASK_SIZE - len >= addr &&
32763- (!vma || addr + len <= vma->vm_start))
32764+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32765 return addr;
32766 }
32767 if (mm->get_unmapped_area == arch_get_unmapped_area)
32768 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32769- pgoff, flags);
32770+ pgoff, flags, offset);
32771 else
32772 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32773- pgoff, flags);
32774+ pgoff, flags, offset);
32775 }
32776 #endif /* CONFIG_HUGETLB_PAGE */
32777
32778diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32779index 079c3b6..7069023 100644
32780--- a/arch/x86/mm/init.c
32781+++ b/arch/x86/mm/init.c
32782@@ -4,6 +4,7 @@
32783 #include <linux/swap.h>
32784 #include <linux/memblock.h>
32785 #include <linux/bootmem.h> /* for max_low_pfn */
32786+#include <linux/tboot.h>
32787
32788 #include <asm/cacheflush.h>
32789 #include <asm/e820.h>
32790@@ -17,6 +18,8 @@
32791 #include <asm/proto.h>
32792 #include <asm/dma.h> /* for MAX_DMA_PFN */
32793 #include <asm/microcode.h>
32794+#include <asm/desc.h>
32795+#include <asm/bios_ebda.h>
32796
32797 /*
32798 * We need to define the tracepoints somewhere, and tlb.c
32799@@ -596,7 +599,18 @@ void __init init_mem_mapping(void)
32800 early_ioremap_page_table_range_init();
32801 #endif
32802
32803+#ifdef CONFIG_PAX_PER_CPU_PGD
32804+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32805+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32806+ KERNEL_PGD_PTRS);
32807+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32808+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32809+ KERNEL_PGD_PTRS);
32810+ load_cr3(get_cpu_pgd(0, kernel));
32811+#else
32812 load_cr3(swapper_pg_dir);
32813+#endif
32814+
32815 __flush_tlb_all();
32816
32817 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32818@@ -612,10 +626,40 @@ void __init init_mem_mapping(void)
32819 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32820 * mmio resources as well as potential bios/acpi data regions.
32821 */
32822+
32823+#ifdef CONFIG_GRKERNSEC_KMEM
32824+static unsigned int ebda_start __read_only;
32825+static unsigned int ebda_end __read_only;
32826+#endif
32827+
32828 int devmem_is_allowed(unsigned long pagenr)
32829 {
32830- if (pagenr < 256)
32831+#ifdef CONFIG_GRKERNSEC_KMEM
32832+ /* allow BDA */
32833+ if (!pagenr)
32834 return 1;
32835+ /* allow EBDA */
32836+ if (pagenr >= ebda_start && pagenr < ebda_end)
32837+ return 1;
32838+ /* if tboot is in use, allow access to its hardcoded serial log range */
32839+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32840+ return 1;
32841+#else
32842+ if (!pagenr)
32843+ return 1;
32844+#ifdef CONFIG_VM86
32845+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32846+ return 1;
32847+#endif
32848+#endif
32849+
32850+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32851+ return 1;
32852+#ifdef CONFIG_GRKERNSEC_KMEM
32853+ /* throw out everything else below 1MB */
32854+ if (pagenr <= 256)
32855+ return 0;
32856+#endif
32857 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32858 return 0;
32859 if (!page_is_ram(pagenr))
32860@@ -661,8 +705,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32861 #endif
32862 }
32863
32864+#ifdef CONFIG_GRKERNSEC_KMEM
32865+static inline void gr_init_ebda(void)
32866+{
32867+ unsigned int ebda_addr;
32868+ unsigned int ebda_size = 0;
32869+
32870+ ebda_addr = get_bios_ebda();
32871+ if (ebda_addr) {
32872+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32873+ ebda_size <<= 10;
32874+ }
32875+ if (ebda_addr && ebda_size) {
32876+ ebda_start = ebda_addr >> PAGE_SHIFT;
32877+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32878+ } else {
32879+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32880+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32881+ }
32882+}
32883+#else
32884+static inline void gr_init_ebda(void) { }
32885+#endif
32886+
32887 void free_initmem(void)
32888 {
32889+#ifdef CONFIG_PAX_KERNEXEC
32890+#ifdef CONFIG_X86_32
32891+ /* PaX: limit KERNEL_CS to actual size */
32892+ unsigned long addr, limit;
32893+ struct desc_struct d;
32894+ int cpu;
32895+#else
32896+ pgd_t *pgd;
32897+ pud_t *pud;
32898+ pmd_t *pmd;
32899+ unsigned long addr, end;
32900+#endif
32901+#endif
32902+
32903+ gr_init_ebda();
32904+
32905+#ifdef CONFIG_PAX_KERNEXEC
32906+#ifdef CONFIG_X86_32
32907+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32908+ limit = (limit - 1UL) >> PAGE_SHIFT;
32909+
32910+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32911+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32912+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32913+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32914+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32915+ }
32916+
32917+ /* PaX: make KERNEL_CS read-only */
32918+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32919+ if (!paravirt_enabled())
32920+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32921+/*
32922+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32923+ pgd = pgd_offset_k(addr);
32924+ pud = pud_offset(pgd, addr);
32925+ pmd = pmd_offset(pud, addr);
32926+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32927+ }
32928+*/
32929+#ifdef CONFIG_X86_PAE
32930+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32931+/*
32932+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32933+ pgd = pgd_offset_k(addr);
32934+ pud = pud_offset(pgd, addr);
32935+ pmd = pmd_offset(pud, addr);
32936+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32937+ }
32938+*/
32939+#endif
32940+
32941+#ifdef CONFIG_MODULES
32942+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32943+#endif
32944+
32945+#else
32946+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32947+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32948+ pgd = pgd_offset_k(addr);
32949+ pud = pud_offset(pgd, addr);
32950+ pmd = pmd_offset(pud, addr);
32951+ if (!pmd_present(*pmd))
32952+ continue;
32953+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32954+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32955+ else
32956+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32957+ }
32958+
32959+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32960+ end = addr + KERNEL_IMAGE_SIZE;
32961+ for (; addr < end; addr += PMD_SIZE) {
32962+ pgd = pgd_offset_k(addr);
32963+ pud = pud_offset(pgd, addr);
32964+ pmd = pmd_offset(pud, addr);
32965+ if (!pmd_present(*pmd))
32966+ continue;
32967+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32968+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32969+ }
32970+#endif
32971+
32972+ flush_tlb_all();
32973+#endif
32974+
32975 free_init_pages("unused kernel",
32976 (unsigned long)(&__init_begin),
32977 (unsigned long)(&__init_end));
32978diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32979index c8140e1..59257fc 100644
32980--- a/arch/x86/mm/init_32.c
32981+++ b/arch/x86/mm/init_32.c
32982@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32983 bool __read_mostly __vmalloc_start_set = false;
32984
32985 /*
32986- * Creates a middle page table and puts a pointer to it in the
32987- * given global directory entry. This only returns the gd entry
32988- * in non-PAE compilation mode, since the middle layer is folded.
32989- */
32990-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32991-{
32992- pud_t *pud;
32993- pmd_t *pmd_table;
32994-
32995-#ifdef CONFIG_X86_PAE
32996- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32997- pmd_table = (pmd_t *)alloc_low_page();
32998- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32999- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
33000- pud = pud_offset(pgd, 0);
33001- BUG_ON(pmd_table != pmd_offset(pud, 0));
33002-
33003- return pmd_table;
33004- }
33005-#endif
33006- pud = pud_offset(pgd, 0);
33007- pmd_table = pmd_offset(pud, 0);
33008-
33009- return pmd_table;
33010-}
33011-
33012-/*
33013 * Create a page table and place a pointer to it in a middle page
33014 * directory entry:
33015 */
33016@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
33017 pte_t *page_table = (pte_t *)alloc_low_page();
33018
33019 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33020+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33021+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33022+#else
33023 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33024+#endif
33025 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33026 }
33027
33028 return pte_offset_kernel(pmd, 0);
33029 }
33030
33031+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33032+{
33033+ pud_t *pud;
33034+ pmd_t *pmd_table;
33035+
33036+ pud = pud_offset(pgd, 0);
33037+ pmd_table = pmd_offset(pud, 0);
33038+
33039+ return pmd_table;
33040+}
33041+
33042 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33043 {
33044 int pgd_idx = pgd_index(vaddr);
33045@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33046 int pgd_idx, pmd_idx;
33047 unsigned long vaddr;
33048 pgd_t *pgd;
33049+ pud_t *pud;
33050 pmd_t *pmd;
33051 pte_t *pte = NULL;
33052 unsigned long count = page_table_range_init_count(start, end);
33053@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33054 pgd = pgd_base + pgd_idx;
33055
33056 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33057- pmd = one_md_table_init(pgd);
33058- pmd = pmd + pmd_index(vaddr);
33059+ pud = pud_offset(pgd, vaddr);
33060+ pmd = pmd_offset(pud, vaddr);
33061+
33062+#ifdef CONFIG_X86_PAE
33063+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33064+#endif
33065+
33066 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33067 pmd++, pmd_idx++) {
33068 pte = page_table_kmap_check(one_page_table_init(pmd),
33069@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33070 }
33071 }
33072
33073-static inline int is_kernel_text(unsigned long addr)
33074+static inline int is_kernel_text(unsigned long start, unsigned long end)
33075 {
33076- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33077- return 1;
33078- return 0;
33079+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33080+ end <= ktla_ktva((unsigned long)_stext)) &&
33081+ (start >= ktla_ktva((unsigned long)_einittext) ||
33082+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33083+
33084+#ifdef CONFIG_ACPI_SLEEP
33085+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33086+#endif
33087+
33088+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33089+ return 0;
33090+ return 1;
33091 }
33092
33093 /*
33094@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33095 unsigned long last_map_addr = end;
33096 unsigned long start_pfn, end_pfn;
33097 pgd_t *pgd_base = swapper_pg_dir;
33098- int pgd_idx, pmd_idx, pte_ofs;
33099+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33100 unsigned long pfn;
33101 pgd_t *pgd;
33102+ pud_t *pud;
33103 pmd_t *pmd;
33104 pte_t *pte;
33105 unsigned pages_2m, pages_4k;
33106@@ -291,8 +295,13 @@ repeat:
33107 pfn = start_pfn;
33108 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33109 pgd = pgd_base + pgd_idx;
33110- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33111- pmd = one_md_table_init(pgd);
33112+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33113+ pud = pud_offset(pgd, 0);
33114+ pmd = pmd_offset(pud, 0);
33115+
33116+#ifdef CONFIG_X86_PAE
33117+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33118+#endif
33119
33120 if (pfn >= end_pfn)
33121 continue;
33122@@ -304,14 +313,13 @@ repeat:
33123 #endif
33124 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33125 pmd++, pmd_idx++) {
33126- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33127+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33128
33129 /*
33130 * Map with big pages if possible, otherwise
33131 * create normal page tables:
33132 */
33133 if (use_pse) {
33134- unsigned int addr2;
33135 pgprot_t prot = PAGE_KERNEL_LARGE;
33136 /*
33137 * first pass will use the same initial
33138@@ -322,11 +330,7 @@ repeat:
33139 _PAGE_PSE);
33140
33141 pfn &= PMD_MASK >> PAGE_SHIFT;
33142- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33143- PAGE_OFFSET + PAGE_SIZE-1;
33144-
33145- if (is_kernel_text(addr) ||
33146- is_kernel_text(addr2))
33147+ if (is_kernel_text(address, address + PMD_SIZE))
33148 prot = PAGE_KERNEL_LARGE_EXEC;
33149
33150 pages_2m++;
33151@@ -343,7 +347,7 @@ repeat:
33152 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33153 pte += pte_ofs;
33154 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33155- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33156+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33157 pgprot_t prot = PAGE_KERNEL;
33158 /*
33159 * first pass will use the same initial
33160@@ -351,7 +355,7 @@ repeat:
33161 */
33162 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33163
33164- if (is_kernel_text(addr))
33165+ if (is_kernel_text(address, address + PAGE_SIZE))
33166 prot = PAGE_KERNEL_EXEC;
33167
33168 pages_4k++;
33169@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33170
33171 pud = pud_offset(pgd, va);
33172 pmd = pmd_offset(pud, va);
33173- if (!pmd_present(*pmd))
33174+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33175 break;
33176
33177 /* should not be large page here */
33178@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33179
33180 static void __init pagetable_init(void)
33181 {
33182- pgd_t *pgd_base = swapper_pg_dir;
33183-
33184- permanent_kmaps_init(pgd_base);
33185+ permanent_kmaps_init(swapper_pg_dir);
33186 }
33187
33188-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33189+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33190 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33191
33192 /* user-defined highmem size */
33193@@ -787,10 +789,10 @@ void __init mem_init(void)
33194 ((unsigned long)&__init_end -
33195 (unsigned long)&__init_begin) >> 10,
33196
33197- (unsigned long)&_etext, (unsigned long)&_edata,
33198- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33199+ (unsigned long)&_sdata, (unsigned long)&_edata,
33200+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33201
33202- (unsigned long)&_text, (unsigned long)&_etext,
33203+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33204 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33205
33206 /*
33207@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33208 if (!kernel_set_to_readonly)
33209 return;
33210
33211+ start = ktla_ktva(start);
33212 pr_debug("Set kernel text: %lx - %lx for read write\n",
33213 start, start+size);
33214
33215@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33216 if (!kernel_set_to_readonly)
33217 return;
33218
33219+ start = ktla_ktva(start);
33220 pr_debug("Set kernel text: %lx - %lx for read only\n",
33221 start, start+size);
33222
33223@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33224 unsigned long start = PFN_ALIGN(_text);
33225 unsigned long size = PFN_ALIGN(_etext) - start;
33226
33227+ start = ktla_ktva(start);
33228 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33229 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33230 size >> 10);
33231diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33232index 30eb05a..ae671ac 100644
33233--- a/arch/x86/mm/init_64.c
33234+++ b/arch/x86/mm/init_64.c
33235@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33236 * around without checking the pgd every time.
33237 */
33238
33239-pteval_t __supported_pte_mask __read_mostly = ~0;
33240+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33241 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33242
33243 int force_personality32;
33244@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33245
33246 for (address = start; address <= end; address += PGDIR_SIZE) {
33247 const pgd_t *pgd_ref = pgd_offset_k(address);
33248+
33249+#ifdef CONFIG_PAX_PER_CPU_PGD
33250+ unsigned long cpu;
33251+#else
33252 struct page *page;
33253+#endif
33254
33255 /*
33256 * When it is called after memory hot remove, pgd_none()
33257@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33258 continue;
33259
33260 spin_lock(&pgd_lock);
33261+
33262+#ifdef CONFIG_PAX_PER_CPU_PGD
33263+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33264+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33265+
33266+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33267+ BUG_ON(pgd_page_vaddr(*pgd)
33268+ != pgd_page_vaddr(*pgd_ref));
33269+
33270+ if (removed) {
33271+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33272+ pgd_clear(pgd);
33273+ } else {
33274+ if (pgd_none(*pgd))
33275+ set_pgd(pgd, *pgd_ref);
33276+ }
33277+
33278+ pgd = pgd_offset_cpu(cpu, kernel, address);
33279+#else
33280 list_for_each_entry(page, &pgd_list, lru) {
33281 pgd_t *pgd;
33282 spinlock_t *pgt_lock;
33283@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33284 /* the pgt_lock only for Xen */
33285 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33286 spin_lock(pgt_lock);
33287+#endif
33288
33289 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33290 BUG_ON(pgd_page_vaddr(*pgd)
33291@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33292 set_pgd(pgd, *pgd_ref);
33293 }
33294
33295+#ifndef CONFIG_PAX_PER_CPU_PGD
33296 spin_unlock(pgt_lock);
33297+#endif
33298+
33299 }
33300 spin_unlock(&pgd_lock);
33301 }
33302@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33303 {
33304 if (pgd_none(*pgd)) {
33305 pud_t *pud = (pud_t *)spp_getpage();
33306- pgd_populate(&init_mm, pgd, pud);
33307+ pgd_populate_kernel(&init_mm, pgd, pud);
33308 if (pud != pud_offset(pgd, 0))
33309 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33310 pud, pud_offset(pgd, 0));
33311@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33312 {
33313 if (pud_none(*pud)) {
33314 pmd_t *pmd = (pmd_t *) spp_getpage();
33315- pud_populate(&init_mm, pud, pmd);
33316+ pud_populate_kernel(&init_mm, pud, pmd);
33317 if (pmd != pmd_offset(pud, 0))
33318 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33319 pmd, pmd_offset(pud, 0));
33320@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33321 pmd = fill_pmd(pud, vaddr);
33322 pte = fill_pte(pmd, vaddr);
33323
33324+ pax_open_kernel();
33325 set_pte(pte, new_pte);
33326+ pax_close_kernel();
33327
33328 /*
33329 * It's enough to flush this one mapping.
33330@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33331 pgd = pgd_offset_k((unsigned long)__va(phys));
33332 if (pgd_none(*pgd)) {
33333 pud = (pud_t *) spp_getpage();
33334- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33335- _PAGE_USER));
33336+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33337 }
33338 pud = pud_offset(pgd, (unsigned long)__va(phys));
33339 if (pud_none(*pud)) {
33340 pmd = (pmd_t *) spp_getpage();
33341- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33342- _PAGE_USER));
33343+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33344 }
33345 pmd = pmd_offset(pud, phys);
33346 BUG_ON(!pmd_none(*pmd));
33347@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33348 prot);
33349
33350 spin_lock(&init_mm.page_table_lock);
33351- pud_populate(&init_mm, pud, pmd);
33352+ pud_populate_kernel(&init_mm, pud, pmd);
33353 spin_unlock(&init_mm.page_table_lock);
33354 }
33355 __flush_tlb_all();
33356@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33357 page_size_mask);
33358
33359 spin_lock(&init_mm.page_table_lock);
33360- pgd_populate(&init_mm, pgd, pud);
33361+ pgd_populate_kernel(&init_mm, pgd, pud);
33362 spin_unlock(&init_mm.page_table_lock);
33363 pgd_changed = true;
33364 }
33365diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33366index 9ca35fc..4b2b7b7 100644
33367--- a/arch/x86/mm/iomap_32.c
33368+++ b/arch/x86/mm/iomap_32.c
33369@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33370 type = kmap_atomic_idx_push();
33371 idx = type + KM_TYPE_NR * smp_processor_id();
33372 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33373+
33374+ pax_open_kernel();
33375 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33376+ pax_close_kernel();
33377+
33378 arch_flush_lazy_mmu_mode();
33379
33380 return (void *)vaddr;
33381diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33382index fdf617c..b9e85bc 100644
33383--- a/arch/x86/mm/ioremap.c
33384+++ b/arch/x86/mm/ioremap.c
33385@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33386 unsigned long i;
33387
33388 for (i = 0; i < nr_pages; ++i)
33389- if (pfn_valid(start_pfn + i) &&
33390- !PageReserved(pfn_to_page(start_pfn + i)))
33391+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33392+ !PageReserved(pfn_to_page(start_pfn + i))))
33393 return 1;
33394
33395 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33396@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33397 *
33398 * Caller must ensure there is only one unmapping for the same pointer.
33399 */
33400-void iounmap(volatile void __iomem *addr)
33401+void iounmap(const volatile void __iomem *addr)
33402 {
33403 struct vm_struct *p, *o;
33404
33405@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33406 */
33407 void *xlate_dev_mem_ptr(phys_addr_t phys)
33408 {
33409- void *addr;
33410- unsigned long start = phys & PAGE_MASK;
33411-
33412 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33413- if (page_is_ram(start >> PAGE_SHIFT))
33414+ if (page_is_ram(phys >> PAGE_SHIFT))
33415+#ifdef CONFIG_HIGHMEM
33416+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33417+#endif
33418 return __va(phys);
33419
33420- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33421- if (addr)
33422- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33423-
33424- return addr;
33425+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33426 }
33427
33428 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33429 {
33430 if (page_is_ram(phys >> PAGE_SHIFT))
33431+#ifdef CONFIG_HIGHMEM
33432+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33433+#endif
33434 return;
33435
33436 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33437 return;
33438 }
33439
33440-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33441+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33442
33443 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33444 {
33445@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33446 early_ioremap_setup();
33447
33448 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33449- memset(bm_pte, 0, sizeof(bm_pte));
33450- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33451+ pmd_populate_user(&init_mm, pmd, bm_pte);
33452
33453 /*
33454 * The boot-ioremap range spans multiple pmds, for which
33455diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33456index b4f2e7e..96c9c3e 100644
33457--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33458+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33459@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33460 * memory (e.g. tracked pages)? For now, we need this to avoid
33461 * invoking kmemcheck for PnP BIOS calls.
33462 */
33463- if (regs->flags & X86_VM_MASK)
33464+ if (v8086_mode(regs))
33465 return false;
33466- if (regs->cs != __KERNEL_CS)
33467+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33468 return false;
33469
33470 pte = kmemcheck_pte_lookup(address);
33471diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33472index df4552b..12c129c 100644
33473--- a/arch/x86/mm/mmap.c
33474+++ b/arch/x86/mm/mmap.c
33475@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33476 * Leave an at least ~128 MB hole with possible stack randomization.
33477 */
33478 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33479-#define MAX_GAP (TASK_SIZE/6*5)
33480+#define MAX_GAP (pax_task_size/6*5)
33481
33482 static int mmap_is_legacy(void)
33483 {
33484@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33485 return rnd << PAGE_SHIFT;
33486 }
33487
33488-static unsigned long mmap_base(void)
33489+static unsigned long mmap_base(struct mm_struct *mm)
33490 {
33491 unsigned long gap = rlimit(RLIMIT_STACK);
33492+ unsigned long pax_task_size = TASK_SIZE;
33493+
33494+#ifdef CONFIG_PAX_SEGMEXEC
33495+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33496+ pax_task_size = SEGMEXEC_TASK_SIZE;
33497+#endif
33498
33499 if (gap < MIN_GAP)
33500 gap = MIN_GAP;
33501 else if (gap > MAX_GAP)
33502 gap = MAX_GAP;
33503
33504- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33505+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33506 }
33507
33508 /*
33509 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33510 * does, but not when emulating X86_32
33511 */
33512-static unsigned long mmap_legacy_base(void)
33513+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33514 {
33515- if (mmap_is_ia32())
33516+ if (mmap_is_ia32()) {
33517+
33518+#ifdef CONFIG_PAX_SEGMEXEC
33519+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33520+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33521+ else
33522+#endif
33523+
33524 return TASK_UNMAPPED_BASE;
33525- else
33526+ } else
33527 return TASK_UNMAPPED_BASE + mmap_rnd();
33528 }
33529
33530@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33531 */
33532 void arch_pick_mmap_layout(struct mm_struct *mm)
33533 {
33534- mm->mmap_legacy_base = mmap_legacy_base();
33535- mm->mmap_base = mmap_base();
33536+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33537+ mm->mmap_base = mmap_base(mm);
33538+
33539+#ifdef CONFIG_PAX_RANDMMAP
33540+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33541+ mm->mmap_legacy_base += mm->delta_mmap;
33542+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33543+ }
33544+#endif
33545
33546 if (mmap_is_legacy()) {
33547 mm->mmap_base = mm->mmap_legacy_base;
33548diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33549index 0057a7a..95c7edd 100644
33550--- a/arch/x86/mm/mmio-mod.c
33551+++ b/arch/x86/mm/mmio-mod.c
33552@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33553 break;
33554 default:
33555 {
33556- unsigned char *ip = (unsigned char *)instptr;
33557+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33558 my_trace->opcode = MMIO_UNKNOWN_OP;
33559 my_trace->width = 0;
33560 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33561@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33562 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33563 void __iomem *addr)
33564 {
33565- static atomic_t next_id;
33566+ static atomic_unchecked_t next_id;
33567 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33568 /* These are page-unaligned. */
33569 struct mmiotrace_map map = {
33570@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33571 .private = trace
33572 },
33573 .phys = offset,
33574- .id = atomic_inc_return(&next_id)
33575+ .id = atomic_inc_return_unchecked(&next_id)
33576 };
33577 map.map_id = trace->id;
33578
33579@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33580 ioremap_trace_core(offset, size, addr);
33581 }
33582
33583-static void iounmap_trace_core(volatile void __iomem *addr)
33584+static void iounmap_trace_core(const volatile void __iomem *addr)
33585 {
33586 struct mmiotrace_map map = {
33587 .phys = 0,
33588@@ -328,7 +328,7 @@ not_enabled:
33589 }
33590 }
33591
33592-void mmiotrace_iounmap(volatile void __iomem *addr)
33593+void mmiotrace_iounmap(const volatile void __iomem *addr)
33594 {
33595 might_sleep();
33596 if (is_enabled()) /* recheck and proper locking in *_core() */
33597diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33598index 1a88370..3f598b5 100644
33599--- a/arch/x86/mm/numa.c
33600+++ b/arch/x86/mm/numa.c
33601@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33602 }
33603 }
33604
33605-static int __init numa_register_memblks(struct numa_meminfo *mi)
33606+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33607 {
33608 unsigned long uninitialized_var(pfn_align);
33609 int i, nid;
33610diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33611index 536ea2f..f42c293 100644
33612--- a/arch/x86/mm/pageattr.c
33613+++ b/arch/x86/mm/pageattr.c
33614@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33615 */
33616 #ifdef CONFIG_PCI_BIOS
33617 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33618- pgprot_val(forbidden) |= _PAGE_NX;
33619+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33620 #endif
33621
33622 /*
33623@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33624 * Does not cover __inittext since that is gone later on. On
33625 * 64bit we do not enforce !NX on the low mapping
33626 */
33627- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33628- pgprot_val(forbidden) |= _PAGE_NX;
33629+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33630+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33631
33632+#ifdef CONFIG_DEBUG_RODATA
33633 /*
33634 * The .rodata section needs to be read-only. Using the pfn
33635 * catches all aliases.
33636@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33637 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33638 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33639 pgprot_val(forbidden) |= _PAGE_RW;
33640+#endif
33641
33642 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33643 /*
33644@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33645 }
33646 #endif
33647
33648+#ifdef CONFIG_PAX_KERNEXEC
33649+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33650+ pgprot_val(forbidden) |= _PAGE_RW;
33651+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33652+ }
33653+#endif
33654+
33655 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33656
33657 return prot;
33658@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33659 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33660 {
33661 /* change init_mm */
33662+ pax_open_kernel();
33663 set_pte_atomic(kpte, pte);
33664+
33665 #ifdef CONFIG_X86_32
33666 if (!SHARED_KERNEL_PMD) {
33667+
33668+#ifdef CONFIG_PAX_PER_CPU_PGD
33669+ unsigned long cpu;
33670+#else
33671 struct page *page;
33672+#endif
33673
33674+#ifdef CONFIG_PAX_PER_CPU_PGD
33675+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33676+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33677+#else
33678 list_for_each_entry(page, &pgd_list, lru) {
33679- pgd_t *pgd;
33680+ pgd_t *pgd = (pgd_t *)page_address(page);
33681+#endif
33682+
33683 pud_t *pud;
33684 pmd_t *pmd;
33685
33686- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33687+ pgd += pgd_index(address);
33688 pud = pud_offset(pgd, address);
33689 pmd = pmd_offset(pud, address);
33690 set_pte_atomic((pte_t *)pmd, pte);
33691 }
33692 }
33693 #endif
33694+ pax_close_kernel();
33695 }
33696
33697 static int
33698diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33699index 7ac6869..c0ba541 100644
33700--- a/arch/x86/mm/pat.c
33701+++ b/arch/x86/mm/pat.c
33702@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33703 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33704
33705 if (pg_flags == _PGMT_DEFAULT)
33706- return -1;
33707+ return _PAGE_CACHE_MODE_NUM;
33708 else if (pg_flags == _PGMT_WC)
33709 return _PAGE_CACHE_MODE_WC;
33710 else if (pg_flags == _PGMT_UC_MINUS)
33711@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33712
33713 page = pfn_to_page(pfn);
33714 type = get_page_memtype(page);
33715- if (type != -1) {
33716+ if (type != _PAGE_CACHE_MODE_NUM) {
33717 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33718 start, end - 1, type, req_type);
33719 if (new_type)
33720@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33721
33722 if (!entry) {
33723 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33724- current->comm, current->pid, start, end - 1);
33725+ current->comm, task_pid_nr(current), start, end - 1);
33726 return -EINVAL;
33727 }
33728
33729@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33730 page = pfn_to_page(paddr >> PAGE_SHIFT);
33731 rettype = get_page_memtype(page);
33732 /*
33733- * -1 from get_page_memtype() implies RAM page is in its
33734+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33735 * default state and not reserved, and hence of type WB
33736 */
33737- if (rettype == -1)
33738+ if (rettype == _PAGE_CACHE_MODE_NUM)
33739 rettype = _PAGE_CACHE_MODE_WB;
33740
33741 return rettype;
33742@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33743
33744 while (cursor < to) {
33745 if (!devmem_is_allowed(pfn)) {
33746- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33747- current->comm, from, to - 1);
33748+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33749+ current->comm, from, to - 1, cursor);
33750 return 0;
33751 }
33752 cursor += PAGE_SIZE;
33753@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33754 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33755 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33756 "for [mem %#010Lx-%#010Lx]\n",
33757- current->comm, current->pid,
33758+ current->comm, task_pid_nr(current),
33759 cattr_name(pcm),
33760 base, (unsigned long long)(base + size-1));
33761 return -EINVAL;
33762@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33763 pcm = lookup_memtype(paddr);
33764 if (want_pcm != pcm) {
33765 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33766- current->comm, current->pid,
33767+ current->comm, task_pid_nr(current),
33768 cattr_name(want_pcm),
33769 (unsigned long long)paddr,
33770 (unsigned long long)(paddr + size - 1),
33771@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33772 free_memtype(paddr, paddr + size);
33773 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33774 " for [mem %#010Lx-%#010Lx], got %s\n",
33775- current->comm, current->pid,
33776+ current->comm, task_pid_nr(current),
33777 cattr_name(want_pcm),
33778 (unsigned long long)paddr,
33779 (unsigned long long)(paddr + size - 1),
33780diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33781index 6582adc..fcc5d0b 100644
33782--- a/arch/x86/mm/pat_rbtree.c
33783+++ b/arch/x86/mm/pat_rbtree.c
33784@@ -161,7 +161,7 @@ success:
33785
33786 failure:
33787 printk(KERN_INFO "%s:%d conflicting memory types "
33788- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33789+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33790 end, cattr_name(found_type), cattr_name(match->type));
33791 return -EBUSY;
33792 }
33793diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33794index 9f0614d..92ae64a 100644
33795--- a/arch/x86/mm/pf_in.c
33796+++ b/arch/x86/mm/pf_in.c
33797@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33798 int i;
33799 enum reason_type rv = OTHERS;
33800
33801- p = (unsigned char *)ins_addr;
33802+ p = (unsigned char *)ktla_ktva(ins_addr);
33803 p += skip_prefix(p, &prf);
33804 p += get_opcode(p, &opcode);
33805
33806@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33807 struct prefix_bits prf;
33808 int i;
33809
33810- p = (unsigned char *)ins_addr;
33811+ p = (unsigned char *)ktla_ktva(ins_addr);
33812 p += skip_prefix(p, &prf);
33813 p += get_opcode(p, &opcode);
33814
33815@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33816 struct prefix_bits prf;
33817 int i;
33818
33819- p = (unsigned char *)ins_addr;
33820+ p = (unsigned char *)ktla_ktva(ins_addr);
33821 p += skip_prefix(p, &prf);
33822 p += get_opcode(p, &opcode);
33823
33824@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33825 struct prefix_bits prf;
33826 int i;
33827
33828- p = (unsigned char *)ins_addr;
33829+ p = (unsigned char *)ktla_ktva(ins_addr);
33830 p += skip_prefix(p, &prf);
33831 p += get_opcode(p, &opcode);
33832 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33833@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33834 struct prefix_bits prf;
33835 int i;
33836
33837- p = (unsigned char *)ins_addr;
33838+ p = (unsigned char *)ktla_ktva(ins_addr);
33839 p += skip_prefix(p, &prf);
33840 p += get_opcode(p, &opcode);
33841 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33842diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33843index 6fb6927..634b0f7 100644
33844--- a/arch/x86/mm/pgtable.c
33845+++ b/arch/x86/mm/pgtable.c
33846@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33847 list_del(&page->lru);
33848 }
33849
33850-#define UNSHARED_PTRS_PER_PGD \
33851- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33852+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33853+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33854
33855+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33856+{
33857+ unsigned int count = USER_PGD_PTRS;
33858
33859+ if (!pax_user_shadow_base)
33860+ return;
33861+
33862+ while (count--)
33863+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33864+}
33865+#endif
33866+
33867+#ifdef CONFIG_PAX_PER_CPU_PGD
33868+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33869+{
33870+ unsigned int count = USER_PGD_PTRS;
33871+
33872+ while (count--) {
33873+ pgd_t pgd;
33874+
33875+#ifdef CONFIG_X86_64
33876+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33877+#else
33878+ pgd = *src++;
33879+#endif
33880+
33881+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33882+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33883+#endif
33884+
33885+ *dst++ = pgd;
33886+ }
33887+
33888+}
33889+#endif
33890+
33891+#ifdef CONFIG_X86_64
33892+#define pxd_t pud_t
33893+#define pyd_t pgd_t
33894+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33895+#define pgtable_pxd_page_ctor(page) true
33896+#define pgtable_pxd_page_dtor(page) do {} while (0)
33897+#define pxd_free(mm, pud) pud_free((mm), (pud))
33898+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33899+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33900+#define PYD_SIZE PGDIR_SIZE
33901+#else
33902+#define pxd_t pmd_t
33903+#define pyd_t pud_t
33904+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33905+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33906+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33907+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33908+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33909+#define pyd_offset(mm, address) pud_offset((mm), (address))
33910+#define PYD_SIZE PUD_SIZE
33911+#endif
33912+
33913+#ifdef CONFIG_PAX_PER_CPU_PGD
33914+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33915+static inline void pgd_dtor(pgd_t *pgd) {}
33916+#else
33917 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33918 {
33919 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33920@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33921 pgd_list_del(pgd);
33922 spin_unlock(&pgd_lock);
33923 }
33924+#endif
33925
33926 /*
33927 * List of all pgd's needed for non-PAE so it can invalidate entries
33928@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33929 * -- nyc
33930 */
33931
33932-#ifdef CONFIG_X86_PAE
33933+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33934 /*
33935 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33936 * updating the top-level pagetable entries to guarantee the
33937@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33938 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33939 * and initialize the kernel pmds here.
33940 */
33941-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33942+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33943
33944 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33945 {
33946@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33947 */
33948 flush_tlb_mm(mm);
33949 }
33950+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33951+#define PREALLOCATED_PXDS USER_PGD_PTRS
33952 #else /* !CONFIG_X86_PAE */
33953
33954 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33955-#define PREALLOCATED_PMDS 0
33956+#define PREALLOCATED_PXDS 0
33957
33958 #endif /* CONFIG_X86_PAE */
33959
33960-static void free_pmds(pmd_t *pmds[])
33961+static void free_pxds(pxd_t *pxds[])
33962 {
33963 int i;
33964
33965- for(i = 0; i < PREALLOCATED_PMDS; i++)
33966- if (pmds[i]) {
33967- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33968- free_page((unsigned long)pmds[i]);
33969+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33970+ if (pxds[i]) {
33971+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33972+ free_page((unsigned long)pxds[i]);
33973 }
33974 }
33975
33976-static int preallocate_pmds(pmd_t *pmds[])
33977+static int preallocate_pxds(pxd_t *pxds[])
33978 {
33979 int i;
33980 bool failed = false;
33981
33982- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33983- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33984- if (!pmd)
33985+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33986+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33987+ if (!pxd)
33988 failed = true;
33989- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33990- free_page((unsigned long)pmd);
33991- pmd = NULL;
33992+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33993+ free_page((unsigned long)pxd);
33994+ pxd = NULL;
33995 failed = true;
33996 }
33997- pmds[i] = pmd;
33998+ pxds[i] = pxd;
33999 }
34000
34001 if (failed) {
34002- free_pmds(pmds);
34003+ free_pxds(pxds);
34004 return -ENOMEM;
34005 }
34006
34007@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
34008 * preallocate which never got a corresponding vma will need to be
34009 * freed manually.
34010 */
34011-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34012+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34013 {
34014 int i;
34015
34016- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34017+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34018 pgd_t pgd = pgdp[i];
34019
34020 if (pgd_val(pgd) != 0) {
34021- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34022+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34023
34024- pgdp[i] = native_make_pgd(0);
34025+ set_pgd(pgdp + i, native_make_pgd(0));
34026
34027- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34028- pmd_free(mm, pmd);
34029+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34030+ pxd_free(mm, pxd);
34031 }
34032 }
34033 }
34034
34035-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34036+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34037 {
34038- pud_t *pud;
34039+ pyd_t *pyd;
34040 int i;
34041
34042- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34043+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34044 return;
34045
34046- pud = pud_offset(pgd, 0);
34047-
34048- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34049- pmd_t *pmd = pmds[i];
34050+#ifdef CONFIG_X86_64
34051+ pyd = pyd_offset(mm, 0L);
34052+#else
34053+ pyd = pyd_offset(pgd, 0L);
34054+#endif
34055
34056+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34057+ pxd_t *pxd = pxds[i];
34058 if (i >= KERNEL_PGD_BOUNDARY)
34059- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34060- sizeof(pmd_t) * PTRS_PER_PMD);
34061+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34062+ sizeof(pxd_t) * PTRS_PER_PMD);
34063
34064- pud_populate(mm, pud, pmd);
34065+ pyd_populate(mm, pyd, pxd);
34066 }
34067 }
34068
34069 pgd_t *pgd_alloc(struct mm_struct *mm)
34070 {
34071 pgd_t *pgd;
34072- pmd_t *pmds[PREALLOCATED_PMDS];
34073+ pxd_t *pxds[PREALLOCATED_PXDS];
34074
34075 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
34076
34077@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34078
34079 mm->pgd = pgd;
34080
34081- if (preallocate_pmds(pmds) != 0)
34082+ if (preallocate_pxds(pxds) != 0)
34083 goto out_free_pgd;
34084
34085 if (paravirt_pgd_alloc(mm) != 0)
34086- goto out_free_pmds;
34087+ goto out_free_pxds;
34088
34089 /*
34090 * Make sure that pre-populating the pmds is atomic with
34091@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34092 spin_lock(&pgd_lock);
34093
34094 pgd_ctor(mm, pgd);
34095- pgd_prepopulate_pmd(mm, pgd, pmds);
34096+ pgd_prepopulate_pxd(mm, pgd, pxds);
34097
34098 spin_unlock(&pgd_lock);
34099
34100 return pgd;
34101
34102-out_free_pmds:
34103- free_pmds(pmds);
34104+out_free_pxds:
34105+ free_pxds(pxds);
34106 out_free_pgd:
34107 free_page((unsigned long)pgd);
34108 out:
34109@@ -313,7 +380,7 @@ out:
34110
34111 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34112 {
34113- pgd_mop_up_pmds(mm, pgd);
34114+ pgd_mop_up_pxds(mm, pgd);
34115 pgd_dtor(pgd);
34116 paravirt_pgd_free(mm, pgd);
34117 free_page((unsigned long)pgd);
34118diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34119index 75cc097..79a097f 100644
34120--- a/arch/x86/mm/pgtable_32.c
34121+++ b/arch/x86/mm/pgtable_32.c
34122@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34123 return;
34124 }
34125 pte = pte_offset_kernel(pmd, vaddr);
34126+
34127+ pax_open_kernel();
34128 if (pte_val(pteval))
34129 set_pte_at(&init_mm, vaddr, pte, pteval);
34130 else
34131 pte_clear(&init_mm, vaddr, pte);
34132+ pax_close_kernel();
34133
34134 /*
34135 * It's enough to flush this one mapping.
34136diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34137index e666cbb..61788c45 100644
34138--- a/arch/x86/mm/physaddr.c
34139+++ b/arch/x86/mm/physaddr.c
34140@@ -10,7 +10,7 @@
34141 #ifdef CONFIG_X86_64
34142
34143 #ifdef CONFIG_DEBUG_VIRTUAL
34144-unsigned long __phys_addr(unsigned long x)
34145+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34146 {
34147 unsigned long y = x - __START_KERNEL_map;
34148
34149@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34150 #else
34151
34152 #ifdef CONFIG_DEBUG_VIRTUAL
34153-unsigned long __phys_addr(unsigned long x)
34154+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34155 {
34156 unsigned long phys_addr = x - PAGE_OFFSET;
34157 /* VMALLOC_* aren't constants */
34158diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34159index 90555bf..f5f1828 100644
34160--- a/arch/x86/mm/setup_nx.c
34161+++ b/arch/x86/mm/setup_nx.c
34162@@ -5,8 +5,10 @@
34163 #include <asm/pgtable.h>
34164 #include <asm/proto.h>
34165
34166+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34167 static int disable_nx;
34168
34169+#ifndef CONFIG_PAX_PAGEEXEC
34170 /*
34171 * noexec = on|off
34172 *
34173@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34174 return 0;
34175 }
34176 early_param("noexec", noexec_setup);
34177+#endif
34178+
34179+#endif
34180
34181 void x86_configure_nx(void)
34182 {
34183+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34184 if (cpu_has_nx && !disable_nx)
34185 __supported_pte_mask |= _PAGE_NX;
34186 else
34187+#endif
34188 __supported_pte_mask &= ~_PAGE_NX;
34189 }
34190
34191diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34192index ee61c36..e6fedeb 100644
34193--- a/arch/x86/mm/tlb.c
34194+++ b/arch/x86/mm/tlb.c
34195@@ -48,7 +48,11 @@ void leave_mm(int cpu)
34196 BUG();
34197 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34198 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34199+
34200+#ifndef CONFIG_PAX_PER_CPU_PGD
34201 load_cr3(swapper_pg_dir);
34202+#endif
34203+
34204 /*
34205 * This gets called in the idle path where RCU
34206 * functions differently. Tracing normally
34207diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34208new file mode 100644
34209index 0000000..dace51c
34210--- /dev/null
34211+++ b/arch/x86/mm/uderef_64.c
34212@@ -0,0 +1,37 @@
34213+#include <linux/mm.h>
34214+#include <asm/pgtable.h>
34215+#include <asm/uaccess.h>
34216+
34217+#ifdef CONFIG_PAX_MEMORY_UDEREF
34218+/* PaX: due to the special call convention these functions must
34219+ * - remain leaf functions under all configurations,
34220+ * - never be called directly, only dereferenced from the wrappers.
34221+ */
34222+void __pax_open_userland(void)
34223+{
34224+ unsigned int cpu;
34225+
34226+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34227+ return;
34228+
34229+ cpu = raw_get_cpu();
34230+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34231+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34232+ raw_put_cpu_no_resched();
34233+}
34234+EXPORT_SYMBOL(__pax_open_userland);
34235+
34236+void __pax_close_userland(void)
34237+{
34238+ unsigned int cpu;
34239+
34240+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34241+ return;
34242+
34243+ cpu = raw_get_cpu();
34244+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34245+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34246+ raw_put_cpu_no_resched();
34247+}
34248+EXPORT_SYMBOL(__pax_close_userland);
34249+#endif
34250diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34251index 6440221..f84b5c7 100644
34252--- a/arch/x86/net/bpf_jit.S
34253+++ b/arch/x86/net/bpf_jit.S
34254@@ -9,6 +9,7 @@
34255 */
34256 #include <linux/linkage.h>
34257 #include <asm/dwarf2.h>
34258+#include <asm/alternative-asm.h>
34259
34260 /*
34261 * Calling convention :
34262@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34263 jle bpf_slow_path_word
34264 mov (SKBDATA,%rsi),%eax
34265 bswap %eax /* ntohl() */
34266+ pax_force_retaddr
34267 ret
34268
34269 sk_load_half:
34270@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34271 jle bpf_slow_path_half
34272 movzwl (SKBDATA,%rsi),%eax
34273 rol $8,%ax # ntohs()
34274+ pax_force_retaddr
34275 ret
34276
34277 sk_load_byte:
34278@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34279 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34280 jle bpf_slow_path_byte
34281 movzbl (SKBDATA,%rsi),%eax
34282+ pax_force_retaddr
34283 ret
34284
34285 /* rsi contains offset and can be scratched */
34286@@ -90,6 +94,7 @@ bpf_slow_path_word:
34287 js bpf_error
34288 mov - MAX_BPF_STACK + 32(%rbp),%eax
34289 bswap %eax
34290+ pax_force_retaddr
34291 ret
34292
34293 bpf_slow_path_half:
34294@@ -98,12 +103,14 @@ bpf_slow_path_half:
34295 mov - MAX_BPF_STACK + 32(%rbp),%ax
34296 rol $8,%ax
34297 movzwl %ax,%eax
34298+ pax_force_retaddr
34299 ret
34300
34301 bpf_slow_path_byte:
34302 bpf_slow_path_common(1)
34303 js bpf_error
34304 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34305+ pax_force_retaddr
34306 ret
34307
34308 #define sk_negative_common(SIZE) \
34309@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34310 sk_negative_common(4)
34311 mov (%rax), %eax
34312 bswap %eax
34313+ pax_force_retaddr
34314 ret
34315
34316 bpf_slow_path_half_neg:
34317@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34318 mov (%rax),%ax
34319 rol $8,%ax
34320 movzwl %ax,%eax
34321+ pax_force_retaddr
34322 ret
34323
34324 bpf_slow_path_byte_neg:
34325@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34326 .globl sk_load_byte_negative_offset
34327 sk_negative_common(1)
34328 movzbl (%rax), %eax
34329+ pax_force_retaddr
34330 ret
34331
34332 bpf_error:
34333@@ -156,4 +166,5 @@ bpf_error:
34334 mov - MAX_BPF_STACK + 16(%rbp),%r14
34335 mov - MAX_BPF_STACK + 24(%rbp),%r15
34336 leaveq
34337+ pax_force_retaddr
34338 ret
34339diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34340index 9875143..00f6656 100644
34341--- a/arch/x86/net/bpf_jit_comp.c
34342+++ b/arch/x86/net/bpf_jit_comp.c
34343@@ -13,7 +13,11 @@
34344 #include <linux/if_vlan.h>
34345 #include <asm/cacheflush.h>
34346
34347+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34348+int bpf_jit_enable __read_only;
34349+#else
34350 int bpf_jit_enable __read_mostly;
34351+#endif
34352
34353 /*
34354 * assembly code in arch/x86/net/bpf_jit.S
34355@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34356 static void jit_fill_hole(void *area, unsigned int size)
34357 {
34358 /* fill whole space with int3 instructions */
34359+ pax_open_kernel();
34360 memset(area, 0xcc, size);
34361+ pax_close_kernel();
34362 }
34363
34364 struct jit_context {
34365@@ -896,7 +902,9 @@ common_load:
34366 pr_err("bpf_jit_compile fatal error\n");
34367 return -EFAULT;
34368 }
34369+ pax_open_kernel();
34370 memcpy(image + proglen, temp, ilen);
34371+ pax_close_kernel();
34372 }
34373 proglen += ilen;
34374 addrs[i] = proglen;
34375@@ -968,7 +976,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34376
34377 if (image) {
34378 bpf_flush_icache(header, image + proglen);
34379- set_memory_ro((unsigned long)header, header->pages);
34380 prog->bpf_func = (void *)image;
34381 prog->jited = true;
34382 }
34383@@ -981,12 +988,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34384 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34385 struct bpf_binary_header *header = (void *)addr;
34386
34387- if (!fp->jited)
34388- goto free_filter;
34389+ if (fp->jited)
34390+ bpf_jit_binary_free(header);
34391
34392- set_memory_rw(addr, header->pages);
34393- bpf_jit_binary_free(header);
34394-
34395-free_filter:
34396 bpf_prog_unlock_free(fp);
34397 }
34398diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34399index 5d04be5..2beeaa2 100644
34400--- a/arch/x86/oprofile/backtrace.c
34401+++ b/arch/x86/oprofile/backtrace.c
34402@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34403 struct stack_frame_ia32 *fp;
34404 unsigned long bytes;
34405
34406- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34407+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34408 if (bytes != 0)
34409 return NULL;
34410
34411- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34412+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34413
34414 oprofile_add_trace(bufhead[0].return_address);
34415
34416@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34417 struct stack_frame bufhead[2];
34418 unsigned long bytes;
34419
34420- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34421+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34422 if (bytes != 0)
34423 return NULL;
34424
34425@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34426 {
34427 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34428
34429- if (!user_mode_vm(regs)) {
34430+ if (!user_mode(regs)) {
34431 unsigned long stack = kernel_stack_pointer(regs);
34432 if (depth)
34433 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34434diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34435index 1d2e639..f6ef82a 100644
34436--- a/arch/x86/oprofile/nmi_int.c
34437+++ b/arch/x86/oprofile/nmi_int.c
34438@@ -23,6 +23,7 @@
34439 #include <asm/nmi.h>
34440 #include <asm/msr.h>
34441 #include <asm/apic.h>
34442+#include <asm/pgtable.h>
34443
34444 #include "op_counter.h"
34445 #include "op_x86_model.h"
34446@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34447 if (ret)
34448 return ret;
34449
34450- if (!model->num_virt_counters)
34451- model->num_virt_counters = model->num_counters;
34452+ if (!model->num_virt_counters) {
34453+ pax_open_kernel();
34454+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34455+ pax_close_kernel();
34456+ }
34457
34458 mux_init(ops);
34459
34460diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34461index 50d86c0..7985318 100644
34462--- a/arch/x86/oprofile/op_model_amd.c
34463+++ b/arch/x86/oprofile/op_model_amd.c
34464@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34465 num_counters = AMD64_NUM_COUNTERS;
34466 }
34467
34468- op_amd_spec.num_counters = num_counters;
34469- op_amd_spec.num_controls = num_counters;
34470- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34471+ pax_open_kernel();
34472+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34473+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34474+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34475+ pax_close_kernel();
34476
34477 return 0;
34478 }
34479diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34480index d90528e..0127e2b 100644
34481--- a/arch/x86/oprofile/op_model_ppro.c
34482+++ b/arch/x86/oprofile/op_model_ppro.c
34483@@ -19,6 +19,7 @@
34484 #include <asm/msr.h>
34485 #include <asm/apic.h>
34486 #include <asm/nmi.h>
34487+#include <asm/pgtable.h>
34488
34489 #include "op_x86_model.h"
34490 #include "op_counter.h"
34491@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34492
34493 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34494
34495- op_arch_perfmon_spec.num_counters = num_counters;
34496- op_arch_perfmon_spec.num_controls = num_counters;
34497+ pax_open_kernel();
34498+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34499+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34500+ pax_close_kernel();
34501 }
34502
34503 static int arch_perfmon_init(struct oprofile_operations *ignore)
34504diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34505index 71e8a67..6a313bb 100644
34506--- a/arch/x86/oprofile/op_x86_model.h
34507+++ b/arch/x86/oprofile/op_x86_model.h
34508@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34509 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34510 struct op_msrs const * const msrs);
34511 #endif
34512-};
34513+} __do_const;
34514
34515 struct op_counter_config;
34516
34517diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34518index 44b9271..4c5a988 100644
34519--- a/arch/x86/pci/intel_mid_pci.c
34520+++ b/arch/x86/pci/intel_mid_pci.c
34521@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34522 pci_mmcfg_late_init();
34523 pcibios_enable_irq = intel_mid_pci_irq_enable;
34524 pcibios_disable_irq = intel_mid_pci_irq_disable;
34525- pci_root_ops = intel_mid_pci_ops;
34526+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34527 pci_soc_mode = 1;
34528 /* Continue with standard init */
34529 return 1;
34530diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34531index 5dc6ca5..25c03f5 100644
34532--- a/arch/x86/pci/irq.c
34533+++ b/arch/x86/pci/irq.c
34534@@ -51,7 +51,7 @@ struct irq_router {
34535 struct irq_router_handler {
34536 u16 vendor;
34537 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34538-};
34539+} __do_const;
34540
34541 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34542 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34543@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34544 return 0;
34545 }
34546
34547-static __initdata struct irq_router_handler pirq_routers[] = {
34548+static __initconst const struct irq_router_handler pirq_routers[] = {
34549 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34550 { PCI_VENDOR_ID_AL, ali_router_probe },
34551 { PCI_VENDOR_ID_ITE, ite_router_probe },
34552@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34553 static void __init pirq_find_router(struct irq_router *r)
34554 {
34555 struct irq_routing_table *rt = pirq_table;
34556- struct irq_router_handler *h;
34557+ const struct irq_router_handler *h;
34558
34559 #ifdef CONFIG_PCI_BIOS
34560 if (!rt->signature) {
34561@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34562 return 0;
34563 }
34564
34565-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34566+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34567 {
34568 .callback = fix_broken_hp_bios_irq9,
34569 .ident = "HP Pavilion N5400 Series Laptop",
34570diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34571index 9b83b90..4112152 100644
34572--- a/arch/x86/pci/pcbios.c
34573+++ b/arch/x86/pci/pcbios.c
34574@@ -79,7 +79,7 @@ union bios32 {
34575 static struct {
34576 unsigned long address;
34577 unsigned short segment;
34578-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34579+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34580
34581 /*
34582 * Returns the entry point for the given service, NULL on error
34583@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34584 unsigned long length; /* %ecx */
34585 unsigned long entry; /* %edx */
34586 unsigned long flags;
34587+ struct desc_struct d, *gdt;
34588
34589 local_irq_save(flags);
34590- __asm__("lcall *(%%edi); cld"
34591+
34592+ gdt = get_cpu_gdt_table(smp_processor_id());
34593+
34594+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34595+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34596+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34597+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34598+
34599+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34600 : "=a" (return_code),
34601 "=b" (address),
34602 "=c" (length),
34603 "=d" (entry)
34604 : "0" (service),
34605 "1" (0),
34606- "D" (&bios32_indirect));
34607+ "D" (&bios32_indirect),
34608+ "r"(__PCIBIOS_DS)
34609+ : "memory");
34610+
34611+ pax_open_kernel();
34612+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34613+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34614+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34615+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34616+ pax_close_kernel();
34617+
34618 local_irq_restore(flags);
34619
34620 switch (return_code) {
34621- case 0:
34622- return address + entry;
34623- case 0x80: /* Not present */
34624- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34625- return 0;
34626- default: /* Shouldn't happen */
34627- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34628- service, return_code);
34629+ case 0: {
34630+ int cpu;
34631+ unsigned char flags;
34632+
34633+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34634+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34635+ printk(KERN_WARNING "bios32_service: not valid\n");
34636 return 0;
34637+ }
34638+ address = address + PAGE_OFFSET;
34639+ length += 16UL; /* some BIOSs underreport this... */
34640+ flags = 4;
34641+ if (length >= 64*1024*1024) {
34642+ length >>= PAGE_SHIFT;
34643+ flags |= 8;
34644+ }
34645+
34646+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34647+ gdt = get_cpu_gdt_table(cpu);
34648+ pack_descriptor(&d, address, length, 0x9b, flags);
34649+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34650+ pack_descriptor(&d, address, length, 0x93, flags);
34651+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34652+ }
34653+ return entry;
34654+ }
34655+ case 0x80: /* Not present */
34656+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34657+ return 0;
34658+ default: /* Shouldn't happen */
34659+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34660+ service, return_code);
34661+ return 0;
34662 }
34663 }
34664
34665 static struct {
34666 unsigned long address;
34667 unsigned short segment;
34668-} pci_indirect = { 0, __KERNEL_CS };
34669+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34670
34671-static int pci_bios_present;
34672+static int pci_bios_present __read_only;
34673
34674 static int __init check_pcibios(void)
34675 {
34676@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34677 unsigned long flags, pcibios_entry;
34678
34679 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34680- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34681+ pci_indirect.address = pcibios_entry;
34682
34683 local_irq_save(flags);
34684- __asm__(
34685- "lcall *(%%edi); cld\n\t"
34686+ __asm__("movw %w6, %%ds\n\t"
34687+ "lcall *%%ss:(%%edi); cld\n\t"
34688+ "push %%ss\n\t"
34689+ "pop %%ds\n\t"
34690 "jc 1f\n\t"
34691 "xor %%ah, %%ah\n"
34692 "1:"
34693@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34694 "=b" (ebx),
34695 "=c" (ecx)
34696 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34697- "D" (&pci_indirect)
34698+ "D" (&pci_indirect),
34699+ "r" (__PCIBIOS_DS)
34700 : "memory");
34701 local_irq_restore(flags);
34702
34703@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34704
34705 switch (len) {
34706 case 1:
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@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34716 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34717 "b" (bx),
34718 "D" ((long)reg),
34719- "S" (&pci_indirect));
34720+ "S" (&pci_indirect),
34721+ "r" (__PCIBIOS_DS));
34722 /*
34723 * Zero-extend the result beyond 8 bits, do not trust the
34724 * BIOS having done it:
34725@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34726 *value &= 0xff;
34727 break;
34728 case 2:
34729- __asm__("lcall *(%%esi); cld\n\t"
34730+ __asm__("movw %w6, %%ds\n\t"
34731+ "lcall *%%ss:(%%esi); cld\n\t"
34732+ "push %%ss\n\t"
34733+ "pop %%ds\n\t"
34734 "jc 1f\n\t"
34735 "xor %%ah, %%ah\n"
34736 "1:"
34737@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34738 : "1" (PCIBIOS_READ_CONFIG_WORD),
34739 "b" (bx),
34740 "D" ((long)reg),
34741- "S" (&pci_indirect));
34742+ "S" (&pci_indirect),
34743+ "r" (__PCIBIOS_DS));
34744 /*
34745 * Zero-extend the result beyond 16 bits, do not trust the
34746 * BIOS having done it:
34747@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34748 *value &= 0xffff;
34749 break;
34750 case 4:
34751- __asm__("lcall *(%%esi); cld\n\t"
34752+ __asm__("movw %w6, %%ds\n\t"
34753+ "lcall *%%ss:(%%esi); cld\n\t"
34754+ "push %%ss\n\t"
34755+ "pop %%ds\n\t"
34756 "jc 1f\n\t"
34757 "xor %%ah, %%ah\n"
34758 "1:"
34759@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34760 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34761 "b" (bx),
34762 "D" ((long)reg),
34763- "S" (&pci_indirect));
34764+ "S" (&pci_indirect),
34765+ "r" (__PCIBIOS_DS));
34766 break;
34767 }
34768
34769@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34770
34771 switch (len) {
34772 case 1:
34773- __asm__("lcall *(%%esi); cld\n\t"
34774+ __asm__("movw %w6, %%ds\n\t"
34775+ "lcall *%%ss:(%%esi); cld\n\t"
34776+ "push %%ss\n\t"
34777+ "pop %%ds\n\t"
34778 "jc 1f\n\t"
34779 "xor %%ah, %%ah\n"
34780 "1:"
34781@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34782 "c" (value),
34783 "b" (bx),
34784 "D" ((long)reg),
34785- "S" (&pci_indirect));
34786+ "S" (&pci_indirect),
34787+ "r" (__PCIBIOS_DS));
34788 break;
34789 case 2:
34790- __asm__("lcall *(%%esi); cld\n\t"
34791+ __asm__("movw %w6, %%ds\n\t"
34792+ "lcall *%%ss:(%%esi); cld\n\t"
34793+ "push %%ss\n\t"
34794+ "pop %%ds\n\t"
34795 "jc 1f\n\t"
34796 "xor %%ah, %%ah\n"
34797 "1:"
34798@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34799 "c" (value),
34800 "b" (bx),
34801 "D" ((long)reg),
34802- "S" (&pci_indirect));
34803+ "S" (&pci_indirect),
34804+ "r" (__PCIBIOS_DS));
34805 break;
34806 case 4:
34807- __asm__("lcall *(%%esi); cld\n\t"
34808+ __asm__("movw %w6, %%ds\n\t"
34809+ "lcall *%%ss:(%%esi); cld\n\t"
34810+ "push %%ss\n\t"
34811+ "pop %%ds\n\t"
34812 "jc 1f\n\t"
34813 "xor %%ah, %%ah\n"
34814 "1:"
34815@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34816 "c" (value),
34817 "b" (bx),
34818 "D" ((long)reg),
34819- "S" (&pci_indirect));
34820+ "S" (&pci_indirect),
34821+ "r" (__PCIBIOS_DS));
34822 break;
34823 }
34824
34825@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34826
34827 DBG("PCI: Fetching IRQ routing table... ");
34828 __asm__("push %%es\n\t"
34829+ "movw %w8, %%ds\n\t"
34830 "push %%ds\n\t"
34831 "pop %%es\n\t"
34832- "lcall *(%%esi); cld\n\t"
34833+ "lcall *%%ss:(%%esi); cld\n\t"
34834 "pop %%es\n\t"
34835+ "push %%ss\n\t"
34836+ "pop %%ds\n"
34837 "jc 1f\n\t"
34838 "xor %%ah, %%ah\n"
34839 "1:"
34840@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34841 "1" (0),
34842 "D" ((long) &opt),
34843 "S" (&pci_indirect),
34844- "m" (opt)
34845+ "m" (opt),
34846+ "r" (__PCIBIOS_DS)
34847 : "memory");
34848 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34849 if (ret & 0xff00)
34850@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34851 {
34852 int ret;
34853
34854- __asm__("lcall *(%%esi); cld\n\t"
34855+ __asm__("movw %w5, %%ds\n\t"
34856+ "lcall *%%ss:(%%esi); cld\n\t"
34857+ "push %%ss\n\t"
34858+ "pop %%ds\n"
34859 "jc 1f\n\t"
34860 "xor %%ah, %%ah\n"
34861 "1:"
34862@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34863 : "0" (PCIBIOS_SET_PCI_HW_INT),
34864 "b" ((dev->bus->number << 8) | dev->devfn),
34865 "c" ((irq << 8) | (pin + 10)),
34866- "S" (&pci_indirect));
34867+ "S" (&pci_indirect),
34868+ "r" (__PCIBIOS_DS));
34869 return !(ret & 0xff00);
34870 }
34871 EXPORT_SYMBOL(pcibios_set_irq_routing);
34872diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34873index 40e7cda..c7e6672 100644
34874--- a/arch/x86/platform/efi/efi_32.c
34875+++ b/arch/x86/platform/efi/efi_32.c
34876@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34877 {
34878 struct desc_ptr gdt_descr;
34879
34880+#ifdef CONFIG_PAX_KERNEXEC
34881+ struct desc_struct d;
34882+#endif
34883+
34884 local_irq_save(efi_rt_eflags);
34885
34886 load_cr3(initial_page_table);
34887 __flush_tlb_all();
34888
34889+#ifdef CONFIG_PAX_KERNEXEC
34890+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34891+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34892+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34893+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34894+#endif
34895+
34896 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34897 gdt_descr.size = GDT_SIZE - 1;
34898 load_gdt(&gdt_descr);
34899@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34900 {
34901 struct desc_ptr gdt_descr;
34902
34903+#ifdef CONFIG_PAX_KERNEXEC
34904+ struct desc_struct d;
34905+
34906+ memset(&d, 0, sizeof d);
34907+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34908+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34909+#endif
34910+
34911 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34912 gdt_descr.size = GDT_SIZE - 1;
34913 load_gdt(&gdt_descr);
34914
34915+#ifdef CONFIG_PAX_PER_CPU_PGD
34916+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34917+#else
34918 load_cr3(swapper_pg_dir);
34919+#endif
34920+
34921 __flush_tlb_all();
34922
34923 local_irq_restore(efi_rt_eflags);
34924diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34925index 17e80d8..9fa6e41 100644
34926--- a/arch/x86/platform/efi/efi_64.c
34927+++ b/arch/x86/platform/efi/efi_64.c
34928@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34929 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34930 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34931 }
34932+
34933+#ifdef CONFIG_PAX_PER_CPU_PGD
34934+ load_cr3(swapper_pg_dir);
34935+#endif
34936+
34937 __flush_tlb_all();
34938 }
34939
34940@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34941 for (pgd = 0; pgd < n_pgds; pgd++)
34942 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34943 kfree(save_pgd);
34944+
34945+#ifdef CONFIG_PAX_PER_CPU_PGD
34946+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34947+#endif
34948+
34949 __flush_tlb_all();
34950 local_irq_restore(efi_flags);
34951 early_code_mapping_set_exec(0);
34952@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34953 unsigned npages;
34954 pgd_t *pgd;
34955
34956- if (efi_enabled(EFI_OLD_MEMMAP))
34957+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34958+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34959+ * able to execute the EFI services.
34960+ */
34961+ if (__supported_pte_mask & _PAGE_NX) {
34962+ unsigned long addr = (unsigned long) __va(0);
34963+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34964+
34965+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34966+#ifdef CONFIG_PAX_PER_CPU_PGD
34967+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34968+#endif
34969+ set_pgd(pgd_offset_k(addr), pe);
34970+ }
34971+
34972 return 0;
34973+ }
34974
34975 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34976 pgd = __va(efi_scratch.efi_pgt);
34977diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34978index 040192b..7d3300f 100644
34979--- a/arch/x86/platform/efi/efi_stub_32.S
34980+++ b/arch/x86/platform/efi/efi_stub_32.S
34981@@ -6,7 +6,9 @@
34982 */
34983
34984 #include <linux/linkage.h>
34985+#include <linux/init.h>
34986 #include <asm/page_types.h>
34987+#include <asm/segment.h>
34988
34989 /*
34990 * efi_call_phys(void *, ...) is a function with variable parameters.
34991@@ -20,7 +22,7 @@
34992 * service functions will comply with gcc calling convention, too.
34993 */
34994
34995-.text
34996+__INIT
34997 ENTRY(efi_call_phys)
34998 /*
34999 * 0. The function can only be called in Linux kernel. So CS has been
35000@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
35001 * The mapping of lower virtual memory has been created in prolog and
35002 * epilog.
35003 */
35004- movl $1f, %edx
35005- subl $__PAGE_OFFSET, %edx
35006- jmp *%edx
35007+#ifdef CONFIG_PAX_KERNEXEC
35008+ movl $(__KERNEXEC_EFI_DS), %edx
35009+ mov %edx, %ds
35010+ mov %edx, %es
35011+ mov %edx, %ss
35012+ addl $2f,(1f)
35013+ ljmp *(1f)
35014+
35015+__INITDATA
35016+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35017+.previous
35018+
35019+2:
35020+ subl $2b,(1b)
35021+#else
35022+ jmp 1f-__PAGE_OFFSET
35023 1:
35024+#endif
35025
35026 /*
35027 * 2. Now on the top of stack is the return
35028@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35029 * parameter 2, ..., param n. To make things easy, we save the return
35030 * address of efi_call_phys in a global variable.
35031 */
35032- popl %edx
35033- movl %edx, saved_return_addr
35034- /* get the function pointer into ECX*/
35035- popl %ecx
35036- movl %ecx, efi_rt_function_ptr
35037- movl $2f, %edx
35038- subl $__PAGE_OFFSET, %edx
35039- pushl %edx
35040+ popl (saved_return_addr)
35041+ popl (efi_rt_function_ptr)
35042
35043 /*
35044 * 3. Clear PG bit in %CR0.
35045@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35046 /*
35047 * 5. Call the physical function.
35048 */
35049- jmp *%ecx
35050+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35051
35052-2:
35053 /*
35054 * 6. After EFI runtime service returns, control will return to
35055 * following instruction. We'd better readjust stack pointer first.
35056@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35057 movl %cr0, %edx
35058 orl $0x80000000, %edx
35059 movl %edx, %cr0
35060- jmp 1f
35061-1:
35062+
35063 /*
35064 * 8. Now restore the virtual mode from flat mode by
35065 * adding EIP with PAGE_OFFSET.
35066 */
35067- movl $1f, %edx
35068- jmp *%edx
35069+#ifdef CONFIG_PAX_KERNEXEC
35070+ movl $(__KERNEL_DS), %edx
35071+ mov %edx, %ds
35072+ mov %edx, %es
35073+ mov %edx, %ss
35074+ ljmp $(__KERNEL_CS),$1f
35075+#else
35076+ jmp 1f+__PAGE_OFFSET
35077+#endif
35078 1:
35079
35080 /*
35081 * 9. Balance the stack. And because EAX contain the return value,
35082 * we'd better not clobber it.
35083 */
35084- leal efi_rt_function_ptr, %edx
35085- movl (%edx), %ecx
35086- pushl %ecx
35087+ pushl (efi_rt_function_ptr)
35088
35089 /*
35090- * 10. Push the saved return address onto the stack and return.
35091+ * 10. Return to the saved return address.
35092 */
35093- leal saved_return_addr, %edx
35094- movl (%edx), %ecx
35095- pushl %ecx
35096- ret
35097+ jmpl *(saved_return_addr)
35098 ENDPROC(efi_call_phys)
35099 .previous
35100
35101-.data
35102+__INITDATA
35103 saved_return_addr:
35104 .long 0
35105 efi_rt_function_ptr:
35106diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35107index 86d0f9e..6d499f4 100644
35108--- a/arch/x86/platform/efi/efi_stub_64.S
35109+++ b/arch/x86/platform/efi/efi_stub_64.S
35110@@ -11,6 +11,7 @@
35111 #include <asm/msr.h>
35112 #include <asm/processor-flags.h>
35113 #include <asm/page_types.h>
35114+#include <asm/alternative-asm.h>
35115
35116 #define SAVE_XMM \
35117 mov %rsp, %rax; \
35118@@ -88,6 +89,7 @@ ENTRY(efi_call)
35119 RESTORE_PGT
35120 addq $48, %rsp
35121 RESTORE_XMM
35122+ pax_force_retaddr 0, 1
35123 ret
35124 ENDPROC(efi_call)
35125
35126diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35127index 1bbedc4..eb795b5 100644
35128--- a/arch/x86/platform/intel-mid/intel-mid.c
35129+++ b/arch/x86/platform/intel-mid/intel-mid.c
35130@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35131 {
35132 };
35133
35134-static void intel_mid_reboot(void)
35135+static void __noreturn intel_mid_reboot(void)
35136 {
35137 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35138+ BUG();
35139 }
35140
35141 static unsigned long __init intel_mid_calibrate_tsc(void)
35142diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35143index 3c1c386..59a68ed 100644
35144--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35145+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35146@@ -13,6 +13,6 @@
35147 /* For every CPU addition a new get_<cpuname>_ops interface needs
35148 * to be added.
35149 */
35150-extern void *get_penwell_ops(void);
35151-extern void *get_cloverview_ops(void);
35152-extern void *get_tangier_ops(void);
35153+extern const void *get_penwell_ops(void);
35154+extern const void *get_cloverview_ops(void);
35155+extern const void *get_tangier_ops(void);
35156diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35157index 23381d2..8ddc10e 100644
35158--- a/arch/x86/platform/intel-mid/mfld.c
35159+++ b/arch/x86/platform/intel-mid/mfld.c
35160@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35161 pm_power_off = mfld_power_off;
35162 }
35163
35164-void *get_penwell_ops(void)
35165+const void *get_penwell_ops(void)
35166 {
35167 return &penwell_ops;
35168 }
35169
35170-void *get_cloverview_ops(void)
35171+const void *get_cloverview_ops(void)
35172 {
35173 return &penwell_ops;
35174 }
35175diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35176index aaca917..66eadbc 100644
35177--- a/arch/x86/platform/intel-mid/mrfl.c
35178+++ b/arch/x86/platform/intel-mid/mrfl.c
35179@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35180 .arch_setup = tangier_arch_setup,
35181 };
35182
35183-void *get_tangier_ops(void)
35184+const void *get_tangier_ops(void)
35185 {
35186 return &tangier_ops;
35187 }
35188diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35189index d6ee929..3637cb5 100644
35190--- a/arch/x86/platform/olpc/olpc_dt.c
35191+++ b/arch/x86/platform/olpc/olpc_dt.c
35192@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35193 return res;
35194 }
35195
35196-static struct of_pdt_ops prom_olpc_ops __initdata = {
35197+static struct of_pdt_ops prom_olpc_ops __initconst = {
35198 .nextprop = olpc_dt_nextprop,
35199 .getproplen = olpc_dt_getproplen,
35200 .getproperty = olpc_dt_getproperty,
35201diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35202index 6ec7910..ecdbb11 100644
35203--- a/arch/x86/power/cpu.c
35204+++ b/arch/x86/power/cpu.c
35205@@ -137,11 +137,8 @@ static void do_fpu_end(void)
35206 static void fix_processor_context(void)
35207 {
35208 int cpu = smp_processor_id();
35209- struct tss_struct *t = &per_cpu(init_tss, cpu);
35210-#ifdef CONFIG_X86_64
35211- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35212- tss_desc tss;
35213-#endif
35214+ struct tss_struct *t = init_tss + cpu;
35215+
35216 set_tss_desc(cpu, t); /*
35217 * This just modifies memory; should not be
35218 * necessary. But... This is necessary, because
35219@@ -150,10 +147,6 @@ static void fix_processor_context(void)
35220 */
35221
35222 #ifdef CONFIG_X86_64
35223- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35224- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35225- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35226-
35227 syscall_init(); /* This sets MSR_*STAR and related */
35228 #endif
35229 load_TR_desc(); /* This does ltr */
35230diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35231index bad628a..a102610 100644
35232--- a/arch/x86/realmode/init.c
35233+++ b/arch/x86/realmode/init.c
35234@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35235 __va(real_mode_header->trampoline_header);
35236
35237 #ifdef CONFIG_X86_32
35238- trampoline_header->start = __pa_symbol(startup_32_smp);
35239+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35240+
35241+#ifdef CONFIG_PAX_KERNEXEC
35242+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35243+#endif
35244+
35245+ trampoline_header->boot_cs = __BOOT_CS;
35246 trampoline_header->gdt_limit = __BOOT_DS + 7;
35247 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35248 #else
35249@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35250 *trampoline_cr4_features = read_cr4();
35251
35252 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35253- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35254+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35255 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35256 #endif
35257 }
35258diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35259index 7c0d7be..d24dc88 100644
35260--- a/arch/x86/realmode/rm/Makefile
35261+++ b/arch/x86/realmode/rm/Makefile
35262@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35263
35264 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35265 -I$(srctree)/arch/x86/boot
35266+ifdef CONSTIFY_PLUGIN
35267+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35268+endif
35269 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35270 GCOV_PROFILE := n
35271diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35272index a28221d..93c40f1 100644
35273--- a/arch/x86/realmode/rm/header.S
35274+++ b/arch/x86/realmode/rm/header.S
35275@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35276 #endif
35277 /* APM/BIOS reboot */
35278 .long pa_machine_real_restart_asm
35279-#ifdef CONFIG_X86_64
35280+#ifdef CONFIG_X86_32
35281+ .long __KERNEL_CS
35282+#else
35283 .long __KERNEL32_CS
35284 #endif
35285 END(real_mode_header)
35286diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35287index 48ddd76..c26749f 100644
35288--- a/arch/x86/realmode/rm/trampoline_32.S
35289+++ b/arch/x86/realmode/rm/trampoline_32.S
35290@@ -24,6 +24,12 @@
35291 #include <asm/page_types.h>
35292 #include "realmode.h"
35293
35294+#ifdef CONFIG_PAX_KERNEXEC
35295+#define ta(X) (X)
35296+#else
35297+#define ta(X) (pa_ ## X)
35298+#endif
35299+
35300 .text
35301 .code16
35302
35303@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35304
35305 cli # We should be safe anyway
35306
35307- movl tr_start, %eax # where we need to go
35308-
35309 movl $0xA5A5A5A5, trampoline_status
35310 # write marker for master knows we're running
35311
35312@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35313 movw $1, %dx # protected mode (PE) bit
35314 lmsw %dx # into protected mode
35315
35316- ljmpl $__BOOT_CS, $pa_startup_32
35317+ ljmpl *(trampoline_header)
35318
35319 .section ".text32","ax"
35320 .code32
35321@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35322 .balign 8
35323 GLOBAL(trampoline_header)
35324 tr_start: .space 4
35325- tr_gdt_pad: .space 2
35326+ tr_boot_cs: .space 2
35327 tr_gdt: .space 6
35328 END(trampoline_header)
35329
35330diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35331index dac7b20..72dbaca 100644
35332--- a/arch/x86/realmode/rm/trampoline_64.S
35333+++ b/arch/x86/realmode/rm/trampoline_64.S
35334@@ -93,6 +93,7 @@ ENTRY(startup_32)
35335 movl %edx, %gs
35336
35337 movl pa_tr_cr4, %eax
35338+ andl $~X86_CR4_PCIDE, %eax
35339 movl %eax, %cr4 # Enable PAE mode
35340
35341 # Setup trampoline 4 level pagetables
35342@@ -106,7 +107,7 @@ ENTRY(startup_32)
35343 wrmsr
35344
35345 # Enable paging and in turn activate Long Mode
35346- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35347+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35348 movl %eax, %cr0
35349
35350 /*
35351diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35352index 9e7e147..25a4158 100644
35353--- a/arch/x86/realmode/rm/wakeup_asm.S
35354+++ b/arch/x86/realmode/rm/wakeup_asm.S
35355@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35356 lgdtl pmode_gdt
35357
35358 /* This really couldn't... */
35359- movl pmode_entry, %eax
35360 movl pmode_cr0, %ecx
35361 movl %ecx, %cr0
35362- ljmpl $__KERNEL_CS, $pa_startup_32
35363- /* -> jmp *%eax in trampoline_32.S */
35364+
35365+ ljmpl *pmode_entry
35366 #else
35367 jmp trampoline_start
35368 #endif
35369diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35370index 604a37e..e49702a 100644
35371--- a/arch/x86/tools/Makefile
35372+++ b/arch/x86/tools/Makefile
35373@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35374
35375 $(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
35376
35377-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35378+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35379 hostprogs-y += relocs
35380 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35381 PHONY += relocs
35382diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35383index 0c2fae8..88036b7 100644
35384--- a/arch/x86/tools/relocs.c
35385+++ b/arch/x86/tools/relocs.c
35386@@ -1,5 +1,7 @@
35387 /* This is included from relocs_32/64.c */
35388
35389+#include "../../../include/generated/autoconf.h"
35390+
35391 #define ElfW(type) _ElfW(ELF_BITS, type)
35392 #define _ElfW(bits, type) __ElfW(bits, type)
35393 #define __ElfW(bits, type) Elf##bits##_##type
35394@@ -11,6 +13,7 @@
35395 #define Elf_Sym ElfW(Sym)
35396
35397 static Elf_Ehdr ehdr;
35398+static Elf_Phdr *phdr;
35399
35400 struct relocs {
35401 uint32_t *offset;
35402@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35403 }
35404 }
35405
35406+static void read_phdrs(FILE *fp)
35407+{
35408+ unsigned int i;
35409+
35410+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35411+ if (!phdr) {
35412+ die("Unable to allocate %d program headers\n",
35413+ ehdr.e_phnum);
35414+ }
35415+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35416+ die("Seek to %d failed: %s\n",
35417+ ehdr.e_phoff, strerror(errno));
35418+ }
35419+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35420+ die("Cannot read ELF program headers: %s\n",
35421+ strerror(errno));
35422+ }
35423+ for(i = 0; i < ehdr.e_phnum; i++) {
35424+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35425+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35426+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35427+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35428+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35429+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35430+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35431+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35432+ }
35433+
35434+}
35435+
35436 static void read_shdrs(FILE *fp)
35437 {
35438- int i;
35439+ unsigned int i;
35440 Elf_Shdr shdr;
35441
35442 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35443@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35444
35445 static void read_strtabs(FILE *fp)
35446 {
35447- int i;
35448+ unsigned int i;
35449 for (i = 0; i < ehdr.e_shnum; i++) {
35450 struct section *sec = &secs[i];
35451 if (sec->shdr.sh_type != SHT_STRTAB) {
35452@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35453
35454 static void read_symtabs(FILE *fp)
35455 {
35456- int i,j;
35457+ unsigned int i,j;
35458 for (i = 0; i < ehdr.e_shnum; i++) {
35459 struct section *sec = &secs[i];
35460 if (sec->shdr.sh_type != SHT_SYMTAB) {
35461@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35462 }
35463
35464
35465-static void read_relocs(FILE *fp)
35466+static void read_relocs(FILE *fp, int use_real_mode)
35467 {
35468- int i,j;
35469+ unsigned int i,j;
35470+ uint32_t base;
35471+
35472 for (i = 0; i < ehdr.e_shnum; i++) {
35473 struct section *sec = &secs[i];
35474 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35475@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35476 die("Cannot read symbol table: %s\n",
35477 strerror(errno));
35478 }
35479+ base = 0;
35480+
35481+#ifdef CONFIG_X86_32
35482+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35483+ if (phdr[j].p_type != PT_LOAD )
35484+ continue;
35485+ 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)
35486+ continue;
35487+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35488+ break;
35489+ }
35490+#endif
35491+
35492 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35493 Elf_Rel *rel = &sec->reltab[j];
35494- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35495+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35496 rel->r_info = elf_xword_to_cpu(rel->r_info);
35497 #if (SHT_REL_TYPE == SHT_RELA)
35498 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35499@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35500
35501 static void print_absolute_symbols(void)
35502 {
35503- int i;
35504+ unsigned int i;
35505 const char *format;
35506
35507 if (ELF_BITS == 64)
35508@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35509 for (i = 0; i < ehdr.e_shnum; i++) {
35510 struct section *sec = &secs[i];
35511 char *sym_strtab;
35512- int j;
35513+ unsigned int j;
35514
35515 if (sec->shdr.sh_type != SHT_SYMTAB) {
35516 continue;
35517@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35518
35519 static void print_absolute_relocs(void)
35520 {
35521- int i, printed = 0;
35522+ unsigned int i, printed = 0;
35523 const char *format;
35524
35525 if (ELF_BITS == 64)
35526@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35527 struct section *sec_applies, *sec_symtab;
35528 char *sym_strtab;
35529 Elf_Sym *sh_symtab;
35530- int j;
35531+ unsigned int j;
35532 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35533 continue;
35534 }
35535@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35536 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35537 Elf_Sym *sym, const char *symname))
35538 {
35539- int i;
35540+ unsigned int i;
35541 /* Walk through the relocations */
35542 for (i = 0; i < ehdr.e_shnum; i++) {
35543 char *sym_strtab;
35544 Elf_Sym *sh_symtab;
35545 struct section *sec_applies, *sec_symtab;
35546- int j;
35547+ unsigned int j;
35548 struct section *sec = &secs[i];
35549
35550 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35551@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35552 {
35553 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35554 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35555+ char *sym_strtab = sec->link->link->strtab;
35556+
35557+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35558+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35559+ return 0;
35560+
35561+#ifdef CONFIG_PAX_KERNEXEC
35562+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35563+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35564+ return 0;
35565+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35566+ return 0;
35567+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35568+ return 0;
35569+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35570+ return 0;
35571+#endif
35572
35573 switch (r_type) {
35574 case R_386_NONE:
35575@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35576
35577 static void emit_relocs(int as_text, int use_real_mode)
35578 {
35579- int i;
35580+ unsigned int i;
35581 int (*write_reloc)(uint32_t, FILE *) = write32;
35582 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35583 const char *symname);
35584@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35585 {
35586 regex_init(use_real_mode);
35587 read_ehdr(fp);
35588+ read_phdrs(fp);
35589 read_shdrs(fp);
35590 read_strtabs(fp);
35591 read_symtabs(fp);
35592- read_relocs(fp);
35593+ read_relocs(fp, use_real_mode);
35594 if (ELF_BITS == 64)
35595 percpu_init();
35596 if (show_absolute_syms) {
35597diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35598index f40281e..92728c9 100644
35599--- a/arch/x86/um/mem_32.c
35600+++ b/arch/x86/um/mem_32.c
35601@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35602 gate_vma.vm_start = FIXADDR_USER_START;
35603 gate_vma.vm_end = FIXADDR_USER_END;
35604 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35605- gate_vma.vm_page_prot = __P101;
35606+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35607
35608 return 0;
35609 }
35610diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35611index 80ffa5b..a33bd15 100644
35612--- a/arch/x86/um/tls_32.c
35613+++ b/arch/x86/um/tls_32.c
35614@@ -260,7 +260,7 @@ out:
35615 if (unlikely(task == current &&
35616 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35617 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35618- "without flushed TLS.", current->pid);
35619+ "without flushed TLS.", task_pid_nr(current));
35620 }
35621
35622 return 0;
35623diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35624index 5a4affe..9e2d522 100644
35625--- a/arch/x86/vdso/Makefile
35626+++ b/arch/x86/vdso/Makefile
35627@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35628 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35629 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35630
35631-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35632+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35633 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35634 GCOV_PROFILE := n
35635
35636diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35637index 0224987..c7d65a5 100644
35638--- a/arch/x86/vdso/vdso2c.h
35639+++ b/arch/x86/vdso/vdso2c.h
35640@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35641 unsigned long load_size = -1; /* Work around bogus warning */
35642 unsigned long mapping_size;
35643 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35644- int i;
35645+ unsigned int i;
35646 unsigned long j;
35647 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35648 *alt_sec = NULL;
35649diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35650index e904c27..b9eaa03 100644
35651--- a/arch/x86/vdso/vdso32-setup.c
35652+++ b/arch/x86/vdso/vdso32-setup.c
35653@@ -14,6 +14,7 @@
35654 #include <asm/cpufeature.h>
35655 #include <asm/processor.h>
35656 #include <asm/vdso.h>
35657+#include <asm/mman.h>
35658
35659 #ifdef CONFIG_COMPAT_VDSO
35660 #define VDSO_DEFAULT 0
35661diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35662index 1c9f750..cfddb1a 100644
35663--- a/arch/x86/vdso/vma.c
35664+++ b/arch/x86/vdso/vma.c
35665@@ -19,10 +19,7 @@
35666 #include <asm/page.h>
35667 #include <asm/hpet.h>
35668 #include <asm/desc.h>
35669-
35670-#if defined(CONFIG_X86_64)
35671-unsigned int __read_mostly vdso64_enabled = 1;
35672-#endif
35673+#include <asm/mman.h>
35674
35675 void __init init_vdso_image(const struct vdso_image *image)
35676 {
35677@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35678 .pages = no_pages,
35679 };
35680
35681+#ifdef CONFIG_PAX_RANDMMAP
35682+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35683+ calculate_addr = false;
35684+#endif
35685+
35686 if (calculate_addr) {
35687 addr = vdso_addr(current->mm->start_stack,
35688 image->size - image->sym_vvar_start);
35689@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35690 down_write(&mm->mmap_sem);
35691
35692 addr = get_unmapped_area(NULL, addr,
35693- image->size - image->sym_vvar_start, 0, 0);
35694+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35695 if (IS_ERR_VALUE(addr)) {
35696 ret = addr;
35697 goto up_fail;
35698 }
35699
35700 text_start = addr - image->sym_vvar_start;
35701- current->mm->context.vdso = (void __user *)text_start;
35702+ mm->context.vdso = text_start;
35703
35704 /*
35705 * MAYWRITE to allow gdb to COW and set breakpoints
35706@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35707 hpet_address >> PAGE_SHIFT,
35708 PAGE_SIZE,
35709 pgprot_noncached(PAGE_READONLY));
35710-
35711- if (ret)
35712- goto up_fail;
35713 }
35714 #endif
35715
35716 up_fail:
35717 if (ret)
35718- current->mm->context.vdso = NULL;
35719+ current->mm->context.vdso = 0;
35720
35721 up_write(&mm->mmap_sem);
35722 return ret;
35723@@ -191,8 +190,8 @@ static int load_vdso32(void)
35724
35725 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35726 current_thread_info()->sysenter_return =
35727- current->mm->context.vdso +
35728- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35729+ (void __force_user *)(current->mm->context.vdso +
35730+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35731
35732 return 0;
35733 }
35734@@ -201,9 +200,6 @@ static int load_vdso32(void)
35735 #ifdef CONFIG_X86_64
35736 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35737 {
35738- if (!vdso64_enabled)
35739- return 0;
35740-
35741 return map_vdso(&vdso_image_64, true);
35742 }
35743
35744@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35745 int uses_interp)
35746 {
35747 #ifdef CONFIG_X86_X32_ABI
35748- if (test_thread_flag(TIF_X32)) {
35749- if (!vdso64_enabled)
35750- return 0;
35751-
35752+ if (test_thread_flag(TIF_X32))
35753 return map_vdso(&vdso_image_x32, true);
35754- }
35755 #endif
35756
35757 return load_vdso32();
35758@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35759 #endif
35760
35761 #ifdef CONFIG_X86_64
35762-static __init int vdso_setup(char *s)
35763-{
35764- vdso64_enabled = simple_strtoul(s, NULL, 0);
35765- return 0;
35766-}
35767-__setup("vdso=", vdso_setup);
35768-#endif
35769-
35770-#ifdef CONFIG_X86_64
35771 static void vgetcpu_cpu_init(void *arg)
35772 {
35773 int cpu = smp_processor_id();
35774diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35775index e88fda8..76ce7ce 100644
35776--- a/arch/x86/xen/Kconfig
35777+++ b/arch/x86/xen/Kconfig
35778@@ -9,6 +9,7 @@ config XEN
35779 select XEN_HAVE_PVMMU
35780 depends on X86_64 || (X86_32 && X86_PAE)
35781 depends on X86_TSC
35782+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35783 help
35784 This is the Linux Xen port. Enabling this will allow the
35785 kernel to boot in a paravirtualized environment under the
35786diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35787index 78a881b..9994bbb 100644
35788--- a/arch/x86/xen/enlighten.c
35789+++ b/arch/x86/xen/enlighten.c
35790@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35791
35792 struct shared_info xen_dummy_shared_info;
35793
35794-void *xen_initial_gdt;
35795-
35796 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35797 __read_mostly int xen_have_vector_callback;
35798 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35799@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35800 {
35801 unsigned long va = dtr->address;
35802 unsigned int size = dtr->size + 1;
35803- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35804- unsigned long frames[pages];
35805+ unsigned long frames[65536 / PAGE_SIZE];
35806 int f;
35807
35808 /*
35809@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35810 {
35811 unsigned long va = dtr->address;
35812 unsigned int size = dtr->size + 1;
35813- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35814- unsigned long frames[pages];
35815+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35816 int f;
35817
35818 /*
35819@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35820 * 8-byte entries, or 16 4k pages..
35821 */
35822
35823- BUG_ON(size > 65536);
35824+ BUG_ON(size > GDT_SIZE);
35825 BUG_ON(va & ~PAGE_MASK);
35826
35827 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35828@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35829 return 0;
35830 }
35831
35832-static void set_xen_basic_apic_ops(void)
35833+static void __init set_xen_basic_apic_ops(void)
35834 {
35835 apic->read = xen_apic_read;
35836 apic->write = xen_apic_write;
35837@@ -1291,30 +1287,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35838 #endif
35839 };
35840
35841-static void xen_reboot(int reason)
35842+static __noreturn void xen_reboot(int reason)
35843 {
35844 struct sched_shutdown r = { .reason = reason };
35845
35846- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35847- BUG();
35848+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35849+ BUG();
35850 }
35851
35852-static void xen_restart(char *msg)
35853+static __noreturn void xen_restart(char *msg)
35854 {
35855 xen_reboot(SHUTDOWN_reboot);
35856 }
35857
35858-static void xen_emergency_restart(void)
35859+static __noreturn void xen_emergency_restart(void)
35860 {
35861 xen_reboot(SHUTDOWN_reboot);
35862 }
35863
35864-static void xen_machine_halt(void)
35865+static __noreturn void xen_machine_halt(void)
35866 {
35867 xen_reboot(SHUTDOWN_poweroff);
35868 }
35869
35870-static void xen_machine_power_off(void)
35871+static __noreturn void xen_machine_power_off(void)
35872 {
35873 if (pm_power_off)
35874 pm_power_off();
35875@@ -1467,8 +1463,11 @@ static void __ref xen_setup_gdt(int cpu)
35876 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35877 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35878
35879- setup_stack_canary_segment(0);
35880- switch_to_new_gdt(0);
35881+ setup_stack_canary_segment(cpu);
35882+#ifdef CONFIG_X86_64
35883+ load_percpu_segment(cpu);
35884+#endif
35885+ switch_to_new_gdt(cpu);
35886
35887 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35888 pv_cpu_ops.load_gdt = xen_load_gdt;
35889@@ -1583,7 +1582,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35890 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35891
35892 /* Work out if we support NX */
35893- x86_configure_nx();
35894+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35895+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35896+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35897+ unsigned l, h;
35898+
35899+ __supported_pte_mask |= _PAGE_NX;
35900+ rdmsr(MSR_EFER, l, h);
35901+ l |= EFER_NX;
35902+ wrmsr(MSR_EFER, l, h);
35903+ }
35904+#endif
35905
35906 /* Get mfn list */
35907 xen_build_dynamic_phys_to_machine();
35908@@ -1611,13 +1620,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35909
35910 machine_ops = xen_machine_ops;
35911
35912- /*
35913- * The only reliable way to retain the initial address of the
35914- * percpu gdt_page is to remember it here, so we can go and
35915- * mark it RW later, when the initial percpu area is freed.
35916- */
35917- xen_initial_gdt = &per_cpu(gdt_page, 0);
35918-
35919 xen_smp_init();
35920
35921 #ifdef CONFIG_ACPI_NUMA
35922diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35923index 5c1f9ac..0e15f5c 100644
35924--- a/arch/x86/xen/mmu.c
35925+++ b/arch/x86/xen/mmu.c
35926@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35927 return val;
35928 }
35929
35930-static pteval_t pte_pfn_to_mfn(pteval_t val)
35931+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35932 {
35933 if (val & _PAGE_PRESENT) {
35934 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35935@@ -1836,7 +1836,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35936 * L3_k[511] -> level2_fixmap_pgt */
35937 convert_pfn_mfn(level3_kernel_pgt);
35938
35939+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35940+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35941+ convert_pfn_mfn(level3_vmemmap_pgt);
35942 /* L3_k[511][506] -> level1_fixmap_pgt */
35943+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35944 convert_pfn_mfn(level2_fixmap_pgt);
35945 }
35946 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35947@@ -1861,11 +1865,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35948 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35949 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35950 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35951+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35952+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35953+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35954 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35955 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35956+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35957 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35958 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35959 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35960+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35961
35962 /* Pin down new L4 */
35963 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35964@@ -2049,6 +2058,7 @@ static void __init xen_post_allocator_init(void)
35965 pv_mmu_ops.set_pud = xen_set_pud;
35966 #if PAGETABLE_LEVELS == 4
35967 pv_mmu_ops.set_pgd = xen_set_pgd;
35968+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35969 #endif
35970
35971 /* This will work as long as patching hasn't happened yet
35972@@ -2127,6 +2137,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35973 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35974 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35975 .set_pgd = xen_set_pgd_hyper,
35976+ .set_pgd_batched = xen_set_pgd_hyper,
35977
35978 .alloc_pud = xen_alloc_pmd_init,
35979 .release_pud = xen_release_pmd_init,
35980diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35981index 4c071ae..00e7049 100644
35982--- a/arch/x86/xen/smp.c
35983+++ b/arch/x86/xen/smp.c
35984@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35985
35986 if (xen_pv_domain()) {
35987 if (!xen_feature(XENFEAT_writable_page_tables))
35988- /* We've switched to the "real" per-cpu gdt, so make
35989- * sure the old memory can be recycled. */
35990- make_lowmem_page_readwrite(xen_initial_gdt);
35991-
35992 #ifdef CONFIG_X86_32
35993 /*
35994 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35995 * expects __USER_DS
35996 */
35997- loadsegment(ds, __USER_DS);
35998- loadsegment(es, __USER_DS);
35999+ loadsegment(ds, __KERNEL_DS);
36000+ loadsegment(es, __KERNEL_DS);
36001 #endif
36002
36003 xen_filter_cpu_maps();
36004@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36005 #ifdef CONFIG_X86_32
36006 /* Note: PVH is not yet supported on x86_32. */
36007 ctxt->user_regs.fs = __KERNEL_PERCPU;
36008- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36009+ savesegment(gs, ctxt->user_regs.gs);
36010 #endif
36011 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36012
36013@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36014 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36015 ctxt->flags = VGCF_IN_KERNEL;
36016 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36017- ctxt->user_regs.ds = __USER_DS;
36018- ctxt->user_regs.es = __USER_DS;
36019+ ctxt->user_regs.ds = __KERNEL_DS;
36020+ ctxt->user_regs.es = __KERNEL_DS;
36021 ctxt->user_regs.ss = __KERNEL_DS;
36022
36023 xen_copy_trap_info(ctxt->trap_ctxt);
36024@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36025 int rc;
36026
36027 per_cpu(current_task, cpu) = idle;
36028+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36029 #ifdef CONFIG_X86_32
36030 irq_ctx_init(cpu);
36031 #else
36032 clear_tsk_thread_flag(idle, TIF_FORK);
36033 #endif
36034- per_cpu(kernel_stack, cpu) =
36035- (unsigned long)task_stack_page(idle) -
36036- KERNEL_STACK_OFFSET + THREAD_SIZE;
36037+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36038
36039 xen_setup_runstate_info(cpu);
36040 xen_setup_timer(cpu);
36041@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36042
36043 void __init xen_smp_init(void)
36044 {
36045- smp_ops = xen_smp_ops;
36046+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36047 xen_fill_possible_map();
36048 }
36049
36050diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36051index fd92a64..1f72641 100644
36052--- a/arch/x86/xen/xen-asm_32.S
36053+++ b/arch/x86/xen/xen-asm_32.S
36054@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36055 pushw %fs
36056 movl $(__KERNEL_PERCPU), %eax
36057 movl %eax, %fs
36058- movl %fs:xen_vcpu, %eax
36059+ mov PER_CPU_VAR(xen_vcpu), %eax
36060 POP_FS
36061 #else
36062 movl %ss:xen_vcpu, %eax
36063diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36064index 674b2225..f1f5dc1 100644
36065--- a/arch/x86/xen/xen-head.S
36066+++ b/arch/x86/xen/xen-head.S
36067@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36068 #ifdef CONFIG_X86_32
36069 mov %esi,xen_start_info
36070 mov $init_thread_union+THREAD_SIZE,%esp
36071+#ifdef CONFIG_SMP
36072+ movl $cpu_gdt_table,%edi
36073+ movl $__per_cpu_load,%eax
36074+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36075+ rorl $16,%eax
36076+ movb %al,__KERNEL_PERCPU + 4(%edi)
36077+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36078+ movl $__per_cpu_end - 1,%eax
36079+ subl $__per_cpu_start,%eax
36080+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36081+#endif
36082 #else
36083 mov %rsi,xen_start_info
36084 mov $init_thread_union+THREAD_SIZE,%rsp
36085diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36086index 5686bd9..0c8b6ee 100644
36087--- a/arch/x86/xen/xen-ops.h
36088+++ b/arch/x86/xen/xen-ops.h
36089@@ -10,8 +10,6 @@
36090 extern const char xen_hypervisor_callback[];
36091 extern const char xen_failsafe_callback[];
36092
36093-extern void *xen_initial_gdt;
36094-
36095 struct trap_info;
36096 void xen_copy_trap_info(struct trap_info *traps);
36097
36098diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36099index 525bd3d..ef888b1 100644
36100--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36101+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36102@@ -119,9 +119,9 @@
36103 ----------------------------------------------------------------------*/
36104
36105 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36106-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36107 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36108 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36109+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36110
36111 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36112 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36113diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36114index 2f33760..835e50a 100644
36115--- a/arch/xtensa/variants/fsf/include/variant/core.h
36116+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36117@@ -11,6 +11,7 @@
36118 #ifndef _XTENSA_CORE_H
36119 #define _XTENSA_CORE_H
36120
36121+#include <linux/const.h>
36122
36123 /****************************************************************************
36124 Parameters Useful for Any Code, USER or PRIVILEGED
36125@@ -112,9 +113,9 @@
36126 ----------------------------------------------------------------------*/
36127
36128 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36129-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36130 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36131 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36132+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36133
36134 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36135 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36136diff --git a/block/bio.c b/block/bio.c
36137index 471d738..bd3da0d 100644
36138--- a/block/bio.c
36139+++ b/block/bio.c
36140@@ -1169,7 +1169,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36141 /*
36142 * Overflow, abort
36143 */
36144- if (end < start)
36145+ if (end < start || end - start > INT_MAX - nr_pages)
36146 return ERR_PTR(-EINVAL);
36147
36148 nr_pages += end - start;
36149@@ -1303,7 +1303,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
36150 /*
36151 * Overflow, abort
36152 */
36153- if (end < start)
36154+ if (end < start || end - start > INT_MAX - nr_pages)
36155 return ERR_PTR(-EINVAL);
36156
36157 nr_pages += end - start;
36158@@ -1565,7 +1565,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
36159 const int read = bio_data_dir(bio) == READ;
36160 struct bio_map_data *bmd = bio->bi_private;
36161 int i;
36162- char *p = bmd->sgvecs[0].iov_base;
36163+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
36164
36165 bio_for_each_segment_all(bvec, bio, i) {
36166 char *addr = page_address(bvec->bv_page);
36167diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36168index 0736729..2ec3b48 100644
36169--- a/block/blk-iopoll.c
36170+++ b/block/blk-iopoll.c
36171@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36172 }
36173 EXPORT_SYMBOL(blk_iopoll_complete);
36174
36175-static void blk_iopoll_softirq(struct softirq_action *h)
36176+static __latent_entropy void blk_iopoll_softirq(void)
36177 {
36178 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36179 int rearm = 0, budget = blk_iopoll_budget;
36180diff --git a/block/blk-map.c b/block/blk-map.c
36181index f890d43..97b0482 100644
36182--- a/block/blk-map.c
36183+++ b/block/blk-map.c
36184@@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36185 if (!len || !kbuf)
36186 return -EINVAL;
36187
36188- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36189+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36190 if (do_copy)
36191 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36192 else
36193diff --git a/block/blk-mq.c b/block/blk-mq.c
36194index 447f533..da01de2 100644
36195--- a/block/blk-mq.c
36196+++ b/block/blk-mq.c
36197@@ -1456,7 +1456,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
36198
36199 do {
36200 page = alloc_pages_node(set->numa_node,
36201- GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
36202+ GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,
36203 this_order);
36204 if (page)
36205 break;
36206@@ -1478,8 +1478,6 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
36207 left -= to_do * rq_size;
36208 for (j = 0; j < to_do; j++) {
36209 tags->rqs[i] = p;
36210- tags->rqs[i]->atomic_flags = 0;
36211- tags->rqs[i]->cmd_flags = 0;
36212 if (set->ops->init_request) {
36213 if (set->ops->init_request(set->driver_data,
36214 tags->rqs[i], hctx_idx, i,
36215diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36216index 53b1737..08177d2e 100644
36217--- a/block/blk-softirq.c
36218+++ b/block/blk-softirq.c
36219@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36220 * Softirq action handler - move entries to local list and loop over them
36221 * while passing them to the queue registered handler.
36222 */
36223-static void blk_done_softirq(struct softirq_action *h)
36224+static __latent_entropy void blk_done_softirq(void)
36225 {
36226 struct list_head *cpu_list, local_list;
36227
36228diff --git a/block/bsg.c b/block/bsg.c
36229index 276e869..6fe4c61 100644
36230--- a/block/bsg.c
36231+++ b/block/bsg.c
36232@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36233 struct sg_io_v4 *hdr, struct bsg_device *bd,
36234 fmode_t has_write_perm)
36235 {
36236+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36237+ unsigned char *cmdptr;
36238+
36239 if (hdr->request_len > BLK_MAX_CDB) {
36240 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36241 if (!rq->cmd)
36242 return -ENOMEM;
36243- }
36244+ cmdptr = rq->cmd;
36245+ } else
36246+ cmdptr = tmpcmd;
36247
36248- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36249+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36250 hdr->request_len))
36251 return -EFAULT;
36252
36253+ if (cmdptr != rq->cmd)
36254+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36255+
36256 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36257 if (blk_verify_command(rq->cmd, has_write_perm))
36258 return -EPERM;
36259diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36260index f678c73..f35aa18 100644
36261--- a/block/compat_ioctl.c
36262+++ b/block/compat_ioctl.c
36263@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36264 cgc = compat_alloc_user_space(sizeof(*cgc));
36265 cgc32 = compat_ptr(arg);
36266
36267- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36268+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36269 get_user(data, &cgc32->buffer) ||
36270 put_user(compat_ptr(data), &cgc->buffer) ||
36271 copy_in_user(&cgc->buflen, &cgc32->buflen,
36272@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36273 err |= __get_user(f->spec1, &uf->spec1);
36274 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36275 err |= __get_user(name, &uf->name);
36276- f->name = compat_ptr(name);
36277+ f->name = (void __force_kernel *)compat_ptr(name);
36278 if (err) {
36279 err = -EFAULT;
36280 goto out;
36281diff --git a/block/genhd.c b/block/genhd.c
36282index 0a536dc..b8f7aca 100644
36283--- a/block/genhd.c
36284+++ b/block/genhd.c
36285@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36286
36287 /*
36288 * Register device numbers dev..(dev+range-1)
36289- * range must be nonzero
36290+ * Noop if @range is zero.
36291 * The hash chain is sorted on range, so that subranges can override.
36292 */
36293 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36294 struct kobject *(*probe)(dev_t, int *, void *),
36295 int (*lock)(dev_t, void *), void *data)
36296 {
36297- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36298+ if (range)
36299+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36300 }
36301
36302 EXPORT_SYMBOL(blk_register_region);
36303
36304+/* undo blk_register_region(), noop if @range is zero */
36305 void blk_unregister_region(dev_t devt, unsigned long range)
36306 {
36307- kobj_unmap(bdev_map, devt, range);
36308+ if (range)
36309+ kobj_unmap(bdev_map, devt, range);
36310 }
36311
36312 EXPORT_SYMBOL(blk_unregister_region);
36313diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36314index 56d08fd..2e07090 100644
36315--- a/block/partitions/efi.c
36316+++ b/block/partitions/efi.c
36317@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36318 if (!gpt)
36319 return NULL;
36320
36321+ if (!le32_to_cpu(gpt->num_partition_entries))
36322+ return NULL;
36323+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36324+ if (!pte)
36325+ return NULL;
36326+
36327 count = le32_to_cpu(gpt->num_partition_entries) *
36328 le32_to_cpu(gpt->sizeof_partition_entry);
36329- if (!count)
36330- return NULL;
36331- pte = kmalloc(count, GFP_KERNEL);
36332- if (!pte)
36333- return NULL;
36334-
36335 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36336 (u8 *) pte, count) < count) {
36337 kfree(pte);
36338diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36339index 28163fa..07190a06 100644
36340--- a/block/scsi_ioctl.c
36341+++ b/block/scsi_ioctl.c
36342@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36343 return put_user(0, p);
36344 }
36345
36346-static int sg_get_timeout(struct request_queue *q)
36347+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36348 {
36349 return jiffies_to_clock_t(q->sg_timeout);
36350 }
36351@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36352 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36353 struct sg_io_hdr *hdr, fmode_t mode)
36354 {
36355- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36356+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36357+ unsigned char *cmdptr;
36358+
36359+ if (rq->cmd != rq->__cmd)
36360+ cmdptr = rq->cmd;
36361+ else
36362+ cmdptr = tmpcmd;
36363+
36364+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36365 return -EFAULT;
36366+
36367+ if (cmdptr != rq->cmd)
36368+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36369+
36370 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36371 return -EPERM;
36372
36373@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36374 int err;
36375 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36376 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36377+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36378+ unsigned char *cmdptr;
36379
36380 if (!sic)
36381 return -EINVAL;
36382@@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36383 */
36384 err = -EFAULT;
36385 rq->cmd_len = cmdlen;
36386- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36387+
36388+ if (rq->cmd != rq->__cmd)
36389+ cmdptr = rq->cmd;
36390+ else
36391+ cmdptr = tmpcmd;
36392+
36393+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36394 goto error;
36395
36396+ if (rq->cmd != cmdptr)
36397+ memcpy(rq->cmd, cmdptr, cmdlen);
36398+
36399 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36400 goto error;
36401
36402diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36403index 650afac1..f3307de 100644
36404--- a/crypto/cryptd.c
36405+++ b/crypto/cryptd.c
36406@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36407
36408 struct cryptd_blkcipher_request_ctx {
36409 crypto_completion_t complete;
36410-};
36411+} __no_const;
36412
36413 struct cryptd_hash_ctx {
36414 struct crypto_shash *child;
36415@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36416
36417 struct cryptd_aead_request_ctx {
36418 crypto_completion_t complete;
36419-};
36420+} __no_const;
36421
36422 static void cryptd_queue_worker(struct work_struct *work);
36423
36424diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36425index c305d41..a96de79 100644
36426--- a/crypto/pcrypt.c
36427+++ b/crypto/pcrypt.c
36428@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36429 int ret;
36430
36431 pinst->kobj.kset = pcrypt_kset;
36432- ret = kobject_add(&pinst->kobj, NULL, name);
36433+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36434 if (!ret)
36435 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36436
36437diff --git a/crypto/zlib.c b/crypto/zlib.c
36438index 0eefa9d..0fa3d29 100644
36439--- a/crypto/zlib.c
36440+++ b/crypto/zlib.c
36441@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36442 zlib_comp_exit(ctx);
36443
36444 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36445- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36446+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36447 : MAX_WBITS;
36448 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36449- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36450+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36451 : DEF_MEM_LEVEL;
36452
36453 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36454diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36455index 6921c7f..78e1af7 100644
36456--- a/drivers/acpi/acpica/hwxfsleep.c
36457+++ b/drivers/acpi/acpica/hwxfsleep.c
36458@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36459 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36460
36461 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36462- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36463- acpi_hw_extended_sleep},
36464- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36465- acpi_hw_extended_wake_prep},
36466- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36467+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36468+ .extended_function = acpi_hw_extended_sleep},
36469+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36470+ .extended_function = acpi_hw_extended_wake_prep},
36471+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36472+ .extended_function = acpi_hw_extended_wake}
36473 };
36474
36475 /*
36476diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36477index 16129c7..8b675cd 100644
36478--- a/drivers/acpi/apei/apei-internal.h
36479+++ b/drivers/acpi/apei/apei-internal.h
36480@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36481 struct apei_exec_ins_type {
36482 u32 flags;
36483 apei_exec_ins_func_t run;
36484-};
36485+} __do_const;
36486
36487 struct apei_exec_context {
36488 u32 ip;
36489diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36490index e82d097..0c855c1 100644
36491--- a/drivers/acpi/apei/ghes.c
36492+++ b/drivers/acpi/apei/ghes.c
36493@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36494 const struct acpi_hest_generic *generic,
36495 const struct acpi_hest_generic_status *estatus)
36496 {
36497- static atomic_t seqno;
36498+ static atomic_unchecked_t seqno;
36499 unsigned int curr_seqno;
36500 char pfx_seq[64];
36501
36502@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36503 else
36504 pfx = KERN_ERR;
36505 }
36506- curr_seqno = atomic_inc_return(&seqno);
36507+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36508 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36509 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36510 pfx_seq, generic->header.source_id);
36511diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36512index a83e3c6..c3d617f 100644
36513--- a/drivers/acpi/bgrt.c
36514+++ b/drivers/acpi/bgrt.c
36515@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36516 if (!bgrt_image)
36517 return -ENODEV;
36518
36519- bin_attr_image.private = bgrt_image;
36520- bin_attr_image.size = bgrt_image_size;
36521+ pax_open_kernel();
36522+ *(void **)&bin_attr_image.private = bgrt_image;
36523+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36524+ pax_close_kernel();
36525
36526 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36527 if (!bgrt_kobj)
36528diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36529index 9b693d5..8953d54 100644
36530--- a/drivers/acpi/blacklist.c
36531+++ b/drivers/acpi/blacklist.c
36532@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36533 u32 is_critical_error;
36534 };
36535
36536-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36537+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36538
36539 /*
36540 * POLICY: If *anything* doesn't work, put it on the blacklist.
36541@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36542 return 0;
36543 }
36544
36545-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36546+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36547 {
36548 .callback = dmi_disable_osi_vista,
36549 .ident = "Fujitsu Siemens",
36550diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36551index 8b67bd0..b59593e 100644
36552--- a/drivers/acpi/bus.c
36553+++ b/drivers/acpi/bus.c
36554@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36555 }
36556 #endif
36557
36558-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36559+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36560 /*
36561 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36562 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36563@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36564 {}
36565 };
36566 #else
36567-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36568+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36569 {}
36570 };
36571 #endif
36572diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36573index c68e724..e863008 100644
36574--- a/drivers/acpi/custom_method.c
36575+++ b/drivers/acpi/custom_method.c
36576@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36577 struct acpi_table_header table;
36578 acpi_status status;
36579
36580+#ifdef CONFIG_GRKERNSEC_KMEM
36581+ return -EPERM;
36582+#endif
36583+
36584 if (!(*ppos)) {
36585 /* parse the table header to get the table length */
36586 if (count <= sizeof(struct acpi_table_header))
36587diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36588index c0d44d3..5ad8f9a 100644
36589--- a/drivers/acpi/device_pm.c
36590+++ b/drivers/acpi/device_pm.c
36591@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36592
36593 #endif /* CONFIG_PM_SLEEP */
36594
36595+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36596+
36597 static struct dev_pm_domain acpi_general_pm_domain = {
36598 .ops = {
36599 #ifdef CONFIG_PM
36600@@ -1043,6 +1045,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36601 #endif
36602 #endif
36603 },
36604+ .detach = acpi_dev_pm_detach
36605 };
36606
36607 /**
36608@@ -1112,7 +1115,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36609 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36610 }
36611
36612- dev->pm_domain->detach = acpi_dev_pm_detach;
36613 return 0;
36614 }
36615 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36616diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36617index 1b5853f..ab1808c 100644
36618--- a/drivers/acpi/ec.c
36619+++ b/drivers/acpi/ec.c
36620@@ -1045,7 +1045,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36621 return 0;
36622 }
36623
36624-static struct dmi_system_id ec_dmi_table[] __initdata = {
36625+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36626 {
36627 ec_skip_dsdt_scan, "Compal JFL92", {
36628 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36629diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36630index 139d9e4..9a9d799 100644
36631--- a/drivers/acpi/pci_slot.c
36632+++ b/drivers/acpi/pci_slot.c
36633@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36634 return 0;
36635 }
36636
36637-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36638+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36639 /*
36640 * Fujitsu Primequest machines will return 1023 to indicate an
36641 * error if the _SUN method is evaluated on SxFy objects that
36642diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36643index d9f7158..168e742 100644
36644--- a/drivers/acpi/processor_driver.c
36645+++ b/drivers/acpi/processor_driver.c
36646@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36647 return NOTIFY_OK;
36648 }
36649
36650-static struct notifier_block __refdata acpi_cpu_notifier = {
36651+static struct notifier_block __refconst acpi_cpu_notifier = {
36652 .notifier_call = acpi_cpu_soft_notify,
36653 };
36654
36655diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36656index b27ab7a..275b1b6 100644
36657--- a/drivers/acpi/processor_idle.c
36658+++ b/drivers/acpi/processor_idle.c
36659@@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36660 {
36661 int i, count = CPUIDLE_DRIVER_STATE_START;
36662 struct acpi_processor_cx *cx;
36663- struct cpuidle_state *state;
36664+ cpuidle_state_no_const *state;
36665 struct cpuidle_driver *drv = &acpi_idle_driver;
36666
36667 if (!pr->flags.power_setup_done)
36668diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36669index e5dd808..1eceed1 100644
36670--- a/drivers/acpi/processor_pdc.c
36671+++ b/drivers/acpi/processor_pdc.c
36672@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36673 return 0;
36674 }
36675
36676-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36677+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36678 {
36679 set_no_mwait, "Extensa 5220", {
36680 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36681diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36682index 8aa9254..aeff570 100644
36683--- a/drivers/acpi/sleep.c
36684+++ b/drivers/acpi/sleep.c
36685@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36686 return 0;
36687 }
36688
36689-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36690+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36691 {
36692 .callback = init_old_suspend_ordering,
36693 .ident = "Abit KN9 (nForce4 variant)",
36694diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36695index 13e577c..cef11ee 100644
36696--- a/drivers/acpi/sysfs.c
36697+++ b/drivers/acpi/sysfs.c
36698@@ -423,11 +423,11 @@ static u32 num_counters;
36699 static struct attribute **all_attrs;
36700 static u32 acpi_gpe_count;
36701
36702-static struct attribute_group interrupt_stats_attr_group = {
36703+static attribute_group_no_const interrupt_stats_attr_group = {
36704 .name = "interrupts",
36705 };
36706
36707-static struct kobj_attribute *counter_attrs;
36708+static kobj_attribute_no_const *counter_attrs;
36709
36710 static void delete_gpe_attr_array(void)
36711 {
36712diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36713index d24fa19..782f1e6 100644
36714--- a/drivers/acpi/thermal.c
36715+++ b/drivers/acpi/thermal.c
36716@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36717 return 0;
36718 }
36719
36720-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36721+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36722 /*
36723 * Award BIOS on this AOpen makes thermal control almost worthless.
36724 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36725diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36726index 3647ce7..e733107 100644
36727--- a/drivers/acpi/video.c
36728+++ b/drivers/acpi/video.c
36729@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36730 return 0;
36731 }
36732
36733-static struct dmi_system_id video_dmi_table[] __initdata = {
36734+static const struct dmi_system_id video_dmi_table[] __initconst = {
36735 /*
36736 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36737 */
36738diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36739index 61a9c07..ea98fa1 100644
36740--- a/drivers/ata/libahci.c
36741+++ b/drivers/ata/libahci.c
36742@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36743 }
36744 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36745
36746-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36747+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36748 struct ata_taskfile *tf, int is_cmd, u16 flags,
36749 unsigned long timeout_msec)
36750 {
36751diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36752index 00f2f74..efd8b7d 100644
36753--- a/drivers/ata/libata-core.c
36754+++ b/drivers/ata/libata-core.c
36755@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36756 static void ata_dev_xfermask(struct ata_device *dev);
36757 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36758
36759-atomic_t ata_print_id = ATOMIC_INIT(0);
36760+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36761
36762 struct ata_force_param {
36763 const char *name;
36764@@ -4842,7 +4842,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36765 struct ata_port *ap;
36766 unsigned int tag;
36767
36768- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36769+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36770 ap = qc->ap;
36771
36772 qc->flags = 0;
36773@@ -4858,7 +4858,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36774 struct ata_port *ap;
36775 struct ata_link *link;
36776
36777- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36778+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36779 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36780 ap = qc->ap;
36781 link = qc->dev->link;
36782@@ -5962,6 +5962,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36783 return;
36784
36785 spin_lock(&lock);
36786+ pax_open_kernel();
36787
36788 for (cur = ops->inherits; cur; cur = cur->inherits) {
36789 void **inherit = (void **)cur;
36790@@ -5975,8 +5976,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36791 if (IS_ERR(*pp))
36792 *pp = NULL;
36793
36794- ops->inherits = NULL;
36795+ *(struct ata_port_operations **)&ops->inherits = NULL;
36796
36797+ pax_close_kernel();
36798 spin_unlock(&lock);
36799 }
36800
36801@@ -6172,7 +6174,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36802
36803 /* give ports names and add SCSI hosts */
36804 for (i = 0; i < host->n_ports; i++) {
36805- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36806+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36807 host->ports[i]->local_port_no = i + 1;
36808 }
36809
36810diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36811index 6abd17a..9961bf7 100644
36812--- a/drivers/ata/libata-scsi.c
36813+++ b/drivers/ata/libata-scsi.c
36814@@ -4169,7 +4169,7 @@ int ata_sas_port_init(struct ata_port *ap)
36815
36816 if (rc)
36817 return rc;
36818- ap->print_id = atomic_inc_return(&ata_print_id);
36819+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36820 return 0;
36821 }
36822 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36823diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36824index 5f4e0cc..ff2c347 100644
36825--- a/drivers/ata/libata.h
36826+++ b/drivers/ata/libata.h
36827@@ -53,7 +53,7 @@ enum {
36828 ATA_DNXFER_QUIET = (1 << 31),
36829 };
36830
36831-extern atomic_t ata_print_id;
36832+extern atomic_unchecked_t ata_print_id;
36833 extern int atapi_passthru16;
36834 extern int libata_fua;
36835 extern int libata_noacpi;
36836diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36837index a9b0c82..207d97d 100644
36838--- a/drivers/ata/pata_arasan_cf.c
36839+++ b/drivers/ata/pata_arasan_cf.c
36840@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36841 /* Handle platform specific quirks */
36842 if (quirk) {
36843 if (quirk & CF_BROKEN_PIO) {
36844- ap->ops->set_piomode = NULL;
36845+ pax_open_kernel();
36846+ *(void **)&ap->ops->set_piomode = NULL;
36847+ pax_close_kernel();
36848 ap->pio_mask = 0;
36849 }
36850 if (quirk & CF_BROKEN_MWDMA)
36851diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36852index f9b983a..887b9d8 100644
36853--- a/drivers/atm/adummy.c
36854+++ b/drivers/atm/adummy.c
36855@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36856 vcc->pop(vcc, skb);
36857 else
36858 dev_kfree_skb_any(skb);
36859- atomic_inc(&vcc->stats->tx);
36860+ atomic_inc_unchecked(&vcc->stats->tx);
36861
36862 return 0;
36863 }
36864diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36865index f1a9198..f466a4a 100644
36866--- a/drivers/atm/ambassador.c
36867+++ b/drivers/atm/ambassador.c
36868@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36869 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36870
36871 // VC layer stats
36872- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36873+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36874
36875 // free the descriptor
36876 kfree (tx_descr);
36877@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36878 dump_skb ("<<<", vc, skb);
36879
36880 // VC layer stats
36881- atomic_inc(&atm_vcc->stats->rx);
36882+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36883 __net_timestamp(skb);
36884 // end of our responsibility
36885 atm_vcc->push (atm_vcc, skb);
36886@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36887 } else {
36888 PRINTK (KERN_INFO, "dropped over-size frame");
36889 // should we count this?
36890- atomic_inc(&atm_vcc->stats->rx_drop);
36891+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36892 }
36893
36894 } else {
36895@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36896 }
36897
36898 if (check_area (skb->data, skb->len)) {
36899- atomic_inc(&atm_vcc->stats->tx_err);
36900+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36901 return -ENOMEM; // ?
36902 }
36903
36904diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36905index 480fa6f..947067c 100644
36906--- a/drivers/atm/atmtcp.c
36907+++ b/drivers/atm/atmtcp.c
36908@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36909 if (vcc->pop) vcc->pop(vcc,skb);
36910 else dev_kfree_skb(skb);
36911 if (dev_data) return 0;
36912- atomic_inc(&vcc->stats->tx_err);
36913+ atomic_inc_unchecked(&vcc->stats->tx_err);
36914 return -ENOLINK;
36915 }
36916 size = skb->len+sizeof(struct atmtcp_hdr);
36917@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36918 if (!new_skb) {
36919 if (vcc->pop) vcc->pop(vcc,skb);
36920 else dev_kfree_skb(skb);
36921- atomic_inc(&vcc->stats->tx_err);
36922+ atomic_inc_unchecked(&vcc->stats->tx_err);
36923 return -ENOBUFS;
36924 }
36925 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36926@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36927 if (vcc->pop) vcc->pop(vcc,skb);
36928 else dev_kfree_skb(skb);
36929 out_vcc->push(out_vcc,new_skb);
36930- atomic_inc(&vcc->stats->tx);
36931- atomic_inc(&out_vcc->stats->rx);
36932+ atomic_inc_unchecked(&vcc->stats->tx);
36933+ atomic_inc_unchecked(&out_vcc->stats->rx);
36934 return 0;
36935 }
36936
36937@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36938 read_unlock(&vcc_sklist_lock);
36939 if (!out_vcc) {
36940 result = -EUNATCH;
36941- atomic_inc(&vcc->stats->tx_err);
36942+ atomic_inc_unchecked(&vcc->stats->tx_err);
36943 goto done;
36944 }
36945 skb_pull(skb,sizeof(struct atmtcp_hdr));
36946@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36947 __net_timestamp(new_skb);
36948 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36949 out_vcc->push(out_vcc,new_skb);
36950- atomic_inc(&vcc->stats->tx);
36951- atomic_inc(&out_vcc->stats->rx);
36952+ atomic_inc_unchecked(&vcc->stats->tx);
36953+ atomic_inc_unchecked(&out_vcc->stats->rx);
36954 done:
36955 if (vcc->pop) vcc->pop(vcc,skb);
36956 else dev_kfree_skb(skb);
36957diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36958index c7fab3e..68d0965 100644
36959--- a/drivers/atm/eni.c
36960+++ b/drivers/atm/eni.c
36961@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36962 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36963 vcc->dev->number);
36964 length = 0;
36965- atomic_inc(&vcc->stats->rx_err);
36966+ atomic_inc_unchecked(&vcc->stats->rx_err);
36967 }
36968 else {
36969 length = ATM_CELL_SIZE-1; /* no HEC */
36970@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36971 size);
36972 }
36973 eff = length = 0;
36974- atomic_inc(&vcc->stats->rx_err);
36975+ atomic_inc_unchecked(&vcc->stats->rx_err);
36976 }
36977 else {
36978 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36979@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36980 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36981 vcc->dev->number,vcc->vci,length,size << 2,descr);
36982 length = eff = 0;
36983- atomic_inc(&vcc->stats->rx_err);
36984+ atomic_inc_unchecked(&vcc->stats->rx_err);
36985 }
36986 }
36987 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36988@@ -770,7 +770,7 @@ rx_dequeued++;
36989 vcc->push(vcc,skb);
36990 pushed++;
36991 }
36992- atomic_inc(&vcc->stats->rx);
36993+ atomic_inc_unchecked(&vcc->stats->rx);
36994 }
36995 wake_up(&eni_dev->rx_wait);
36996 }
36997@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36998 PCI_DMA_TODEVICE);
36999 if (vcc->pop) vcc->pop(vcc,skb);
37000 else dev_kfree_skb_irq(skb);
37001- atomic_inc(&vcc->stats->tx);
37002+ atomic_inc_unchecked(&vcc->stats->tx);
37003 wake_up(&eni_dev->tx_wait);
37004 dma_complete++;
37005 }
37006diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37007index 82f2ae0..f205c02 100644
37008--- a/drivers/atm/firestream.c
37009+++ b/drivers/atm/firestream.c
37010@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37011 }
37012 }
37013
37014- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37015+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37016
37017 fs_dprintk (FS_DEBUG_TXMEM, "i");
37018 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37019@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37020 #endif
37021 skb_put (skb, qe->p1 & 0xffff);
37022 ATM_SKB(skb)->vcc = atm_vcc;
37023- atomic_inc(&atm_vcc->stats->rx);
37024+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37025 __net_timestamp(skb);
37026 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37027 atm_vcc->push (atm_vcc, skb);
37028@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37029 kfree (pe);
37030 }
37031 if (atm_vcc)
37032- atomic_inc(&atm_vcc->stats->rx_drop);
37033+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37034 break;
37035 case 0x1f: /* Reassembly abort: no buffers. */
37036 /* Silently increment error counter. */
37037 if (atm_vcc)
37038- atomic_inc(&atm_vcc->stats->rx_drop);
37039+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37040 break;
37041 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37042 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37043diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37044index d5d9eaf..65c0d53 100644
37045--- a/drivers/atm/fore200e.c
37046+++ b/drivers/atm/fore200e.c
37047@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37048 #endif
37049 /* check error condition */
37050 if (*entry->status & STATUS_ERROR)
37051- atomic_inc(&vcc->stats->tx_err);
37052+ atomic_inc_unchecked(&vcc->stats->tx_err);
37053 else
37054- atomic_inc(&vcc->stats->tx);
37055+ atomic_inc_unchecked(&vcc->stats->tx);
37056 }
37057 }
37058
37059@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37060 if (skb == NULL) {
37061 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37062
37063- atomic_inc(&vcc->stats->rx_drop);
37064+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37065 return -ENOMEM;
37066 }
37067
37068@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37069
37070 dev_kfree_skb_any(skb);
37071
37072- atomic_inc(&vcc->stats->rx_drop);
37073+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37074 return -ENOMEM;
37075 }
37076
37077 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37078
37079 vcc->push(vcc, skb);
37080- atomic_inc(&vcc->stats->rx);
37081+ atomic_inc_unchecked(&vcc->stats->rx);
37082
37083 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37084
37085@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37086 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37087 fore200e->atm_dev->number,
37088 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37089- atomic_inc(&vcc->stats->rx_err);
37090+ atomic_inc_unchecked(&vcc->stats->rx_err);
37091 }
37092 }
37093
37094@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37095 goto retry_here;
37096 }
37097
37098- atomic_inc(&vcc->stats->tx_err);
37099+ atomic_inc_unchecked(&vcc->stats->tx_err);
37100
37101 fore200e->tx_sat++;
37102 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37103diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37104index c39702b..785b73b 100644
37105--- a/drivers/atm/he.c
37106+++ b/drivers/atm/he.c
37107@@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37108
37109 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37110 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37111- atomic_inc(&vcc->stats->rx_drop);
37112+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37113 goto return_host_buffers;
37114 }
37115
37116@@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37117 RBRQ_LEN_ERR(he_dev->rbrq_head)
37118 ? "LEN_ERR" : "",
37119 vcc->vpi, vcc->vci);
37120- atomic_inc(&vcc->stats->rx_err);
37121+ atomic_inc_unchecked(&vcc->stats->rx_err);
37122 goto return_host_buffers;
37123 }
37124
37125@@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37126 vcc->push(vcc, skb);
37127 spin_lock(&he_dev->global_lock);
37128
37129- atomic_inc(&vcc->stats->rx);
37130+ atomic_inc_unchecked(&vcc->stats->rx);
37131
37132 return_host_buffers:
37133 ++pdus_assembled;
37134@@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37135 tpd->vcc->pop(tpd->vcc, tpd->skb);
37136 else
37137 dev_kfree_skb_any(tpd->skb);
37138- atomic_inc(&tpd->vcc->stats->tx_err);
37139+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37140 }
37141 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37142 return;
37143@@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37144 vcc->pop(vcc, skb);
37145 else
37146 dev_kfree_skb_any(skb);
37147- atomic_inc(&vcc->stats->tx_err);
37148+ atomic_inc_unchecked(&vcc->stats->tx_err);
37149 return -EINVAL;
37150 }
37151
37152@@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37153 vcc->pop(vcc, skb);
37154 else
37155 dev_kfree_skb_any(skb);
37156- atomic_inc(&vcc->stats->tx_err);
37157+ atomic_inc_unchecked(&vcc->stats->tx_err);
37158 return -EINVAL;
37159 }
37160 #endif
37161@@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37162 vcc->pop(vcc, skb);
37163 else
37164 dev_kfree_skb_any(skb);
37165- atomic_inc(&vcc->stats->tx_err);
37166+ atomic_inc_unchecked(&vcc->stats->tx_err);
37167 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37168 return -ENOMEM;
37169 }
37170@@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37171 vcc->pop(vcc, skb);
37172 else
37173 dev_kfree_skb_any(skb);
37174- atomic_inc(&vcc->stats->tx_err);
37175+ atomic_inc_unchecked(&vcc->stats->tx_err);
37176 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37177 return -ENOMEM;
37178 }
37179@@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37180 __enqueue_tpd(he_dev, tpd, cid);
37181 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37182
37183- atomic_inc(&vcc->stats->tx);
37184+ atomic_inc_unchecked(&vcc->stats->tx);
37185
37186 return 0;
37187 }
37188diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37189index 1dc0519..1aadaf7 100644
37190--- a/drivers/atm/horizon.c
37191+++ b/drivers/atm/horizon.c
37192@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37193 {
37194 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37195 // VC layer stats
37196- atomic_inc(&vcc->stats->rx);
37197+ atomic_inc_unchecked(&vcc->stats->rx);
37198 __net_timestamp(skb);
37199 // end of our responsibility
37200 vcc->push (vcc, skb);
37201@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37202 dev->tx_iovec = NULL;
37203
37204 // VC layer stats
37205- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37206+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37207
37208 // free the skb
37209 hrz_kfree_skb (skb);
37210diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37211index 2b24ed0..b3d6acc 100644
37212--- a/drivers/atm/idt77252.c
37213+++ b/drivers/atm/idt77252.c
37214@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37215 else
37216 dev_kfree_skb(skb);
37217
37218- atomic_inc(&vcc->stats->tx);
37219+ atomic_inc_unchecked(&vcc->stats->tx);
37220 }
37221
37222 atomic_dec(&scq->used);
37223@@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37224 if ((sb = dev_alloc_skb(64)) == NULL) {
37225 printk("%s: Can't allocate buffers for aal0.\n",
37226 card->name);
37227- atomic_add(i, &vcc->stats->rx_drop);
37228+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37229 break;
37230 }
37231 if (!atm_charge(vcc, sb->truesize)) {
37232 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37233 card->name);
37234- atomic_add(i - 1, &vcc->stats->rx_drop);
37235+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37236 dev_kfree_skb(sb);
37237 break;
37238 }
37239@@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37240 ATM_SKB(sb)->vcc = vcc;
37241 __net_timestamp(sb);
37242 vcc->push(vcc, sb);
37243- atomic_inc(&vcc->stats->rx);
37244+ atomic_inc_unchecked(&vcc->stats->rx);
37245
37246 cell += ATM_CELL_PAYLOAD;
37247 }
37248@@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37249 "(CDC: %08x)\n",
37250 card->name, len, rpp->len, readl(SAR_REG_CDC));
37251 recycle_rx_pool_skb(card, rpp);
37252- atomic_inc(&vcc->stats->rx_err);
37253+ atomic_inc_unchecked(&vcc->stats->rx_err);
37254 return;
37255 }
37256 if (stat & SAR_RSQE_CRC) {
37257 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37258 recycle_rx_pool_skb(card, rpp);
37259- atomic_inc(&vcc->stats->rx_err);
37260+ atomic_inc_unchecked(&vcc->stats->rx_err);
37261 return;
37262 }
37263 if (skb_queue_len(&rpp->queue) > 1) {
37264@@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37265 RXPRINTK("%s: Can't alloc RX skb.\n",
37266 card->name);
37267 recycle_rx_pool_skb(card, rpp);
37268- atomic_inc(&vcc->stats->rx_err);
37269+ atomic_inc_unchecked(&vcc->stats->rx_err);
37270 return;
37271 }
37272 if (!atm_charge(vcc, skb->truesize)) {
37273@@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37274 __net_timestamp(skb);
37275
37276 vcc->push(vcc, skb);
37277- atomic_inc(&vcc->stats->rx);
37278+ atomic_inc_unchecked(&vcc->stats->rx);
37279
37280 return;
37281 }
37282@@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37283 __net_timestamp(skb);
37284
37285 vcc->push(vcc, skb);
37286- atomic_inc(&vcc->stats->rx);
37287+ atomic_inc_unchecked(&vcc->stats->rx);
37288
37289 if (skb->truesize > SAR_FB_SIZE_3)
37290 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37291@@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37292 if (vcc->qos.aal != ATM_AAL0) {
37293 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37294 card->name, vpi, vci);
37295- atomic_inc(&vcc->stats->rx_drop);
37296+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37297 goto drop;
37298 }
37299
37300 if ((sb = dev_alloc_skb(64)) == NULL) {
37301 printk("%s: Can't allocate buffers for AAL0.\n",
37302 card->name);
37303- atomic_inc(&vcc->stats->rx_err);
37304+ atomic_inc_unchecked(&vcc->stats->rx_err);
37305 goto drop;
37306 }
37307
37308@@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37309 ATM_SKB(sb)->vcc = vcc;
37310 __net_timestamp(sb);
37311 vcc->push(vcc, sb);
37312- atomic_inc(&vcc->stats->rx);
37313+ atomic_inc_unchecked(&vcc->stats->rx);
37314
37315 drop:
37316 skb_pull(queue, 64);
37317@@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37318
37319 if (vc == NULL) {
37320 printk("%s: NULL connection in send().\n", card->name);
37321- atomic_inc(&vcc->stats->tx_err);
37322+ atomic_inc_unchecked(&vcc->stats->tx_err);
37323 dev_kfree_skb(skb);
37324 return -EINVAL;
37325 }
37326 if (!test_bit(VCF_TX, &vc->flags)) {
37327 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37328- atomic_inc(&vcc->stats->tx_err);
37329+ atomic_inc_unchecked(&vcc->stats->tx_err);
37330 dev_kfree_skb(skb);
37331 return -EINVAL;
37332 }
37333@@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37334 break;
37335 default:
37336 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37337- atomic_inc(&vcc->stats->tx_err);
37338+ atomic_inc_unchecked(&vcc->stats->tx_err);
37339 dev_kfree_skb(skb);
37340 return -EINVAL;
37341 }
37342
37343 if (skb_shinfo(skb)->nr_frags != 0) {
37344 printk("%s: No scatter-gather yet.\n", card->name);
37345- atomic_inc(&vcc->stats->tx_err);
37346+ atomic_inc_unchecked(&vcc->stats->tx_err);
37347 dev_kfree_skb(skb);
37348 return -EINVAL;
37349 }
37350@@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37351
37352 err = queue_skb(card, vc, skb, oam);
37353 if (err) {
37354- atomic_inc(&vcc->stats->tx_err);
37355+ atomic_inc_unchecked(&vcc->stats->tx_err);
37356 dev_kfree_skb(skb);
37357 return err;
37358 }
37359@@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37360 skb = dev_alloc_skb(64);
37361 if (!skb) {
37362 printk("%s: Out of memory in send_oam().\n", card->name);
37363- atomic_inc(&vcc->stats->tx_err);
37364+ atomic_inc_unchecked(&vcc->stats->tx_err);
37365 return -ENOMEM;
37366 }
37367 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37368diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37369index 4217f29..88f547a 100644
37370--- a/drivers/atm/iphase.c
37371+++ b/drivers/atm/iphase.c
37372@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37373 status = (u_short) (buf_desc_ptr->desc_mode);
37374 if (status & (RX_CER | RX_PTE | RX_OFL))
37375 {
37376- atomic_inc(&vcc->stats->rx_err);
37377+ atomic_inc_unchecked(&vcc->stats->rx_err);
37378 IF_ERR(printk("IA: bad packet, dropping it");)
37379 if (status & RX_CER) {
37380 IF_ERR(printk(" cause: packet CRC error\n");)
37381@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37382 len = dma_addr - buf_addr;
37383 if (len > iadev->rx_buf_sz) {
37384 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37385- atomic_inc(&vcc->stats->rx_err);
37386+ atomic_inc_unchecked(&vcc->stats->rx_err);
37387 goto out_free_desc;
37388 }
37389
37390@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37391 ia_vcc = INPH_IA_VCC(vcc);
37392 if (ia_vcc == NULL)
37393 {
37394- atomic_inc(&vcc->stats->rx_err);
37395+ atomic_inc_unchecked(&vcc->stats->rx_err);
37396 atm_return(vcc, skb->truesize);
37397 dev_kfree_skb_any(skb);
37398 goto INCR_DLE;
37399@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37400 if ((length > iadev->rx_buf_sz) || (length >
37401 (skb->len - sizeof(struct cpcs_trailer))))
37402 {
37403- atomic_inc(&vcc->stats->rx_err);
37404+ atomic_inc_unchecked(&vcc->stats->rx_err);
37405 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37406 length, skb->len);)
37407 atm_return(vcc, skb->truesize);
37408@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37409
37410 IF_RX(printk("rx_dle_intr: skb push");)
37411 vcc->push(vcc,skb);
37412- atomic_inc(&vcc->stats->rx);
37413+ atomic_inc_unchecked(&vcc->stats->rx);
37414 iadev->rx_pkt_cnt++;
37415 }
37416 INCR_DLE:
37417@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37418 {
37419 struct k_sonet_stats *stats;
37420 stats = &PRIV(_ia_dev[board])->sonet_stats;
37421- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37422- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37423- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37424- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37425- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37426- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37427- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37428- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37429- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37430+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37431+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37432+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37433+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37434+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37435+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37436+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37437+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37438+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37439 }
37440 ia_cmds.status = 0;
37441 break;
37442@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37443 if ((desc == 0) || (desc > iadev->num_tx_desc))
37444 {
37445 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37446- atomic_inc(&vcc->stats->tx);
37447+ atomic_inc_unchecked(&vcc->stats->tx);
37448 if (vcc->pop)
37449 vcc->pop(vcc, skb);
37450 else
37451@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37452 ATM_DESC(skb) = vcc->vci;
37453 skb_queue_tail(&iadev->tx_dma_q, skb);
37454
37455- atomic_inc(&vcc->stats->tx);
37456+ atomic_inc_unchecked(&vcc->stats->tx);
37457 iadev->tx_pkt_cnt++;
37458 /* Increment transaction counter */
37459 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37460
37461 #if 0
37462 /* add flow control logic */
37463- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37464+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37465 if (iavcc->vc_desc_cnt > 10) {
37466 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37467 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37468diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37469index 93eaf8d..b4ca7da 100644
37470--- a/drivers/atm/lanai.c
37471+++ b/drivers/atm/lanai.c
37472@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37473 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37474 lanai_endtx(lanai, lvcc);
37475 lanai_free_skb(lvcc->tx.atmvcc, skb);
37476- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37477+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37478 }
37479
37480 /* Try to fill the buffer - don't call unless there is backlog */
37481@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37482 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37483 __net_timestamp(skb);
37484 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37485- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37486+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37487 out:
37488 lvcc->rx.buf.ptr = end;
37489 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37490@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37491 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37492 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37493 lanai->stats.service_rxnotaal5++;
37494- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37495+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37496 return 0;
37497 }
37498 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37499@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37500 int bytes;
37501 read_unlock(&vcc_sklist_lock);
37502 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37503- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37504+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37505 lvcc->stats.x.aal5.service_trash++;
37506 bytes = (SERVICE_GET_END(s) * 16) -
37507 (((unsigned long) lvcc->rx.buf.ptr) -
37508@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37509 }
37510 if (s & SERVICE_STREAM) {
37511 read_unlock(&vcc_sklist_lock);
37512- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37513+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37514 lvcc->stats.x.aal5.service_stream++;
37515 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37516 "PDU on VCI %d!\n", lanai->number, vci);
37517@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37518 return 0;
37519 }
37520 DPRINTK("got rx crc error on vci %d\n", vci);
37521- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37522+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37523 lvcc->stats.x.aal5.service_rxcrc++;
37524 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37525 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37526diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37527index 9988ac9..7c52585 100644
37528--- a/drivers/atm/nicstar.c
37529+++ b/drivers/atm/nicstar.c
37530@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37531 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37532 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37533 card->index);
37534- atomic_inc(&vcc->stats->tx_err);
37535+ atomic_inc_unchecked(&vcc->stats->tx_err);
37536 dev_kfree_skb_any(skb);
37537 return -EINVAL;
37538 }
37539@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37540 if (!vc->tx) {
37541 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37542 card->index);
37543- atomic_inc(&vcc->stats->tx_err);
37544+ atomic_inc_unchecked(&vcc->stats->tx_err);
37545 dev_kfree_skb_any(skb);
37546 return -EINVAL;
37547 }
37548@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37549 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37550 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37551 card->index);
37552- atomic_inc(&vcc->stats->tx_err);
37553+ atomic_inc_unchecked(&vcc->stats->tx_err);
37554 dev_kfree_skb_any(skb);
37555 return -EINVAL;
37556 }
37557
37558 if (skb_shinfo(skb)->nr_frags != 0) {
37559 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37560- atomic_inc(&vcc->stats->tx_err);
37561+ atomic_inc_unchecked(&vcc->stats->tx_err);
37562 dev_kfree_skb_any(skb);
37563 return -EINVAL;
37564 }
37565@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37566 }
37567
37568 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37569- atomic_inc(&vcc->stats->tx_err);
37570+ atomic_inc_unchecked(&vcc->stats->tx_err);
37571 dev_kfree_skb_any(skb);
37572 return -EIO;
37573 }
37574- atomic_inc(&vcc->stats->tx);
37575+ atomic_inc_unchecked(&vcc->stats->tx);
37576
37577 return 0;
37578 }
37579@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37580 printk
37581 ("nicstar%d: Can't allocate buffers for aal0.\n",
37582 card->index);
37583- atomic_add(i, &vcc->stats->rx_drop);
37584+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37585 break;
37586 }
37587 if (!atm_charge(vcc, sb->truesize)) {
37588 RXPRINTK
37589 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37590 card->index);
37591- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37592+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37593 dev_kfree_skb_any(sb);
37594 break;
37595 }
37596@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37597 ATM_SKB(sb)->vcc = vcc;
37598 __net_timestamp(sb);
37599 vcc->push(vcc, sb);
37600- atomic_inc(&vcc->stats->rx);
37601+ atomic_inc_unchecked(&vcc->stats->rx);
37602 cell += ATM_CELL_PAYLOAD;
37603 }
37604
37605@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37606 if (iovb == NULL) {
37607 printk("nicstar%d: Out of iovec buffers.\n",
37608 card->index);
37609- atomic_inc(&vcc->stats->rx_drop);
37610+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37611 recycle_rx_buf(card, skb);
37612 return;
37613 }
37614@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37615 small or large buffer itself. */
37616 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37617 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37618- atomic_inc(&vcc->stats->rx_err);
37619+ atomic_inc_unchecked(&vcc->stats->rx_err);
37620 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37621 NS_MAX_IOVECS);
37622 NS_PRV_IOVCNT(iovb) = 0;
37623@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37624 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37625 card->index);
37626 which_list(card, skb);
37627- atomic_inc(&vcc->stats->rx_err);
37628+ atomic_inc_unchecked(&vcc->stats->rx_err);
37629 recycle_rx_buf(card, skb);
37630 vc->rx_iov = NULL;
37631 recycle_iov_buf(card, iovb);
37632@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37633 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37634 card->index);
37635 which_list(card, skb);
37636- atomic_inc(&vcc->stats->rx_err);
37637+ atomic_inc_unchecked(&vcc->stats->rx_err);
37638 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37639 NS_PRV_IOVCNT(iovb));
37640 vc->rx_iov = NULL;
37641@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37642 printk(" - PDU size mismatch.\n");
37643 else
37644 printk(".\n");
37645- atomic_inc(&vcc->stats->rx_err);
37646+ atomic_inc_unchecked(&vcc->stats->rx_err);
37647 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37648 NS_PRV_IOVCNT(iovb));
37649 vc->rx_iov = NULL;
37650@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37651 /* skb points to a small buffer */
37652 if (!atm_charge(vcc, skb->truesize)) {
37653 push_rxbufs(card, skb);
37654- atomic_inc(&vcc->stats->rx_drop);
37655+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37656 } else {
37657 skb_put(skb, len);
37658 dequeue_sm_buf(card, skb);
37659@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37660 ATM_SKB(skb)->vcc = vcc;
37661 __net_timestamp(skb);
37662 vcc->push(vcc, skb);
37663- atomic_inc(&vcc->stats->rx);
37664+ atomic_inc_unchecked(&vcc->stats->rx);
37665 }
37666 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37667 struct sk_buff *sb;
37668@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37669 if (len <= NS_SMBUFSIZE) {
37670 if (!atm_charge(vcc, sb->truesize)) {
37671 push_rxbufs(card, sb);
37672- atomic_inc(&vcc->stats->rx_drop);
37673+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37674 } else {
37675 skb_put(sb, len);
37676 dequeue_sm_buf(card, sb);
37677@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37678 ATM_SKB(sb)->vcc = vcc;
37679 __net_timestamp(sb);
37680 vcc->push(vcc, sb);
37681- atomic_inc(&vcc->stats->rx);
37682+ atomic_inc_unchecked(&vcc->stats->rx);
37683 }
37684
37685 push_rxbufs(card, skb);
37686@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37687
37688 if (!atm_charge(vcc, skb->truesize)) {
37689 push_rxbufs(card, skb);
37690- atomic_inc(&vcc->stats->rx_drop);
37691+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37692 } else {
37693 dequeue_lg_buf(card, skb);
37694 #ifdef NS_USE_DESTRUCTORS
37695@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37696 ATM_SKB(skb)->vcc = vcc;
37697 __net_timestamp(skb);
37698 vcc->push(vcc, skb);
37699- atomic_inc(&vcc->stats->rx);
37700+ atomic_inc_unchecked(&vcc->stats->rx);
37701 }
37702
37703 push_rxbufs(card, sb);
37704@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37705 printk
37706 ("nicstar%d: Out of huge buffers.\n",
37707 card->index);
37708- atomic_inc(&vcc->stats->rx_drop);
37709+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37710 recycle_iovec_rx_bufs(card,
37711 (struct iovec *)
37712 iovb->data,
37713@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37714 card->hbpool.count++;
37715 } else
37716 dev_kfree_skb_any(hb);
37717- atomic_inc(&vcc->stats->rx_drop);
37718+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37719 } else {
37720 /* Copy the small buffer to the huge buffer */
37721 sb = (struct sk_buff *)iov->iov_base;
37722@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37723 #endif /* NS_USE_DESTRUCTORS */
37724 __net_timestamp(hb);
37725 vcc->push(vcc, hb);
37726- atomic_inc(&vcc->stats->rx);
37727+ atomic_inc_unchecked(&vcc->stats->rx);
37728 }
37729 }
37730
37731diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37732index 21b0bc6..b5f40ba 100644
37733--- a/drivers/atm/solos-pci.c
37734+++ b/drivers/atm/solos-pci.c
37735@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37736 }
37737 atm_charge(vcc, skb->truesize);
37738 vcc->push(vcc, skb);
37739- atomic_inc(&vcc->stats->rx);
37740+ atomic_inc_unchecked(&vcc->stats->rx);
37741 break;
37742
37743 case PKT_STATUS:
37744@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37745 vcc = SKB_CB(oldskb)->vcc;
37746
37747 if (vcc) {
37748- atomic_inc(&vcc->stats->tx);
37749+ atomic_inc_unchecked(&vcc->stats->tx);
37750 solos_pop(vcc, oldskb);
37751 } else {
37752 dev_kfree_skb_irq(oldskb);
37753diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37754index 0215934..ce9f5b1 100644
37755--- a/drivers/atm/suni.c
37756+++ b/drivers/atm/suni.c
37757@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37758
37759
37760 #define ADD_LIMITED(s,v) \
37761- atomic_add((v),&stats->s); \
37762- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37763+ atomic_add_unchecked((v),&stats->s); \
37764+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37765
37766
37767 static void suni_hz(unsigned long from_timer)
37768diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37769index 5120a96..e2572bd 100644
37770--- a/drivers/atm/uPD98402.c
37771+++ b/drivers/atm/uPD98402.c
37772@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37773 struct sonet_stats tmp;
37774 int error = 0;
37775
37776- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37777+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37778 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37779 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37780 if (zero && !error) {
37781@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37782
37783
37784 #define ADD_LIMITED(s,v) \
37785- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37786- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37787- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37788+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37789+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37790+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37791
37792
37793 static void stat_event(struct atm_dev *dev)
37794@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37795 if (reason & uPD98402_INT_PFM) stat_event(dev);
37796 if (reason & uPD98402_INT_PCO) {
37797 (void) GET(PCOCR); /* clear interrupt cause */
37798- atomic_add(GET(HECCT),
37799+ atomic_add_unchecked(GET(HECCT),
37800 &PRIV(dev)->sonet_stats.uncorr_hcs);
37801 }
37802 if ((reason & uPD98402_INT_RFO) &&
37803@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37804 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37805 uPD98402_INT_LOS),PIMR); /* enable them */
37806 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37807- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37808- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37809- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37810+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37811+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37812+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37813 return 0;
37814 }
37815
37816diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37817index 969c3c2..9b72956 100644
37818--- a/drivers/atm/zatm.c
37819+++ b/drivers/atm/zatm.c
37820@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37821 }
37822 if (!size) {
37823 dev_kfree_skb_irq(skb);
37824- if (vcc) atomic_inc(&vcc->stats->rx_err);
37825+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37826 continue;
37827 }
37828 if (!atm_charge(vcc,skb->truesize)) {
37829@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37830 skb->len = size;
37831 ATM_SKB(skb)->vcc = vcc;
37832 vcc->push(vcc,skb);
37833- atomic_inc(&vcc->stats->rx);
37834+ atomic_inc_unchecked(&vcc->stats->rx);
37835 }
37836 zout(pos & 0xffff,MTA(mbx));
37837 #if 0 /* probably a stupid idea */
37838@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37839 skb_queue_head(&zatm_vcc->backlog,skb);
37840 break;
37841 }
37842- atomic_inc(&vcc->stats->tx);
37843+ atomic_inc_unchecked(&vcc->stats->tx);
37844 wake_up(&zatm_vcc->tx_wait);
37845 }
37846
37847diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37848index 876bae5..8978785 100644
37849--- a/drivers/base/bus.c
37850+++ b/drivers/base/bus.c
37851@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37852 return -EINVAL;
37853
37854 mutex_lock(&subsys->p->mutex);
37855- list_add_tail(&sif->node, &subsys->p->interfaces);
37856+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37857 if (sif->add_dev) {
37858 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37859 while ((dev = subsys_dev_iter_next(&iter)))
37860@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37861 subsys = sif->subsys;
37862
37863 mutex_lock(&subsys->p->mutex);
37864- list_del_init(&sif->node);
37865+ pax_list_del_init((struct list_head *)&sif->node);
37866 if (sif->remove_dev) {
37867 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37868 while ((dev = subsys_dev_iter_next(&iter)))
37869diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37870index 25798db..15f130e 100644
37871--- a/drivers/base/devtmpfs.c
37872+++ b/drivers/base/devtmpfs.c
37873@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37874 if (!thread)
37875 return 0;
37876
37877- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37878+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37879 if (err)
37880 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37881 else
37882@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37883 *err = sys_unshare(CLONE_NEWNS);
37884 if (*err)
37885 goto out;
37886- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37887+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37888 if (*err)
37889 goto out;
37890- sys_chdir("/.."); /* will traverse into overmounted root */
37891- sys_chroot(".");
37892+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37893+ sys_chroot((char __force_user *)".");
37894 complete(&setup_done);
37895 while (1) {
37896 spin_lock(&req_lock);
37897diff --git a/drivers/base/node.c b/drivers/base/node.c
37898index a3b82e9..f90a8ce 100644
37899--- a/drivers/base/node.c
37900+++ b/drivers/base/node.c
37901@@ -614,7 +614,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37902 struct node_attr {
37903 struct device_attribute attr;
37904 enum node_states state;
37905-};
37906+} __do_const;
37907
37908 static ssize_t show_node_state(struct device *dev,
37909 struct device_attribute *attr, char *buf)
37910diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37911index 0d8780c..0b5df3f 100644
37912--- a/drivers/base/power/domain.c
37913+++ b/drivers/base/power/domain.c
37914@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37915 {
37916 struct cpuidle_driver *cpuidle_drv;
37917 struct gpd_cpuidle_data *cpuidle_data;
37918- struct cpuidle_state *idle_state;
37919+ cpuidle_state_no_const *idle_state;
37920 int ret = 0;
37921
37922 if (IS_ERR_OR_NULL(genpd) || state < 0)
37923@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37924 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37925 {
37926 struct gpd_cpuidle_data *cpuidle_data;
37927- struct cpuidle_state *idle_state;
37928+ cpuidle_state_no_const *idle_state;
37929 int ret = 0;
37930
37931 if (IS_ERR_OR_NULL(genpd))
37932@@ -2222,7 +2222,10 @@ int genpd_dev_pm_attach(struct device *dev)
37933 return ret;
37934 }
37935
37936- dev->pm_domain->detach = genpd_dev_pm_detach;
37937+ pax_open_kernel();
37938+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37939+ pax_close_kernel();
37940+
37941 pm_genpd_poweron(pd);
37942
37943 return 0;
37944diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37945index d2be3f9..0a3167a 100644
37946--- a/drivers/base/power/sysfs.c
37947+++ b/drivers/base/power/sysfs.c
37948@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37949 return -EIO;
37950 }
37951 }
37952- return sprintf(buf, p);
37953+ return sprintf(buf, "%s", p);
37954 }
37955
37956 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37957diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37958index c2744b3..08fac19 100644
37959--- a/drivers/base/power/wakeup.c
37960+++ b/drivers/base/power/wakeup.c
37961@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37962 * They need to be modified together atomically, so it's better to use one
37963 * atomic variable to hold them both.
37964 */
37965-static atomic_t combined_event_count = ATOMIC_INIT(0);
37966+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37967
37968 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37969 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37970
37971 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37972 {
37973- unsigned int comb = atomic_read(&combined_event_count);
37974+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37975
37976 *cnt = (comb >> IN_PROGRESS_BITS);
37977 *inpr = comb & MAX_IN_PROGRESS;
37978@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37979 ws->start_prevent_time = ws->last_time;
37980
37981 /* Increment the counter of events in progress. */
37982- cec = atomic_inc_return(&combined_event_count);
37983+ cec = atomic_inc_return_unchecked(&combined_event_count);
37984
37985 trace_wakeup_source_activate(ws->name, cec);
37986 }
37987@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37988 * Increment the counter of registered wakeup events and decrement the
37989 * couter of wakeup events in progress simultaneously.
37990 */
37991- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37992+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37993 trace_wakeup_source_deactivate(ws->name, cec);
37994
37995 split_counters(&cnt, &inpr);
37996diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37997index 8d98a32..61d3165 100644
37998--- a/drivers/base/syscore.c
37999+++ b/drivers/base/syscore.c
38000@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38001 void register_syscore_ops(struct syscore_ops *ops)
38002 {
38003 mutex_lock(&syscore_ops_lock);
38004- list_add_tail(&ops->node, &syscore_ops_list);
38005+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38006 mutex_unlock(&syscore_ops_lock);
38007 }
38008 EXPORT_SYMBOL_GPL(register_syscore_ops);
38009@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38010 void unregister_syscore_ops(struct syscore_ops *ops)
38011 {
38012 mutex_lock(&syscore_ops_lock);
38013- list_del(&ops->node);
38014+ pax_list_del((struct list_head *)&ops->node);
38015 mutex_unlock(&syscore_ops_lock);
38016 }
38017 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38018diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38019index ff20f19..018f1da 100644
38020--- a/drivers/block/cciss.c
38021+++ b/drivers/block/cciss.c
38022@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38023 while (!list_empty(&h->reqQ)) {
38024 c = list_entry(h->reqQ.next, CommandList_struct, list);
38025 /* can't do anything if fifo is full */
38026- if ((h->access.fifo_full(h))) {
38027+ if ((h->access->fifo_full(h))) {
38028 dev_warn(&h->pdev->dev, "fifo full\n");
38029 break;
38030 }
38031@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38032 h->Qdepth--;
38033
38034 /* Tell the controller execute command */
38035- h->access.submit_command(h, c);
38036+ h->access->submit_command(h, c);
38037
38038 /* Put job onto the completed Q */
38039 addQ(&h->cmpQ, c);
38040@@ -3444,17 +3444,17 @@ startio:
38041
38042 static inline unsigned long get_next_completion(ctlr_info_t *h)
38043 {
38044- return h->access.command_completed(h);
38045+ return h->access->command_completed(h);
38046 }
38047
38048 static inline int interrupt_pending(ctlr_info_t *h)
38049 {
38050- return h->access.intr_pending(h);
38051+ return h->access->intr_pending(h);
38052 }
38053
38054 static inline long interrupt_not_for_us(ctlr_info_t *h)
38055 {
38056- return ((h->access.intr_pending(h) == 0) ||
38057+ return ((h->access->intr_pending(h) == 0) ||
38058 (h->interrupts_enabled == 0));
38059 }
38060
38061@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38062 u32 a;
38063
38064 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38065- return h->access.command_completed(h);
38066+ return h->access->command_completed(h);
38067
38068 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38069 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38070@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38071 trans_support & CFGTBL_Trans_use_short_tags);
38072
38073 /* Change the access methods to the performant access methods */
38074- h->access = SA5_performant_access;
38075+ h->access = &SA5_performant_access;
38076 h->transMethod = CFGTBL_Trans_Performant;
38077
38078 return;
38079@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38080 if (prod_index < 0)
38081 return -ENODEV;
38082 h->product_name = products[prod_index].product_name;
38083- h->access = *(products[prod_index].access);
38084+ h->access = products[prod_index].access;
38085
38086 if (cciss_board_disabled(h)) {
38087 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38088@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38089 }
38090
38091 /* make sure the board interrupts are off */
38092- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38093+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38094 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38095 if (rc)
38096 goto clean2;
38097@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38098 * fake ones to scoop up any residual completions.
38099 */
38100 spin_lock_irqsave(&h->lock, flags);
38101- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38102+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38103 spin_unlock_irqrestore(&h->lock, flags);
38104 free_irq(h->intr[h->intr_mode], h);
38105 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38106@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38107 dev_info(&h->pdev->dev, "Board READY.\n");
38108 dev_info(&h->pdev->dev,
38109 "Waiting for stale completions to drain.\n");
38110- h->access.set_intr_mask(h, CCISS_INTR_ON);
38111+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38112 msleep(10000);
38113- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38114+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38115
38116 rc = controller_reset_failed(h->cfgtable);
38117 if (rc)
38118@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38119 cciss_scsi_setup(h);
38120
38121 /* Turn the interrupts on so we can service requests */
38122- h->access.set_intr_mask(h, CCISS_INTR_ON);
38123+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38124
38125 /* Get the firmware version */
38126 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38127@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38128 kfree(flush_buf);
38129 if (return_code != IO_OK)
38130 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38131- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38132+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38133 free_irq(h->intr[h->intr_mode], h);
38134 }
38135
38136diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38137index 7fda30e..2f27946 100644
38138--- a/drivers/block/cciss.h
38139+++ b/drivers/block/cciss.h
38140@@ -101,7 +101,7 @@ struct ctlr_info
38141 /* information about each logical volume */
38142 drive_info_struct *drv[CISS_MAX_LUN];
38143
38144- struct access_method access;
38145+ struct access_method *access;
38146
38147 /* queue and queue Info */
38148 struct list_head reqQ;
38149@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38150 }
38151
38152 static struct access_method SA5_access = {
38153- SA5_submit_command,
38154- SA5_intr_mask,
38155- SA5_fifo_full,
38156- SA5_intr_pending,
38157- SA5_completed,
38158+ .submit_command = SA5_submit_command,
38159+ .set_intr_mask = SA5_intr_mask,
38160+ .fifo_full = SA5_fifo_full,
38161+ .intr_pending = SA5_intr_pending,
38162+ .command_completed = SA5_completed,
38163 };
38164
38165 static struct access_method SA5B_access = {
38166- SA5_submit_command,
38167- SA5B_intr_mask,
38168- SA5_fifo_full,
38169- SA5B_intr_pending,
38170- SA5_completed,
38171+ .submit_command = SA5_submit_command,
38172+ .set_intr_mask = SA5B_intr_mask,
38173+ .fifo_full = SA5_fifo_full,
38174+ .intr_pending = SA5B_intr_pending,
38175+ .command_completed = SA5_completed,
38176 };
38177
38178 static struct access_method SA5_performant_access = {
38179- SA5_submit_command,
38180- SA5_performant_intr_mask,
38181- SA5_fifo_full,
38182- SA5_performant_intr_pending,
38183- SA5_performant_completed,
38184+ .submit_command = SA5_submit_command,
38185+ .set_intr_mask = SA5_performant_intr_mask,
38186+ .fifo_full = SA5_fifo_full,
38187+ .intr_pending = SA5_performant_intr_pending,
38188+ .command_completed = SA5_performant_completed,
38189 };
38190
38191 struct board_type {
38192diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38193index 2b94403..fd6ad1f 100644
38194--- a/drivers/block/cpqarray.c
38195+++ b/drivers/block/cpqarray.c
38196@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38197 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38198 goto Enomem4;
38199 }
38200- hba[i]->access.set_intr_mask(hba[i], 0);
38201+ hba[i]->access->set_intr_mask(hba[i], 0);
38202 if (request_irq(hba[i]->intr, do_ida_intr,
38203 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38204 {
38205@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38206 add_timer(&hba[i]->timer);
38207
38208 /* Enable IRQ now that spinlock and rate limit timer are set up */
38209- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38210+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38211
38212 for(j=0; j<NWD; j++) {
38213 struct gendisk *disk = ida_gendisk[i][j];
38214@@ -694,7 +694,7 @@ DBGINFO(
38215 for(i=0; i<NR_PRODUCTS; i++) {
38216 if (board_id == products[i].board_id) {
38217 c->product_name = products[i].product_name;
38218- c->access = *(products[i].access);
38219+ c->access = products[i].access;
38220 break;
38221 }
38222 }
38223@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38224 hba[ctlr]->intr = intr;
38225 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38226 hba[ctlr]->product_name = products[j].product_name;
38227- hba[ctlr]->access = *(products[j].access);
38228+ hba[ctlr]->access = products[j].access;
38229 hba[ctlr]->ctlr = ctlr;
38230 hba[ctlr]->board_id = board_id;
38231 hba[ctlr]->pci_dev = NULL; /* not PCI */
38232@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38233
38234 while((c = h->reqQ) != NULL) {
38235 /* Can't do anything if we're busy */
38236- if (h->access.fifo_full(h) == 0)
38237+ if (h->access->fifo_full(h) == 0)
38238 return;
38239
38240 /* Get the first entry from the request Q */
38241@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38242 h->Qdepth--;
38243
38244 /* Tell the controller to do our bidding */
38245- h->access.submit_command(h, c);
38246+ h->access->submit_command(h, c);
38247
38248 /* Get onto the completion Q */
38249 addQ(&h->cmpQ, c);
38250@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38251 unsigned long flags;
38252 __u32 a,a1;
38253
38254- istat = h->access.intr_pending(h);
38255+ istat = h->access->intr_pending(h);
38256 /* Is this interrupt for us? */
38257 if (istat == 0)
38258 return IRQ_NONE;
38259@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38260 */
38261 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38262 if (istat & FIFO_NOT_EMPTY) {
38263- while((a = h->access.command_completed(h))) {
38264+ while((a = h->access->command_completed(h))) {
38265 a1 = a; a &= ~3;
38266 if ((c = h->cmpQ) == NULL)
38267 {
38268@@ -1448,11 +1448,11 @@ static int sendcmd(
38269 /*
38270 * Disable interrupt
38271 */
38272- info_p->access.set_intr_mask(info_p, 0);
38273+ info_p->access->set_intr_mask(info_p, 0);
38274 /* Make sure there is room in the command FIFO */
38275 /* Actually it should be completely empty at this time. */
38276 for (i = 200000; i > 0; i--) {
38277- temp = info_p->access.fifo_full(info_p);
38278+ temp = info_p->access->fifo_full(info_p);
38279 if (temp != 0) {
38280 break;
38281 }
38282@@ -1465,7 +1465,7 @@ DBG(
38283 /*
38284 * Send the cmd
38285 */
38286- info_p->access.submit_command(info_p, c);
38287+ info_p->access->submit_command(info_p, c);
38288 complete = pollcomplete(ctlr);
38289
38290 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38291@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38292 * we check the new geometry. Then turn interrupts back on when
38293 * we're done.
38294 */
38295- host->access.set_intr_mask(host, 0);
38296+ host->access->set_intr_mask(host, 0);
38297 getgeometry(ctlr);
38298- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38299+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38300
38301 for(i=0; i<NWD; i++) {
38302 struct gendisk *disk = ida_gendisk[ctlr][i];
38303@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38304 /* Wait (up to 2 seconds) for a command to complete */
38305
38306 for (i = 200000; i > 0; i--) {
38307- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38308+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38309 if (done == 0) {
38310 udelay(10); /* a short fixed delay */
38311 } else
38312diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38313index be73e9d..7fbf140 100644
38314--- a/drivers/block/cpqarray.h
38315+++ b/drivers/block/cpqarray.h
38316@@ -99,7 +99,7 @@ struct ctlr_info {
38317 drv_info_t drv[NWD];
38318 struct proc_dir_entry *proc;
38319
38320- struct access_method access;
38321+ struct access_method *access;
38322
38323 cmdlist_t *reqQ;
38324 cmdlist_t *cmpQ;
38325diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38326index 434c77d..6d3219a 100644
38327--- a/drivers/block/drbd/drbd_bitmap.c
38328+++ b/drivers/block/drbd/drbd_bitmap.c
38329@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38330 submit_bio(rw, bio);
38331 /* this should not count as user activity and cause the
38332 * resync to throttle -- see drbd_rs_should_slow_down(). */
38333- atomic_add(len >> 9, &device->rs_sect_ev);
38334+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38335 }
38336 }
38337
38338diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38339index b905e98..0812ed8 100644
38340--- a/drivers/block/drbd/drbd_int.h
38341+++ b/drivers/block/drbd/drbd_int.h
38342@@ -385,7 +385,7 @@ struct drbd_epoch {
38343 struct drbd_connection *connection;
38344 struct list_head list;
38345 unsigned int barrier_nr;
38346- atomic_t epoch_size; /* increased on every request added. */
38347+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38348 atomic_t active; /* increased on every req. added, and dec on every finished. */
38349 unsigned long flags;
38350 };
38351@@ -946,7 +946,7 @@ struct drbd_device {
38352 unsigned int al_tr_number;
38353 int al_tr_cycle;
38354 wait_queue_head_t seq_wait;
38355- atomic_t packet_seq;
38356+ atomic_unchecked_t packet_seq;
38357 unsigned int peer_seq;
38358 spinlock_t peer_seq_lock;
38359 unsigned long comm_bm_set; /* communicated number of set bits. */
38360@@ -955,8 +955,8 @@ struct drbd_device {
38361 struct mutex own_state_mutex;
38362 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38363 char congestion_reason; /* Why we where congested... */
38364- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38365- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38366+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38367+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38368 int rs_last_sect_ev; /* counter to compare with */
38369 int rs_last_events; /* counter of read or write "events" (unit sectors)
38370 * on the lower level device when we last looked. */
38371diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38372index 1fc8342..7e7742b 100644
38373--- a/drivers/block/drbd/drbd_main.c
38374+++ b/drivers/block/drbd/drbd_main.c
38375@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38376 p->sector = sector;
38377 p->block_id = block_id;
38378 p->blksize = blksize;
38379- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38380+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38381 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38382 }
38383
38384@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38385 return -EIO;
38386 p->sector = cpu_to_be64(req->i.sector);
38387 p->block_id = (unsigned long)req;
38388- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38389+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38390 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38391 if (device->state.conn >= C_SYNC_SOURCE &&
38392 device->state.conn <= C_PAUSED_SYNC_T)
38393@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38394 atomic_set(&device->unacked_cnt, 0);
38395 atomic_set(&device->local_cnt, 0);
38396 atomic_set(&device->pp_in_use_by_net, 0);
38397- atomic_set(&device->rs_sect_in, 0);
38398- atomic_set(&device->rs_sect_ev, 0);
38399+ atomic_set_unchecked(&device->rs_sect_in, 0);
38400+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38401 atomic_set(&device->ap_in_flight, 0);
38402 atomic_set(&device->md_io.in_use, 0);
38403
38404@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38405 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38406 struct drbd_resource *resource = connection->resource;
38407
38408- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38409- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38410+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38411+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38412 kfree(connection->current_epoch);
38413
38414 idr_destroy(&connection->peer_devices);
38415diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38416index 74df8cf..e41fc24 100644
38417--- a/drivers/block/drbd/drbd_nl.c
38418+++ b/drivers/block/drbd/drbd_nl.c
38419@@ -3637,13 +3637,13 @@ finish:
38420
38421 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38422 {
38423- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38424+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38425 struct sk_buff *msg;
38426 struct drbd_genlmsghdr *d_out;
38427 unsigned seq;
38428 int err = -ENOMEM;
38429
38430- seq = atomic_inc_return(&drbd_genl_seq);
38431+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38432 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38433 if (!msg)
38434 goto failed;
38435diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38436index d169b4a..481463f 100644
38437--- a/drivers/block/drbd/drbd_receiver.c
38438+++ b/drivers/block/drbd/drbd_receiver.c
38439@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38440 struct drbd_device *device = peer_device->device;
38441 int err;
38442
38443- atomic_set(&device->packet_seq, 0);
38444+ atomic_set_unchecked(&device->packet_seq, 0);
38445 device->peer_seq = 0;
38446
38447 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38448@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38449 do {
38450 next_epoch = NULL;
38451
38452- epoch_size = atomic_read(&epoch->epoch_size);
38453+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38454
38455 switch (ev & ~EV_CLEANUP) {
38456 case EV_PUT:
38457@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38458 rv = FE_DESTROYED;
38459 } else {
38460 epoch->flags = 0;
38461- atomic_set(&epoch->epoch_size, 0);
38462+ atomic_set_unchecked(&epoch->epoch_size, 0);
38463 /* atomic_set(&epoch->active, 0); is already zero */
38464 if (rv == FE_STILL_LIVE)
38465 rv = FE_RECYCLED;
38466@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38467 conn_wait_active_ee_empty(connection);
38468 drbd_flush(connection);
38469
38470- if (atomic_read(&connection->current_epoch->epoch_size)) {
38471+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38472 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38473 if (epoch)
38474 break;
38475@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38476 }
38477
38478 epoch->flags = 0;
38479- atomic_set(&epoch->epoch_size, 0);
38480+ atomic_set_unchecked(&epoch->epoch_size, 0);
38481 atomic_set(&epoch->active, 0);
38482
38483 spin_lock(&connection->epoch_lock);
38484- if (atomic_read(&connection->current_epoch->epoch_size)) {
38485+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38486 list_add(&epoch->list, &connection->current_epoch->list);
38487 connection->current_epoch = epoch;
38488 connection->epochs++;
38489@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38490 list_add_tail(&peer_req->w.list, &device->sync_ee);
38491 spin_unlock_irq(&device->resource->req_lock);
38492
38493- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38494+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38495 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38496 return 0;
38497
38498@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38499 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38500 }
38501
38502- atomic_add(pi->size >> 9, &device->rs_sect_in);
38503+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38504
38505 return err;
38506 }
38507@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38508
38509 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38510 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38511- atomic_inc(&connection->current_epoch->epoch_size);
38512+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38513 err2 = drbd_drain_block(peer_device, pi->size);
38514 if (!err)
38515 err = err2;
38516@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38517
38518 spin_lock(&connection->epoch_lock);
38519 peer_req->epoch = connection->current_epoch;
38520- atomic_inc(&peer_req->epoch->epoch_size);
38521+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38522 atomic_inc(&peer_req->epoch->active);
38523 spin_unlock(&connection->epoch_lock);
38524
38525@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38526
38527 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38528 (int)part_stat_read(&disk->part0, sectors[1]) -
38529- atomic_read(&device->rs_sect_ev);
38530+ atomic_read_unchecked(&device->rs_sect_ev);
38531
38532 if (atomic_read(&device->ap_actlog_cnt)
38533 || curr_events - device->rs_last_events > 64) {
38534@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38535 device->use_csums = true;
38536 } else if (pi->cmd == P_OV_REPLY) {
38537 /* track progress, we may need to throttle */
38538- atomic_add(size >> 9, &device->rs_sect_in);
38539+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38540 peer_req->w.cb = w_e_end_ov_reply;
38541 dec_rs_pending(device);
38542 /* drbd_rs_begin_io done when we sent this request,
38543@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38544 goto out_free_e;
38545
38546 submit_for_resync:
38547- atomic_add(size >> 9, &device->rs_sect_ev);
38548+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38549
38550 submit:
38551 update_receiver_timing_details(connection, drbd_submit_peer_request);
38552@@ -4564,7 +4564,7 @@ struct data_cmd {
38553 int expect_payload;
38554 size_t pkt_size;
38555 int (*fn)(struct drbd_connection *, struct packet_info *);
38556-};
38557+} __do_const;
38558
38559 static struct data_cmd drbd_cmd_handler[] = {
38560 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38561@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38562 if (!list_empty(&connection->current_epoch->list))
38563 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38564 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38565- atomic_set(&connection->current_epoch->epoch_size, 0);
38566+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38567 connection->send.seen_any_write_yet = false;
38568
38569 drbd_info(connection, "Connection closed\n");
38570@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38571 put_ldev(device);
38572 }
38573 dec_rs_pending(device);
38574- atomic_add(blksize >> 9, &device->rs_sect_in);
38575+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38576
38577 return 0;
38578 }
38579@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38580 struct asender_cmd {
38581 size_t pkt_size;
38582 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38583-};
38584+} __do_const;
38585
38586 static struct asender_cmd asender_tbl[] = {
38587 [P_PING] = { 0, got_Ping },
38588diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38589index d0fae55..4469096 100644
38590--- a/drivers/block/drbd/drbd_worker.c
38591+++ b/drivers/block/drbd/drbd_worker.c
38592@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38593 list_add_tail(&peer_req->w.list, &device->read_ee);
38594 spin_unlock_irq(&device->resource->req_lock);
38595
38596- atomic_add(size >> 9, &device->rs_sect_ev);
38597+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38598 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38599 return 0;
38600
38601@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38602 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38603 int number, mxb;
38604
38605- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38606+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38607 device->rs_in_flight -= sect_in;
38608
38609 rcu_read_lock();
38610@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38611 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38612 struct fifo_buffer *plan;
38613
38614- atomic_set(&device->rs_sect_in, 0);
38615- atomic_set(&device->rs_sect_ev, 0);
38616+ atomic_set_unchecked(&device->rs_sect_in, 0);
38617+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38618 device->rs_in_flight = 0;
38619 device->rs_last_events =
38620 (int)part_stat_read(&disk->part0, sectors[0]) +
38621diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38622index 6cb1beb..bf490f7 100644
38623--- a/drivers/block/loop.c
38624+++ b/drivers/block/loop.c
38625@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38626
38627 file_start_write(file);
38628 set_fs(get_ds());
38629- bw = file->f_op->write(file, buf, len, &pos);
38630+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38631 set_fs(old_fs);
38632 file_end_write(file);
38633 if (likely(bw == len))
38634diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38635index d826bf3..8eb406c 100644
38636--- a/drivers/block/nvme-core.c
38637+++ b/drivers/block/nvme-core.c
38638@@ -76,7 +76,6 @@ static LIST_HEAD(dev_list);
38639 static struct task_struct *nvme_thread;
38640 static struct workqueue_struct *nvme_workq;
38641 static wait_queue_head_t nvme_kthread_wait;
38642-static struct notifier_block nvme_nb;
38643
38644 static void nvme_reset_failed_dev(struct work_struct *ws);
38645 static int nvme_process_cq(struct nvme_queue *nvmeq);
38646@@ -2955,7 +2954,6 @@ static int __init nvme_init(void)
38647 static void __exit nvme_exit(void)
38648 {
38649 pci_unregister_driver(&nvme_driver);
38650- unregister_hotcpu_notifier(&nvme_nb);
38651 unregister_blkdev(nvme_major, "nvme");
38652 destroy_workqueue(nvme_workq);
38653 BUG_ON(nvme_thread && !IS_ERR(nvme_thread));
38654diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38655index 09e628da..7607aaa 100644
38656--- a/drivers/block/pktcdvd.c
38657+++ b/drivers/block/pktcdvd.c
38658@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38659
38660 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38661 {
38662- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38663+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38664 }
38665
38666 /*
38667@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38668 return -EROFS;
38669 }
38670 pd->settings.fp = ti.fp;
38671- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38672+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38673
38674 if (ti.nwa_v) {
38675 pd->nwa = be32_to_cpu(ti.next_writable);
38676diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38677index 8a86b62..f54c87e 100644
38678--- a/drivers/block/rbd.c
38679+++ b/drivers/block/rbd.c
38680@@ -63,7 +63,7 @@
38681 * If the counter is already at its maximum value returns
38682 * -EINVAL without updating it.
38683 */
38684-static int atomic_inc_return_safe(atomic_t *v)
38685+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38686 {
38687 unsigned int counter;
38688
38689diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38690index e5565fb..71be10b4 100644
38691--- a/drivers/block/smart1,2.h
38692+++ b/drivers/block/smart1,2.h
38693@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38694 }
38695
38696 static struct access_method smart4_access = {
38697- smart4_submit_command,
38698- smart4_intr_mask,
38699- smart4_fifo_full,
38700- smart4_intr_pending,
38701- smart4_completed,
38702+ .submit_command = smart4_submit_command,
38703+ .set_intr_mask = smart4_intr_mask,
38704+ .fifo_full = smart4_fifo_full,
38705+ .intr_pending = smart4_intr_pending,
38706+ .command_completed = smart4_completed,
38707 };
38708
38709 /*
38710@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38711 }
38712
38713 static struct access_method smart2_access = {
38714- smart2_submit_command,
38715- smart2_intr_mask,
38716- smart2_fifo_full,
38717- smart2_intr_pending,
38718- smart2_completed,
38719+ .submit_command = smart2_submit_command,
38720+ .set_intr_mask = smart2_intr_mask,
38721+ .fifo_full = smart2_fifo_full,
38722+ .intr_pending = smart2_intr_pending,
38723+ .command_completed = smart2_completed,
38724 };
38725
38726 /*
38727@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38728 }
38729
38730 static struct access_method smart2e_access = {
38731- smart2e_submit_command,
38732- smart2e_intr_mask,
38733- smart2e_fifo_full,
38734- smart2e_intr_pending,
38735- smart2e_completed,
38736+ .submit_command = smart2e_submit_command,
38737+ .set_intr_mask = smart2e_intr_mask,
38738+ .fifo_full = smart2e_fifo_full,
38739+ .intr_pending = smart2e_intr_pending,
38740+ .command_completed = smart2e_completed,
38741 };
38742
38743 /*
38744@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38745 }
38746
38747 static struct access_method smart1_access = {
38748- smart1_submit_command,
38749- smart1_intr_mask,
38750- smart1_fifo_full,
38751- smart1_intr_pending,
38752- smart1_completed,
38753+ .submit_command = smart1_submit_command,
38754+ .set_intr_mask = smart1_intr_mask,
38755+ .fifo_full = smart1_fifo_full,
38756+ .intr_pending = smart1_intr_pending,
38757+ .command_completed = smart1_completed,
38758 };
38759diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38760index 55c135b..9f8d60c 100644
38761--- a/drivers/bluetooth/btwilink.c
38762+++ b/drivers/bluetooth/btwilink.c
38763@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38764
38765 static int bt_ti_probe(struct platform_device *pdev)
38766 {
38767- static struct ti_st *hst;
38768+ struct ti_st *hst;
38769 struct hci_dev *hdev;
38770 int err;
38771
38772diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38773index 5d28a45..a538f90 100644
38774--- a/drivers/cdrom/cdrom.c
38775+++ b/drivers/cdrom/cdrom.c
38776@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38777 ENSURE(reset, CDC_RESET);
38778 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38779 cdi->mc_flags = 0;
38780- cdo->n_minors = 0;
38781 cdi->options = CDO_USE_FFLAGS;
38782
38783 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38784@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38785 else
38786 cdi->cdda_method = CDDA_OLD;
38787
38788- if (!cdo->generic_packet)
38789- cdo->generic_packet = cdrom_dummy_generic_packet;
38790+ if (!cdo->generic_packet) {
38791+ pax_open_kernel();
38792+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38793+ pax_close_kernel();
38794+ }
38795
38796 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38797 mutex_lock(&cdrom_mutex);
38798@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38799 if (cdi->exit)
38800 cdi->exit(cdi);
38801
38802- cdi->ops->n_minors--;
38803 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38804 }
38805
38806@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38807 */
38808 nr = nframes;
38809 do {
38810- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38811+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38812 if (cgc.buffer)
38813 break;
38814
38815@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38816 struct cdrom_device_info *cdi;
38817 int ret;
38818
38819- ret = scnprintf(info + *pos, max_size - *pos, header);
38820+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38821 if (!ret)
38822 return 1;
38823
38824diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38825index 584bc31..e64a12c 100644
38826--- a/drivers/cdrom/gdrom.c
38827+++ b/drivers/cdrom/gdrom.c
38828@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38829 .audio_ioctl = gdrom_audio_ioctl,
38830 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38831 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38832- .n_minors = 1,
38833 };
38834
38835 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38836diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38837index efefd12..4f1d494 100644
38838--- a/drivers/char/Kconfig
38839+++ b/drivers/char/Kconfig
38840@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38841
38842 config DEVKMEM
38843 bool "/dev/kmem virtual device support"
38844- default y
38845+ default n
38846+ depends on !GRKERNSEC_KMEM
38847 help
38848 Say Y here if you want to support the /dev/kmem device. The
38849 /dev/kmem device is rarely used, but can be used for certain
38850@@ -577,6 +578,7 @@ config DEVPORT
38851 bool
38852 depends on !M68K
38853 depends on ISA || PCI
38854+ depends on !GRKERNSEC_KMEM
38855 default y
38856
38857 source "drivers/s390/char/Kconfig"
38858diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38859index a48e05b..6bac831 100644
38860--- a/drivers/char/agp/compat_ioctl.c
38861+++ b/drivers/char/agp/compat_ioctl.c
38862@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38863 return -ENOMEM;
38864 }
38865
38866- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38867+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38868 sizeof(*usegment) * ureserve.seg_count)) {
38869 kfree(usegment);
38870 kfree(ksegment);
38871diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38872index 09f17eb..8531d2f 100644
38873--- a/drivers/char/agp/frontend.c
38874+++ b/drivers/char/agp/frontend.c
38875@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38876 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38877 return -EFAULT;
38878
38879- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38880+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38881 return -EFAULT;
38882
38883 client = agp_find_client_by_pid(reserve.pid);
38884@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38885 if (segment == NULL)
38886 return -ENOMEM;
38887
38888- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38889+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38890 sizeof(struct agp_segment) * reserve.seg_count)) {
38891 kfree(segment);
38892 return -EFAULT;
38893diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38894index 4f94375..413694e 100644
38895--- a/drivers/char/genrtc.c
38896+++ b/drivers/char/genrtc.c
38897@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38898 switch (cmd) {
38899
38900 case RTC_PLL_GET:
38901+ memset(&pll, 0, sizeof(pll));
38902 if (get_rtc_pll(&pll))
38903 return -EINVAL;
38904 else
38905diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38906index d5d4cd8..22d561d 100644
38907--- a/drivers/char/hpet.c
38908+++ b/drivers/char/hpet.c
38909@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38910 }
38911
38912 static int
38913-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38914+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38915 struct hpet_info *info)
38916 {
38917 struct hpet_timer __iomem *timer;
38918diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38919index e34a019..842a568 100644
38920--- a/drivers/char/i8k.c
38921+++ b/drivers/char/i8k.c
38922@@ -684,7 +684,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38923 },
38924 };
38925
38926-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38927+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38928 {
38929 .ident = "Dell Inspiron",
38930 .matches = {
38931diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38932index 6b65fa4..8ebbc99 100644
38933--- a/drivers/char/ipmi/ipmi_msghandler.c
38934+++ b/drivers/char/ipmi/ipmi_msghandler.c
38935@@ -436,7 +436,7 @@ struct ipmi_smi {
38936 struct proc_dir_entry *proc_dir;
38937 char proc_dir_name[10];
38938
38939- atomic_t stats[IPMI_NUM_STATS];
38940+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38941
38942 /*
38943 * run_to_completion duplicate of smb_info, smi_info
38944@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38945 static DEFINE_MUTEX(smi_watchers_mutex);
38946
38947 #define ipmi_inc_stat(intf, stat) \
38948- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38949+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38950 #define ipmi_get_stat(intf, stat) \
38951- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38952+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38953
38954 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38955 "ACPI", "SMBIOS", "PCI",
38956@@ -2837,7 +2837,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38957 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38958 init_waitqueue_head(&intf->waitq);
38959 for (i = 0; i < IPMI_NUM_STATS; i++)
38960- atomic_set(&intf->stats[i], 0);
38961+ atomic_set_unchecked(&intf->stats[i], 0);
38962
38963 intf->proc_dir = NULL;
38964
38965diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38966index 967b73a..946e94c 100644
38967--- a/drivers/char/ipmi/ipmi_si_intf.c
38968+++ b/drivers/char/ipmi/ipmi_si_intf.c
38969@@ -284,7 +284,7 @@ struct smi_info {
38970 unsigned char slave_addr;
38971
38972 /* Counters and things for the proc filesystem. */
38973- atomic_t stats[SI_NUM_STATS];
38974+ atomic_unchecked_t stats[SI_NUM_STATS];
38975
38976 struct task_struct *thread;
38977
38978@@ -293,9 +293,9 @@ struct smi_info {
38979 };
38980
38981 #define smi_inc_stat(smi, stat) \
38982- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38983+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38984 #define smi_get_stat(smi, stat) \
38985- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38986+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38987
38988 #define SI_MAX_PARMS 4
38989
38990@@ -3412,7 +3412,7 @@ static int try_smi_init(struct smi_info *new_smi)
38991 atomic_set(&new_smi->req_events, 0);
38992 new_smi->run_to_completion = false;
38993 for (i = 0; i < SI_NUM_STATS; i++)
38994- atomic_set(&new_smi->stats[i], 0);
38995+ atomic_set_unchecked(&new_smi->stats[i], 0);
38996
38997 new_smi->interrupt_disabled = true;
38998 atomic_set(&new_smi->need_watch, 0);
38999diff --git a/drivers/char/mem.c b/drivers/char/mem.c
39000index 4c58333..d5cca27 100644
39001--- a/drivers/char/mem.c
39002+++ b/drivers/char/mem.c
39003@@ -18,6 +18,7 @@
39004 #include <linux/raw.h>
39005 #include <linux/tty.h>
39006 #include <linux/capability.h>
39007+#include <linux/security.h>
39008 #include <linux/ptrace.h>
39009 #include <linux/device.h>
39010 #include <linux/highmem.h>
39011@@ -36,6 +37,10 @@
39012
39013 #define DEVPORT_MINOR 4
39014
39015+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39016+extern const struct file_operations grsec_fops;
39017+#endif
39018+
39019 static inline unsigned long size_inside_page(unsigned long start,
39020 unsigned long size)
39021 {
39022@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39023
39024 while (cursor < to) {
39025 if (!devmem_is_allowed(pfn)) {
39026+#ifdef CONFIG_GRKERNSEC_KMEM
39027+ gr_handle_mem_readwrite(from, to);
39028+#else
39029 printk(KERN_INFO
39030 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39031 current->comm, from, to);
39032+#endif
39033 return 0;
39034 }
39035 cursor += PAGE_SIZE;
39036@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39037 }
39038 return 1;
39039 }
39040+#elif defined(CONFIG_GRKERNSEC_KMEM)
39041+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39042+{
39043+ return 0;
39044+}
39045 #else
39046 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39047 {
39048@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39049 #endif
39050
39051 while (count > 0) {
39052- unsigned long remaining;
39053+ unsigned long remaining = 0;
39054+ char *temp;
39055
39056 sz = size_inside_page(p, count);
39057
39058@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39059 if (!ptr)
39060 return -EFAULT;
39061
39062- remaining = copy_to_user(buf, ptr, sz);
39063+#ifdef CONFIG_PAX_USERCOPY
39064+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39065+ if (!temp) {
39066+ unxlate_dev_mem_ptr(p, ptr);
39067+ return -ENOMEM;
39068+ }
39069+ remaining = probe_kernel_read(temp, ptr, sz);
39070+#else
39071+ temp = ptr;
39072+#endif
39073+
39074+ if (!remaining)
39075+ remaining = copy_to_user(buf, temp, sz);
39076+
39077+#ifdef CONFIG_PAX_USERCOPY
39078+ kfree(temp);
39079+#endif
39080+
39081 unxlate_dev_mem_ptr(p, ptr);
39082 if (remaining)
39083 return -EFAULT;
39084@@ -372,9 +404,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39085 size_t count, loff_t *ppos)
39086 {
39087 unsigned long p = *ppos;
39088- ssize_t low_count, read, sz;
39089+ ssize_t low_count, read, sz, err = 0;
39090 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39091- int err = 0;
39092
39093 read = 0;
39094 if (p < (unsigned long) high_memory) {
39095@@ -396,6 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39096 }
39097 #endif
39098 while (low_count > 0) {
39099+ char *temp;
39100+
39101 sz = size_inside_page(p, low_count);
39102
39103 /*
39104@@ -405,7 +438,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39105 */
39106 kbuf = xlate_dev_kmem_ptr((void *)p);
39107
39108- if (copy_to_user(buf, kbuf, sz))
39109+#ifdef CONFIG_PAX_USERCOPY
39110+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39111+ if (!temp)
39112+ return -ENOMEM;
39113+ err = probe_kernel_read(temp, kbuf, sz);
39114+#else
39115+ temp = kbuf;
39116+#endif
39117+
39118+ if (!err)
39119+ err = copy_to_user(buf, temp, sz);
39120+
39121+#ifdef CONFIG_PAX_USERCOPY
39122+ kfree(temp);
39123+#endif
39124+
39125+ if (err)
39126 return -EFAULT;
39127 buf += sz;
39128 p += sz;
39129@@ -800,6 +849,9 @@ static const struct memdev {
39130 #ifdef CONFIG_PRINTK
39131 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
39132 #endif
39133+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39134+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
39135+#endif
39136 };
39137
39138 static int memory_open(struct inode *inode, struct file *filp)
39139@@ -871,7 +923,7 @@ static int __init chr_dev_init(void)
39140 continue;
39141
39142 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39143- NULL, devlist[minor].name);
39144+ NULL, "%s", devlist[minor].name);
39145 }
39146
39147 return tty_init();
39148diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39149index 9df78e2..01ba9ae 100644
39150--- a/drivers/char/nvram.c
39151+++ b/drivers/char/nvram.c
39152@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39153
39154 spin_unlock_irq(&rtc_lock);
39155
39156- if (copy_to_user(buf, contents, tmp - contents))
39157+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39158 return -EFAULT;
39159
39160 *ppos = i;
39161diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39162index 0ea9986..e7b07e4 100644
39163--- a/drivers/char/pcmcia/synclink_cs.c
39164+++ b/drivers/char/pcmcia/synclink_cs.c
39165@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39166
39167 if (debug_level >= DEBUG_LEVEL_INFO)
39168 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39169- __FILE__, __LINE__, info->device_name, port->count);
39170+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39171
39172 if (tty_port_close_start(port, tty, filp) == 0)
39173 goto cleanup;
39174@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39175 cleanup:
39176 if (debug_level >= DEBUG_LEVEL_INFO)
39177 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39178- tty->driver->name, port->count);
39179+ tty->driver->name, atomic_read(&port->count));
39180 }
39181
39182 /* Wait until the transmitter is empty.
39183@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39184
39185 if (debug_level >= DEBUG_LEVEL_INFO)
39186 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39187- __FILE__, __LINE__, tty->driver->name, port->count);
39188+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39189
39190 /* If port is closing, signal caller to try again */
39191 if (port->flags & ASYNC_CLOSING){
39192@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39193 goto cleanup;
39194 }
39195 spin_lock(&port->lock);
39196- port->count++;
39197+ atomic_inc(&port->count);
39198 spin_unlock(&port->lock);
39199 spin_unlock_irqrestore(&info->netlock, flags);
39200
39201- if (port->count == 1) {
39202+ if (atomic_read(&port->count) == 1) {
39203 /* 1st open on this device, init hardware */
39204 retval = startup(info, tty);
39205 if (retval < 0)
39206@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39207 unsigned short new_crctype;
39208
39209 /* return error if TTY interface open */
39210- if (info->port.count)
39211+ if (atomic_read(&info->port.count))
39212 return -EBUSY;
39213
39214 switch (encoding)
39215@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39216
39217 /* arbitrate between network and tty opens */
39218 spin_lock_irqsave(&info->netlock, flags);
39219- if (info->port.count != 0 || info->netcount != 0) {
39220+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39221 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39222 spin_unlock_irqrestore(&info->netlock, flags);
39223 return -EBUSY;
39224@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39225 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39226
39227 /* return error if TTY interface open */
39228- if (info->port.count)
39229+ if (atomic_read(&info->port.count))
39230 return -EBUSY;
39231
39232 if (cmd != SIOCWANDEV)
39233diff --git a/drivers/char/random.c b/drivers/char/random.c
39234index 9cd6968..6416f00 100644
39235--- a/drivers/char/random.c
39236+++ b/drivers/char/random.c
39237@@ -289,9 +289,6 @@
39238 /*
39239 * To allow fractional bits to be tracked, the entropy_count field is
39240 * denominated in units of 1/8th bits.
39241- *
39242- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39243- * credit_entropy_bits() needs to be 64 bits wide.
39244 */
39245 #define ENTROPY_SHIFT 3
39246 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39247@@ -439,9 +436,9 @@ struct entropy_store {
39248 };
39249
39250 static void push_to_pool(struct work_struct *work);
39251-static __u32 input_pool_data[INPUT_POOL_WORDS];
39252-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39253-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39254+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39255+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39256+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39257
39258 static struct entropy_store input_pool = {
39259 .poolinfo = &poolinfo_table[0],
39260@@ -635,7 +632,7 @@ retry:
39261 /* The +2 corresponds to the /4 in the denominator */
39262
39263 do {
39264- unsigned int anfrac = min(pnfrac, pool_size/2);
39265+ u64 anfrac = min(pnfrac, pool_size/2);
39266 unsigned int add =
39267 ((pool_size - entropy_count)*anfrac*3) >> s;
39268
39269@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39270
39271 extract_buf(r, tmp);
39272 i = min_t(int, nbytes, EXTRACT_SIZE);
39273- if (copy_to_user(buf, tmp, i)) {
39274+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39275 ret = -EFAULT;
39276 break;
39277 }
39278@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39279 static int proc_do_uuid(struct ctl_table *table, int write,
39280 void __user *buffer, size_t *lenp, loff_t *ppos)
39281 {
39282- struct ctl_table fake_table;
39283+ ctl_table_no_const fake_table;
39284 unsigned char buf[64], tmp_uuid[16], *uuid;
39285
39286 uuid = table->data;
39287@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39288 static int proc_do_entropy(struct ctl_table *table, int write,
39289 void __user *buffer, size_t *lenp, loff_t *ppos)
39290 {
39291- struct ctl_table fake_table;
39292+ ctl_table_no_const fake_table;
39293 int entropy_count;
39294
39295 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39296diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39297index e496dae..3db53b6 100644
39298--- a/drivers/char/sonypi.c
39299+++ b/drivers/char/sonypi.c
39300@@ -54,6 +54,7 @@
39301
39302 #include <asm/uaccess.h>
39303 #include <asm/io.h>
39304+#include <asm/local.h>
39305
39306 #include <linux/sonypi.h>
39307
39308@@ -490,7 +491,7 @@ static struct sonypi_device {
39309 spinlock_t fifo_lock;
39310 wait_queue_head_t fifo_proc_list;
39311 struct fasync_struct *fifo_async;
39312- int open_count;
39313+ local_t open_count;
39314 int model;
39315 struct input_dev *input_jog_dev;
39316 struct input_dev *input_key_dev;
39317@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39318 static int sonypi_misc_release(struct inode *inode, struct file *file)
39319 {
39320 mutex_lock(&sonypi_device.lock);
39321- sonypi_device.open_count--;
39322+ local_dec(&sonypi_device.open_count);
39323 mutex_unlock(&sonypi_device.lock);
39324 return 0;
39325 }
39326@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39327 {
39328 mutex_lock(&sonypi_device.lock);
39329 /* Flush input queue on first open */
39330- if (!sonypi_device.open_count)
39331+ if (!local_read(&sonypi_device.open_count))
39332 kfifo_reset(&sonypi_device.fifo);
39333- sonypi_device.open_count++;
39334+ local_inc(&sonypi_device.open_count);
39335 mutex_unlock(&sonypi_device.lock);
39336
39337 return 0;
39338@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39339
39340 static struct platform_device *sonypi_platform_device;
39341
39342-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39343+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39344 {
39345 .ident = "Sony Vaio",
39346 .matches = {
39347diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39348index 565a947..dcdc06e 100644
39349--- a/drivers/char/tpm/tpm_acpi.c
39350+++ b/drivers/char/tpm/tpm_acpi.c
39351@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39352 virt = acpi_os_map_iomem(start, len);
39353 if (!virt) {
39354 kfree(log->bios_event_log);
39355+ log->bios_event_log = NULL;
39356 printk("%s: ERROR - Unable to map memory\n", __func__);
39357 return -EIO;
39358 }
39359
39360- memcpy_fromio(log->bios_event_log, virt, len);
39361+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39362
39363 acpi_os_unmap_iomem(virt, len);
39364 return 0;
39365diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39366index 3a56a13..f8cbd25 100644
39367--- a/drivers/char/tpm/tpm_eventlog.c
39368+++ b/drivers/char/tpm/tpm_eventlog.c
39369@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39370 event = addr;
39371
39372 if ((event->event_type == 0 && event->event_size == 0) ||
39373- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39374+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39375 return NULL;
39376
39377 return addr;
39378@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39379 return NULL;
39380
39381 if ((event->event_type == 0 && event->event_size == 0) ||
39382- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39383+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39384 return NULL;
39385
39386 (*pos)++;
39387@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39388 int i;
39389
39390 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39391- seq_putc(m, data[i]);
39392+ if (!seq_putc(m, data[i]))
39393+ return -EFAULT;
39394
39395 return 0;
39396 }
39397diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39398index c3aac4c..88de09f9 100644
39399--- a/drivers/char/virtio_console.c
39400+++ b/drivers/char/virtio_console.c
39401@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39402 if (to_user) {
39403 ssize_t ret;
39404
39405- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39406+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39407 if (ret)
39408 return -EFAULT;
39409 } else {
39410@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39411 if (!port_has_data(port) && !port->host_connected)
39412 return 0;
39413
39414- return fill_readbuf(port, ubuf, count, true);
39415+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39416 }
39417
39418 static int wait_port_writable(struct port *port, bool nonblock)
39419diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39420index 4386697..754ceca 100644
39421--- a/drivers/clk/clk-composite.c
39422+++ b/drivers/clk/clk-composite.c
39423@@ -192,7 +192,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39424 struct clk *clk;
39425 struct clk_init_data init;
39426 struct clk_composite *composite;
39427- struct clk_ops *clk_composite_ops;
39428+ clk_ops_no_const *clk_composite_ops;
39429
39430 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39431 if (!composite) {
39432diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39433index dd3a78c..386d49c 100644
39434--- a/drivers/clk/socfpga/clk-gate.c
39435+++ b/drivers/clk/socfpga/clk-gate.c
39436@@ -22,6 +22,7 @@
39437 #include <linux/mfd/syscon.h>
39438 #include <linux/of.h>
39439 #include <linux/regmap.h>
39440+#include <asm/pgtable.h>
39441
39442 #include "clk.h"
39443
39444@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39445 return 0;
39446 }
39447
39448-static struct clk_ops gateclk_ops = {
39449+static clk_ops_no_const gateclk_ops __read_only = {
39450 .prepare = socfpga_clk_prepare,
39451 .recalc_rate = socfpga_clk_recalc_rate,
39452 .get_parent = socfpga_clk_get_parent,
39453@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39454 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39455 socfpga_clk->hw.bit_idx = clk_gate[1];
39456
39457- gateclk_ops.enable = clk_gate_ops.enable;
39458- gateclk_ops.disable = clk_gate_ops.disable;
39459+ pax_open_kernel();
39460+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39461+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39462+ pax_close_kernel();
39463 }
39464
39465 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39466diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39467index de6da95..c98278b 100644
39468--- a/drivers/clk/socfpga/clk-pll.c
39469+++ b/drivers/clk/socfpga/clk-pll.c
39470@@ -21,6 +21,7 @@
39471 #include <linux/io.h>
39472 #include <linux/of.h>
39473 #include <linux/of_address.h>
39474+#include <asm/pgtable.h>
39475
39476 #include "clk.h"
39477
39478@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39479 CLK_MGR_PLL_CLK_SRC_MASK;
39480 }
39481
39482-static struct clk_ops clk_pll_ops = {
39483+static clk_ops_no_const clk_pll_ops __read_only = {
39484 .recalc_rate = clk_pll_recalc_rate,
39485 .get_parent = clk_pll_get_parent,
39486 };
39487@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39488 pll_clk->hw.hw.init = &init;
39489
39490 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39491- clk_pll_ops.enable = clk_gate_ops.enable;
39492- clk_pll_ops.disable = clk_gate_ops.disable;
39493+ pax_open_kernel();
39494+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39495+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39496+ pax_close_kernel();
39497
39498 clk = clk_register(NULL, &pll_clk->hw.hw);
39499 if (WARN_ON(IS_ERR(clk))) {
39500diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39501index b0c18ed..1713a80 100644
39502--- a/drivers/cpufreq/acpi-cpufreq.c
39503+++ b/drivers/cpufreq/acpi-cpufreq.c
39504@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39505 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39506 per_cpu(acfreq_data, cpu) = data;
39507
39508- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39509- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39510+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39511+ pax_open_kernel();
39512+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39513+ pax_close_kernel();
39514+ }
39515
39516 result = acpi_processor_register_performance(data->acpi_data, cpu);
39517 if (result)
39518@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39519 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39520 break;
39521 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39522- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39523+ pax_open_kernel();
39524+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39525+ pax_close_kernel();
39526 break;
39527 default:
39528 break;
39529@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39530 if (!msrs)
39531 return;
39532
39533- acpi_cpufreq_driver.boost_supported = true;
39534- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39535+ pax_open_kernel();
39536+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39537+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39538+ pax_close_kernel();
39539
39540 cpu_notifier_register_begin();
39541
39542diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39543index fde97d6..3631eca 100644
39544--- a/drivers/cpufreq/cpufreq-dt.c
39545+++ b/drivers/cpufreq/cpufreq-dt.c
39546@@ -393,7 +393,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39547 if (!IS_ERR(cpu_reg))
39548 regulator_put(cpu_reg);
39549
39550- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39551+ pax_open_kernel();
39552+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39553+ pax_close_kernel();
39554
39555 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39556 if (ret)
39557diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39558index 24736bb..aae33f4 100644
39559--- a/drivers/cpufreq/cpufreq.c
39560+++ b/drivers/cpufreq/cpufreq.c
39561@@ -2138,7 +2138,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39562 }
39563
39564 mutex_lock(&cpufreq_governor_mutex);
39565- list_del(&governor->governor_list);
39566+ pax_list_del(&governor->governor_list);
39567 mutex_unlock(&cpufreq_governor_mutex);
39568 return;
39569 }
39570@@ -2354,7 +2354,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39571 return NOTIFY_OK;
39572 }
39573
39574-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39575+static struct notifier_block cpufreq_cpu_notifier = {
39576 .notifier_call = cpufreq_cpu_callback,
39577 };
39578
39579@@ -2394,13 +2394,17 @@ int cpufreq_boost_trigger_state(int state)
39580 return 0;
39581
39582 write_lock_irqsave(&cpufreq_driver_lock, flags);
39583- cpufreq_driver->boost_enabled = state;
39584+ pax_open_kernel();
39585+ *(bool *)&cpufreq_driver->boost_enabled = state;
39586+ pax_close_kernel();
39587 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39588
39589 ret = cpufreq_driver->set_boost(state);
39590 if (ret) {
39591 write_lock_irqsave(&cpufreq_driver_lock, flags);
39592- cpufreq_driver->boost_enabled = !state;
39593+ pax_open_kernel();
39594+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39595+ pax_close_kernel();
39596 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39597
39598 pr_err("%s: Cannot %s BOOST\n",
39599@@ -2457,8 +2461,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39600
39601 pr_debug("trying to register driver %s\n", driver_data->name);
39602
39603- if (driver_data->setpolicy)
39604- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39605+ if (driver_data->setpolicy) {
39606+ pax_open_kernel();
39607+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39608+ pax_close_kernel();
39609+ }
39610
39611 write_lock_irqsave(&cpufreq_driver_lock, flags);
39612 if (cpufreq_driver) {
39613@@ -2473,8 +2480,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39614 * Check if driver provides function to enable boost -
39615 * if not, use cpufreq_boost_set_sw as default
39616 */
39617- if (!cpufreq_driver->set_boost)
39618- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39619+ if (!cpufreq_driver->set_boost) {
39620+ pax_open_kernel();
39621+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39622+ pax_close_kernel();
39623+ }
39624
39625 ret = cpufreq_sysfs_create_file(&boost.attr);
39626 if (ret) {
39627diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39628index 1b44496..b80ff5e 100644
39629--- a/drivers/cpufreq/cpufreq_governor.c
39630+++ b/drivers/cpufreq/cpufreq_governor.c
39631@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39632 struct dbs_data *dbs_data;
39633 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39634 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39635- struct od_ops *od_ops = NULL;
39636+ const struct od_ops *od_ops = NULL;
39637 struct od_dbs_tuners *od_tuners = NULL;
39638 struct cs_dbs_tuners *cs_tuners = NULL;
39639 struct cpu_dbs_common_info *cpu_cdbs;
39640@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39641
39642 if ((cdata->governor == GOV_CONSERVATIVE) &&
39643 (!policy->governor->initialized)) {
39644- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39645+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39646
39647 cpufreq_register_notifier(cs_ops->notifier_block,
39648 CPUFREQ_TRANSITION_NOTIFIER);
39649@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39650
39651 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39652 (policy->governor->initialized == 1)) {
39653- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39654+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39655
39656 cpufreq_unregister_notifier(cs_ops->notifier_block,
39657 CPUFREQ_TRANSITION_NOTIFIER);
39658diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39659index cc401d1..8197340 100644
39660--- a/drivers/cpufreq/cpufreq_governor.h
39661+++ b/drivers/cpufreq/cpufreq_governor.h
39662@@ -212,7 +212,7 @@ struct common_dbs_data {
39663 void (*exit)(struct dbs_data *dbs_data);
39664
39665 /* Governor specific ops, see below */
39666- void *gov_ops;
39667+ const void *gov_ops;
39668 };
39669
39670 /* Governor Per policy data */
39671@@ -232,7 +232,7 @@ struct od_ops {
39672 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39673 unsigned int freq_next, unsigned int relation);
39674 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39675-};
39676+} __no_const;
39677
39678 struct cs_ops {
39679 struct notifier_block *notifier_block;
39680diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39681index ad3f38f..8f086cd 100644
39682--- a/drivers/cpufreq/cpufreq_ondemand.c
39683+++ b/drivers/cpufreq/cpufreq_ondemand.c
39684@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39685
39686 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39687
39688-static struct od_ops od_ops = {
39689+static struct od_ops od_ops __read_only = {
39690 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39691 .powersave_bias_target = generic_powersave_bias_target,
39692 .freq_increase = dbs_freq_increase,
39693@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39694 (struct cpufreq_policy *, unsigned int, unsigned int),
39695 unsigned int powersave_bias)
39696 {
39697- od_ops.powersave_bias_target = f;
39698+ pax_open_kernel();
39699+ *(void **)&od_ops.powersave_bias_target = f;
39700+ pax_close_kernel();
39701 od_set_powersave_bias(powersave_bias);
39702 }
39703 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39704
39705 void od_unregister_powersave_bias_handler(void)
39706 {
39707- od_ops.powersave_bias_target = generic_powersave_bias_target;
39708+ pax_open_kernel();
39709+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39710+ pax_close_kernel();
39711 od_set_powersave_bias(0);
39712 }
39713 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39714diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39715index 742eefb..e2fcfc8 100644
39716--- a/drivers/cpufreq/intel_pstate.c
39717+++ b/drivers/cpufreq/intel_pstate.c
39718@@ -133,10 +133,10 @@ struct pstate_funcs {
39719 struct cpu_defaults {
39720 struct pstate_adjust_policy pid_policy;
39721 struct pstate_funcs funcs;
39722-};
39723+} __do_const;
39724
39725 static struct pstate_adjust_policy pid_params;
39726-static struct pstate_funcs pstate_funcs;
39727+static struct pstate_funcs *pstate_funcs;
39728 static int hwp_active;
39729
39730 struct perf_limits {
39731@@ -653,18 +653,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39732
39733 cpu->pstate.current_pstate = pstate;
39734
39735- pstate_funcs.set(cpu, pstate);
39736+ pstate_funcs->set(cpu, pstate);
39737 }
39738
39739 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39740 {
39741- cpu->pstate.min_pstate = pstate_funcs.get_min();
39742- cpu->pstate.max_pstate = pstate_funcs.get_max();
39743- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39744- cpu->pstate.scaling = pstate_funcs.get_scaling();
39745+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39746+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39747+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39748+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39749
39750- if (pstate_funcs.get_vid)
39751- pstate_funcs.get_vid(cpu);
39752+ if (pstate_funcs->get_vid)
39753+ pstate_funcs->get_vid(cpu);
39754 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39755 }
39756
39757@@ -988,9 +988,9 @@ static int intel_pstate_msrs_not_valid(void)
39758 rdmsrl(MSR_IA32_APERF, aperf);
39759 rdmsrl(MSR_IA32_MPERF, mperf);
39760
39761- if (!pstate_funcs.get_max() ||
39762- !pstate_funcs.get_min() ||
39763- !pstate_funcs.get_turbo())
39764+ if (!pstate_funcs->get_max() ||
39765+ !pstate_funcs->get_min() ||
39766+ !pstate_funcs->get_turbo())
39767 return -ENODEV;
39768
39769 rdmsrl(MSR_IA32_APERF, tmp);
39770@@ -1004,7 +1004,7 @@ static int intel_pstate_msrs_not_valid(void)
39771 return 0;
39772 }
39773
39774-static void copy_pid_params(struct pstate_adjust_policy *policy)
39775+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39776 {
39777 pid_params.sample_rate_ms = policy->sample_rate_ms;
39778 pid_params.p_gain_pct = policy->p_gain_pct;
39779@@ -1016,12 +1016,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39780
39781 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39782 {
39783- pstate_funcs.get_max = funcs->get_max;
39784- pstate_funcs.get_min = funcs->get_min;
39785- pstate_funcs.get_turbo = funcs->get_turbo;
39786- pstate_funcs.get_scaling = funcs->get_scaling;
39787- pstate_funcs.set = funcs->set;
39788- pstate_funcs.get_vid = funcs->get_vid;
39789+ pstate_funcs = funcs;
39790 }
39791
39792 #if IS_ENABLED(CONFIG_ACPI)
39793diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39794index 529cfd9..0e28fff 100644
39795--- a/drivers/cpufreq/p4-clockmod.c
39796+++ b/drivers/cpufreq/p4-clockmod.c
39797@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39798 case 0x0F: /* Core Duo */
39799 case 0x16: /* Celeron Core */
39800 case 0x1C: /* Atom */
39801- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39802+ pax_open_kernel();
39803+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39804+ pax_close_kernel();
39805 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39806 case 0x0D: /* Pentium M (Dothan) */
39807- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39808+ pax_open_kernel();
39809+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39810+ pax_close_kernel();
39811 /* fall through */
39812 case 0x09: /* Pentium M (Banias) */
39813 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39814@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39815
39816 /* on P-4s, the TSC runs with constant frequency independent whether
39817 * throttling is active or not. */
39818- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39819+ pax_open_kernel();
39820+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39821+ pax_close_kernel();
39822
39823 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39824 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39825diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39826index 9bb42ba..b01b4a2 100644
39827--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39828+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39829@@ -18,14 +18,12 @@
39830 #include <asm/head.h>
39831 #include <asm/timer.h>
39832
39833-static struct cpufreq_driver *cpufreq_us3_driver;
39834-
39835 struct us3_freq_percpu_info {
39836 struct cpufreq_frequency_table table[4];
39837 };
39838
39839 /* Indexed by cpu number. */
39840-static struct us3_freq_percpu_info *us3_freq_table;
39841+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39842
39843 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39844 * in the Safari config register.
39845@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39846
39847 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39848 {
39849- if (cpufreq_us3_driver)
39850- us3_freq_target(policy, 0);
39851+ us3_freq_target(policy, 0);
39852
39853 return 0;
39854 }
39855
39856+static int __init us3_freq_init(void);
39857+static void __exit us3_freq_exit(void);
39858+
39859+static struct cpufreq_driver cpufreq_us3_driver = {
39860+ .init = us3_freq_cpu_init,
39861+ .verify = cpufreq_generic_frequency_table_verify,
39862+ .target_index = us3_freq_target,
39863+ .get = us3_freq_get,
39864+ .exit = us3_freq_cpu_exit,
39865+ .name = "UltraSPARC-III",
39866+
39867+};
39868+
39869 static int __init us3_freq_init(void)
39870 {
39871 unsigned long manuf, impl, ver;
39872- int ret;
39873
39874 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39875 return -ENODEV;
39876@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39877 (impl == CHEETAH_IMPL ||
39878 impl == CHEETAH_PLUS_IMPL ||
39879 impl == JAGUAR_IMPL ||
39880- impl == PANTHER_IMPL)) {
39881- struct cpufreq_driver *driver;
39882-
39883- ret = -ENOMEM;
39884- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39885- if (!driver)
39886- goto err_out;
39887-
39888- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39889- GFP_KERNEL);
39890- if (!us3_freq_table)
39891- goto err_out;
39892-
39893- driver->init = us3_freq_cpu_init;
39894- driver->verify = cpufreq_generic_frequency_table_verify;
39895- driver->target_index = us3_freq_target;
39896- driver->get = us3_freq_get;
39897- driver->exit = us3_freq_cpu_exit;
39898- strcpy(driver->name, "UltraSPARC-III");
39899-
39900- cpufreq_us3_driver = driver;
39901- ret = cpufreq_register_driver(driver);
39902- if (ret)
39903- goto err_out;
39904-
39905- return 0;
39906-
39907-err_out:
39908- if (driver) {
39909- kfree(driver);
39910- cpufreq_us3_driver = NULL;
39911- }
39912- kfree(us3_freq_table);
39913- us3_freq_table = NULL;
39914- return ret;
39915- }
39916+ impl == PANTHER_IMPL))
39917+ return cpufreq_register_driver(&cpufreq_us3_driver);
39918
39919 return -ENODEV;
39920 }
39921
39922 static void __exit us3_freq_exit(void)
39923 {
39924- if (cpufreq_us3_driver) {
39925- cpufreq_unregister_driver(cpufreq_us3_driver);
39926- kfree(cpufreq_us3_driver);
39927- cpufreq_us3_driver = NULL;
39928- kfree(us3_freq_table);
39929- us3_freq_table = NULL;
39930- }
39931+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39932 }
39933
39934 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39935diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39936index 7d4a315..21bb886 100644
39937--- a/drivers/cpufreq/speedstep-centrino.c
39938+++ b/drivers/cpufreq/speedstep-centrino.c
39939@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39940 !cpu_has(cpu, X86_FEATURE_EST))
39941 return -ENODEV;
39942
39943- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39944- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39945+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39946+ pax_open_kernel();
39947+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39948+ pax_close_kernel();
39949+ }
39950
39951 if (policy->cpu != 0)
39952 return -ENODEV;
39953diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39954index 2697e87..c32476c 100644
39955--- a/drivers/cpuidle/driver.c
39956+++ b/drivers/cpuidle/driver.c
39957@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39958
39959 static void poll_idle_init(struct cpuidle_driver *drv)
39960 {
39961- struct cpuidle_state *state = &drv->states[0];
39962+ cpuidle_state_no_const *state = &drv->states[0];
39963
39964 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39965 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39966diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39967index fb9f511..213e6cc 100644
39968--- a/drivers/cpuidle/governor.c
39969+++ b/drivers/cpuidle/governor.c
39970@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39971 mutex_lock(&cpuidle_lock);
39972 if (__cpuidle_find_governor(gov->name) == NULL) {
39973 ret = 0;
39974- list_add_tail(&gov->governor_list, &cpuidle_governors);
39975+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39976 if (!cpuidle_curr_governor ||
39977 cpuidle_curr_governor->rating < gov->rating)
39978 cpuidle_switch_governor(gov);
39979diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39980index 832a2c3..1794080 100644
39981--- a/drivers/cpuidle/sysfs.c
39982+++ b/drivers/cpuidle/sysfs.c
39983@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39984 NULL
39985 };
39986
39987-static struct attribute_group cpuidle_attr_group = {
39988+static attribute_group_no_const cpuidle_attr_group = {
39989 .attrs = cpuidle_default_attrs,
39990 .name = "cpuidle",
39991 };
39992diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39993index 8d2a772..33826c9 100644
39994--- a/drivers/crypto/hifn_795x.c
39995+++ b/drivers/crypto/hifn_795x.c
39996@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39997 MODULE_PARM_DESC(hifn_pll_ref,
39998 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39999
40000-static atomic_t hifn_dev_number;
40001+static atomic_unchecked_t hifn_dev_number;
40002
40003 #define ACRYPTO_OP_DECRYPT 0
40004 #define ACRYPTO_OP_ENCRYPT 1
40005@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40006 goto err_out_disable_pci_device;
40007
40008 snprintf(name, sizeof(name), "hifn%d",
40009- atomic_inc_return(&hifn_dev_number)-1);
40010+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40011
40012 err = pci_request_regions(pdev, name);
40013 if (err)
40014diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40015index 30b538d8..1610d75 100644
40016--- a/drivers/devfreq/devfreq.c
40017+++ b/drivers/devfreq/devfreq.c
40018@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40019 goto err_out;
40020 }
40021
40022- list_add(&governor->node, &devfreq_governor_list);
40023+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40024
40025 list_for_each_entry(devfreq, &devfreq_list, node) {
40026 int ret = 0;
40027@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40028 }
40029 }
40030
40031- list_del(&governor->node);
40032+ pax_list_del((struct list_head *)&governor->node);
40033 err_out:
40034 mutex_unlock(&devfreq_list_lock);
40035
40036diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40037index 3a2adb1..b3be9a3 100644
40038--- a/drivers/dma/sh/shdma-base.c
40039+++ b/drivers/dma/sh/shdma-base.c
40040@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40041 schan->slave_id = -EINVAL;
40042 }
40043
40044- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40045- sdev->desc_size, GFP_KERNEL);
40046+ schan->desc = kcalloc(sdev->desc_size,
40047+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40048 if (!schan->desc) {
40049 ret = -ENOMEM;
40050 goto edescalloc;
40051diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40052index aec8a84..7b45a1f 100644
40053--- a/drivers/dma/sh/shdmac.c
40054+++ b/drivers/dma/sh/shdmac.c
40055@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40056 return ret;
40057 }
40058
40059-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40060+static struct notifier_block sh_dmae_nmi_notifier = {
40061 .notifier_call = sh_dmae_nmi_handler,
40062
40063 /* Run before NMI debug handler and KGDB */
40064diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40065index 592af5f..bb1d583 100644
40066--- a/drivers/edac/edac_device.c
40067+++ b/drivers/edac/edac_device.c
40068@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40069 */
40070 int edac_device_alloc_index(void)
40071 {
40072- static atomic_t device_indexes = ATOMIC_INIT(0);
40073+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40074
40075- return atomic_inc_return(&device_indexes) - 1;
40076+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40077 }
40078 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40079
40080diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40081index 670d282..6675f4d 100644
40082--- a/drivers/edac/edac_mc_sysfs.c
40083+++ b/drivers/edac/edac_mc_sysfs.c
40084@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40085 struct dev_ch_attribute {
40086 struct device_attribute attr;
40087 int channel;
40088-};
40089+} __do_const;
40090
40091 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40092 struct dev_ch_attribute dev_attr_legacy_##_name = \
40093@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40094 }
40095
40096 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40097+ pax_open_kernel();
40098 if (mci->get_sdram_scrub_rate) {
40099- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40100- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40101+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40102+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40103 }
40104 if (mci->set_sdram_scrub_rate) {
40105- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40106- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40107+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40108+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40109 }
40110+ pax_close_kernel();
40111 err = device_create_file(&mci->dev,
40112 &dev_attr_sdram_scrub_rate);
40113 if (err) {
40114diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40115index 2cf44b4d..6dd2dc7 100644
40116--- a/drivers/edac/edac_pci.c
40117+++ b/drivers/edac/edac_pci.c
40118@@ -29,7 +29,7 @@
40119
40120 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40121 static LIST_HEAD(edac_pci_list);
40122-static atomic_t pci_indexes = ATOMIC_INIT(0);
40123+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40124
40125 /*
40126 * edac_pci_alloc_ctl_info
40127@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40128 */
40129 int edac_pci_alloc_index(void)
40130 {
40131- return atomic_inc_return(&pci_indexes) - 1;
40132+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40133 }
40134 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40135
40136diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40137index 24d877f..4e30133 100644
40138--- a/drivers/edac/edac_pci_sysfs.c
40139+++ b/drivers/edac/edac_pci_sysfs.c
40140@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40141 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40142 static int edac_pci_poll_msec = 1000; /* one second workq period */
40143
40144-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40145-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40146+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40147+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40148
40149 static struct kobject *edac_pci_top_main_kobj;
40150 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40151@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40152 void *value;
40153 ssize_t(*show) (void *, char *);
40154 ssize_t(*store) (void *, const char *, size_t);
40155-};
40156+} __do_const;
40157
40158 /* Set of show/store abstract level functions for PCI Parity object */
40159 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40160@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40161 edac_printk(KERN_CRIT, EDAC_PCI,
40162 "Signaled System Error on %s\n",
40163 pci_name(dev));
40164- atomic_inc(&pci_nonparity_count);
40165+ atomic_inc_unchecked(&pci_nonparity_count);
40166 }
40167
40168 if (status & (PCI_STATUS_PARITY)) {
40169@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40170 "Master Data Parity Error on %s\n",
40171 pci_name(dev));
40172
40173- atomic_inc(&pci_parity_count);
40174+ atomic_inc_unchecked(&pci_parity_count);
40175 }
40176
40177 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40178@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40179 "Detected Parity Error on %s\n",
40180 pci_name(dev));
40181
40182- atomic_inc(&pci_parity_count);
40183+ atomic_inc_unchecked(&pci_parity_count);
40184 }
40185 }
40186
40187@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40188 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40189 "Signaled System Error on %s\n",
40190 pci_name(dev));
40191- atomic_inc(&pci_nonparity_count);
40192+ atomic_inc_unchecked(&pci_nonparity_count);
40193 }
40194
40195 if (status & (PCI_STATUS_PARITY)) {
40196@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40197 "Master Data Parity Error on "
40198 "%s\n", pci_name(dev));
40199
40200- atomic_inc(&pci_parity_count);
40201+ atomic_inc_unchecked(&pci_parity_count);
40202 }
40203
40204 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40205@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40206 "Detected Parity Error on %s\n",
40207 pci_name(dev));
40208
40209- atomic_inc(&pci_parity_count);
40210+ atomic_inc_unchecked(&pci_parity_count);
40211 }
40212 }
40213 }
40214@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40215 if (!check_pci_errors)
40216 return;
40217
40218- before_count = atomic_read(&pci_parity_count);
40219+ before_count = atomic_read_unchecked(&pci_parity_count);
40220
40221 /* scan all PCI devices looking for a Parity Error on devices and
40222 * bridges.
40223@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40224 /* Only if operator has selected panic on PCI Error */
40225 if (edac_pci_get_panic_on_pe()) {
40226 /* If the count is different 'after' from 'before' */
40227- if (before_count != atomic_read(&pci_parity_count))
40228+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40229 panic("EDAC: PCI Parity Error");
40230 }
40231 }
40232diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40233index c2359a1..8bd119d 100644
40234--- a/drivers/edac/mce_amd.h
40235+++ b/drivers/edac/mce_amd.h
40236@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40237 bool (*mc0_mce)(u16, u8);
40238 bool (*mc1_mce)(u16, u8);
40239 bool (*mc2_mce)(u16, u8);
40240-};
40241+} __no_const;
40242
40243 void amd_report_gart_errors(bool);
40244 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40245diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40246index 57ea7f4..af06b76 100644
40247--- a/drivers/firewire/core-card.c
40248+++ b/drivers/firewire/core-card.c
40249@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40250 const struct fw_card_driver *driver,
40251 struct device *device)
40252 {
40253- static atomic_t index = ATOMIC_INIT(-1);
40254+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40255
40256- card->index = atomic_inc_return(&index);
40257+ card->index = atomic_inc_return_unchecked(&index);
40258 card->driver = driver;
40259 card->device = device;
40260 card->current_tlabel = 0;
40261@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40262
40263 void fw_core_remove_card(struct fw_card *card)
40264 {
40265- struct fw_card_driver dummy_driver = dummy_driver_template;
40266+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40267
40268 card->driver->update_phy_reg(card, 4,
40269 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40270diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40271index f9e3aee..269dbdb 100644
40272--- a/drivers/firewire/core-device.c
40273+++ b/drivers/firewire/core-device.c
40274@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40275 struct config_rom_attribute {
40276 struct device_attribute attr;
40277 u32 key;
40278-};
40279+} __do_const;
40280
40281 static ssize_t show_immediate(struct device *dev,
40282 struct device_attribute *dattr, char *buf)
40283diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40284index eb6935c..3cc2bfa 100644
40285--- a/drivers/firewire/core-transaction.c
40286+++ b/drivers/firewire/core-transaction.c
40287@@ -38,6 +38,7 @@
40288 #include <linux/timer.h>
40289 #include <linux/types.h>
40290 #include <linux/workqueue.h>
40291+#include <linux/sched.h>
40292
40293 #include <asm/byteorder.h>
40294
40295diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40296index e1480ff6..1a429bd 100644
40297--- a/drivers/firewire/core.h
40298+++ b/drivers/firewire/core.h
40299@@ -111,6 +111,7 @@ struct fw_card_driver {
40300
40301 int (*stop_iso)(struct fw_iso_context *ctx);
40302 };
40303+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40304
40305 void fw_card_initialize(struct fw_card *card,
40306 const struct fw_card_driver *driver, struct device *device);
40307diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40308index aff9018..fc87ded 100644
40309--- a/drivers/firewire/ohci.c
40310+++ b/drivers/firewire/ohci.c
40311@@ -2054,10 +2054,12 @@ static void bus_reset_work(struct work_struct *work)
40312 be32_to_cpu(ohci->next_header));
40313 }
40314
40315+#ifndef CONFIG_GRKERNSEC
40316 if (param_remote_dma) {
40317 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40318 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40319 }
40320+#endif
40321
40322 spin_unlock_irq(&ohci->lock);
40323
40324@@ -2589,8 +2591,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40325 unsigned long flags;
40326 int n, ret = 0;
40327
40328+#ifndef CONFIG_GRKERNSEC
40329 if (param_remote_dma)
40330 return 0;
40331+#endif
40332
40333 /*
40334 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40335diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40336index 94a58a0..f5eba42 100644
40337--- a/drivers/firmware/dmi-id.c
40338+++ b/drivers/firmware/dmi-id.c
40339@@ -16,7 +16,7 @@
40340 struct dmi_device_attribute{
40341 struct device_attribute dev_attr;
40342 int field;
40343-};
40344+} __do_const;
40345 #define to_dmi_dev_attr(_dev_attr) \
40346 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40347
40348diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40349index 2eebd28b..4261350 100644
40350--- a/drivers/firmware/dmi_scan.c
40351+++ b/drivers/firmware/dmi_scan.c
40352@@ -893,7 +893,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40353 if (buf == NULL)
40354 return -1;
40355
40356- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40357+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40358
40359 dmi_unmap(buf);
40360 return 0;
40361diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40362index 4fd9961..52d60ce 100644
40363--- a/drivers/firmware/efi/cper.c
40364+++ b/drivers/firmware/efi/cper.c
40365@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40366 */
40367 u64 cper_next_record_id(void)
40368 {
40369- static atomic64_t seq;
40370+ static atomic64_unchecked_t seq;
40371
40372- if (!atomic64_read(&seq))
40373- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40374+ if (!atomic64_read_unchecked(&seq))
40375+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40376
40377- return atomic64_inc_return(&seq);
40378+ return atomic64_inc_return_unchecked(&seq);
40379 }
40380 EXPORT_SYMBOL_GPL(cper_next_record_id);
40381
40382diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40383index 9035c1b..aff45f8 100644
40384--- a/drivers/firmware/efi/efi.c
40385+++ b/drivers/firmware/efi/efi.c
40386@@ -151,14 +151,16 @@ static struct attribute_group efi_subsys_attr_group = {
40387 };
40388
40389 static struct efivars generic_efivars;
40390-static struct efivar_operations generic_ops;
40391+static efivar_operations_no_const generic_ops __read_only;
40392
40393 static int generic_ops_register(void)
40394 {
40395- generic_ops.get_variable = efi.get_variable;
40396- generic_ops.set_variable = efi.set_variable;
40397- generic_ops.get_next_variable = efi.get_next_variable;
40398- generic_ops.query_variable_store = efi_query_variable_store;
40399+ pax_open_kernel();
40400+ *(void **)&generic_ops.get_variable = efi.get_variable;
40401+ *(void **)&generic_ops.set_variable = efi.set_variable;
40402+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40403+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40404+ pax_close_kernel();
40405
40406 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40407 }
40408diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40409index f256ecd..387dcb1 100644
40410--- a/drivers/firmware/efi/efivars.c
40411+++ b/drivers/firmware/efi/efivars.c
40412@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40413 static int
40414 create_efivars_bin_attributes(void)
40415 {
40416- struct bin_attribute *attr;
40417+ bin_attribute_no_const *attr;
40418 int error;
40419
40420 /* new_var */
40421diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40422index 87b8e3b..c4afb35 100644
40423--- a/drivers/firmware/efi/runtime-map.c
40424+++ b/drivers/firmware/efi/runtime-map.c
40425@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40426 kfree(entry);
40427 }
40428
40429-static struct kobj_type __refdata map_ktype = {
40430+static const struct kobj_type __refconst map_ktype = {
40431 .sysfs_ops = &map_attr_ops,
40432 .default_attrs = def_attrs,
40433 .release = map_release,
40434diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40435index f1ab05e..ab51228 100644
40436--- a/drivers/firmware/google/gsmi.c
40437+++ b/drivers/firmware/google/gsmi.c
40438@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40439 return local_hash_64(input, 32);
40440 }
40441
40442-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40443+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40444 {
40445 .ident = "Google Board",
40446 .matches = {
40447diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40448index 2f569aa..26e4f39 100644
40449--- a/drivers/firmware/google/memconsole.c
40450+++ b/drivers/firmware/google/memconsole.c
40451@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40452 return false;
40453 }
40454
40455-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40456+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40457 {
40458 .ident = "Google Board",
40459 .matches = {
40460@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40461 if (!found_memconsole())
40462 return -ENODEV;
40463
40464- memconsole_bin_attr.size = memconsole_length;
40465+ pax_open_kernel();
40466+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40467+ pax_close_kernel();
40468+
40469 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40470 }
40471
40472diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40473index cc016c61..d35279e 100644
40474--- a/drivers/firmware/memmap.c
40475+++ b/drivers/firmware/memmap.c
40476@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40477 kfree(entry);
40478 }
40479
40480-static struct kobj_type __refdata memmap_ktype = {
40481+static const struct kobj_type __refconst memmap_ktype = {
40482 .release = release_firmware_map_entry,
40483 .sysfs_ops = &memmap_attr_ops,
40484 .default_attrs = def_attrs,
40485diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40486index 3cfcfc6..09d6f117 100644
40487--- a/drivers/gpio/gpio-em.c
40488+++ b/drivers/gpio/gpio-em.c
40489@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40490 struct em_gio_priv *p;
40491 struct resource *io[2], *irq[2];
40492 struct gpio_chip *gpio_chip;
40493- struct irq_chip *irq_chip;
40494+ irq_chip_no_const *irq_chip;
40495 const char *name = dev_name(&pdev->dev);
40496 int ret;
40497
40498diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40499index 7818cd1..1be40e5 100644
40500--- a/drivers/gpio/gpio-ich.c
40501+++ b/drivers/gpio/gpio-ich.c
40502@@ -94,7 +94,7 @@ struct ichx_desc {
40503 * this option allows driver caching written output values
40504 */
40505 bool use_outlvl_cache;
40506-};
40507+} __do_const;
40508
40509 static struct {
40510 spinlock_t lock;
40511diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40512index f476ae2..05e1bdd 100644
40513--- a/drivers/gpio/gpio-omap.c
40514+++ b/drivers/gpio/gpio-omap.c
40515@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40516 const struct omap_gpio_platform_data *pdata;
40517 struct resource *res;
40518 struct gpio_bank *bank;
40519- struct irq_chip *irqc;
40520+ irq_chip_no_const *irqc;
40521 int ret;
40522
40523 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40524diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40525index 584484e..e26ebd6 100644
40526--- a/drivers/gpio/gpio-rcar.c
40527+++ b/drivers/gpio/gpio-rcar.c
40528@@ -366,7 +366,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40529 struct gpio_rcar_priv *p;
40530 struct resource *io, *irq;
40531 struct gpio_chip *gpio_chip;
40532- struct irq_chip *irq_chip;
40533+ irq_chip_no_const *irq_chip;
40534 struct device *dev = &pdev->dev;
40535 const char *name = dev_name(dev);
40536 int ret;
40537diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40538index c1caa45..f0f97d2 100644
40539--- a/drivers/gpio/gpio-vr41xx.c
40540+++ b/drivers/gpio/gpio-vr41xx.c
40541@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40542 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40543 maskl, pendl, maskh, pendh);
40544
40545- atomic_inc(&irq_err_count);
40546+ atomic_inc_unchecked(&irq_err_count);
40547
40548 return -EINVAL;
40549 }
40550diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40551index 568aa2b..d1204d8 100644
40552--- a/drivers/gpio/gpiolib.c
40553+++ b/drivers/gpio/gpiolib.c
40554@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40555 }
40556
40557 if (gpiochip->irqchip) {
40558- gpiochip->irqchip->irq_request_resources = NULL;
40559- gpiochip->irqchip->irq_release_resources = NULL;
40560+ pax_open_kernel();
40561+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40562+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40563+ pax_close_kernel();
40564 gpiochip->irqchip = NULL;
40565 }
40566 }
40567@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40568 gpiochip->irqchip = NULL;
40569 return -EINVAL;
40570 }
40571- irqchip->irq_request_resources = gpiochip_irq_reqres;
40572- irqchip->irq_release_resources = gpiochip_irq_relres;
40573+
40574+ pax_open_kernel();
40575+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40576+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40577+ pax_close_kernel();
40578
40579 /*
40580 * Prepare the mapping since the irqchip shall be orthogonal to
40581diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40582index 27a37e5..b6c6c71 100644
40583--- a/drivers/gpu/drm/drm_crtc.c
40584+++ b/drivers/gpu/drm/drm_crtc.c
40585@@ -3953,7 +3953,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40586 goto done;
40587 }
40588
40589- if (copy_to_user(&enum_ptr[copied].name,
40590+ if (copy_to_user(enum_ptr[copied].name,
40591 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40592 ret = -EFAULT;
40593 goto done;
40594diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40595index 4f41377..ee33f40 100644
40596--- a/drivers/gpu/drm/drm_drv.c
40597+++ b/drivers/gpu/drm/drm_drv.c
40598@@ -444,7 +444,7 @@ void drm_unplug_dev(struct drm_device *dev)
40599
40600 drm_device_set_unplugged(dev);
40601
40602- if (dev->open_count == 0) {
40603+ if (local_read(&dev->open_count) == 0) {
40604 drm_put_dev(dev);
40605 }
40606 mutex_unlock(&drm_global_mutex);
40607diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40608index 0b9514b..6acd174 100644
40609--- a/drivers/gpu/drm/drm_fops.c
40610+++ b/drivers/gpu/drm/drm_fops.c
40611@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40612 return PTR_ERR(minor);
40613
40614 dev = minor->dev;
40615- if (!dev->open_count++)
40616+ if (local_inc_return(&dev->open_count) == 1)
40617 need_setup = 1;
40618
40619 /* share address_space across all char-devs of a single device */
40620@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40621 return 0;
40622
40623 err_undo:
40624- dev->open_count--;
40625+ local_dec(&dev->open_count);
40626 drm_minor_release(minor);
40627 return retcode;
40628 }
40629@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40630
40631 mutex_lock(&drm_global_mutex);
40632
40633- DRM_DEBUG("open_count = %d\n", dev->open_count);
40634+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40635
40636 mutex_lock(&dev->struct_mutex);
40637 list_del(&file_priv->lhead);
40638@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40639 * Begin inline drm_release
40640 */
40641
40642- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40643+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40644 task_pid_nr(current),
40645 (long)old_encode_dev(file_priv->minor->kdev->devt),
40646- dev->open_count);
40647+ local_read(&dev->open_count));
40648
40649 /* Release any auth tokens that might point to this file_priv,
40650 (do that under the drm_global_mutex) */
40651@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40652 * End inline drm_release
40653 */
40654
40655- if (!--dev->open_count) {
40656+ if (local_dec_and_test(&dev->open_count)) {
40657 retcode = drm_lastclose(dev);
40658 if (drm_device_is_unplugged(dev))
40659 drm_put_dev(dev);
40660diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40661index 3d2e91c..d31c4c9 100644
40662--- a/drivers/gpu/drm/drm_global.c
40663+++ b/drivers/gpu/drm/drm_global.c
40664@@ -36,7 +36,7 @@
40665 struct drm_global_item {
40666 struct mutex mutex;
40667 void *object;
40668- int refcount;
40669+ atomic_t refcount;
40670 };
40671
40672 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40673@@ -49,7 +49,7 @@ void drm_global_init(void)
40674 struct drm_global_item *item = &glob[i];
40675 mutex_init(&item->mutex);
40676 item->object = NULL;
40677- item->refcount = 0;
40678+ atomic_set(&item->refcount, 0);
40679 }
40680 }
40681
40682@@ -59,7 +59,7 @@ void drm_global_release(void)
40683 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40684 struct drm_global_item *item = &glob[i];
40685 BUG_ON(item->object != NULL);
40686- BUG_ON(item->refcount != 0);
40687+ BUG_ON(atomic_read(&item->refcount) != 0);
40688 }
40689 }
40690
40691@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40692 struct drm_global_item *item = &glob[ref->global_type];
40693
40694 mutex_lock(&item->mutex);
40695- if (item->refcount == 0) {
40696+ if (atomic_read(&item->refcount) == 0) {
40697 item->object = kzalloc(ref->size, GFP_KERNEL);
40698 if (unlikely(item->object == NULL)) {
40699 ret = -ENOMEM;
40700@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40701 goto out_err;
40702
40703 }
40704- ++item->refcount;
40705+ atomic_inc(&item->refcount);
40706 ref->object = item->object;
40707 mutex_unlock(&item->mutex);
40708 return 0;
40709@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40710 struct drm_global_item *item = &glob[ref->global_type];
40711
40712 mutex_lock(&item->mutex);
40713- BUG_ON(item->refcount == 0);
40714+ BUG_ON(atomic_read(&item->refcount) == 0);
40715 BUG_ON(ref->object != item->object);
40716- if (--item->refcount == 0) {
40717+ if (atomic_dec_and_test(&item->refcount)) {
40718 ref->release(ref);
40719 item->object = NULL;
40720 }
40721diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40722index 51efebd..2b70935 100644
40723--- a/drivers/gpu/drm/drm_info.c
40724+++ b/drivers/gpu/drm/drm_info.c
40725@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40726 struct drm_local_map *map;
40727 struct drm_map_list *r_list;
40728
40729- /* Hardcoded from _DRM_FRAME_BUFFER,
40730- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40731- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40732- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40733+ static const char * const types[] = {
40734+ [_DRM_FRAME_BUFFER] = "FB",
40735+ [_DRM_REGISTERS] = "REG",
40736+ [_DRM_SHM] = "SHM",
40737+ [_DRM_AGP] = "AGP",
40738+ [_DRM_SCATTER_GATHER] = "SG",
40739+ [_DRM_CONSISTENT] = "PCI"};
40740 const char *type;
40741 int i;
40742
40743@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40744 map = r_list->map;
40745 if (!map)
40746 continue;
40747- if (map->type < 0 || map->type > 5)
40748+ if (map->type >= ARRAY_SIZE(types))
40749 type = "??";
40750 else
40751 type = types[map->type];
40752diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40753index 2f4c4343..dd12cd2 100644
40754--- a/drivers/gpu/drm/drm_ioc32.c
40755+++ b/drivers/gpu/drm/drm_ioc32.c
40756@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40757 request = compat_alloc_user_space(nbytes);
40758 if (!access_ok(VERIFY_WRITE, request, nbytes))
40759 return -EFAULT;
40760- list = (struct drm_buf_desc *) (request + 1);
40761+ list = (struct drm_buf_desc __user *) (request + 1);
40762
40763 if (__put_user(count, &request->count)
40764 || __put_user(list, &request->list))
40765@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40766 request = compat_alloc_user_space(nbytes);
40767 if (!access_ok(VERIFY_WRITE, request, nbytes))
40768 return -EFAULT;
40769- list = (struct drm_buf_pub *) (request + 1);
40770+ list = (struct drm_buf_pub __user *) (request + 1);
40771
40772 if (__put_user(count, &request->count)
40773 || __put_user(list, &request->list))
40774@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40775 return 0;
40776 }
40777
40778-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40779+drm_ioctl_compat_t drm_compat_ioctls[] = {
40780 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40781 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40782 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40783@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40784 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40785 {
40786 unsigned int nr = DRM_IOCTL_NR(cmd);
40787- drm_ioctl_compat_t *fn;
40788 int ret;
40789
40790 /* Assume that ioctls without an explicit compat routine will just
40791@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40792 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40793 return drm_ioctl(filp, cmd, arg);
40794
40795- fn = drm_compat_ioctls[nr];
40796-
40797- if (fn != NULL)
40798- ret = (*fn) (filp, cmd, arg);
40799+ if (drm_compat_ioctls[nr] != NULL)
40800+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40801 else
40802 ret = drm_ioctl(filp, cmd, arg);
40803
40804diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40805index 00587a1..57a65ca 100644
40806--- a/drivers/gpu/drm/drm_ioctl.c
40807+++ b/drivers/gpu/drm/drm_ioctl.c
40808@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40809 struct drm_file *file_priv = filp->private_data;
40810 struct drm_device *dev;
40811 const struct drm_ioctl_desc *ioctl = NULL;
40812- drm_ioctl_t *func;
40813+ drm_ioctl_no_const_t func;
40814 unsigned int nr = DRM_IOCTL_NR(cmd);
40815 int retcode = -EINVAL;
40816 char stack_kdata[128];
40817diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40818index 93ec5dc..82acbaf 100644
40819--- a/drivers/gpu/drm/i810/i810_drv.h
40820+++ b/drivers/gpu/drm/i810/i810_drv.h
40821@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40822 int page_flipping;
40823
40824 wait_queue_head_t irq_queue;
40825- atomic_t irq_received;
40826- atomic_t irq_emitted;
40827+ atomic_unchecked_t irq_received;
40828+ atomic_unchecked_t irq_emitted;
40829
40830 int front_offset;
40831 } drm_i810_private_t;
40832diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40833index ecee3bc..ad5ae67 100644
40834--- a/drivers/gpu/drm/i915/i915_dma.c
40835+++ b/drivers/gpu/drm/i915/i915_dma.c
40836@@ -356,7 +356,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40837 * locking inversion with the driver load path. And the access here is
40838 * completely racy anyway. So don't bother with locking for now.
40839 */
40840- return dev->open_count == 0;
40841+ return local_read(&dev->open_count) == 0;
40842 }
40843
40844 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40845diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40846index 1173831..7dfb389 100644
40847--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40848+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40849@@ -863,12 +863,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40850 static int
40851 validate_exec_list(struct drm_device *dev,
40852 struct drm_i915_gem_exec_object2 *exec,
40853- int count)
40854+ unsigned int count)
40855 {
40856 unsigned relocs_total = 0;
40857 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40858 unsigned invalid_flags;
40859- int i;
40860+ unsigned int i;
40861
40862 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40863 if (USES_FULL_PPGTT(dev))
40864diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40865index 176de63..1ef9ac7 100644
40866--- a/drivers/gpu/drm/i915/i915_ioc32.c
40867+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40868@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40869 (unsigned long)request);
40870 }
40871
40872-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40873+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40874 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40875 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40876 [DRM_I915_GETPARAM] = compat_i915_getparam,
40877@@ -201,18 +201,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40878 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40879 {
40880 unsigned int nr = DRM_IOCTL_NR(cmd);
40881- drm_ioctl_compat_t *fn = NULL;
40882 int ret;
40883
40884 if (nr < DRM_COMMAND_BASE)
40885 return drm_compat_ioctl(filp, cmd, arg);
40886
40887- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40888- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40889-
40890- if (fn != NULL)
40891+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40892+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40893 ret = (*fn) (filp, cmd, arg);
40894- else
40895+ } else
40896 ret = drm_ioctl(filp, cmd, arg);
40897
40898 return ret;
40899diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40900index 791b00e..4d10235 100644
40901--- a/drivers/gpu/drm/i915/intel_display.c
40902+++ b/drivers/gpu/drm/i915/intel_display.c
40903@@ -12939,13 +12939,13 @@ struct intel_quirk {
40904 int subsystem_vendor;
40905 int subsystem_device;
40906 void (*hook)(struct drm_device *dev);
40907-};
40908+} __do_const;
40909
40910 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40911 struct intel_dmi_quirk {
40912 void (*hook)(struct drm_device *dev);
40913 const struct dmi_system_id (*dmi_id_list)[];
40914-};
40915+} __do_const;
40916
40917 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40918 {
40919@@ -12953,18 +12953,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40920 return 1;
40921 }
40922
40923-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40924+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40925 {
40926- .dmi_id_list = &(const struct dmi_system_id[]) {
40927- {
40928- .callback = intel_dmi_reverse_brightness,
40929- .ident = "NCR Corporation",
40930- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40931- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40932- },
40933- },
40934- { } /* terminating entry */
40935+ .callback = intel_dmi_reverse_brightness,
40936+ .ident = "NCR Corporation",
40937+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40938+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40939 },
40940+ },
40941+ { } /* terminating entry */
40942+};
40943+
40944+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40945+ {
40946+ .dmi_id_list = &intel_dmi_quirks_table,
40947 .hook = quirk_invert_brightness,
40948 },
40949 };
40950diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
40951index b250130..98df2a4 100644
40952--- a/drivers/gpu/drm/imx/imx-drm-core.c
40953+++ b/drivers/gpu/drm/imx/imx-drm-core.c
40954@@ -356,7 +356,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
40955 if (imxdrm->pipes >= MAX_CRTC)
40956 return -EINVAL;
40957
40958- if (imxdrm->drm->open_count)
40959+ if (local_read(&imxdrm->drm->open_count))
40960 return -EBUSY;
40961
40962 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
40963diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40964index b4a20149..219ab78 100644
40965--- a/drivers/gpu/drm/mga/mga_drv.h
40966+++ b/drivers/gpu/drm/mga/mga_drv.h
40967@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40968 u32 clear_cmd;
40969 u32 maccess;
40970
40971- atomic_t vbl_received; /**< Number of vblanks received. */
40972+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40973 wait_queue_head_t fence_queue;
40974- atomic_t last_fence_retired;
40975+ atomic_unchecked_t last_fence_retired;
40976 u32 next_fence_to_post;
40977
40978 unsigned int fb_cpp;
40979diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40980index 729bfd5..ead8823 100644
40981--- a/drivers/gpu/drm/mga/mga_ioc32.c
40982+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40983@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40984 return 0;
40985 }
40986
40987-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40988+drm_ioctl_compat_t mga_compat_ioctls[] = {
40989 [DRM_MGA_INIT] = compat_mga_init,
40990 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40991 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40992@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40993 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40994 {
40995 unsigned int nr = DRM_IOCTL_NR(cmd);
40996- drm_ioctl_compat_t *fn = NULL;
40997 int ret;
40998
40999 if (nr < DRM_COMMAND_BASE)
41000 return drm_compat_ioctl(filp, cmd, arg);
41001
41002- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41003- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41004-
41005- if (fn != NULL)
41006+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
41007+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41008 ret = (*fn) (filp, cmd, arg);
41009- else
41010+ } else
41011 ret = drm_ioctl(filp, cmd, arg);
41012
41013 return ret;
41014diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41015index 1b071b8..de8601a 100644
41016--- a/drivers/gpu/drm/mga/mga_irq.c
41017+++ b/drivers/gpu/drm/mga/mga_irq.c
41018@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41019 if (crtc != 0)
41020 return 0;
41021
41022- return atomic_read(&dev_priv->vbl_received);
41023+ return atomic_read_unchecked(&dev_priv->vbl_received);
41024 }
41025
41026
41027@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41028 /* VBLANK interrupt */
41029 if (status & MGA_VLINEPEN) {
41030 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41031- atomic_inc(&dev_priv->vbl_received);
41032+ atomic_inc_unchecked(&dev_priv->vbl_received);
41033 drm_handle_vblank(dev, 0);
41034 handled = 1;
41035 }
41036@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41037 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41038 MGA_WRITE(MGA_PRIMEND, prim_end);
41039
41040- atomic_inc(&dev_priv->last_fence_retired);
41041+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41042 wake_up(&dev_priv->fence_queue);
41043 handled = 1;
41044 }
41045@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41046 * using fences.
41047 */
41048 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41049- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41050+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41051 - *sequence) <= (1 << 23)));
41052
41053 *sequence = cur_fence;
41054diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41055index 7df6acc..84bbe52 100644
41056--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41057+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41058@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41059 struct bit_table {
41060 const char id;
41061 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41062-};
41063+} __no_const;
41064
41065 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41066
41067diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41068index 8ae36f2..1147a30 100644
41069--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41070+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41071@@ -121,7 +121,6 @@ struct nouveau_drm {
41072 struct drm_global_reference mem_global_ref;
41073 struct ttm_bo_global_ref bo_global_ref;
41074 struct ttm_bo_device bdev;
41075- atomic_t validate_sequence;
41076 int (*move)(struct nouveau_channel *,
41077 struct ttm_buffer_object *,
41078 struct ttm_mem_reg *, struct ttm_mem_reg *);
41079diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41080index 462679a..88e32a7 100644
41081--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41082+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41083@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41084 unsigned long arg)
41085 {
41086 unsigned int nr = DRM_IOCTL_NR(cmd);
41087- drm_ioctl_compat_t *fn = NULL;
41088+ drm_ioctl_compat_t fn = NULL;
41089 int ret;
41090
41091 if (nr < DRM_COMMAND_BASE)
41092diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41093index 3d1cfcb..0542700 100644
41094--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41095+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41096@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41097 }
41098
41099 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41100- nouveau_vram_manager_init,
41101- nouveau_vram_manager_fini,
41102- nouveau_vram_manager_new,
41103- nouveau_vram_manager_del,
41104- nouveau_vram_manager_debug
41105+ .init = nouveau_vram_manager_init,
41106+ .takedown = nouveau_vram_manager_fini,
41107+ .get_node = nouveau_vram_manager_new,
41108+ .put_node = nouveau_vram_manager_del,
41109+ .debug = nouveau_vram_manager_debug
41110 };
41111
41112 static int
41113@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41114 }
41115
41116 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41117- nouveau_gart_manager_init,
41118- nouveau_gart_manager_fini,
41119- nouveau_gart_manager_new,
41120- nouveau_gart_manager_del,
41121- nouveau_gart_manager_debug
41122+ .init = nouveau_gart_manager_init,
41123+ .takedown = nouveau_gart_manager_fini,
41124+ .get_node = nouveau_gart_manager_new,
41125+ .put_node = nouveau_gart_manager_del,
41126+ .debug = nouveau_gart_manager_debug
41127 };
41128
41129 /*XXX*/
41130@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41131 }
41132
41133 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41134- nv04_gart_manager_init,
41135- nv04_gart_manager_fini,
41136- nv04_gart_manager_new,
41137- nv04_gart_manager_del,
41138- nv04_gart_manager_debug
41139+ .init = nv04_gart_manager_init,
41140+ .takedown = nv04_gart_manager_fini,
41141+ .get_node = nv04_gart_manager_new,
41142+ .put_node = nv04_gart_manager_del,
41143+ .debug = nv04_gart_manager_debug
41144 };
41145
41146 int
41147diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41148index c7592ec..dd45ebc 100644
41149--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41150+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41151@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41152 * locking inversion with the driver load path. And the access here is
41153 * completely racy anyway. So don't bother with locking for now.
41154 */
41155- return dev->open_count == 0;
41156+ return local_read(&dev->open_count) == 0;
41157 }
41158
41159 static const struct vga_switcheroo_client_ops
41160diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41161index 9782364..89bd954 100644
41162--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41163+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41164@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41165 int ret;
41166
41167 mutex_lock(&qdev->async_io_mutex);
41168- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41169+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41170 if (qdev->last_sent_io_cmd > irq_num) {
41171 if (intr)
41172 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41173- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41174+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41175 else
41176 ret = wait_event_timeout(qdev->io_cmd_event,
41177- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41178+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41179 /* 0 is timeout, just bail the "hw" has gone away */
41180 if (ret <= 0)
41181 goto out;
41182- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41183+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41184 }
41185 outb(val, addr);
41186 qdev->last_sent_io_cmd = irq_num + 1;
41187 if (intr)
41188 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41189- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41190+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41191 else
41192 ret = wait_event_timeout(qdev->io_cmd_event,
41193- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41194+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41195 out:
41196 if (ret > 0)
41197 ret = 0;
41198diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41199index 6911b8c..89d6867 100644
41200--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41201+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41202@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41203 struct drm_info_node *node = (struct drm_info_node *) m->private;
41204 struct qxl_device *qdev = node->minor->dev->dev_private;
41205
41206- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41207- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41208- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41209- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41210+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41211+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41212+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41213+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41214 seq_printf(m, "%d\n", qdev->irq_received_error);
41215 return 0;
41216 }
41217diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41218index 7c6cafe..460f542 100644
41219--- a/drivers/gpu/drm/qxl/qxl_drv.h
41220+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41221@@ -290,10 +290,10 @@ struct qxl_device {
41222 unsigned int last_sent_io_cmd;
41223
41224 /* interrupt handling */
41225- atomic_t irq_received;
41226- atomic_t irq_received_display;
41227- atomic_t irq_received_cursor;
41228- atomic_t irq_received_io_cmd;
41229+ atomic_unchecked_t irq_received;
41230+ atomic_unchecked_t irq_received_display;
41231+ atomic_unchecked_t irq_received_cursor;
41232+ atomic_unchecked_t irq_received_io_cmd;
41233 unsigned irq_received_error;
41234 wait_queue_head_t display_event;
41235 wait_queue_head_t cursor_event;
41236diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41237index b110883..dd06418 100644
41238--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41239+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41240@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41241
41242 /* TODO copy slow path code from i915 */
41243 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41244- 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);
41245+ 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);
41246
41247 {
41248 struct qxl_drawable *draw = fb_cmd;
41249@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41250 struct drm_qxl_reloc reloc;
41251
41252 if (copy_from_user(&reloc,
41253- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41254+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41255 sizeof(reloc))) {
41256 ret = -EFAULT;
41257 goto out_free_bos;
41258@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41259
41260 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41261
41262- struct drm_qxl_command *commands =
41263- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41264+ struct drm_qxl_command __user *commands =
41265+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41266
41267- if (copy_from_user(&user_cmd, &commands[cmd_num],
41268+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41269 sizeof(user_cmd)))
41270 return -EFAULT;
41271
41272diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41273index 0bf1e20..42a7310 100644
41274--- a/drivers/gpu/drm/qxl/qxl_irq.c
41275+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41276@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41277 if (!pending)
41278 return IRQ_NONE;
41279
41280- atomic_inc(&qdev->irq_received);
41281+ atomic_inc_unchecked(&qdev->irq_received);
41282
41283 if (pending & QXL_INTERRUPT_DISPLAY) {
41284- atomic_inc(&qdev->irq_received_display);
41285+ atomic_inc_unchecked(&qdev->irq_received_display);
41286 wake_up_all(&qdev->display_event);
41287 qxl_queue_garbage_collect(qdev, false);
41288 }
41289 if (pending & QXL_INTERRUPT_CURSOR) {
41290- atomic_inc(&qdev->irq_received_cursor);
41291+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41292 wake_up_all(&qdev->cursor_event);
41293 }
41294 if (pending & QXL_INTERRUPT_IO_CMD) {
41295- atomic_inc(&qdev->irq_received_io_cmd);
41296+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41297 wake_up_all(&qdev->io_cmd_event);
41298 }
41299 if (pending & QXL_INTERRUPT_ERROR) {
41300@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41301 init_waitqueue_head(&qdev->io_cmd_event);
41302 INIT_WORK(&qdev->client_monitors_config_work,
41303 qxl_client_monitors_config_work_func);
41304- atomic_set(&qdev->irq_received, 0);
41305- atomic_set(&qdev->irq_received_display, 0);
41306- atomic_set(&qdev->irq_received_cursor, 0);
41307- atomic_set(&qdev->irq_received_io_cmd, 0);
41308+ atomic_set_unchecked(&qdev->irq_received, 0);
41309+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41310+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41311+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41312 qdev->irq_received_error = 0;
41313 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41314 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41315diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41316index 0cbc4c9..0e46686 100644
41317--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41318+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41319@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41320 }
41321 }
41322
41323-static struct vm_operations_struct qxl_ttm_vm_ops;
41324+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41325 static const struct vm_operations_struct *ttm_vm_ops;
41326
41327 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41328@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41329 return r;
41330 if (unlikely(ttm_vm_ops == NULL)) {
41331 ttm_vm_ops = vma->vm_ops;
41332+ pax_open_kernel();
41333 qxl_ttm_vm_ops = *ttm_vm_ops;
41334 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41335+ pax_close_kernel();
41336 }
41337 vma->vm_ops = &qxl_ttm_vm_ops;
41338 return 0;
41339@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41340 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41341 {
41342 #if defined(CONFIG_DEBUG_FS)
41343- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41344- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41345- unsigned i;
41346+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41347+ {
41348+ .name = "qxl_mem_mm",
41349+ .show = &qxl_mm_dump_table,
41350+ },
41351+ {
41352+ .name = "qxl_surf_mm",
41353+ .show = &qxl_mm_dump_table,
41354+ }
41355+ };
41356
41357- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41358- if (i == 0)
41359- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41360- else
41361- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41362- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41363- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41364- qxl_mem_types_list[i].driver_features = 0;
41365- if (i == 0)
41366- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41367- else
41368- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41369+ pax_open_kernel();
41370+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41371+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41372+ pax_close_kernel();
41373
41374- }
41375- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41376+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41377 #else
41378 return 0;
41379 #endif
41380diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41381index 2c45ac9..5d740f8 100644
41382--- a/drivers/gpu/drm/r128/r128_cce.c
41383+++ b/drivers/gpu/drm/r128/r128_cce.c
41384@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41385
41386 /* GH: Simple idle check.
41387 */
41388- atomic_set(&dev_priv->idle_count, 0);
41389+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41390
41391 /* We don't support anything other than bus-mastering ring mode,
41392 * but the ring can be in either AGP or PCI space for the ring
41393diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41394index 723e5d6..102dbaf 100644
41395--- a/drivers/gpu/drm/r128/r128_drv.h
41396+++ b/drivers/gpu/drm/r128/r128_drv.h
41397@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41398 int is_pci;
41399 unsigned long cce_buffers_offset;
41400
41401- atomic_t idle_count;
41402+ atomic_unchecked_t idle_count;
41403
41404 int page_flipping;
41405 int current_page;
41406 u32 crtc_offset;
41407 u32 crtc_offset_cntl;
41408
41409- atomic_t vbl_received;
41410+ atomic_unchecked_t vbl_received;
41411
41412 u32 color_fmt;
41413 unsigned int front_offset;
41414diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41415index 663f38c..c689495 100644
41416--- a/drivers/gpu/drm/r128/r128_ioc32.c
41417+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41418@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41419 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41420 }
41421
41422-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41423+drm_ioctl_compat_t r128_compat_ioctls[] = {
41424 [DRM_R128_INIT] = compat_r128_init,
41425 [DRM_R128_DEPTH] = compat_r128_depth,
41426 [DRM_R128_STIPPLE] = compat_r128_stipple,
41427@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41428 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41429 {
41430 unsigned int nr = DRM_IOCTL_NR(cmd);
41431- drm_ioctl_compat_t *fn = NULL;
41432 int ret;
41433
41434 if (nr < DRM_COMMAND_BASE)
41435 return drm_compat_ioctl(filp, cmd, arg);
41436
41437- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41438- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41439-
41440- if (fn != NULL)
41441+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41442+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41443 ret = (*fn) (filp, cmd, arg);
41444- else
41445+ } else
41446 ret = drm_ioctl(filp, cmd, arg);
41447
41448 return ret;
41449diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41450index c2ae496..30b5993 100644
41451--- a/drivers/gpu/drm/r128/r128_irq.c
41452+++ b/drivers/gpu/drm/r128/r128_irq.c
41453@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41454 if (crtc != 0)
41455 return 0;
41456
41457- return atomic_read(&dev_priv->vbl_received);
41458+ return atomic_read_unchecked(&dev_priv->vbl_received);
41459 }
41460
41461 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41462@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41463 /* VBLANK interrupt */
41464 if (status & R128_CRTC_VBLANK_INT) {
41465 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41466- atomic_inc(&dev_priv->vbl_received);
41467+ atomic_inc_unchecked(&dev_priv->vbl_received);
41468 drm_handle_vblank(dev, 0);
41469 return IRQ_HANDLED;
41470 }
41471diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41472index 8fd2d9f..18c9660 100644
41473--- a/drivers/gpu/drm/r128/r128_state.c
41474+++ b/drivers/gpu/drm/r128/r128_state.c
41475@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41476
41477 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41478 {
41479- if (atomic_read(&dev_priv->idle_count) == 0)
41480+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41481 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41482 else
41483- atomic_set(&dev_priv->idle_count, 0);
41484+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41485 }
41486
41487 #endif
41488diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41489index b928c17..e5d9400 100644
41490--- a/drivers/gpu/drm/radeon/mkregtable.c
41491+++ b/drivers/gpu/drm/radeon/mkregtable.c
41492@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41493 regex_t mask_rex;
41494 regmatch_t match[4];
41495 char buf[1024];
41496- size_t end;
41497+ long end;
41498 int len;
41499 int done = 0;
41500 int r;
41501 unsigned o;
41502 struct offset *offset;
41503 char last_reg_s[10];
41504- int last_reg;
41505+ unsigned long last_reg;
41506
41507 if (regcomp
41508 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41509diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41510index bd7519f..e1c2cd95 100644
41511--- a/drivers/gpu/drm/radeon/radeon_device.c
41512+++ b/drivers/gpu/drm/radeon/radeon_device.c
41513@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41514 * locking inversion with the driver load path. And the access here is
41515 * completely racy anyway. So don't bother with locking for now.
41516 */
41517- return dev->open_count == 0;
41518+ return local_read(&dev->open_count) == 0;
41519 }
41520
41521 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41522diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41523index 46bd393..6ae4719 100644
41524--- a/drivers/gpu/drm/radeon/radeon_drv.h
41525+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41526@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41527
41528 /* SW interrupt */
41529 wait_queue_head_t swi_queue;
41530- atomic_t swi_emitted;
41531+ atomic_unchecked_t swi_emitted;
41532 int vblank_crtc;
41533 uint32_t irq_enable_reg;
41534 uint32_t r500_disp_irq_reg;
41535diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41536index 0b98ea1..0881827 100644
41537--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41538+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41539@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41540 request = compat_alloc_user_space(sizeof(*request));
41541 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41542 || __put_user(req32.param, &request->param)
41543- || __put_user((void __user *)(unsigned long)req32.value,
41544+ || __put_user((unsigned long)req32.value,
41545 &request->value))
41546 return -EFAULT;
41547
41548@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41549 #define compat_radeon_cp_setparam NULL
41550 #endif /* X86_64 || IA64 */
41551
41552-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41553+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41554 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41555 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41556 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41557@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41558 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41559 {
41560 unsigned int nr = DRM_IOCTL_NR(cmd);
41561- drm_ioctl_compat_t *fn = NULL;
41562 int ret;
41563
41564 if (nr < DRM_COMMAND_BASE)
41565 return drm_compat_ioctl(filp, cmd, arg);
41566
41567- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41568- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41569-
41570- if (fn != NULL)
41571+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41572+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41573 ret = (*fn) (filp, cmd, arg);
41574- else
41575+ } else
41576 ret = drm_ioctl(filp, cmd, arg);
41577
41578 return ret;
41579diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41580index 244b19b..c19226d 100644
41581--- a/drivers/gpu/drm/radeon/radeon_irq.c
41582+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41583@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41584 unsigned int ret;
41585 RING_LOCALS;
41586
41587- atomic_inc(&dev_priv->swi_emitted);
41588- ret = atomic_read(&dev_priv->swi_emitted);
41589+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41590+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41591
41592 BEGIN_RING(4);
41593 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41594@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41595 drm_radeon_private_t *dev_priv =
41596 (drm_radeon_private_t *) dev->dev_private;
41597
41598- atomic_set(&dev_priv->swi_emitted, 0);
41599+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41600 init_waitqueue_head(&dev_priv->swi_queue);
41601
41602 dev->max_vblank_count = 0x001fffff;
41603diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41604index 15aee72..cda326e 100644
41605--- a/drivers/gpu/drm/radeon/radeon_state.c
41606+++ b/drivers/gpu/drm/radeon/radeon_state.c
41607@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41608 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41609 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41610
41611- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41612+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41613 sarea_priv->nbox * sizeof(depth_boxes[0])))
41614 return -EFAULT;
41615
41616@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41617 {
41618 drm_radeon_private_t *dev_priv = dev->dev_private;
41619 drm_radeon_getparam_t *param = data;
41620- int value;
41621+ int value = 0;
41622
41623 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41624
41625diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41626index b292aca..4e338b5 100644
41627--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41628+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41629@@ -963,7 +963,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41630 man->size = size >> PAGE_SHIFT;
41631 }
41632
41633-static struct vm_operations_struct radeon_ttm_vm_ops;
41634+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41635 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41636
41637 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41638@@ -1004,8 +1004,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41639 }
41640 if (unlikely(ttm_vm_ops == NULL)) {
41641 ttm_vm_ops = vma->vm_ops;
41642+ pax_open_kernel();
41643 radeon_ttm_vm_ops = *ttm_vm_ops;
41644 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41645+ pax_close_kernel();
41646 }
41647 vma->vm_ops = &radeon_ttm_vm_ops;
41648 return 0;
41649diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41650index 978993f..e36e50e 100644
41651--- a/drivers/gpu/drm/tegra/dc.c
41652+++ b/drivers/gpu/drm/tegra/dc.c
41653@@ -1416,7 +1416,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41654 }
41655
41656 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41657- dc->debugfs_files[i].data = dc;
41658+ *(void **)&dc->debugfs_files[i].data = dc;
41659
41660 err = drm_debugfs_create_files(dc->debugfs_files,
41661 ARRAY_SIZE(debugfs_files),
41662diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41663index 33f67fd..55ee9761 100644
41664--- a/drivers/gpu/drm/tegra/dsi.c
41665+++ b/drivers/gpu/drm/tegra/dsi.c
41666@@ -39,7 +39,7 @@ struct tegra_dsi {
41667 struct clk *clk_lp;
41668 struct clk *clk;
41669
41670- struct drm_info_list *debugfs_files;
41671+ drm_info_list_no_const *debugfs_files;
41672 struct drm_minor *minor;
41673 struct dentry *debugfs;
41674
41675diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41676index ffe2654..03c7b1c 100644
41677--- a/drivers/gpu/drm/tegra/hdmi.c
41678+++ b/drivers/gpu/drm/tegra/hdmi.c
41679@@ -60,7 +60,7 @@ struct tegra_hdmi {
41680 bool stereo;
41681 bool dvi;
41682
41683- struct drm_info_list *debugfs_files;
41684+ drm_info_list_no_const *debugfs_files;
41685 struct drm_minor *minor;
41686 struct dentry *debugfs;
41687 };
41688diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41689index aa0bd054..aea6a01 100644
41690--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41691+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41692@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41693 }
41694
41695 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41696- ttm_bo_man_init,
41697- ttm_bo_man_takedown,
41698- ttm_bo_man_get_node,
41699- ttm_bo_man_put_node,
41700- ttm_bo_man_debug
41701+ .init = ttm_bo_man_init,
41702+ .takedown = ttm_bo_man_takedown,
41703+ .get_node = ttm_bo_man_get_node,
41704+ .put_node = ttm_bo_man_put_node,
41705+ .debug = ttm_bo_man_debug
41706 };
41707 EXPORT_SYMBOL(ttm_bo_manager_func);
41708diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41709index a1803fb..c53f6b0 100644
41710--- a/drivers/gpu/drm/ttm/ttm_memory.c
41711+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41712@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41713 zone->glob = glob;
41714 glob->zone_kernel = zone;
41715 ret = kobject_init_and_add(
41716- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41717+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41718 if (unlikely(ret != 0)) {
41719 kobject_put(&zone->kobj);
41720 return ret;
41721@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41722 zone->glob = glob;
41723 glob->zone_dma32 = zone;
41724 ret = kobject_init_and_add(
41725- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41726+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41727 if (unlikely(ret != 0)) {
41728 kobject_put(&zone->kobj);
41729 return ret;
41730diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41731index 025c429..314062f 100644
41732--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41733+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41734@@ -54,7 +54,7 @@
41735
41736 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41737 #define SMALL_ALLOCATION 16
41738-#define FREE_ALL_PAGES (~0U)
41739+#define FREE_ALL_PAGES (~0UL)
41740 /* times are in msecs */
41741 #define PAGE_FREE_INTERVAL 1000
41742
41743@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41744 * @free_all: If set to true will free all pages in pool
41745 * @use_static: Safe to use static buffer
41746 **/
41747-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41748+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41749 bool use_static)
41750 {
41751 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41752 unsigned long irq_flags;
41753 struct page *p;
41754 struct page **pages_to_free;
41755- unsigned freed_pages = 0,
41756- npages_to_free = nr_free;
41757+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41758
41759 if (NUM_PAGES_TO_ALLOC < nr_free)
41760 npages_to_free = NUM_PAGES_TO_ALLOC;
41761@@ -371,7 +370,8 @@ restart:
41762 __list_del(&p->lru, &pool->list);
41763
41764 ttm_pool_update_free_locked(pool, freed_pages);
41765- nr_free -= freed_pages;
41766+ if (likely(nr_free != FREE_ALL_PAGES))
41767+ nr_free -= freed_pages;
41768 }
41769
41770 spin_unlock_irqrestore(&pool->lock, irq_flags);
41771@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41772 unsigned i;
41773 unsigned pool_offset;
41774 struct ttm_page_pool *pool;
41775- int shrink_pages = sc->nr_to_scan;
41776+ unsigned long shrink_pages = sc->nr_to_scan;
41777 unsigned long freed = 0;
41778
41779 if (!mutex_trylock(&lock))
41780@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41781 pool_offset = ++start_pool % NUM_POOLS;
41782 /* select start pool in round robin fashion */
41783 for (i = 0; i < NUM_POOLS; ++i) {
41784- unsigned nr_free = shrink_pages;
41785+ unsigned long nr_free = shrink_pages;
41786 if (shrink_pages == 0)
41787 break;
41788 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41789@@ -673,7 +673,7 @@ out:
41790 }
41791
41792 /* Put all pages in pages list to correct pool to wait for reuse */
41793-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41794+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41795 enum ttm_caching_state cstate)
41796 {
41797 unsigned long irq_flags;
41798@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41799 struct list_head plist;
41800 struct page *p = NULL;
41801 gfp_t gfp_flags = GFP_USER;
41802- unsigned count;
41803+ unsigned long count;
41804 int r;
41805
41806 /* set zero flag for page allocation if required */
41807diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41808index 01e1d27..aaa018a 100644
41809--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41810+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41811@@ -56,7 +56,7 @@
41812
41813 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41814 #define SMALL_ALLOCATION 4
41815-#define FREE_ALL_PAGES (~0U)
41816+#define FREE_ALL_PAGES (~0UL)
41817 /* times are in msecs */
41818 #define IS_UNDEFINED (0)
41819 #define IS_WC (1<<1)
41820@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41821 * @nr_free: If set to true will free all pages in pool
41822 * @use_static: Safe to use static buffer
41823 **/
41824-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41825+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41826 bool use_static)
41827 {
41828 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41829@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41830 struct dma_page *dma_p, *tmp;
41831 struct page **pages_to_free;
41832 struct list_head d_pages;
41833- unsigned freed_pages = 0,
41834- npages_to_free = nr_free;
41835+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41836
41837 if (NUM_PAGES_TO_ALLOC < nr_free)
41838 npages_to_free = NUM_PAGES_TO_ALLOC;
41839@@ -499,7 +498,8 @@ restart:
41840 /* remove range of pages from the pool */
41841 if (freed_pages) {
41842 ttm_pool_update_free_locked(pool, freed_pages);
41843- nr_free -= freed_pages;
41844+ if (likely(nr_free != FREE_ALL_PAGES))
41845+ nr_free -= freed_pages;
41846 }
41847
41848 spin_unlock_irqrestore(&pool->lock, irq_flags);
41849@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41850 struct dma_page *d_page, *next;
41851 enum pool_type type;
41852 bool is_cached = false;
41853- unsigned count = 0, i, npages = 0;
41854+ unsigned long count = 0, i, npages = 0;
41855 unsigned long irq_flags;
41856
41857 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41858@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41859 static unsigned start_pool;
41860 unsigned idx = 0;
41861 unsigned pool_offset;
41862- unsigned shrink_pages = sc->nr_to_scan;
41863+ unsigned long shrink_pages = sc->nr_to_scan;
41864 struct device_pools *p;
41865 unsigned long freed = 0;
41866
41867@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41868 goto out;
41869 pool_offset = ++start_pool % _manager->npools;
41870 list_for_each_entry(p, &_manager->pools, pools) {
41871- unsigned nr_free;
41872+ unsigned long nr_free;
41873
41874 if (!p->dev)
41875 continue;
41876@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41877 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
41878 freed += nr_free - shrink_pages;
41879
41880- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41881+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41882 p->pool->dev_name, p->pool->name, current->pid,
41883 nr_free, shrink_pages);
41884 }
41885diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41886index 8cbcb45..a4d9cf7 100644
41887--- a/drivers/gpu/drm/udl/udl_fb.c
41888+++ b/drivers/gpu/drm/udl/udl_fb.c
41889@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41890 fb_deferred_io_cleanup(info);
41891 kfree(info->fbdefio);
41892 info->fbdefio = NULL;
41893- info->fbops->fb_mmap = udl_fb_mmap;
41894 }
41895
41896 pr_warn("released /dev/fb%d user=%d count=%d\n",
41897diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41898index ef8c500..01030c8 100644
41899--- a/drivers/gpu/drm/via/via_drv.h
41900+++ b/drivers/gpu/drm/via/via_drv.h
41901@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41902 typedef uint32_t maskarray_t[5];
41903
41904 typedef struct drm_via_irq {
41905- atomic_t irq_received;
41906+ atomic_unchecked_t irq_received;
41907 uint32_t pending_mask;
41908 uint32_t enable_mask;
41909 wait_queue_head_t irq_queue;
41910@@ -77,7 +77,7 @@ typedef struct drm_via_private {
41911 struct timeval last_vblank;
41912 int last_vblank_valid;
41913 unsigned usec_per_vblank;
41914- atomic_t vbl_received;
41915+ atomic_unchecked_t vbl_received;
41916 drm_via_state_t hc_state;
41917 char pci_buf[VIA_PCI_BUF_SIZE];
41918 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41919diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41920index 1319433..a993b0c 100644
41921--- a/drivers/gpu/drm/via/via_irq.c
41922+++ b/drivers/gpu/drm/via/via_irq.c
41923@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41924 if (crtc != 0)
41925 return 0;
41926
41927- return atomic_read(&dev_priv->vbl_received);
41928+ return atomic_read_unchecked(&dev_priv->vbl_received);
41929 }
41930
41931 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41932@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41933
41934 status = VIA_READ(VIA_REG_INTERRUPT);
41935 if (status & VIA_IRQ_VBLANK_PENDING) {
41936- atomic_inc(&dev_priv->vbl_received);
41937- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41938+ atomic_inc_unchecked(&dev_priv->vbl_received);
41939+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41940 do_gettimeofday(&cur_vblank);
41941 if (dev_priv->last_vblank_valid) {
41942 dev_priv->usec_per_vblank =
41943@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41944 dev_priv->last_vblank = cur_vblank;
41945 dev_priv->last_vblank_valid = 1;
41946 }
41947- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41948+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41949 DRM_DEBUG("US per vblank is: %u\n",
41950 dev_priv->usec_per_vblank);
41951 }
41952@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41953
41954 for (i = 0; i < dev_priv->num_irqs; ++i) {
41955 if (status & cur_irq->pending_mask) {
41956- atomic_inc(&cur_irq->irq_received);
41957+ atomic_inc_unchecked(&cur_irq->irq_received);
41958 wake_up(&cur_irq->irq_queue);
41959 handled = 1;
41960 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41961@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41962 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41963 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41964 masks[irq][4]));
41965- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41966+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41967 } else {
41968 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41969 (((cur_irq_sequence =
41970- atomic_read(&cur_irq->irq_received)) -
41971+ atomic_read_unchecked(&cur_irq->irq_received)) -
41972 *sequence) <= (1 << 23)));
41973 }
41974 *sequence = cur_irq_sequence;
41975@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41976 }
41977
41978 for (i = 0; i < dev_priv->num_irqs; ++i) {
41979- atomic_set(&cur_irq->irq_received, 0);
41980+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41981 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41982 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41983 init_waitqueue_head(&cur_irq->irq_queue);
41984@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41985 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41986 case VIA_IRQ_RELATIVE:
41987 irqwait->request.sequence +=
41988- atomic_read(&cur_irq->irq_received);
41989+ atomic_read_unchecked(&cur_irq->irq_received);
41990 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41991 case VIA_IRQ_ABSOLUTE:
41992 break;
41993diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41994index d26a6da..5fa41ed 100644
41995--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41996+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41997@@ -447,7 +447,7 @@ struct vmw_private {
41998 * Fencing and IRQs.
41999 */
42000
42001- atomic_t marker_seq;
42002+ atomic_unchecked_t marker_seq;
42003 wait_queue_head_t fence_queue;
42004 wait_queue_head_t fifo_queue;
42005 spinlock_t waiter_lock;
42006diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42007index 39f2b03..d1b0a64 100644
42008--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42009+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42010@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42011 (unsigned int) min,
42012 (unsigned int) fifo->capabilities);
42013
42014- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42015+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42016 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42017 vmw_marker_queue_init(&fifo->marker_queue);
42018 return vmw_fifo_send_fence(dev_priv, &dummy);
42019@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42020 if (reserveable)
42021 iowrite32(bytes, fifo_mem +
42022 SVGA_FIFO_RESERVED);
42023- return fifo_mem + (next_cmd >> 2);
42024+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42025 } else {
42026 need_bounce = true;
42027 }
42028@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42029
42030 fm = vmw_fifo_reserve(dev_priv, bytes);
42031 if (unlikely(fm == NULL)) {
42032- *seqno = atomic_read(&dev_priv->marker_seq);
42033+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42034 ret = -ENOMEM;
42035 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42036 false, 3*HZ);
42037@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42038 }
42039
42040 do {
42041- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42042+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42043 } while (*seqno == 0);
42044
42045 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42046diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42047index 170b61b..fec7348 100644
42048--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42049+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42050@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42051 }
42052
42053 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42054- vmw_gmrid_man_init,
42055- vmw_gmrid_man_takedown,
42056- vmw_gmrid_man_get_node,
42057- vmw_gmrid_man_put_node,
42058- vmw_gmrid_man_debug
42059+ .init = vmw_gmrid_man_init,
42060+ .takedown = vmw_gmrid_man_takedown,
42061+ .get_node = vmw_gmrid_man_get_node,
42062+ .put_node = vmw_gmrid_man_put_node,
42063+ .debug = vmw_gmrid_man_debug
42064 };
42065diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42066index 69c8ce2..cacb0ab 100644
42067--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42068+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42069@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42070 int ret;
42071
42072 num_clips = arg->num_clips;
42073- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42074+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42075
42076 if (unlikely(num_clips == 0))
42077 return 0;
42078@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42079 int ret;
42080
42081 num_clips = arg->num_clips;
42082- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42083+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42084
42085 if (unlikely(num_clips == 0))
42086 return 0;
42087diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42088index 9fe9827..0aa2fc0 100644
42089--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42090+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42091@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42092 * emitted. Then the fence is stale and signaled.
42093 */
42094
42095- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42096+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42097 > VMW_FENCE_WRAP);
42098
42099 return ret;
42100@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42101
42102 if (fifo_idle)
42103 down_read(&fifo_state->rwsem);
42104- signal_seq = atomic_read(&dev_priv->marker_seq);
42105+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42106 ret = 0;
42107
42108 for (;;) {
42109diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42110index efd1ffd..0ae13ca 100644
42111--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42112+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42113@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42114 while (!vmw_lag_lt(queue, us)) {
42115 spin_lock(&queue->lock);
42116 if (list_empty(&queue->head))
42117- seqno = atomic_read(&dev_priv->marker_seq);
42118+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42119 else {
42120 marker = list_first_entry(&queue->head,
42121 struct vmw_marker, head);
42122diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42123index 37ac7b5..d52a5c9 100644
42124--- a/drivers/gpu/vga/vga_switcheroo.c
42125+++ b/drivers/gpu/vga/vga_switcheroo.c
42126@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42127
42128 /* this version is for the case where the power switch is separate
42129 to the device being powered down. */
42130-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42131+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42132 {
42133 /* copy over all the bus versions */
42134 if (dev->bus && dev->bus->pm) {
42135@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42136 return ret;
42137 }
42138
42139-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42140+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42141 {
42142 /* copy over all the bus versions */
42143 if (dev->bus && dev->bus->pm) {
42144diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42145index 8b63879..a5a5e72 100644
42146--- a/drivers/hid/hid-core.c
42147+++ b/drivers/hid/hid-core.c
42148@@ -2508,7 +2508,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42149
42150 int hid_add_device(struct hid_device *hdev)
42151 {
42152- static atomic_t id = ATOMIC_INIT(0);
42153+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42154 int ret;
42155
42156 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42157@@ -2551,7 +2551,7 @@ int hid_add_device(struct hid_device *hdev)
42158 /* XXX hack, any other cleaner solution after the driver core
42159 * is converted to allow more than 20 bytes as the device name? */
42160 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42161- hdev->vendor, hdev->product, atomic_inc_return(&id));
42162+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42163
42164 hid_debug_register(hdev, dev_name(&hdev->dev));
42165 ret = device_add(&hdev->dev);
42166diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
42167index 5bc6d80..e47b55a 100644
42168--- a/drivers/hid/hid-logitech-dj.c
42169+++ b/drivers/hid/hid-logitech-dj.c
42170@@ -853,6 +853,12 @@ static int logi_dj_dj_event(struct hid_device *hdev,
42171 * case we forward it to the correct hid device (via hid_input_report()
42172 * ) and return 1 so hid-core does not anything else with it.
42173 */
42174+ if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
42175+ (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
42176+ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
42177+ __func__, dj_report->device_index);
42178+ return false;
42179+ }
42180
42181 if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
42182 (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
42183diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42184index c13fb5b..55a3802 100644
42185--- a/drivers/hid/hid-wiimote-debug.c
42186+++ b/drivers/hid/hid-wiimote-debug.c
42187@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42188 else if (size == 0)
42189 return -EIO;
42190
42191- if (copy_to_user(u, buf, size))
42192+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42193 return -EFAULT;
42194
42195 *off += size;
42196diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42197index 433f72a..2926005 100644
42198--- a/drivers/hv/channel.c
42199+++ b/drivers/hv/channel.c
42200@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42201 unsigned long flags;
42202 int ret = 0;
42203
42204- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42205- atomic_inc(&vmbus_connection.next_gpadl_handle);
42206+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42207+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42208
42209 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42210 if (ret)
42211diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42212index 3e4235c..877d0e5 100644
42213--- a/drivers/hv/hv.c
42214+++ b/drivers/hv/hv.c
42215@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42216 u64 output_address = (output) ? virt_to_phys(output) : 0;
42217 u32 output_address_hi = output_address >> 32;
42218 u32 output_address_lo = output_address & 0xFFFFFFFF;
42219- void *hypercall_page = hv_context.hypercall_page;
42220+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42221
42222 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42223 "=a"(hv_status_lo) : "d" (control_hi),
42224@@ -156,7 +156,7 @@ int hv_init(void)
42225 /* See if the hypercall page is already set */
42226 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42227
42228- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42229+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42230
42231 if (!virtaddr)
42232 goto cleanup;
42233diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42234index b958ded..b2452bb 100644
42235--- a/drivers/hv/hv_balloon.c
42236+++ b/drivers/hv/hv_balloon.c
42237@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42238
42239 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42240 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42241-static atomic_t trans_id = ATOMIC_INIT(0);
42242+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42243
42244 static int dm_ring_size = (5 * PAGE_SIZE);
42245
42246@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42247 pr_info("Memory hot add failed\n");
42248
42249 dm->state = DM_INITIALIZED;
42250- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42251+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42252 vmbus_sendpacket(dm->dev->channel, &resp,
42253 sizeof(struct dm_hot_add_response),
42254 (unsigned long)NULL,
42255@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42256 memset(&status, 0, sizeof(struct dm_status));
42257 status.hdr.type = DM_STATUS_REPORT;
42258 status.hdr.size = sizeof(struct dm_status);
42259- status.hdr.trans_id = atomic_inc_return(&trans_id);
42260+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42261
42262 /*
42263 * The host expects the guest to report free memory.
42264@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42265 * send the status. This can happen if we were interrupted
42266 * after we picked our transaction ID.
42267 */
42268- if (status.hdr.trans_id != atomic_read(&trans_id))
42269+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42270 return;
42271
42272 /*
42273@@ -1133,7 +1133,7 @@ static void balloon_up(struct work_struct *dummy)
42274 */
42275
42276 do {
42277- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42278+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42279 ret = vmbus_sendpacket(dm_device.dev->channel,
42280 bl_resp,
42281 bl_resp->hdr.size,
42282@@ -1179,7 +1179,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42283
42284 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42285 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42286- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42287+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42288 resp.hdr.size = sizeof(struct dm_unballoon_response);
42289
42290 vmbus_sendpacket(dm_device.dev->channel, &resp,
42291@@ -1243,7 +1243,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42292 memset(&version_req, 0, sizeof(struct dm_version_request));
42293 version_req.hdr.type = DM_VERSION_REQUEST;
42294 version_req.hdr.size = sizeof(struct dm_version_request);
42295- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42296+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42297 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42298 version_req.is_last_attempt = 1;
42299
42300@@ -1413,7 +1413,7 @@ static int balloon_probe(struct hv_device *dev,
42301 memset(&version_req, 0, sizeof(struct dm_version_request));
42302 version_req.hdr.type = DM_VERSION_REQUEST;
42303 version_req.hdr.size = sizeof(struct dm_version_request);
42304- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42305+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42306 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42307 version_req.is_last_attempt = 0;
42308
42309@@ -1444,7 +1444,7 @@ static int balloon_probe(struct hv_device *dev,
42310 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42311 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42312 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42313- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42314+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42315
42316 cap_msg.caps.cap_bits.balloon = 1;
42317 cap_msg.caps.cap_bits.hot_add = 1;
42318diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42319index c386d8d..d6004c4 100644
42320--- a/drivers/hv/hyperv_vmbus.h
42321+++ b/drivers/hv/hyperv_vmbus.h
42322@@ -611,7 +611,7 @@ enum vmbus_connect_state {
42323 struct vmbus_connection {
42324 enum vmbus_connect_state conn_state;
42325
42326- atomic_t next_gpadl_handle;
42327+ atomic_unchecked_t next_gpadl_handle;
42328
42329 /*
42330 * Represents channel interrupts. Each bit position represents a
42331diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42332index 4d6b269..2e23b86 100644
42333--- a/drivers/hv/vmbus_drv.c
42334+++ b/drivers/hv/vmbus_drv.c
42335@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42336 {
42337 int ret = 0;
42338
42339- static atomic_t device_num = ATOMIC_INIT(0);
42340+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42341
42342 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42343- atomic_inc_return(&device_num));
42344+ atomic_inc_return_unchecked(&device_num));
42345
42346 child_device_obj->device.bus = &hv_bus;
42347 child_device_obj->device.parent = &hv_acpi_dev->dev;
42348diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42349index 579bdf9..0dac21d5 100644
42350--- a/drivers/hwmon/acpi_power_meter.c
42351+++ b/drivers/hwmon/acpi_power_meter.c
42352@@ -116,7 +116,7 @@ struct sensor_template {
42353 struct device_attribute *devattr,
42354 const char *buf, size_t count);
42355 int index;
42356-};
42357+} __do_const;
42358
42359 /* Averaging interval */
42360 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42361@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42362 struct sensor_template *attrs)
42363 {
42364 struct device *dev = &resource->acpi_dev->dev;
42365- struct sensor_device_attribute *sensors =
42366+ sensor_device_attribute_no_const *sensors =
42367 &resource->sensors[resource->num_sensors];
42368 int res = 0;
42369
42370@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42371 return 0;
42372 }
42373
42374-static struct dmi_system_id __initdata pm_dmi_table[] = {
42375+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42376 {
42377 enable_cap_knobs, "IBM Active Energy Manager",
42378 {
42379diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42380index 0af63da..05a183a 100644
42381--- a/drivers/hwmon/applesmc.c
42382+++ b/drivers/hwmon/applesmc.c
42383@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42384 {
42385 struct applesmc_node_group *grp;
42386 struct applesmc_dev_attr *node;
42387- struct attribute *attr;
42388+ attribute_no_const *attr;
42389 int ret, i;
42390
42391 for (grp = groups; grp->format; grp++) {
42392diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42393index cccef87..06ce8ec 100644
42394--- a/drivers/hwmon/asus_atk0110.c
42395+++ b/drivers/hwmon/asus_atk0110.c
42396@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42397 struct atk_sensor_data {
42398 struct list_head list;
42399 struct atk_data *data;
42400- struct device_attribute label_attr;
42401- struct device_attribute input_attr;
42402- struct device_attribute limit1_attr;
42403- struct device_attribute limit2_attr;
42404+ device_attribute_no_const label_attr;
42405+ device_attribute_no_const input_attr;
42406+ device_attribute_no_const limit1_attr;
42407+ device_attribute_no_const limit2_attr;
42408 char label_attr_name[ATTR_NAME_SIZE];
42409 char input_attr_name[ATTR_NAME_SIZE];
42410 char limit1_attr_name[ATTR_NAME_SIZE];
42411@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42412 static struct device_attribute atk_name_attr =
42413 __ATTR(name, 0444, atk_name_show, NULL);
42414
42415-static void atk_init_attribute(struct device_attribute *attr, char *name,
42416+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42417 sysfs_show_func show)
42418 {
42419 sysfs_attr_init(&attr->attr);
42420diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42421index 5b7fec8..05c957a 100644
42422--- a/drivers/hwmon/coretemp.c
42423+++ b/drivers/hwmon/coretemp.c
42424@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42425 return NOTIFY_OK;
42426 }
42427
42428-static struct notifier_block coretemp_cpu_notifier __refdata = {
42429+static struct notifier_block coretemp_cpu_notifier = {
42430 .notifier_call = coretemp_cpu_callback,
42431 };
42432
42433diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42434index 7a8a6fb..015c1fd 100644
42435--- a/drivers/hwmon/ibmaem.c
42436+++ b/drivers/hwmon/ibmaem.c
42437@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42438 struct aem_rw_sensor_template *rw)
42439 {
42440 struct device *dev = &data->pdev->dev;
42441- struct sensor_device_attribute *sensors = data->sensors;
42442+ sensor_device_attribute_no_const *sensors = data->sensors;
42443 int err;
42444
42445 /* Set up read-only sensors */
42446diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42447index 17ae2eb..21b71dd 100644
42448--- a/drivers/hwmon/iio_hwmon.c
42449+++ b/drivers/hwmon/iio_hwmon.c
42450@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42451 {
42452 struct device *dev = &pdev->dev;
42453 struct iio_hwmon_state *st;
42454- struct sensor_device_attribute *a;
42455+ sensor_device_attribute_no_const *a;
42456 int ret, i;
42457 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42458 enum iio_chan_type type;
42459diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42460index f3830db..9f4d6d5 100644
42461--- a/drivers/hwmon/nct6683.c
42462+++ b/drivers/hwmon/nct6683.c
42463@@ -397,11 +397,11 @@ static struct attribute_group *
42464 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42465 int repeat)
42466 {
42467- struct sensor_device_attribute_2 *a2;
42468- struct sensor_device_attribute *a;
42469+ sensor_device_attribute_2_no_const *a2;
42470+ sensor_device_attribute_no_const *a;
42471 struct sensor_device_template **t;
42472 struct sensor_device_attr_u *su;
42473- struct attribute_group *group;
42474+ attribute_group_no_const *group;
42475 struct attribute **attrs;
42476 int i, j, count;
42477
42478diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42479index 1be4117..88ae1e1 100644
42480--- a/drivers/hwmon/nct6775.c
42481+++ b/drivers/hwmon/nct6775.c
42482@@ -952,10 +952,10 @@ static struct attribute_group *
42483 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42484 int repeat)
42485 {
42486- struct attribute_group *group;
42487+ attribute_group_no_const *group;
42488 struct sensor_device_attr_u *su;
42489- struct sensor_device_attribute *a;
42490- struct sensor_device_attribute_2 *a2;
42491+ sensor_device_attribute_no_const *a;
42492+ sensor_device_attribute_2_no_const *a2;
42493 struct attribute **attrs;
42494 struct sensor_device_template **t;
42495 int i, count;
42496diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42497index f2e47c7..45d7941 100644
42498--- a/drivers/hwmon/pmbus/pmbus_core.c
42499+++ b/drivers/hwmon/pmbus/pmbus_core.c
42500@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42501 return 0;
42502 }
42503
42504-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42505+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42506 const char *name,
42507 umode_t mode,
42508 ssize_t (*show)(struct device *dev,
42509@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42510 dev_attr->store = store;
42511 }
42512
42513-static void pmbus_attr_init(struct sensor_device_attribute *a,
42514+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42515 const char *name,
42516 umode_t mode,
42517 ssize_t (*show)(struct device *dev,
42518@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42519 u16 reg, u8 mask)
42520 {
42521 struct pmbus_boolean *boolean;
42522- struct sensor_device_attribute *a;
42523+ sensor_device_attribute_no_const *a;
42524
42525 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42526 if (!boolean)
42527@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42528 bool update, bool readonly)
42529 {
42530 struct pmbus_sensor *sensor;
42531- struct device_attribute *a;
42532+ device_attribute_no_const *a;
42533
42534 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42535 if (!sensor)
42536@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42537 const char *lstring, int index)
42538 {
42539 struct pmbus_label *label;
42540- struct device_attribute *a;
42541+ device_attribute_no_const *a;
42542
42543 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42544 if (!label)
42545diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42546index d4f0935..7420593 100644
42547--- a/drivers/hwmon/sht15.c
42548+++ b/drivers/hwmon/sht15.c
42549@@ -169,7 +169,7 @@ struct sht15_data {
42550 int supply_uv;
42551 bool supply_uv_valid;
42552 struct work_struct update_supply_work;
42553- atomic_t interrupt_handled;
42554+ atomic_unchecked_t interrupt_handled;
42555 };
42556
42557 /**
42558@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42559 ret = gpio_direction_input(data->pdata->gpio_data);
42560 if (ret)
42561 return ret;
42562- atomic_set(&data->interrupt_handled, 0);
42563+ atomic_set_unchecked(&data->interrupt_handled, 0);
42564
42565 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42566 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42567 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42568 /* Only relevant if the interrupt hasn't occurred. */
42569- if (!atomic_read(&data->interrupt_handled))
42570+ if (!atomic_read_unchecked(&data->interrupt_handled))
42571 schedule_work(&data->read_work);
42572 }
42573 ret = wait_event_timeout(data->wait_queue,
42574@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42575
42576 /* First disable the interrupt */
42577 disable_irq_nosync(irq);
42578- atomic_inc(&data->interrupt_handled);
42579+ atomic_inc_unchecked(&data->interrupt_handled);
42580 /* Then schedule a reading work struct */
42581 if (data->state != SHT15_READING_NOTHING)
42582 schedule_work(&data->read_work);
42583@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42584 * If not, then start the interrupt again - care here as could
42585 * have gone low in meantime so verify it hasn't!
42586 */
42587- atomic_set(&data->interrupt_handled, 0);
42588+ atomic_set_unchecked(&data->interrupt_handled, 0);
42589 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42590 /* If still not occurred or another handler was scheduled */
42591 if (gpio_get_value(data->pdata->gpio_data)
42592- || atomic_read(&data->interrupt_handled))
42593+ || atomic_read_unchecked(&data->interrupt_handled))
42594 return;
42595 }
42596
42597diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42598index ac91c07..8e69663 100644
42599--- a/drivers/hwmon/via-cputemp.c
42600+++ b/drivers/hwmon/via-cputemp.c
42601@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42602 return NOTIFY_OK;
42603 }
42604
42605-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42606+static struct notifier_block via_cputemp_cpu_notifier = {
42607 .notifier_call = via_cputemp_cpu_callback,
42608 };
42609
42610diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42611index 65e3240..e6c511d 100644
42612--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42613+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42614@@ -39,7 +39,7 @@
42615 extern struct i2c_adapter amd756_smbus;
42616
42617 static struct i2c_adapter *s4882_adapter;
42618-static struct i2c_algorithm *s4882_algo;
42619+static i2c_algorithm_no_const *s4882_algo;
42620
42621 /* Wrapper access functions for multiplexed SMBus */
42622 static DEFINE_MUTEX(amd756_lock);
42623diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42624index b19a310..d6eece0 100644
42625--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42626+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42627@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42628 /* usb layer */
42629
42630 /* Send command to device, and get response. */
42631-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42632+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42633 {
42634 int ret = 0;
42635 int actual;
42636diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42637index 88eda09..cf40434 100644
42638--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42639+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42640@@ -37,7 +37,7 @@
42641 extern struct i2c_adapter *nforce2_smbus;
42642
42643 static struct i2c_adapter *s4985_adapter;
42644-static struct i2c_algorithm *s4985_algo;
42645+static i2c_algorithm_no_const *s4985_algo;
42646
42647 /* Wrapper access functions for multiplexed SMBus */
42648 static DEFINE_MUTEX(nforce2_lock);
42649diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42650index 71c7a39..71dd3e0 100644
42651--- a/drivers/i2c/i2c-dev.c
42652+++ b/drivers/i2c/i2c-dev.c
42653@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42654 break;
42655 }
42656
42657- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42658+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42659 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42660 if (IS_ERR(rdwr_pa[i].buf)) {
42661 res = PTR_ERR(rdwr_pa[i].buf);
42662diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42663index 0b510ba..4fbb5085 100644
42664--- a/drivers/ide/ide-cd.c
42665+++ b/drivers/ide/ide-cd.c
42666@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42667 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42668 if ((unsigned long)buf & alignment
42669 || blk_rq_bytes(rq) & q->dma_pad_mask
42670- || object_is_on_stack(buf))
42671+ || object_starts_on_stack(buf))
42672 drive->dma = 0;
42673 }
42674 }
42675diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42676index f009d05..d95b613 100644
42677--- a/drivers/iio/industrialio-core.c
42678+++ b/drivers/iio/industrialio-core.c
42679@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42680 }
42681
42682 static
42683-int __iio_device_attr_init(struct device_attribute *dev_attr,
42684+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42685 const char *postfix,
42686 struct iio_chan_spec const *chan,
42687 ssize_t (*readfunc)(struct device *dev,
42688diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42689index e28a494..f7c2671 100644
42690--- a/drivers/infiniband/core/cm.c
42691+++ b/drivers/infiniband/core/cm.c
42692@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42693
42694 struct cm_counter_group {
42695 struct kobject obj;
42696- atomic_long_t counter[CM_ATTR_COUNT];
42697+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42698 };
42699
42700 struct cm_counter_attribute {
42701@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42702 struct ib_mad_send_buf *msg = NULL;
42703 int ret;
42704
42705- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42706+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42707 counter[CM_REQ_COUNTER]);
42708
42709 /* Quick state check to discard duplicate REQs. */
42710@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42711 if (!cm_id_priv)
42712 return;
42713
42714- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42715+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42716 counter[CM_REP_COUNTER]);
42717 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42718 if (ret)
42719@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42720 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42721 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42722 spin_unlock_irq(&cm_id_priv->lock);
42723- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42724+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42725 counter[CM_RTU_COUNTER]);
42726 goto out;
42727 }
42728@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42729 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42730 dreq_msg->local_comm_id);
42731 if (!cm_id_priv) {
42732- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42733+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42734 counter[CM_DREQ_COUNTER]);
42735 cm_issue_drep(work->port, work->mad_recv_wc);
42736 return -EINVAL;
42737@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42738 case IB_CM_MRA_REP_RCVD:
42739 break;
42740 case IB_CM_TIMEWAIT:
42741- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42742+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42743 counter[CM_DREQ_COUNTER]);
42744 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42745 goto unlock;
42746@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42747 cm_free_msg(msg);
42748 goto deref;
42749 case IB_CM_DREQ_RCVD:
42750- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42751+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42752 counter[CM_DREQ_COUNTER]);
42753 goto unlock;
42754 default:
42755@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42756 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42757 cm_id_priv->msg, timeout)) {
42758 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42759- atomic_long_inc(&work->port->
42760+ atomic_long_inc_unchecked(&work->port->
42761 counter_group[CM_RECV_DUPLICATES].
42762 counter[CM_MRA_COUNTER]);
42763 goto out;
42764@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42765 break;
42766 case IB_CM_MRA_REQ_RCVD:
42767 case IB_CM_MRA_REP_RCVD:
42768- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42769+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42770 counter[CM_MRA_COUNTER]);
42771 /* fall through */
42772 default:
42773@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42774 case IB_CM_LAP_IDLE:
42775 break;
42776 case IB_CM_MRA_LAP_SENT:
42777- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42778+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42779 counter[CM_LAP_COUNTER]);
42780 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42781 goto unlock;
42782@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42783 cm_free_msg(msg);
42784 goto deref;
42785 case IB_CM_LAP_RCVD:
42786- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42787+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42788 counter[CM_LAP_COUNTER]);
42789 goto unlock;
42790 default:
42791@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42792 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42793 if (cur_cm_id_priv) {
42794 spin_unlock_irq(&cm.lock);
42795- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42796+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42797 counter[CM_SIDR_REQ_COUNTER]);
42798 goto out; /* Duplicate message. */
42799 }
42800@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42801 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42802 msg->retries = 1;
42803
42804- atomic_long_add(1 + msg->retries,
42805+ atomic_long_add_unchecked(1 + msg->retries,
42806 &port->counter_group[CM_XMIT].counter[attr_index]);
42807 if (msg->retries)
42808- atomic_long_add(msg->retries,
42809+ atomic_long_add_unchecked(msg->retries,
42810 &port->counter_group[CM_XMIT_RETRIES].
42811 counter[attr_index]);
42812
42813@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42814 }
42815
42816 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42817- atomic_long_inc(&port->counter_group[CM_RECV].
42818+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42819 counter[attr_id - CM_ATTR_ID_OFFSET]);
42820
42821 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42822@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42823 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42824
42825 return sprintf(buf, "%ld\n",
42826- atomic_long_read(&group->counter[cm_attr->index]));
42827+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42828 }
42829
42830 static const struct sysfs_ops cm_counter_ops = {
42831diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42832index 9f5ad7c..588cd84 100644
42833--- a/drivers/infiniband/core/fmr_pool.c
42834+++ b/drivers/infiniband/core/fmr_pool.c
42835@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42836
42837 struct task_struct *thread;
42838
42839- atomic_t req_ser;
42840- atomic_t flush_ser;
42841+ atomic_unchecked_t req_ser;
42842+ atomic_unchecked_t flush_ser;
42843
42844 wait_queue_head_t force_wait;
42845 };
42846@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42847 struct ib_fmr_pool *pool = pool_ptr;
42848
42849 do {
42850- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42851+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42852 ib_fmr_batch_release(pool);
42853
42854- atomic_inc(&pool->flush_ser);
42855+ atomic_inc_unchecked(&pool->flush_ser);
42856 wake_up_interruptible(&pool->force_wait);
42857
42858 if (pool->flush_function)
42859@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42860 }
42861
42862 set_current_state(TASK_INTERRUPTIBLE);
42863- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42864+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42865 !kthread_should_stop())
42866 schedule();
42867 __set_current_state(TASK_RUNNING);
42868@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42869 pool->dirty_watermark = params->dirty_watermark;
42870 pool->dirty_len = 0;
42871 spin_lock_init(&pool->pool_lock);
42872- atomic_set(&pool->req_ser, 0);
42873- atomic_set(&pool->flush_ser, 0);
42874+ atomic_set_unchecked(&pool->req_ser, 0);
42875+ atomic_set_unchecked(&pool->flush_ser, 0);
42876 init_waitqueue_head(&pool->force_wait);
42877
42878 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42879@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42880 }
42881 spin_unlock_irq(&pool->pool_lock);
42882
42883- serial = atomic_inc_return(&pool->req_ser);
42884+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42885 wake_up_process(pool->thread);
42886
42887 if (wait_event_interruptible(pool->force_wait,
42888- atomic_read(&pool->flush_ser) - serial >= 0))
42889+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42890 return -EINTR;
42891
42892 return 0;
42893@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42894 } else {
42895 list_add_tail(&fmr->list, &pool->dirty_list);
42896 if (++pool->dirty_len >= pool->dirty_watermark) {
42897- atomic_inc(&pool->req_ser);
42898+ atomic_inc_unchecked(&pool->req_ser);
42899 wake_up_process(pool->thread);
42900 }
42901 }
42902diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
42903index 6c52e72..6303e3f 100644
42904--- a/drivers/infiniband/core/uverbs_cmd.c
42905+++ b/drivers/infiniband/core/uverbs_cmd.c
42906@@ -945,6 +945,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
42907 if (copy_from_user(&cmd, buf, sizeof cmd))
42908 return -EFAULT;
42909
42910+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
42911+ return -EFAULT;
42912+
42913 INIT_UDATA(&udata, buf + sizeof cmd,
42914 (unsigned long) cmd.response + sizeof resp,
42915 in_len - sizeof cmd, out_len - sizeof resp);
42916diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42917index cb43c22..2e12dd7 100644
42918--- a/drivers/infiniband/hw/cxgb4/mem.c
42919+++ b/drivers/infiniband/hw/cxgb4/mem.c
42920@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42921 int err;
42922 struct fw_ri_tpte tpt;
42923 u32 stag_idx;
42924- static atomic_t key;
42925+ static atomic_unchecked_t key;
42926
42927 if (c4iw_fatal_error(rdev))
42928 return -EIO;
42929@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42930 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42931 rdev->stats.stag.max = rdev->stats.stag.cur;
42932 mutex_unlock(&rdev->stats.lock);
42933- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42934+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42935 }
42936 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42937 __func__, stag_state, type, pdid, stag_idx);
42938diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42939index 79b3dbc..96e5fcc 100644
42940--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42941+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42942@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42943 struct ib_atomic_eth *ateth;
42944 struct ipath_ack_entry *e;
42945 u64 vaddr;
42946- atomic64_t *maddr;
42947+ atomic64_unchecked_t *maddr;
42948 u64 sdata;
42949 u32 rkey;
42950 u8 next;
42951@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42952 IB_ACCESS_REMOTE_ATOMIC)))
42953 goto nack_acc_unlck;
42954 /* Perform atomic OP and save result. */
42955- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42956+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42957 sdata = be64_to_cpu(ateth->swap_data);
42958 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42959 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42960- (u64) atomic64_add_return(sdata, maddr) - sdata :
42961+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42962 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42963 be64_to_cpu(ateth->compare_data),
42964 sdata);
42965diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42966index 1f95bba..9530f87 100644
42967--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42968+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42969@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42970 unsigned long flags;
42971 struct ib_wc wc;
42972 u64 sdata;
42973- atomic64_t *maddr;
42974+ atomic64_unchecked_t *maddr;
42975 enum ib_wc_status send_status;
42976
42977 /*
42978@@ -382,11 +382,11 @@ again:
42979 IB_ACCESS_REMOTE_ATOMIC)))
42980 goto acc_err;
42981 /* Perform atomic OP and save result. */
42982- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42983+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42984 sdata = wqe->wr.wr.atomic.compare_add;
42985 *(u64 *) sqp->s_sge.sge.vaddr =
42986 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42987- (u64) atomic64_add_return(sdata, maddr) - sdata :
42988+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42989 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42990 sdata, wqe->wr.wr.atomic.swap);
42991 goto send_comp;
42992diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42993index 729382c..2f82b8d 100644
42994--- a/drivers/infiniband/hw/mlx4/mad.c
42995+++ b/drivers/infiniband/hw/mlx4/mad.c
42996@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42997
42998 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42999 {
43000- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43001+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43002 cpu_to_be64(0xff00000000000000LL);
43003 }
43004
43005diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43006index ed327e6..ca1739e0 100644
43007--- a/drivers/infiniband/hw/mlx4/mcg.c
43008+++ b/drivers/infiniband/hw/mlx4/mcg.c
43009@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43010 {
43011 char name[20];
43012
43013- atomic_set(&ctx->tid, 0);
43014+ atomic_set_unchecked(&ctx->tid, 0);
43015 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43016 ctx->mcg_wq = create_singlethread_workqueue(name);
43017 if (!ctx->mcg_wq)
43018diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43019index 6eb743f..a7b0f6d 100644
43020--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43021+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43022@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
43023 struct list_head mcg_mgid0_list;
43024 struct workqueue_struct *mcg_wq;
43025 struct mlx4_ib_demux_pv_ctx **tun;
43026- atomic_t tid;
43027+ atomic_unchecked_t tid;
43028 int flushing; /* flushing the work queue */
43029 };
43030
43031diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43032index 9d3e5c1..6f166df 100644
43033--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43034+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43035@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43036 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43037 }
43038
43039-int mthca_QUERY_FW(struct mthca_dev *dev)
43040+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43041 {
43042 struct mthca_mailbox *mailbox;
43043 u32 *outbox;
43044@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43045 CMD_TIME_CLASS_B);
43046 }
43047
43048-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43049+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43050 int num_mtt)
43051 {
43052 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43053@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43054 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43055 }
43056
43057-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43058+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43059 int eq_num)
43060 {
43061 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43062@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43063 CMD_TIME_CLASS_B);
43064 }
43065
43066-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43067+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43068 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43069 void *in_mad, void *response_mad)
43070 {
43071diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43072index ded76c1..0cf0a08 100644
43073--- a/drivers/infiniband/hw/mthca/mthca_main.c
43074+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43075@@ -692,7 +692,7 @@ err_close:
43076 return err;
43077 }
43078
43079-static int mthca_setup_hca(struct mthca_dev *dev)
43080+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43081 {
43082 int err;
43083
43084diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43085index ed9a989..6aa5dc2 100644
43086--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43087+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43088@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43089 * through the bitmaps)
43090 */
43091
43092-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43093+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43094 {
43095 int o;
43096 int m;
43097@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43098 return key;
43099 }
43100
43101-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43102+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43103 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43104 {
43105 struct mthca_mailbox *mailbox;
43106@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43107 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43108 }
43109
43110-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43111+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43112 u64 *buffer_list, int buffer_size_shift,
43113 int list_len, u64 iova, u64 total_size,
43114 u32 access, struct mthca_mr *mr)
43115diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43116index 415f8e1..e34214e 100644
43117--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43118+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43119@@ -764,7 +764,7 @@ unlock:
43120 return 0;
43121 }
43122
43123-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43124+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43125 {
43126 struct mthca_dev *dev = to_mdev(ibcq->device);
43127 struct mthca_cq *cq = to_mcq(ibcq);
43128diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43129index 3b2a6dc..bce26ff 100644
43130--- a/drivers/infiniband/hw/nes/nes.c
43131+++ b/drivers/infiniband/hw/nes/nes.c
43132@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43133 LIST_HEAD(nes_adapter_list);
43134 static LIST_HEAD(nes_dev_list);
43135
43136-atomic_t qps_destroyed;
43137+atomic_unchecked_t qps_destroyed;
43138
43139 static unsigned int ee_flsh_adapter;
43140 static unsigned int sysfs_nonidx_addr;
43141@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43142 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43143 struct nes_adapter *nesadapter = nesdev->nesadapter;
43144
43145- atomic_inc(&qps_destroyed);
43146+ atomic_inc_unchecked(&qps_destroyed);
43147
43148 /* Free the control structures */
43149
43150diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43151index bd9d132..70d84f4 100644
43152--- a/drivers/infiniband/hw/nes/nes.h
43153+++ b/drivers/infiniband/hw/nes/nes.h
43154@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43155 extern unsigned int wqm_quanta;
43156 extern struct list_head nes_adapter_list;
43157
43158-extern atomic_t cm_connects;
43159-extern atomic_t cm_accepts;
43160-extern atomic_t cm_disconnects;
43161-extern atomic_t cm_closes;
43162-extern atomic_t cm_connecteds;
43163-extern atomic_t cm_connect_reqs;
43164-extern atomic_t cm_rejects;
43165-extern atomic_t mod_qp_timouts;
43166-extern atomic_t qps_created;
43167-extern atomic_t qps_destroyed;
43168-extern atomic_t sw_qps_destroyed;
43169+extern atomic_unchecked_t cm_connects;
43170+extern atomic_unchecked_t cm_accepts;
43171+extern atomic_unchecked_t cm_disconnects;
43172+extern atomic_unchecked_t cm_closes;
43173+extern atomic_unchecked_t cm_connecteds;
43174+extern atomic_unchecked_t cm_connect_reqs;
43175+extern atomic_unchecked_t cm_rejects;
43176+extern atomic_unchecked_t mod_qp_timouts;
43177+extern atomic_unchecked_t qps_created;
43178+extern atomic_unchecked_t qps_destroyed;
43179+extern atomic_unchecked_t sw_qps_destroyed;
43180 extern u32 mh_detected;
43181 extern u32 mh_pauses_sent;
43182 extern u32 cm_packets_sent;
43183@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43184 extern u32 cm_packets_received;
43185 extern u32 cm_packets_dropped;
43186 extern u32 cm_packets_retrans;
43187-extern atomic_t cm_listens_created;
43188-extern atomic_t cm_listens_destroyed;
43189+extern atomic_unchecked_t cm_listens_created;
43190+extern atomic_unchecked_t cm_listens_destroyed;
43191 extern u32 cm_backlog_drops;
43192-extern atomic_t cm_loopbacks;
43193-extern atomic_t cm_nodes_created;
43194-extern atomic_t cm_nodes_destroyed;
43195-extern atomic_t cm_accel_dropped_pkts;
43196-extern atomic_t cm_resets_recvd;
43197-extern atomic_t pau_qps_created;
43198-extern atomic_t pau_qps_destroyed;
43199+extern atomic_unchecked_t cm_loopbacks;
43200+extern atomic_unchecked_t cm_nodes_created;
43201+extern atomic_unchecked_t cm_nodes_destroyed;
43202+extern atomic_unchecked_t cm_accel_dropped_pkts;
43203+extern atomic_unchecked_t cm_resets_recvd;
43204+extern atomic_unchecked_t pau_qps_created;
43205+extern atomic_unchecked_t pau_qps_destroyed;
43206
43207 extern u32 int_mod_timer_init;
43208 extern u32 int_mod_cq_depth_256;
43209diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43210index 6f09a72..cf4399d 100644
43211--- a/drivers/infiniband/hw/nes/nes_cm.c
43212+++ b/drivers/infiniband/hw/nes/nes_cm.c
43213@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43214 u32 cm_packets_retrans;
43215 u32 cm_packets_created;
43216 u32 cm_packets_received;
43217-atomic_t cm_listens_created;
43218-atomic_t cm_listens_destroyed;
43219+atomic_unchecked_t cm_listens_created;
43220+atomic_unchecked_t cm_listens_destroyed;
43221 u32 cm_backlog_drops;
43222-atomic_t cm_loopbacks;
43223-atomic_t cm_nodes_created;
43224-atomic_t cm_nodes_destroyed;
43225-atomic_t cm_accel_dropped_pkts;
43226-atomic_t cm_resets_recvd;
43227+atomic_unchecked_t cm_loopbacks;
43228+atomic_unchecked_t cm_nodes_created;
43229+atomic_unchecked_t cm_nodes_destroyed;
43230+atomic_unchecked_t cm_accel_dropped_pkts;
43231+atomic_unchecked_t cm_resets_recvd;
43232
43233 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43234 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43235@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43236 /* instance of function pointers for client API */
43237 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43238 static struct nes_cm_ops nes_cm_api = {
43239- mini_cm_accelerated,
43240- mini_cm_listen,
43241- mini_cm_del_listen,
43242- mini_cm_connect,
43243- mini_cm_close,
43244- mini_cm_accept,
43245- mini_cm_reject,
43246- mini_cm_recv_pkt,
43247- mini_cm_dealloc_core,
43248- mini_cm_get,
43249- mini_cm_set
43250+ .accelerated = mini_cm_accelerated,
43251+ .listen = mini_cm_listen,
43252+ .stop_listener = mini_cm_del_listen,
43253+ .connect = mini_cm_connect,
43254+ .close = mini_cm_close,
43255+ .accept = mini_cm_accept,
43256+ .reject = mini_cm_reject,
43257+ .recv_pkt = mini_cm_recv_pkt,
43258+ .destroy_cm_core = mini_cm_dealloc_core,
43259+ .get = mini_cm_get,
43260+ .set = mini_cm_set
43261 };
43262
43263 static struct nes_cm_core *g_cm_core;
43264
43265-atomic_t cm_connects;
43266-atomic_t cm_accepts;
43267-atomic_t cm_disconnects;
43268-atomic_t cm_closes;
43269-atomic_t cm_connecteds;
43270-atomic_t cm_connect_reqs;
43271-atomic_t cm_rejects;
43272+atomic_unchecked_t cm_connects;
43273+atomic_unchecked_t cm_accepts;
43274+atomic_unchecked_t cm_disconnects;
43275+atomic_unchecked_t cm_closes;
43276+atomic_unchecked_t cm_connecteds;
43277+atomic_unchecked_t cm_connect_reqs;
43278+atomic_unchecked_t cm_rejects;
43279
43280 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43281 {
43282@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43283 kfree(listener);
43284 listener = NULL;
43285 ret = 0;
43286- atomic_inc(&cm_listens_destroyed);
43287+ atomic_inc_unchecked(&cm_listens_destroyed);
43288 } else {
43289 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43290 }
43291@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43292 cm_node->rem_mac);
43293
43294 add_hte_node(cm_core, cm_node);
43295- atomic_inc(&cm_nodes_created);
43296+ atomic_inc_unchecked(&cm_nodes_created);
43297
43298 return cm_node;
43299 }
43300@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43301 }
43302
43303 atomic_dec(&cm_core->node_cnt);
43304- atomic_inc(&cm_nodes_destroyed);
43305+ atomic_inc_unchecked(&cm_nodes_destroyed);
43306 nesqp = cm_node->nesqp;
43307 if (nesqp) {
43308 nesqp->cm_node = NULL;
43309@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43310
43311 static void drop_packet(struct sk_buff *skb)
43312 {
43313- atomic_inc(&cm_accel_dropped_pkts);
43314+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43315 dev_kfree_skb_any(skb);
43316 }
43317
43318@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43319 {
43320
43321 int reset = 0; /* whether to send reset in case of err.. */
43322- atomic_inc(&cm_resets_recvd);
43323+ atomic_inc_unchecked(&cm_resets_recvd);
43324 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43325 " refcnt=%d\n", cm_node, cm_node->state,
43326 atomic_read(&cm_node->ref_count));
43327@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43328 rem_ref_cm_node(cm_node->cm_core, cm_node);
43329 return NULL;
43330 }
43331- atomic_inc(&cm_loopbacks);
43332+ atomic_inc_unchecked(&cm_loopbacks);
43333 loopbackremotenode->loopbackpartner = cm_node;
43334 loopbackremotenode->tcp_cntxt.rcv_wscale =
43335 NES_CM_DEFAULT_RCV_WND_SCALE;
43336@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43337 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43338 else {
43339 rem_ref_cm_node(cm_core, cm_node);
43340- atomic_inc(&cm_accel_dropped_pkts);
43341+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43342 dev_kfree_skb_any(skb);
43343 }
43344 break;
43345@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43346
43347 if ((cm_id) && (cm_id->event_handler)) {
43348 if (issue_disconn) {
43349- atomic_inc(&cm_disconnects);
43350+ atomic_inc_unchecked(&cm_disconnects);
43351 cm_event.event = IW_CM_EVENT_DISCONNECT;
43352 cm_event.status = disconn_status;
43353 cm_event.local_addr = cm_id->local_addr;
43354@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43355 }
43356
43357 if (issue_close) {
43358- atomic_inc(&cm_closes);
43359+ atomic_inc_unchecked(&cm_closes);
43360 nes_disconnect(nesqp, 1);
43361
43362 cm_id->provider_data = nesqp;
43363@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43364
43365 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43366 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43367- atomic_inc(&cm_accepts);
43368+ atomic_inc_unchecked(&cm_accepts);
43369
43370 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43371 netdev_refcnt_read(nesvnic->netdev));
43372@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43373 struct nes_cm_core *cm_core;
43374 u8 *start_buff;
43375
43376- atomic_inc(&cm_rejects);
43377+ atomic_inc_unchecked(&cm_rejects);
43378 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43379 loopback = cm_node->loopbackpartner;
43380 cm_core = cm_node->cm_core;
43381@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43382 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43383 ntohs(laddr->sin_port));
43384
43385- atomic_inc(&cm_connects);
43386+ atomic_inc_unchecked(&cm_connects);
43387 nesqp->active_conn = 1;
43388
43389 /* cache the cm_id in the qp */
43390@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43391 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43392 return err;
43393 }
43394- atomic_inc(&cm_listens_created);
43395+ atomic_inc_unchecked(&cm_listens_created);
43396 }
43397
43398 cm_id->add_ref(cm_id);
43399@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43400
43401 if (nesqp->destroyed)
43402 return;
43403- atomic_inc(&cm_connecteds);
43404+ atomic_inc_unchecked(&cm_connecteds);
43405 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43406 " local port 0x%04X. jiffies = %lu.\n",
43407 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43408@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43409
43410 cm_id->add_ref(cm_id);
43411 ret = cm_id->event_handler(cm_id, &cm_event);
43412- atomic_inc(&cm_closes);
43413+ atomic_inc_unchecked(&cm_closes);
43414 cm_event.event = IW_CM_EVENT_CLOSE;
43415 cm_event.status = 0;
43416 cm_event.provider_data = cm_id->provider_data;
43417@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43418 return;
43419 cm_id = cm_node->cm_id;
43420
43421- atomic_inc(&cm_connect_reqs);
43422+ atomic_inc_unchecked(&cm_connect_reqs);
43423 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43424 cm_node, cm_id, jiffies);
43425
43426@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43427 return;
43428 cm_id = cm_node->cm_id;
43429
43430- atomic_inc(&cm_connect_reqs);
43431+ atomic_inc_unchecked(&cm_connect_reqs);
43432 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43433 cm_node, cm_id, jiffies);
43434
43435diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43436index 4166452..fc952c3 100644
43437--- a/drivers/infiniband/hw/nes/nes_mgt.c
43438+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43439@@ -40,8 +40,8 @@
43440 #include "nes.h"
43441 #include "nes_mgt.h"
43442
43443-atomic_t pau_qps_created;
43444-atomic_t pau_qps_destroyed;
43445+atomic_unchecked_t pau_qps_created;
43446+atomic_unchecked_t pau_qps_destroyed;
43447
43448 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43449 {
43450@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43451 {
43452 struct sk_buff *skb;
43453 unsigned long flags;
43454- atomic_inc(&pau_qps_destroyed);
43455+ atomic_inc_unchecked(&pau_qps_destroyed);
43456
43457 /* Free packets that have not yet been forwarded */
43458 /* Lock is acquired by skb_dequeue when removing the skb */
43459@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43460 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43461 skb_queue_head_init(&nesqp->pau_list);
43462 spin_lock_init(&nesqp->pau_lock);
43463- atomic_inc(&pau_qps_created);
43464+ atomic_inc_unchecked(&pau_qps_created);
43465 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43466 }
43467
43468diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43469index 49eb511..a774366 100644
43470--- a/drivers/infiniband/hw/nes/nes_nic.c
43471+++ b/drivers/infiniband/hw/nes/nes_nic.c
43472@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43473 target_stat_values[++index] = mh_detected;
43474 target_stat_values[++index] = mh_pauses_sent;
43475 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43476- target_stat_values[++index] = atomic_read(&cm_connects);
43477- target_stat_values[++index] = atomic_read(&cm_accepts);
43478- target_stat_values[++index] = atomic_read(&cm_disconnects);
43479- target_stat_values[++index] = atomic_read(&cm_connecteds);
43480- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43481- target_stat_values[++index] = atomic_read(&cm_rejects);
43482- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43483- target_stat_values[++index] = atomic_read(&qps_created);
43484- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43485- target_stat_values[++index] = atomic_read(&qps_destroyed);
43486- target_stat_values[++index] = atomic_read(&cm_closes);
43487+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43488+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43489+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43490+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43491+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43492+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43493+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43494+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43495+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43496+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43497+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43498 target_stat_values[++index] = cm_packets_sent;
43499 target_stat_values[++index] = cm_packets_bounced;
43500 target_stat_values[++index] = cm_packets_created;
43501 target_stat_values[++index] = cm_packets_received;
43502 target_stat_values[++index] = cm_packets_dropped;
43503 target_stat_values[++index] = cm_packets_retrans;
43504- target_stat_values[++index] = atomic_read(&cm_listens_created);
43505- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43506+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43507+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43508 target_stat_values[++index] = cm_backlog_drops;
43509- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43510- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43511- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43512- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43513- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43514+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43515+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43516+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43517+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43518+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43519 target_stat_values[++index] = nesadapter->free_4kpbl;
43520 target_stat_values[++index] = nesadapter->free_256pbl;
43521 target_stat_values[++index] = int_mod_timer_init;
43522 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43523 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43524 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43525- target_stat_values[++index] = atomic_read(&pau_qps_created);
43526- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43527+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43528+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43529 }
43530
43531 /**
43532diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43533index c0d0296..3185f57 100644
43534--- a/drivers/infiniband/hw/nes/nes_verbs.c
43535+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43536@@ -46,9 +46,9 @@
43537
43538 #include <rdma/ib_umem.h>
43539
43540-atomic_t mod_qp_timouts;
43541-atomic_t qps_created;
43542-atomic_t sw_qps_destroyed;
43543+atomic_unchecked_t mod_qp_timouts;
43544+atomic_unchecked_t qps_created;
43545+atomic_unchecked_t sw_qps_destroyed;
43546
43547 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43548
43549@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43550 if (init_attr->create_flags)
43551 return ERR_PTR(-EINVAL);
43552
43553- atomic_inc(&qps_created);
43554+ atomic_inc_unchecked(&qps_created);
43555 switch (init_attr->qp_type) {
43556 case IB_QPT_RC:
43557 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43558@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43559 struct iw_cm_event cm_event;
43560 int ret = 0;
43561
43562- atomic_inc(&sw_qps_destroyed);
43563+ atomic_inc_unchecked(&sw_qps_destroyed);
43564 nesqp->destroyed = 1;
43565
43566 /* Blow away the connection if it exists. */
43567diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43568index b218254..1d1aa3c 100644
43569--- a/drivers/infiniband/hw/qib/qib.h
43570+++ b/drivers/infiniband/hw/qib/qib.h
43571@@ -52,6 +52,7 @@
43572 #include <linux/kref.h>
43573 #include <linux/sched.h>
43574 #include <linux/kthread.h>
43575+#include <linux/slab.h>
43576
43577 #include "qib_common.h"
43578 #include "qib_verbs.h"
43579diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43580index cdc7df4..a2fdfdb 100644
43581--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43582+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43583@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43584 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43585 }
43586
43587-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43588+static struct rtnl_link_ops ipoib_link_ops = {
43589 .kind = "ipoib",
43590 .maxtype = IFLA_IPOIB_MAX,
43591 .policy = ipoib_policy,
43592diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43593index e853a21..56fc5a8 100644
43594--- a/drivers/input/gameport/gameport.c
43595+++ b/drivers/input/gameport/gameport.c
43596@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43597 */
43598 static void gameport_init_port(struct gameport *gameport)
43599 {
43600- static atomic_t gameport_no = ATOMIC_INIT(-1);
43601+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43602
43603 __module_get(THIS_MODULE);
43604
43605 mutex_init(&gameport->drv_mutex);
43606 device_initialize(&gameport->dev);
43607 dev_set_name(&gameport->dev, "gameport%lu",
43608- (unsigned long)atomic_inc_return(&gameport_no));
43609+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43610 gameport->dev.bus = &gameport_bus;
43611 gameport->dev.release = gameport_release_port;
43612 if (gameport->parent)
43613diff --git a/drivers/input/input.c b/drivers/input/input.c
43614index 213e3a1..4fea837 100644
43615--- a/drivers/input/input.c
43616+++ b/drivers/input/input.c
43617@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43618 */
43619 struct input_dev *input_allocate_device(void)
43620 {
43621- static atomic_t input_no = ATOMIC_INIT(-1);
43622+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43623 struct input_dev *dev;
43624
43625 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43626@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43627 INIT_LIST_HEAD(&dev->node);
43628
43629 dev_set_name(&dev->dev, "input%lu",
43630- (unsigned long)atomic_inc_return(&input_no));
43631+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43632
43633 __module_get(THIS_MODULE);
43634 }
43635diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43636index 4a95b22..874c182 100644
43637--- a/drivers/input/joystick/sidewinder.c
43638+++ b/drivers/input/joystick/sidewinder.c
43639@@ -30,6 +30,7 @@
43640 #include <linux/kernel.h>
43641 #include <linux/module.h>
43642 #include <linux/slab.h>
43643+#include <linux/sched.h>
43644 #include <linux/input.h>
43645 #include <linux/gameport.h>
43646 #include <linux/jiffies.h>
43647diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43648index 3aa2f3f..53c00ea 100644
43649--- a/drivers/input/joystick/xpad.c
43650+++ b/drivers/input/joystick/xpad.c
43651@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43652
43653 static int xpad_led_probe(struct usb_xpad *xpad)
43654 {
43655- static atomic_t led_seq = ATOMIC_INIT(-1);
43656+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43657 unsigned long led_no;
43658 struct xpad_led *led;
43659 struct led_classdev *led_cdev;
43660@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43661 if (!led)
43662 return -ENOMEM;
43663
43664- led_no = atomic_inc_return(&led_seq);
43665+ led_no = atomic_inc_return_unchecked(&led_seq);
43666
43667 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43668 led->xpad = xpad;
43669diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43670index ac1fa5f..5f7502c 100644
43671--- a/drivers/input/misc/ims-pcu.c
43672+++ b/drivers/input/misc/ims-pcu.c
43673@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43674
43675 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43676 {
43677- static atomic_t device_no = ATOMIC_INIT(-1);
43678+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43679
43680 const struct ims_pcu_device_info *info;
43681 int error;
43682@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43683 }
43684
43685 /* Device appears to be operable, complete initialization */
43686- pcu->device_no = atomic_inc_return(&device_no);
43687+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43688
43689 /*
43690 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43691diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43692index f4cf664..3204fda 100644
43693--- a/drivers/input/mouse/psmouse.h
43694+++ b/drivers/input/mouse/psmouse.h
43695@@ -117,7 +117,7 @@ struct psmouse_attribute {
43696 ssize_t (*set)(struct psmouse *psmouse, void *data,
43697 const char *buf, size_t count);
43698 bool protect;
43699-};
43700+} __do_const;
43701 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43702
43703 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43704diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43705index b604564..3f14ae4 100644
43706--- a/drivers/input/mousedev.c
43707+++ b/drivers/input/mousedev.c
43708@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43709
43710 spin_unlock_irq(&client->packet_lock);
43711
43712- if (copy_to_user(buffer, data, count))
43713+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43714 return -EFAULT;
43715
43716 return count;
43717diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43718index a05a517..323a2fd 100644
43719--- a/drivers/input/serio/serio.c
43720+++ b/drivers/input/serio/serio.c
43721@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43722 */
43723 static void serio_init_port(struct serio *serio)
43724 {
43725- static atomic_t serio_no = ATOMIC_INIT(-1);
43726+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43727
43728 __module_get(THIS_MODULE);
43729
43730@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43731 mutex_init(&serio->drv_mutex);
43732 device_initialize(&serio->dev);
43733 dev_set_name(&serio->dev, "serio%lu",
43734- (unsigned long)atomic_inc_return(&serio_no));
43735+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43736 serio->dev.bus = &serio_bus;
43737 serio->dev.release = serio_release_port;
43738 serio->dev.groups = serio_device_attr_groups;
43739diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43740index 71ef5d6..93380a9 100644
43741--- a/drivers/input/serio/serio_raw.c
43742+++ b/drivers/input/serio/serio_raw.c
43743@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43744
43745 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43746 {
43747- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43748+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43749 struct serio_raw *serio_raw;
43750 int err;
43751
43752@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43753 }
43754
43755 snprintf(serio_raw->name, sizeof(serio_raw->name),
43756- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43757+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43758 kref_init(&serio_raw->kref);
43759 INIT_LIST_HEAD(&serio_raw->client_list);
43760 init_waitqueue_head(&serio_raw->wait);
43761diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43762index 92e2243..8fd9092 100644
43763--- a/drivers/input/touchscreen/htcpen.c
43764+++ b/drivers/input/touchscreen/htcpen.c
43765@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43766 }
43767 };
43768
43769-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43770+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43771 {
43772 .ident = "Shift",
43773 .matches = {
43774diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43775index 9802485..2e9941d 100644
43776--- a/drivers/iommu/amd_iommu.c
43777+++ b/drivers/iommu/amd_iommu.c
43778@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43779
43780 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43781 {
43782+ phys_addr_t physaddr;
43783 WARN_ON(address & 0x7ULL);
43784
43785 memset(cmd, 0, sizeof(*cmd));
43786- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43787- cmd->data[1] = upper_32_bits(__pa(address));
43788+
43789+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43790+ if (object_starts_on_stack((void *)address)) {
43791+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43792+ physaddr = __pa((u64)adjbuf);
43793+ } else
43794+#endif
43795+ physaddr = __pa(address);
43796+
43797+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43798+ cmd->data[1] = upper_32_bits(physaddr);
43799 cmd->data[2] = 1;
43800 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43801 }
43802diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43803index 6cd47b7..264d14a 100644
43804--- a/drivers/iommu/arm-smmu.c
43805+++ b/drivers/iommu/arm-smmu.c
43806@@ -968,7 +968,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43807 cfg->irptndx = cfg->cbndx;
43808 }
43809
43810- ACCESS_ONCE(smmu_domain->smmu) = smmu;
43811+ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43812 arm_smmu_init_context_bank(smmu_domain);
43813 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43814
43815diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43816index f7718d7..3ef740b 100644
43817--- a/drivers/iommu/iommu.c
43818+++ b/drivers/iommu/iommu.c
43819@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43820 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43821 {
43822 int err;
43823- struct notifier_block *nb;
43824+ notifier_block_no_const *nb;
43825 struct iommu_callback_data cb = {
43826 .ops = ops,
43827 };
43828diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43829index 89c4846..1de796f 100644
43830--- a/drivers/iommu/irq_remapping.c
43831+++ b/drivers/iommu/irq_remapping.c
43832@@ -353,7 +353,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43833 void panic_if_irq_remap(const char *msg)
43834 {
43835 if (irq_remapping_enabled)
43836- panic(msg);
43837+ panic("%s", msg);
43838 }
43839
43840 static void ir_ack_apic_edge(struct irq_data *data)
43841@@ -374,10 +374,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43842
43843 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43844 {
43845- chip->irq_print_chip = ir_print_prefix;
43846- chip->irq_ack = ir_ack_apic_edge;
43847- chip->irq_eoi = ir_ack_apic_level;
43848- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43849+ pax_open_kernel();
43850+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43851+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43852+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43853+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43854+ pax_close_kernel();
43855 }
43856
43857 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43858diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43859index d617ee5..df8be8b 100644
43860--- a/drivers/irqchip/irq-gic.c
43861+++ b/drivers/irqchip/irq-gic.c
43862@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43863 * Supported arch specific GIC irq extension.
43864 * Default make them NULL.
43865 */
43866-struct irq_chip gic_arch_extn = {
43867+irq_chip_no_const gic_arch_extn = {
43868 .irq_eoi = NULL,
43869 .irq_mask = NULL,
43870 .irq_unmask = NULL,
43871@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43872 chained_irq_exit(chip, desc);
43873 }
43874
43875-static struct irq_chip gic_chip = {
43876+static irq_chip_no_const gic_chip __read_only = {
43877 .name = "GIC",
43878 .irq_mask = gic_mask_irq,
43879 .irq_unmask = gic_unmask_irq,
43880diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
43881index 078cac5..fb0f846 100644
43882--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
43883+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
43884@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
43885 struct intc_irqpin_iomem *i;
43886 struct resource *io[INTC_IRQPIN_REG_NR];
43887 struct resource *irq;
43888- struct irq_chip *irq_chip;
43889+ irq_chip_no_const *irq_chip;
43890 void (*enable_fn)(struct irq_data *d);
43891 void (*disable_fn)(struct irq_data *d);
43892 const char *name = dev_name(dev);
43893diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43894index 384e6ed..7a771b2 100644
43895--- a/drivers/irqchip/irq-renesas-irqc.c
43896+++ b/drivers/irqchip/irq-renesas-irqc.c
43897@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43898 struct irqc_priv *p;
43899 struct resource *io;
43900 struct resource *irq;
43901- struct irq_chip *irq_chip;
43902+ irq_chip_no_const *irq_chip;
43903 const char *name = dev_name(&pdev->dev);
43904 int ret;
43905 int k;
43906diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43907index 6a2df32..dc962f1 100644
43908--- a/drivers/isdn/capi/capi.c
43909+++ b/drivers/isdn/capi/capi.c
43910@@ -81,8 +81,8 @@ struct capiminor {
43911
43912 struct capi20_appl *ap;
43913 u32 ncci;
43914- atomic_t datahandle;
43915- atomic_t msgid;
43916+ atomic_unchecked_t datahandle;
43917+ atomic_unchecked_t msgid;
43918
43919 struct tty_port port;
43920 int ttyinstop;
43921@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43922 capimsg_setu16(s, 2, mp->ap->applid);
43923 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43924 capimsg_setu8 (s, 5, CAPI_RESP);
43925- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43926+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43927 capimsg_setu32(s, 8, mp->ncci);
43928 capimsg_setu16(s, 12, datahandle);
43929 }
43930@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43931 mp->outbytes -= len;
43932 spin_unlock_bh(&mp->outlock);
43933
43934- datahandle = atomic_inc_return(&mp->datahandle);
43935+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43936 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43937 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43938 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43939 capimsg_setu16(skb->data, 2, mp->ap->applid);
43940 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43941 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43942- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43943+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43944 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43945 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43946 capimsg_setu16(skb->data, 16, len); /* Data length */
43947diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43948index aecec6d..11e13c5 100644
43949--- a/drivers/isdn/gigaset/bas-gigaset.c
43950+++ b/drivers/isdn/gigaset/bas-gigaset.c
43951@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43952
43953
43954 static const struct gigaset_ops gigops = {
43955- gigaset_write_cmd,
43956- gigaset_write_room,
43957- gigaset_chars_in_buffer,
43958- gigaset_brkchars,
43959- gigaset_init_bchannel,
43960- gigaset_close_bchannel,
43961- gigaset_initbcshw,
43962- gigaset_freebcshw,
43963- gigaset_reinitbcshw,
43964- gigaset_initcshw,
43965- gigaset_freecshw,
43966- gigaset_set_modem_ctrl,
43967- gigaset_baud_rate,
43968- gigaset_set_line_ctrl,
43969- gigaset_isoc_send_skb,
43970- gigaset_isoc_input,
43971+ .write_cmd = gigaset_write_cmd,
43972+ .write_room = gigaset_write_room,
43973+ .chars_in_buffer = gigaset_chars_in_buffer,
43974+ .brkchars = gigaset_brkchars,
43975+ .init_bchannel = gigaset_init_bchannel,
43976+ .close_bchannel = gigaset_close_bchannel,
43977+ .initbcshw = gigaset_initbcshw,
43978+ .freebcshw = gigaset_freebcshw,
43979+ .reinitbcshw = gigaset_reinitbcshw,
43980+ .initcshw = gigaset_initcshw,
43981+ .freecshw = gigaset_freecshw,
43982+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43983+ .baud_rate = gigaset_baud_rate,
43984+ .set_line_ctrl = gigaset_set_line_ctrl,
43985+ .send_skb = gigaset_isoc_send_skb,
43986+ .handle_input = gigaset_isoc_input,
43987 };
43988
43989 /* bas_gigaset_init
43990diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43991index 600c79b..3752bab 100644
43992--- a/drivers/isdn/gigaset/interface.c
43993+++ b/drivers/isdn/gigaset/interface.c
43994@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43995 }
43996 tty->driver_data = cs;
43997
43998- ++cs->port.count;
43999+ atomic_inc(&cs->port.count);
44000
44001- if (cs->port.count == 1) {
44002+ if (atomic_read(&cs->port.count) == 1) {
44003 tty_port_tty_set(&cs->port, tty);
44004 cs->port.low_latency = 1;
44005 }
44006@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44007
44008 if (!cs->connected)
44009 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44010- else if (!cs->port.count)
44011+ else if (!atomic_read(&cs->port.count))
44012 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44013- else if (!--cs->port.count)
44014+ else if (!atomic_dec_return(&cs->port.count))
44015 tty_port_tty_set(&cs->port, NULL);
44016
44017 mutex_unlock(&cs->mutex);
44018diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44019index 8c91fd5..14f13ce 100644
44020--- a/drivers/isdn/gigaset/ser-gigaset.c
44021+++ b/drivers/isdn/gigaset/ser-gigaset.c
44022@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44023 }
44024
44025 static const struct gigaset_ops ops = {
44026- gigaset_write_cmd,
44027- gigaset_write_room,
44028- gigaset_chars_in_buffer,
44029- gigaset_brkchars,
44030- gigaset_init_bchannel,
44031- gigaset_close_bchannel,
44032- gigaset_initbcshw,
44033- gigaset_freebcshw,
44034- gigaset_reinitbcshw,
44035- gigaset_initcshw,
44036- gigaset_freecshw,
44037- gigaset_set_modem_ctrl,
44038- gigaset_baud_rate,
44039- gigaset_set_line_ctrl,
44040- gigaset_m10x_send_skb, /* asyncdata.c */
44041- gigaset_m10x_input, /* asyncdata.c */
44042+ .write_cmd = gigaset_write_cmd,
44043+ .write_room = gigaset_write_room,
44044+ .chars_in_buffer = gigaset_chars_in_buffer,
44045+ .brkchars = gigaset_brkchars,
44046+ .init_bchannel = gigaset_init_bchannel,
44047+ .close_bchannel = gigaset_close_bchannel,
44048+ .initbcshw = gigaset_initbcshw,
44049+ .freebcshw = gigaset_freebcshw,
44050+ .reinitbcshw = gigaset_reinitbcshw,
44051+ .initcshw = gigaset_initcshw,
44052+ .freecshw = gigaset_freecshw,
44053+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44054+ .baud_rate = gigaset_baud_rate,
44055+ .set_line_ctrl = gigaset_set_line_ctrl,
44056+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44057+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44058 };
44059
44060
44061diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44062index 5f306e2..5342f88 100644
44063--- a/drivers/isdn/gigaset/usb-gigaset.c
44064+++ b/drivers/isdn/gigaset/usb-gigaset.c
44065@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44066 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44067 memcpy(cs->hw.usb->bchars, buf, 6);
44068 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44069- 0, 0, &buf, 6, 2000);
44070+ 0, 0, buf, 6, 2000);
44071 }
44072
44073 static void gigaset_freebcshw(struct bc_state *bcs)
44074@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44075 }
44076
44077 static const struct gigaset_ops ops = {
44078- gigaset_write_cmd,
44079- gigaset_write_room,
44080- gigaset_chars_in_buffer,
44081- gigaset_brkchars,
44082- gigaset_init_bchannel,
44083- gigaset_close_bchannel,
44084- gigaset_initbcshw,
44085- gigaset_freebcshw,
44086- gigaset_reinitbcshw,
44087- gigaset_initcshw,
44088- gigaset_freecshw,
44089- gigaset_set_modem_ctrl,
44090- gigaset_baud_rate,
44091- gigaset_set_line_ctrl,
44092- gigaset_m10x_send_skb,
44093- gigaset_m10x_input,
44094+ .write_cmd = gigaset_write_cmd,
44095+ .write_room = gigaset_write_room,
44096+ .chars_in_buffer = gigaset_chars_in_buffer,
44097+ .brkchars = gigaset_brkchars,
44098+ .init_bchannel = gigaset_init_bchannel,
44099+ .close_bchannel = gigaset_close_bchannel,
44100+ .initbcshw = gigaset_initbcshw,
44101+ .freebcshw = gigaset_freebcshw,
44102+ .reinitbcshw = gigaset_reinitbcshw,
44103+ .initcshw = gigaset_initcshw,
44104+ .freecshw = gigaset_freecshw,
44105+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44106+ .baud_rate = gigaset_baud_rate,
44107+ .set_line_ctrl = gigaset_set_line_ctrl,
44108+ .send_skb = gigaset_m10x_send_skb,
44109+ .handle_input = gigaset_m10x_input,
44110 };
44111
44112 /*
44113diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44114index 4d9b195..455075c 100644
44115--- a/drivers/isdn/hardware/avm/b1.c
44116+++ b/drivers/isdn/hardware/avm/b1.c
44117@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44118 }
44119 if (left) {
44120 if (t4file->user) {
44121- if (copy_from_user(buf, dp, left))
44122+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44123 return -EFAULT;
44124 } else {
44125 memcpy(buf, dp, left);
44126@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44127 }
44128 if (left) {
44129 if (config->user) {
44130- if (copy_from_user(buf, dp, left))
44131+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44132 return -EFAULT;
44133 } else {
44134 memcpy(buf, dp, left);
44135diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44136index 9b856e1..fa03c92 100644
44137--- a/drivers/isdn/i4l/isdn_common.c
44138+++ b/drivers/isdn/i4l/isdn_common.c
44139@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44140 } else
44141 return -EINVAL;
44142 case IIOCDBGVAR:
44143+ if (!capable(CAP_SYS_RAWIO))
44144+ return -EPERM;
44145 if (arg) {
44146 if (copy_to_user(argp, &dev, sizeof(ulong)))
44147 return -EFAULT;
44148diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44149index 91d5730..336523e 100644
44150--- a/drivers/isdn/i4l/isdn_concap.c
44151+++ b/drivers/isdn/i4l/isdn_concap.c
44152@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44153 }
44154
44155 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44156- &isdn_concap_dl_data_req,
44157- &isdn_concap_dl_connect_req,
44158- &isdn_concap_dl_disconn_req
44159+ .data_req = &isdn_concap_dl_data_req,
44160+ .connect_req = &isdn_concap_dl_connect_req,
44161+ .disconn_req = &isdn_concap_dl_disconn_req
44162 };
44163
44164 /* The following should better go into a dedicated source file such that
44165diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44166index bc91261..2ef7e36 100644
44167--- a/drivers/isdn/i4l/isdn_tty.c
44168+++ b/drivers/isdn/i4l/isdn_tty.c
44169@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44170
44171 #ifdef ISDN_DEBUG_MODEM_OPEN
44172 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44173- port->count);
44174+ atomic_read(&port->count));
44175 #endif
44176- port->count++;
44177+ atomic_inc(&port->count);
44178 port->tty = tty;
44179 /*
44180 * Start up serial port
44181@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44182 #endif
44183 return;
44184 }
44185- if ((tty->count == 1) && (port->count != 1)) {
44186+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44187 /*
44188 * Uh, oh. tty->count is 1, which means that the tty
44189 * structure will be freed. Info->count should always
44190@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44191 * serial port won't be shutdown.
44192 */
44193 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44194- "info->count is %d\n", port->count);
44195- port->count = 1;
44196+ "info->count is %d\n", atomic_read(&port->count));
44197+ atomic_set(&port->count, 1);
44198 }
44199- if (--port->count < 0) {
44200+ if (atomic_dec_return(&port->count) < 0) {
44201 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44202- info->line, port->count);
44203- port->count = 0;
44204+ info->line, atomic_read(&port->count));
44205+ atomic_set(&port->count, 0);
44206 }
44207- if (port->count) {
44208+ if (atomic_read(&port->count)) {
44209 #ifdef ISDN_DEBUG_MODEM_OPEN
44210 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44211 #endif
44212@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44213 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44214 return;
44215 isdn_tty_shutdown(info);
44216- port->count = 0;
44217+ atomic_set(&port->count, 0);
44218 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44219 port->tty = NULL;
44220 wake_up_interruptible(&port->open_wait);
44221@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44222 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44223 modem_info *info = &dev->mdm.info[i];
44224
44225- if (info->port.count == 0)
44226+ if (atomic_read(&info->port.count) == 0)
44227 continue;
44228 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44229 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44230diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44231index e2d4e58..40cd045 100644
44232--- a/drivers/isdn/i4l/isdn_x25iface.c
44233+++ b/drivers/isdn/i4l/isdn_x25iface.c
44234@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44235
44236
44237 static struct concap_proto_ops ix25_pops = {
44238- &isdn_x25iface_proto_new,
44239- &isdn_x25iface_proto_del,
44240- &isdn_x25iface_proto_restart,
44241- &isdn_x25iface_proto_close,
44242- &isdn_x25iface_xmit,
44243- &isdn_x25iface_receive,
44244- &isdn_x25iface_connect_ind,
44245- &isdn_x25iface_disconn_ind
44246+ .proto_new = &isdn_x25iface_proto_new,
44247+ .proto_del = &isdn_x25iface_proto_del,
44248+ .restart = &isdn_x25iface_proto_restart,
44249+ .close = &isdn_x25iface_proto_close,
44250+ .encap_and_xmit = &isdn_x25iface_xmit,
44251+ .data_ind = &isdn_x25iface_receive,
44252+ .connect_ind = &isdn_x25iface_connect_ind,
44253+ .disconn_ind = &isdn_x25iface_disconn_ind
44254 };
44255
44256 /* error message helper function */
44257diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44258index 6a7447c..b4987ea 100644
44259--- a/drivers/isdn/icn/icn.c
44260+++ b/drivers/isdn/icn/icn.c
44261@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44262 if (count > len)
44263 count = len;
44264 if (user) {
44265- if (copy_from_user(msg, buf, count))
44266+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44267 return -EFAULT;
44268 } else
44269 memcpy(msg, buf, count);
44270@@ -1609,7 +1609,7 @@ icn_setup(char *line)
44271 if (ints[0] > 1)
44272 membase = (unsigned long)ints[2];
44273 if (str && *str) {
44274- strcpy(sid, str);
44275+ strlcpy(sid, str, sizeof(sid));
44276 icn_id = sid;
44277 if ((p = strchr(sid, ','))) {
44278 *p++ = 0;
44279diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44280index 87f7dff..7300125 100644
44281--- a/drivers/isdn/mISDN/dsp_cmx.c
44282+++ b/drivers/isdn/mISDN/dsp_cmx.c
44283@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44284 static u16 dsp_count; /* last sample count */
44285 static int dsp_count_valid; /* if we have last sample count */
44286
44287-void
44288+void __intentional_overflow(-1)
44289 dsp_cmx_send(void *arg)
44290 {
44291 struct dsp_conf *conf;
44292diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44293index 0f9ed1e..2715d6f 100644
44294--- a/drivers/leds/leds-clevo-mail.c
44295+++ b/drivers/leds/leds-clevo-mail.c
44296@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44297 * detected as working, but in reality it is not) as low as
44298 * possible.
44299 */
44300-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44301+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44302 {
44303 .callback = clevo_mail_led_dmi_callback,
44304 .ident = "Clevo D410J",
44305diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44306index 046cb70..6b20d39 100644
44307--- a/drivers/leds/leds-ss4200.c
44308+++ b/drivers/leds/leds-ss4200.c
44309@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44310 * detected as working, but in reality it is not) as low as
44311 * possible.
44312 */
44313-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44314+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44315 {
44316 .callback = ss4200_led_dmi_callback,
44317 .ident = "Intel SS4200-E",
44318diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44319index 6590558..a74c5dd 100644
44320--- a/drivers/lguest/core.c
44321+++ b/drivers/lguest/core.c
44322@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44323 * The end address needs +1 because __get_vm_area allocates an
44324 * extra guard page, so we need space for that.
44325 */
44326+
44327+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44328+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44329+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44330+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44331+#else
44332 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44333 VM_ALLOC, switcher_addr, switcher_addr
44334 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44335+#endif
44336+
44337 if (!switcher_vma) {
44338 err = -ENOMEM;
44339 printk("lguest: could not map switcher pages high\n");
44340@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44341 * Now the Switcher is mapped at the right address, we can't fail!
44342 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44343 */
44344- memcpy(switcher_vma->addr, start_switcher_text,
44345+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44346 end_switcher_text - start_switcher_text);
44347
44348 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44349diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44350index e8b55c3..3514c37 100644
44351--- a/drivers/lguest/page_tables.c
44352+++ b/drivers/lguest/page_tables.c
44353@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44354 /*:*/
44355
44356 #ifdef CONFIG_X86_PAE
44357-static void release_pmd(pmd_t *spmd)
44358+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44359 {
44360 /* If the entry's not present, there's nothing to release. */
44361 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44362diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44363index 922a1ac..9dd0c2a 100644
44364--- a/drivers/lguest/x86/core.c
44365+++ b/drivers/lguest/x86/core.c
44366@@ -59,7 +59,7 @@ static struct {
44367 /* Offset from where switcher.S was compiled to where we've copied it */
44368 static unsigned long switcher_offset(void)
44369 {
44370- return switcher_addr - (unsigned long)start_switcher_text;
44371+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44372 }
44373
44374 /* This cpu's struct lguest_pages (after the Switcher text page) */
44375@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44376 * These copies are pretty cheap, so we do them unconditionally: */
44377 /* Save the current Host top-level page directory.
44378 */
44379+
44380+#ifdef CONFIG_PAX_PER_CPU_PGD
44381+ pages->state.host_cr3 = read_cr3();
44382+#else
44383 pages->state.host_cr3 = __pa(current->mm->pgd);
44384+#endif
44385+
44386 /*
44387 * Set up the Guest's page tables to see this CPU's pages (and no
44388 * other CPU's pages).
44389@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44390 * compiled-in switcher code and the high-mapped copy we just made.
44391 */
44392 for (i = 0; i < IDT_ENTRIES; i++)
44393- default_idt_entries[i] += switcher_offset();
44394+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44395
44396 /*
44397 * Set up the Switcher's per-cpu areas.
44398@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44399 * it will be undisturbed when we switch. To change %cs and jump we
44400 * need this structure to feed to Intel's "lcall" instruction.
44401 */
44402- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44403+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44404 lguest_entry.segment = LGUEST_CS;
44405
44406 /*
44407diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44408index 40634b0..4f5855e 100644
44409--- a/drivers/lguest/x86/switcher_32.S
44410+++ b/drivers/lguest/x86/switcher_32.S
44411@@ -87,6 +87,7 @@
44412 #include <asm/page.h>
44413 #include <asm/segment.h>
44414 #include <asm/lguest.h>
44415+#include <asm/processor-flags.h>
44416
44417 // We mark the start of the code to copy
44418 // It's placed in .text tho it's never run here
44419@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44420 // Changes type when we load it: damn Intel!
44421 // For after we switch over our page tables
44422 // That entry will be read-only: we'd crash.
44423+
44424+#ifdef CONFIG_PAX_KERNEXEC
44425+ mov %cr0, %edx
44426+ xor $X86_CR0_WP, %edx
44427+ mov %edx, %cr0
44428+#endif
44429+
44430 movl $(GDT_ENTRY_TSS*8), %edx
44431 ltr %dx
44432
44433@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44434 // Let's clear it again for our return.
44435 // The GDT descriptor of the Host
44436 // Points to the table after two "size" bytes
44437- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44438+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44439 // Clear "used" from type field (byte 5, bit 2)
44440- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44441+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44442+
44443+#ifdef CONFIG_PAX_KERNEXEC
44444+ mov %cr0, %eax
44445+ xor $X86_CR0_WP, %eax
44446+ mov %eax, %cr0
44447+#endif
44448
44449 // Once our page table's switched, the Guest is live!
44450 // The Host fades as we run this final step.
44451@@ -295,13 +309,12 @@ deliver_to_host:
44452 // I consulted gcc, and it gave
44453 // These instructions, which I gladly credit:
44454 leal (%edx,%ebx,8), %eax
44455- movzwl (%eax),%edx
44456- movl 4(%eax), %eax
44457- xorw %ax, %ax
44458- orl %eax, %edx
44459+ movl 4(%eax), %edx
44460+ movw (%eax), %dx
44461 // Now the address of the handler's in %edx
44462 // We call it now: its "iret" drops us home.
44463- jmp *%edx
44464+ ljmp $__KERNEL_CS, $1f
44465+1: jmp *%edx
44466
44467 // Every interrupt can come to us here
44468 // But we must truly tell each apart.
44469diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44470index a08e3ee..df8ade2 100644
44471--- a/drivers/md/bcache/closure.h
44472+++ b/drivers/md/bcache/closure.h
44473@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44474 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44475 struct workqueue_struct *wq)
44476 {
44477- BUG_ON(object_is_on_stack(cl));
44478+ BUG_ON(object_starts_on_stack(cl));
44479 closure_set_ip(cl);
44480 cl->fn = fn;
44481 cl->wq = wq;
44482diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44483index 1695ee5..89f18ab 100644
44484--- a/drivers/md/bitmap.c
44485+++ b/drivers/md/bitmap.c
44486@@ -1784,7 +1784,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44487 chunk_kb ? "KB" : "B");
44488 if (bitmap->storage.file) {
44489 seq_printf(seq, ", file: ");
44490- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44491+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44492 }
44493
44494 seq_printf(seq, "\n");
44495diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44496index 73f791b..8c5d3ac 100644
44497--- a/drivers/md/dm-ioctl.c
44498+++ b/drivers/md/dm-ioctl.c
44499@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44500 cmd == DM_LIST_VERSIONS_CMD)
44501 return 0;
44502
44503- if ((cmd == DM_DEV_CREATE_CMD)) {
44504+ if (cmd == DM_DEV_CREATE_CMD) {
44505 if (!*param->name) {
44506 DMWARN("name not supplied when creating device");
44507 return -EINVAL;
44508diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44509index 089d627..ef7352e 100644
44510--- a/drivers/md/dm-raid1.c
44511+++ b/drivers/md/dm-raid1.c
44512@@ -40,7 +40,7 @@ enum dm_raid1_error {
44513
44514 struct mirror {
44515 struct mirror_set *ms;
44516- atomic_t error_count;
44517+ atomic_unchecked_t error_count;
44518 unsigned long error_type;
44519 struct dm_dev *dev;
44520 sector_t offset;
44521@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44522 struct mirror *m;
44523
44524 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44525- if (!atomic_read(&m->error_count))
44526+ if (!atomic_read_unchecked(&m->error_count))
44527 return m;
44528
44529 return NULL;
44530@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44531 * simple way to tell if a device has encountered
44532 * errors.
44533 */
44534- atomic_inc(&m->error_count);
44535+ atomic_inc_unchecked(&m->error_count);
44536
44537 if (test_and_set_bit(error_type, &m->error_type))
44538 return;
44539@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44540 struct mirror *m = get_default_mirror(ms);
44541
44542 do {
44543- if (likely(!atomic_read(&m->error_count)))
44544+ if (likely(!atomic_read_unchecked(&m->error_count)))
44545 return m;
44546
44547 if (m-- == ms->mirror)
44548@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44549 {
44550 struct mirror *default_mirror = get_default_mirror(m->ms);
44551
44552- return !atomic_read(&default_mirror->error_count);
44553+ return !atomic_read_unchecked(&default_mirror->error_count);
44554 }
44555
44556 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44557@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44558 */
44559 if (likely(region_in_sync(ms, region, 1)))
44560 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44561- else if (m && atomic_read(&m->error_count))
44562+ else if (m && atomic_read_unchecked(&m->error_count))
44563 m = NULL;
44564
44565 if (likely(m))
44566@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44567 }
44568
44569 ms->mirror[mirror].ms = ms;
44570- atomic_set(&(ms->mirror[mirror].error_count), 0);
44571+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44572 ms->mirror[mirror].error_type = 0;
44573 ms->mirror[mirror].offset = offset;
44574
44575@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
44576 */
44577 static char device_status_char(struct mirror *m)
44578 {
44579- if (!atomic_read(&(m->error_count)))
44580+ if (!atomic_read_unchecked(&(m->error_count)))
44581 return 'A';
44582
44583 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44584diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44585index f478a4c..4b8e5ef 100644
44586--- a/drivers/md/dm-stats.c
44587+++ b/drivers/md/dm-stats.c
44588@@ -382,7 +382,7 @@ do_sync_free:
44589 synchronize_rcu_expedited();
44590 dm_stat_free(&s->rcu_head);
44591 } else {
44592- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44593+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44594 call_rcu(&s->rcu_head, dm_stat_free);
44595 }
44596 return 0;
44597@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44598 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44599 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44600 ));
44601- ACCESS_ONCE(last->last_sector) = end_sector;
44602- ACCESS_ONCE(last->last_rw) = bi_rw;
44603+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
44604+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44605 }
44606
44607 rcu_read_lock();
44608diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44609index f8b37d4..5c5cafd 100644
44610--- a/drivers/md/dm-stripe.c
44611+++ b/drivers/md/dm-stripe.c
44612@@ -21,7 +21,7 @@ struct stripe {
44613 struct dm_dev *dev;
44614 sector_t physical_start;
44615
44616- atomic_t error_count;
44617+ atomic_unchecked_t error_count;
44618 };
44619
44620 struct stripe_c {
44621@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44622 kfree(sc);
44623 return r;
44624 }
44625- atomic_set(&(sc->stripe[i].error_count), 0);
44626+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44627 }
44628
44629 ti->private = sc;
44630@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44631 DMEMIT("%d ", sc->stripes);
44632 for (i = 0; i < sc->stripes; i++) {
44633 DMEMIT("%s ", sc->stripe[i].dev->name);
44634- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44635+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44636 'D' : 'A';
44637 }
44638 buffer[i] = '\0';
44639@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44640 */
44641 for (i = 0; i < sc->stripes; i++)
44642 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44643- atomic_inc(&(sc->stripe[i].error_count));
44644- if (atomic_read(&(sc->stripe[i].error_count)) <
44645+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
44646+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44647 DM_IO_ERROR_THRESHOLD)
44648 schedule_work(&sc->trigger_event);
44649 }
44650diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44651index 3afae9e..4e1c954 100644
44652--- a/drivers/md/dm-table.c
44653+++ b/drivers/md/dm-table.c
44654@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44655 if (!dev_size)
44656 return 0;
44657
44658- if ((start >= dev_size) || (start + len > dev_size)) {
44659+ if ((start >= dev_size) || (len > dev_size - start)) {
44660 DMWARN("%s: %s too small for target: "
44661 "start=%llu, len=%llu, dev_size=%llu",
44662 dm_device_name(ti->table->md), bdevname(bdev, b),
44663diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44664index 43adbb8..7b34305 100644
44665--- a/drivers/md/dm-thin-metadata.c
44666+++ b/drivers/md/dm-thin-metadata.c
44667@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44668 {
44669 pmd->info.tm = pmd->tm;
44670 pmd->info.levels = 2;
44671- pmd->info.value_type.context = pmd->data_sm;
44672+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44673 pmd->info.value_type.size = sizeof(__le64);
44674 pmd->info.value_type.inc = data_block_inc;
44675 pmd->info.value_type.dec = data_block_dec;
44676@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44677
44678 pmd->bl_info.tm = pmd->tm;
44679 pmd->bl_info.levels = 1;
44680- pmd->bl_info.value_type.context = pmd->data_sm;
44681+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44682 pmd->bl_info.value_type.size = sizeof(__le64);
44683 pmd->bl_info.value_type.inc = data_block_inc;
44684 pmd->bl_info.value_type.dec = data_block_dec;
44685diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44686index b71c600..d0b85b3 100644
44687--- a/drivers/md/dm.c
44688+++ b/drivers/md/dm.c
44689@@ -185,9 +185,9 @@ struct mapped_device {
44690 /*
44691 * Event handling.
44692 */
44693- atomic_t event_nr;
44694+ atomic_unchecked_t event_nr;
44695 wait_queue_head_t eventq;
44696- atomic_t uevent_seq;
44697+ atomic_unchecked_t uevent_seq;
44698 struct list_head uevent_list;
44699 spinlock_t uevent_lock; /* Protect access to uevent_list */
44700
44701@@ -2070,8 +2070,8 @@ static struct mapped_device *alloc_dev(int minor)
44702 spin_lock_init(&md->deferred_lock);
44703 atomic_set(&md->holders, 1);
44704 atomic_set(&md->open_count, 0);
44705- atomic_set(&md->event_nr, 0);
44706- atomic_set(&md->uevent_seq, 0);
44707+ atomic_set_unchecked(&md->event_nr, 0);
44708+ atomic_set_unchecked(&md->uevent_seq, 0);
44709 INIT_LIST_HEAD(&md->uevent_list);
44710 INIT_LIST_HEAD(&md->table_devices);
44711 spin_lock_init(&md->uevent_lock);
44712@@ -2227,7 +2227,7 @@ static void event_callback(void *context)
44713
44714 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44715
44716- atomic_inc(&md->event_nr);
44717+ atomic_inc_unchecked(&md->event_nr);
44718 wake_up(&md->eventq);
44719 }
44720
44721@@ -3055,18 +3055,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44722
44723 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44724 {
44725- return atomic_add_return(1, &md->uevent_seq);
44726+ return atomic_add_return_unchecked(1, &md->uevent_seq);
44727 }
44728
44729 uint32_t dm_get_event_nr(struct mapped_device *md)
44730 {
44731- return atomic_read(&md->event_nr);
44732+ return atomic_read_unchecked(&md->event_nr);
44733 }
44734
44735 int dm_wait_event(struct mapped_device *md, int event_nr)
44736 {
44737 return wait_event_interruptible(md->eventq,
44738- (event_nr != atomic_read(&md->event_nr)));
44739+ (event_nr != atomic_read_unchecked(&md->event_nr)));
44740 }
44741
44742 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44743diff --git a/drivers/md/md.c b/drivers/md/md.c
44744index 709755f..5bc3fa4 100644
44745--- a/drivers/md/md.c
44746+++ b/drivers/md/md.c
44747@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44748 * start build, activate spare
44749 */
44750 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44751-static atomic_t md_event_count;
44752+static atomic_unchecked_t md_event_count;
44753 void md_new_event(struct mddev *mddev)
44754 {
44755- atomic_inc(&md_event_count);
44756+ atomic_inc_unchecked(&md_event_count);
44757 wake_up(&md_event_waiters);
44758 }
44759 EXPORT_SYMBOL_GPL(md_new_event);
44760@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44761 */
44762 static void md_new_event_inintr(struct mddev *mddev)
44763 {
44764- atomic_inc(&md_event_count);
44765+ atomic_inc_unchecked(&md_event_count);
44766 wake_up(&md_event_waiters);
44767 }
44768
44769@@ -1422,7 +1422,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44770 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44771 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44772 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44773- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44774+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44775
44776 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44777 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44778@@ -1673,7 +1673,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44779 else
44780 sb->resync_offset = cpu_to_le64(0);
44781
44782- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44783+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44784
44785 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44786 sb->size = cpu_to_le64(mddev->dev_sectors);
44787@@ -2543,7 +2543,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44788 static ssize_t
44789 errors_show(struct md_rdev *rdev, char *page)
44790 {
44791- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44792+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44793 }
44794
44795 static ssize_t
44796@@ -2552,7 +2552,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44797 char *e;
44798 unsigned long n = simple_strtoul(buf, &e, 10);
44799 if (*buf && (*e == 0 || *e == '\n')) {
44800- atomic_set(&rdev->corrected_errors, n);
44801+ atomic_set_unchecked(&rdev->corrected_errors, n);
44802 return len;
44803 }
44804 return -EINVAL;
44805@@ -2997,8 +2997,8 @@ int md_rdev_init(struct md_rdev *rdev)
44806 rdev->sb_loaded = 0;
44807 rdev->bb_page = NULL;
44808 atomic_set(&rdev->nr_pending, 0);
44809- atomic_set(&rdev->read_errors, 0);
44810- atomic_set(&rdev->corrected_errors, 0);
44811+ atomic_set_unchecked(&rdev->read_errors, 0);
44812+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44813
44814 INIT_LIST_HEAD(&rdev->same_set);
44815 init_waitqueue_head(&rdev->blocked_wait);
44816@@ -6865,7 +6865,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44817
44818 spin_unlock(&pers_lock);
44819 seq_printf(seq, "\n");
44820- seq->poll_event = atomic_read(&md_event_count);
44821+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44822 return 0;
44823 }
44824 if (v == (void*)2) {
44825@@ -6968,7 +6968,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44826 return error;
44827
44828 seq = file->private_data;
44829- seq->poll_event = atomic_read(&md_event_count);
44830+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44831 return error;
44832 }
44833
44834@@ -6985,7 +6985,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44835 /* always allow read */
44836 mask = POLLIN | POLLRDNORM;
44837
44838- if (seq->poll_event != atomic_read(&md_event_count))
44839+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44840 mask |= POLLERR | POLLPRI;
44841 return mask;
44842 }
44843@@ -7032,7 +7032,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44844 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44845 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44846 (int)part_stat_read(&disk->part0, sectors[1]) -
44847- atomic_read(&disk->sync_io);
44848+ atomic_read_unchecked(&disk->sync_io);
44849 /* sync IO will cause sync_io to increase before the disk_stats
44850 * as sync_io is counted when a request starts, and
44851 * disk_stats is counted when it completes.
44852diff --git a/drivers/md/md.h b/drivers/md/md.h
44853index 03cec5b..0a658c1 100644
44854--- a/drivers/md/md.h
44855+++ b/drivers/md/md.h
44856@@ -94,13 +94,13 @@ struct md_rdev {
44857 * only maintained for arrays that
44858 * support hot removal
44859 */
44860- atomic_t read_errors; /* number of consecutive read errors that
44861+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44862 * we have tried to ignore.
44863 */
44864 struct timespec last_read_error; /* monotonic time since our
44865 * last read error
44866 */
44867- atomic_t corrected_errors; /* number of corrected read errors,
44868+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44869 * for reporting to userspace and storing
44870 * in superblock.
44871 */
44872@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44873
44874 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44875 {
44876- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44877+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44878 }
44879
44880 struct md_personality
44881diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44882index e8a9042..35bd145 100644
44883--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44884+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44885@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44886 * Flick into a mode where all blocks get allocated in the new area.
44887 */
44888 smm->begin = old_len;
44889- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44890+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44891
44892 /*
44893 * Extend.
44894@@ -714,7 +714,7 @@ out:
44895 /*
44896 * Switch back to normal behaviour.
44897 */
44898- memcpy(sm, &ops, sizeof(*sm));
44899+ memcpy((void *)sm, &ops, sizeof(*sm));
44900 return r;
44901 }
44902
44903diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44904index 3e6d115..ffecdeb 100644
44905--- a/drivers/md/persistent-data/dm-space-map.h
44906+++ b/drivers/md/persistent-data/dm-space-map.h
44907@@ -71,6 +71,7 @@ struct dm_space_map {
44908 dm_sm_threshold_fn fn,
44909 void *context);
44910 };
44911+typedef struct dm_space_map __no_const dm_space_map_no_const;
44912
44913 /*----------------------------------------------------------------*/
44914
44915diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44916index 2f2f38f..f6a8ebe 100644
44917--- a/drivers/md/raid1.c
44918+++ b/drivers/md/raid1.c
44919@@ -1932,7 +1932,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44920 if (r1_sync_page_io(rdev, sect, s,
44921 bio->bi_io_vec[idx].bv_page,
44922 READ) != 0)
44923- atomic_add(s, &rdev->corrected_errors);
44924+ atomic_add_unchecked(s, &rdev->corrected_errors);
44925 }
44926 sectors -= s;
44927 sect += s;
44928@@ -2165,7 +2165,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44929 !test_bit(Faulty, &rdev->flags)) {
44930 if (r1_sync_page_io(rdev, sect, s,
44931 conf->tmppage, READ)) {
44932- atomic_add(s, &rdev->corrected_errors);
44933+ atomic_add_unchecked(s, &rdev->corrected_errors);
44934 printk(KERN_INFO
44935 "md/raid1:%s: read error corrected "
44936 "(%d sectors at %llu on %s)\n",
44937diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44938index 32e282f..5cec803 100644
44939--- a/drivers/md/raid10.c
44940+++ b/drivers/md/raid10.c
44941@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44942 /* The write handler will notice the lack of
44943 * R10BIO_Uptodate and record any errors etc
44944 */
44945- atomic_add(r10_bio->sectors,
44946+ atomic_add_unchecked(r10_bio->sectors,
44947 &conf->mirrors[d].rdev->corrected_errors);
44948
44949 /* for reconstruct, we always reschedule after a read.
44950@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44951 {
44952 struct timespec cur_time_mon;
44953 unsigned long hours_since_last;
44954- unsigned int read_errors = atomic_read(&rdev->read_errors);
44955+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44956
44957 ktime_get_ts(&cur_time_mon);
44958
44959@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44960 * overflowing the shift of read_errors by hours_since_last.
44961 */
44962 if (hours_since_last >= 8 * sizeof(read_errors))
44963- atomic_set(&rdev->read_errors, 0);
44964+ atomic_set_unchecked(&rdev->read_errors, 0);
44965 else
44966- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44967+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44968 }
44969
44970 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44971@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44972 return;
44973
44974 check_decay_read_errors(mddev, rdev);
44975- atomic_inc(&rdev->read_errors);
44976- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44977+ atomic_inc_unchecked(&rdev->read_errors);
44978+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44979 char b[BDEVNAME_SIZE];
44980 bdevname(rdev->bdev, b);
44981
44982@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44983 "md/raid10:%s: %s: Raid device exceeded "
44984 "read_error threshold [cur %d:max %d]\n",
44985 mdname(mddev), b,
44986- atomic_read(&rdev->read_errors), max_read_errors);
44987+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44988 printk(KERN_NOTICE
44989 "md/raid10:%s: %s: Failing raid device\n",
44990 mdname(mddev), b);
44991@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44992 sect +
44993 choose_data_offset(r10_bio, rdev)),
44994 bdevname(rdev->bdev, b));
44995- atomic_add(s, &rdev->corrected_errors);
44996+ atomic_add_unchecked(s, &rdev->corrected_errors);
44997 }
44998
44999 rdev_dec_pending(rdev, mddev);
45000diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45001index 8577cc7..5779d5b 100644
45002--- a/drivers/md/raid5.c
45003+++ b/drivers/md/raid5.c
45004@@ -950,23 +950,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45005 struct bio_vec bvl;
45006 struct bvec_iter iter;
45007 struct page *bio_page;
45008- int page_offset;
45009+ s64 page_offset;
45010 struct async_submit_ctl submit;
45011 enum async_tx_flags flags = 0;
45012
45013 if (bio->bi_iter.bi_sector >= sector)
45014- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45015+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45016 else
45017- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45018+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45019
45020 if (frombio)
45021 flags |= ASYNC_TX_FENCE;
45022 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45023
45024 bio_for_each_segment(bvl, bio, iter) {
45025- int len = bvl.bv_len;
45026- int clen;
45027- int b_offset = 0;
45028+ s64 len = bvl.bv_len;
45029+ s64 clen;
45030+ s64 b_offset = 0;
45031
45032 if (page_offset < 0) {
45033 b_offset = -page_offset;
45034@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45035 return 1;
45036 }
45037
45038+#ifdef CONFIG_GRKERNSEC_HIDESYM
45039+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45040+#endif
45041+
45042 static int grow_stripes(struct r5conf *conf, int num)
45043 {
45044 struct kmem_cache *sc;
45045@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45046 "raid%d-%s", conf->level, mdname(conf->mddev));
45047 else
45048 sprintf(conf->cache_name[0],
45049+#ifdef CONFIG_GRKERNSEC_HIDESYM
45050+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45051+#else
45052 "raid%d-%p", conf->level, conf->mddev);
45053+#endif
45054 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45055
45056 conf->active_name = 0;
45057@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45058 mdname(conf->mddev), STRIPE_SECTORS,
45059 (unsigned long long)s,
45060 bdevname(rdev->bdev, b));
45061- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45062+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45063 clear_bit(R5_ReadError, &sh->dev[i].flags);
45064 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45065 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45066 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45067
45068- if (atomic_read(&rdev->read_errors))
45069- atomic_set(&rdev->read_errors, 0);
45070+ if (atomic_read_unchecked(&rdev->read_errors))
45071+ atomic_set_unchecked(&rdev->read_errors, 0);
45072 } else {
45073 const char *bdn = bdevname(rdev->bdev, b);
45074 int retry = 0;
45075 int set_bad = 0;
45076
45077 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45078- atomic_inc(&rdev->read_errors);
45079+ atomic_inc_unchecked(&rdev->read_errors);
45080 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45081 printk_ratelimited(
45082 KERN_WARNING
45083@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45084 mdname(conf->mddev),
45085 (unsigned long long)s,
45086 bdn);
45087- } else if (atomic_read(&rdev->read_errors)
45088+ } else if (atomic_read_unchecked(&rdev->read_errors)
45089 > conf->max_nr_stripes)
45090 printk(KERN_WARNING
45091 "md/raid:%s: Too many read errors, failing device %s.\n",
45092diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45093index 983db75..ef9248c 100644
45094--- a/drivers/media/dvb-core/dvbdev.c
45095+++ b/drivers/media/dvb-core/dvbdev.c
45096@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45097 const struct dvb_device *template, void *priv, int type)
45098 {
45099 struct dvb_device *dvbdev;
45100- struct file_operations *dvbdevfops;
45101+ file_operations_no_const *dvbdevfops;
45102 struct device *clsdev;
45103 int minor;
45104 int id;
45105diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45106index 6ad22b6..6e90e2a 100644
45107--- a/drivers/media/dvb-frontends/af9033.h
45108+++ b/drivers/media/dvb-frontends/af9033.h
45109@@ -96,6 +96,6 @@ struct af9033_ops {
45110 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45111 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45112 int onoff);
45113-};
45114+} __no_const;
45115
45116 #endif /* AF9033_H */
45117diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45118index 9b6c3bb..baeb5c7 100644
45119--- a/drivers/media/dvb-frontends/dib3000.h
45120+++ b/drivers/media/dvb-frontends/dib3000.h
45121@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45122 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45123 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45124 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45125-};
45126+} __no_const;
45127
45128 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
45129 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45130diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45131index 1fea0e9..321ce8f 100644
45132--- a/drivers/media/dvb-frontends/dib7000p.h
45133+++ b/drivers/media/dvb-frontends/dib7000p.h
45134@@ -64,7 +64,7 @@ struct dib7000p_ops {
45135 int (*get_adc_power)(struct dvb_frontend *fe);
45136 int (*slave_reset)(struct dvb_frontend *fe);
45137 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45138-};
45139+} __no_const;
45140
45141 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
45142 void *dib7000p_attach(struct dib7000p_ops *ops);
45143diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45144index 84cc103..5780c54 100644
45145--- a/drivers/media/dvb-frontends/dib8000.h
45146+++ b/drivers/media/dvb-frontends/dib8000.h
45147@@ -61,7 +61,7 @@ struct dib8000_ops {
45148 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45149 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45150 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45151-};
45152+} __no_const;
45153
45154 #if IS_ENABLED(CONFIG_DVB_DIB8000)
45155 void *dib8000_attach(struct dib8000_ops *ops);
45156diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45157index 860c98fc..497fa25 100644
45158--- a/drivers/media/pci/cx88/cx88-video.c
45159+++ b/drivers/media/pci/cx88/cx88-video.c
45160@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45161
45162 /* ------------------------------------------------------------------ */
45163
45164-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45165-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45166-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45167+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45168+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45169+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45170
45171 module_param_array(video_nr, int, NULL, 0444);
45172 module_param_array(vbi_nr, int, NULL, 0444);
45173diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45174index 802642d..5534900 100644
45175--- a/drivers/media/pci/ivtv/ivtv-driver.c
45176+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45177@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45178 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45179
45180 /* ivtv instance counter */
45181-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45182+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45183
45184 /* Parameter declarations */
45185 static int cardtype[IVTV_MAX_CARDS];
45186diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45187index 8cbe6b4..ea3601c 100644
45188--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45189+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45190@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45191
45192 static int solo_sysfs_init(struct solo_dev *solo_dev)
45193 {
45194- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45195+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45196 struct device *dev = &solo_dev->dev;
45197 const char *driver;
45198 int i;
45199diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45200index c7141f2..5301fec 100644
45201--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45202+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45203@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45204
45205 int solo_g723_init(struct solo_dev *solo_dev)
45206 {
45207- static struct snd_device_ops ops = { NULL };
45208+ static struct snd_device_ops ops = { };
45209 struct snd_card *card;
45210 struct snd_kcontrol_new kctl;
45211 char name[32];
45212diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45213index 8c84846..27b4f83 100644
45214--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45215+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45216@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45217
45218 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45219 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45220- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45221+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45222 if (p2m_id < 0)
45223 p2m_id = -p2m_id;
45224 }
45225diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45226index bd8edfa..e82ed85 100644
45227--- a/drivers/media/pci/solo6x10/solo6x10.h
45228+++ b/drivers/media/pci/solo6x10/solo6x10.h
45229@@ -220,7 +220,7 @@ struct solo_dev {
45230
45231 /* P2M DMA Engine */
45232 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45233- atomic_t p2m_count;
45234+ atomic_unchecked_t p2m_count;
45235 int p2m_jiffies;
45236 unsigned int p2m_timeouts;
45237
45238diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45239index c135165..dc69499 100644
45240--- a/drivers/media/pci/tw68/tw68-core.c
45241+++ b/drivers/media/pci/tw68/tw68-core.c
45242@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45243 module_param_array(card, int, NULL, 0444);
45244 MODULE_PARM_DESC(card, "card type");
45245
45246-static atomic_t tw68_instance = ATOMIC_INIT(0);
45247+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45248
45249 /* ------------------------------------------------------------------ */
45250
45251diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45252index ba2d8f9..1566684 100644
45253--- a/drivers/media/platform/omap/omap_vout.c
45254+++ b/drivers/media/platform/omap/omap_vout.c
45255@@ -63,7 +63,6 @@ enum omap_vout_channels {
45256 OMAP_VIDEO2,
45257 };
45258
45259-static struct videobuf_queue_ops video_vbq_ops;
45260 /* Variables configurable through module params*/
45261 static u32 video1_numbuffers = 3;
45262 static u32 video2_numbuffers = 3;
45263@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45264 {
45265 struct videobuf_queue *q;
45266 struct omap_vout_device *vout = NULL;
45267+ static struct videobuf_queue_ops video_vbq_ops = {
45268+ .buf_setup = omap_vout_buffer_setup,
45269+ .buf_prepare = omap_vout_buffer_prepare,
45270+ .buf_release = omap_vout_buffer_release,
45271+ .buf_queue = omap_vout_buffer_queue,
45272+ };
45273
45274 vout = video_drvdata(file);
45275 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45276@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45277 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45278
45279 q = &vout->vbq;
45280- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45281- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45282- video_vbq_ops.buf_release = omap_vout_buffer_release;
45283- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45284 spin_lock_init(&vout->vbq_lock);
45285
45286 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45287diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45288index fb2acc5..a2fcbdc4 100644
45289--- a/drivers/media/platform/s5p-tv/mixer.h
45290+++ b/drivers/media/platform/s5p-tv/mixer.h
45291@@ -156,7 +156,7 @@ struct mxr_layer {
45292 /** layer index (unique identifier) */
45293 int idx;
45294 /** callbacks for layer methods */
45295- struct mxr_layer_ops ops;
45296+ struct mxr_layer_ops *ops;
45297 /** format array */
45298 const struct mxr_format **fmt_array;
45299 /** size of format array */
45300diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45301index 74344c7..a39e70e 100644
45302--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45303+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45304@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45305 {
45306 struct mxr_layer *layer;
45307 int ret;
45308- struct mxr_layer_ops ops = {
45309+ static struct mxr_layer_ops ops = {
45310 .release = mxr_graph_layer_release,
45311 .buffer_set = mxr_graph_buffer_set,
45312 .stream_set = mxr_graph_stream_set,
45313diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45314index b713403..53cb5ad 100644
45315--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45316+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45317@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45318 layer->update_buf = next;
45319 }
45320
45321- layer->ops.buffer_set(layer, layer->update_buf);
45322+ layer->ops->buffer_set(layer, layer->update_buf);
45323
45324 if (done && done != layer->shadow_buf)
45325 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45326diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45327index b4d2696..91df48e 100644
45328--- a/drivers/media/platform/s5p-tv/mixer_video.c
45329+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45330@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45331 layer->geo.src.height = layer->geo.src.full_height;
45332
45333 mxr_geometry_dump(mdev, &layer->geo);
45334- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45335+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45336 mxr_geometry_dump(mdev, &layer->geo);
45337 }
45338
45339@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45340 layer->geo.dst.full_width = mbus_fmt.width;
45341 layer->geo.dst.full_height = mbus_fmt.height;
45342 layer->geo.dst.field = mbus_fmt.field;
45343- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45344+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45345
45346 mxr_geometry_dump(mdev, &layer->geo);
45347 }
45348@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45349 /* set source size to highest accepted value */
45350 geo->src.full_width = max(geo->dst.full_width, pix->width);
45351 geo->src.full_height = max(geo->dst.full_height, pix->height);
45352- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45353+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45354 mxr_geometry_dump(mdev, &layer->geo);
45355 /* set cropping to total visible screen */
45356 geo->src.width = pix->width;
45357@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45358 geo->src.x_offset = 0;
45359 geo->src.y_offset = 0;
45360 /* assure consistency of geometry */
45361- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45362+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45363 mxr_geometry_dump(mdev, &layer->geo);
45364 /* set full size to lowest possible value */
45365 geo->src.full_width = 0;
45366 geo->src.full_height = 0;
45367- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45368+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45369 mxr_geometry_dump(mdev, &layer->geo);
45370
45371 /* returning results */
45372@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45373 target->width = s->r.width;
45374 target->height = s->r.height;
45375
45376- layer->ops.fix_geometry(layer, stage, s->flags);
45377+ layer->ops->fix_geometry(layer, stage, s->flags);
45378
45379 /* retrieve update selection rectangle */
45380 res.left = target->x_offset;
45381@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45382 mxr_output_get(mdev);
45383
45384 mxr_layer_update_output(layer);
45385- layer->ops.format_set(layer);
45386+ layer->ops->format_set(layer);
45387 /* enabling layer in hardware */
45388 spin_lock_irqsave(&layer->enq_slock, flags);
45389 layer->state = MXR_LAYER_STREAMING;
45390 spin_unlock_irqrestore(&layer->enq_slock, flags);
45391
45392- layer->ops.stream_set(layer, MXR_ENABLE);
45393+ layer->ops->stream_set(layer, MXR_ENABLE);
45394 mxr_streamer_get(mdev);
45395
45396 return 0;
45397@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45398 spin_unlock_irqrestore(&layer->enq_slock, flags);
45399
45400 /* disabling layer in hardware */
45401- layer->ops.stream_set(layer, MXR_DISABLE);
45402+ layer->ops->stream_set(layer, MXR_DISABLE);
45403 /* remove one streamer */
45404 mxr_streamer_put(mdev);
45405 /* allow changes in output configuration */
45406@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45407
45408 void mxr_layer_release(struct mxr_layer *layer)
45409 {
45410- if (layer->ops.release)
45411- layer->ops.release(layer);
45412+ if (layer->ops->release)
45413+ layer->ops->release(layer);
45414 }
45415
45416 void mxr_base_layer_release(struct mxr_layer *layer)
45417@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45418
45419 layer->mdev = mdev;
45420 layer->idx = idx;
45421- layer->ops = *ops;
45422+ layer->ops = ops;
45423
45424 spin_lock_init(&layer->enq_slock);
45425 INIT_LIST_HEAD(&layer->enq_list);
45426diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45427index c9388c4..ce71ece 100644
45428--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45429+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45430@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45431 {
45432 struct mxr_layer *layer;
45433 int ret;
45434- struct mxr_layer_ops ops = {
45435+ static struct mxr_layer_ops ops = {
45436 .release = mxr_vp_layer_release,
45437 .buffer_set = mxr_vp_buffer_set,
45438 .stream_set = mxr_vp_stream_set,
45439diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45440index 82affae..42833ec 100644
45441--- a/drivers/media/radio/radio-cadet.c
45442+++ b/drivers/media/radio/radio-cadet.c
45443@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45444 unsigned char readbuf[RDS_BUFFER];
45445 int i = 0;
45446
45447+ if (count > RDS_BUFFER)
45448+ return -EFAULT;
45449 mutex_lock(&dev->lock);
45450 if (dev->rdsstat == 0)
45451 cadet_start_rds(dev);
45452@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45453 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45454 mutex_unlock(&dev->lock);
45455
45456- if (i && copy_to_user(data, readbuf, i))
45457- return -EFAULT;
45458+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45459+ i = -EFAULT;
45460+
45461 return i;
45462 }
45463
45464diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45465index 5236035..c622c74 100644
45466--- a/drivers/media/radio/radio-maxiradio.c
45467+++ b/drivers/media/radio/radio-maxiradio.c
45468@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45469 /* TEA5757 pin mappings */
45470 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45471
45472-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45473+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45474
45475 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45476 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45477diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45478index 050b3bb..79f62b9 100644
45479--- a/drivers/media/radio/radio-shark.c
45480+++ b/drivers/media/radio/radio-shark.c
45481@@ -79,7 +79,7 @@ struct shark_device {
45482 u32 last_val;
45483 };
45484
45485-static atomic_t shark_instance = ATOMIC_INIT(0);
45486+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45487
45488 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45489 {
45490diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45491index 8654e0d..0608a64 100644
45492--- a/drivers/media/radio/radio-shark2.c
45493+++ b/drivers/media/radio/radio-shark2.c
45494@@ -74,7 +74,7 @@ struct shark_device {
45495 u8 *transfer_buffer;
45496 };
45497
45498-static atomic_t shark_instance = ATOMIC_INIT(0);
45499+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45500
45501 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45502 {
45503diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45504index dccf586..d5db411 100644
45505--- a/drivers/media/radio/radio-si476x.c
45506+++ b/drivers/media/radio/radio-si476x.c
45507@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45508 struct si476x_radio *radio;
45509 struct v4l2_ctrl *ctrl;
45510
45511- static atomic_t instance = ATOMIC_INIT(0);
45512+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45513
45514 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45515 if (!radio)
45516diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
45517index 704397f..4d05977 100644
45518--- a/drivers/media/radio/wl128x/fmdrv_common.c
45519+++ b/drivers/media/radio/wl128x/fmdrv_common.c
45520@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
45521 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
45522
45523 /* Radio Nr */
45524-static u32 radio_nr = -1;
45525+static int radio_nr = -1;
45526 module_param(radio_nr, int, 0444);
45527 MODULE_PARM_DESC(radio_nr, "Radio Nr");
45528
45529diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45530index 9fd1527..8927230 100644
45531--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45532+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45533@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45534
45535 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45536 {
45537- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45538- char result[64];
45539- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45540- sizeof(result), 0);
45541+ char *buf;
45542+ char *result;
45543+ int retval;
45544+
45545+ buf = kmalloc(2, GFP_KERNEL);
45546+ if (buf == NULL)
45547+ return -ENOMEM;
45548+ result = kmalloc(64, GFP_KERNEL);
45549+ if (result == NULL) {
45550+ kfree(buf);
45551+ return -ENOMEM;
45552+ }
45553+
45554+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45555+ buf[1] = enable ? 1 : 0;
45556+
45557+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45558+
45559+ kfree(buf);
45560+ kfree(result);
45561+ return retval;
45562 }
45563
45564 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45565 {
45566- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45567- char state[3];
45568- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45569+ char *buf;
45570+ char *state;
45571+ int retval;
45572+
45573+ buf = kmalloc(2, GFP_KERNEL);
45574+ if (buf == NULL)
45575+ return -ENOMEM;
45576+ state = kmalloc(3, GFP_KERNEL);
45577+ if (state == NULL) {
45578+ kfree(buf);
45579+ return -ENOMEM;
45580+ }
45581+
45582+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45583+ buf[1] = enable ? 1 : 0;
45584+
45585+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45586+
45587+ kfree(buf);
45588+ kfree(state);
45589+ return retval;
45590 }
45591
45592 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45593 {
45594- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45595- char state[3];
45596+ char *query;
45597+ char *state;
45598 int ret;
45599+ query = kmalloc(1, GFP_KERNEL);
45600+ if (query == NULL)
45601+ return -ENOMEM;
45602+ state = kmalloc(3, GFP_KERNEL);
45603+ if (state == NULL) {
45604+ kfree(query);
45605+ return -ENOMEM;
45606+ }
45607+
45608+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45609
45610 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45611
45612- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45613- sizeof(state), 0);
45614+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45615 if (ret < 0) {
45616 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45617 "state info\n");
45618@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45619
45620 /* Copy this pointer as we are gonna need it in the release phase */
45621 cinergyt2_usb_device = adap->dev;
45622-
45623+ kfree(query);
45624+ kfree(state);
45625 return 0;
45626 }
45627
45628@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45629 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45630 {
45631 struct cinergyt2_state *st = d->priv;
45632- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45633+ u8 *key, *cmd;
45634 int i;
45635
45636+ cmd = kmalloc(1, GFP_KERNEL);
45637+ if (cmd == NULL)
45638+ return -EINVAL;
45639+ key = kzalloc(5, GFP_KERNEL);
45640+ if (key == NULL) {
45641+ kfree(cmd);
45642+ return -EINVAL;
45643+ }
45644+
45645+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45646+
45647 *state = REMOTE_NO_KEY_PRESSED;
45648
45649- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45650+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45651 if (key[4] == 0xff) {
45652 /* key repeat */
45653 st->rc_counter++;
45654@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45655 *event = d->last_event;
45656 deb_rc("repeat key, event %x\n",
45657 *event);
45658- return 0;
45659+ goto out;
45660 }
45661 }
45662 deb_rc("repeated key (non repeatable)\n");
45663 }
45664- return 0;
45665+ goto out;
45666 }
45667
45668 /* hack to pass checksum on the custom field */
45669@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45670
45671 deb_rc("key: %*ph\n", 5, key);
45672 }
45673+out:
45674+ kfree(cmd);
45675+ kfree(key);
45676 return 0;
45677 }
45678
45679diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45680index c890fe4..f9b2ae6 100644
45681--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45682+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45683@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45684 fe_status_t *status)
45685 {
45686 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45687- struct dvbt_get_status_msg result;
45688- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45689+ struct dvbt_get_status_msg *result;
45690+ u8 *cmd;
45691 int ret;
45692
45693- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45694- sizeof(result), 0);
45695+ cmd = kmalloc(1, GFP_KERNEL);
45696+ if (cmd == NULL)
45697+ return -ENOMEM;
45698+ result = kmalloc(sizeof(*result), GFP_KERNEL);
45699+ if (result == NULL) {
45700+ kfree(cmd);
45701+ return -ENOMEM;
45702+ }
45703+
45704+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45705+
45706+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45707+ sizeof(*result), 0);
45708 if (ret < 0)
45709- return ret;
45710+ goto out;
45711
45712 *status = 0;
45713
45714- if (0xffff - le16_to_cpu(result.gain) > 30)
45715+ if (0xffff - le16_to_cpu(result->gain) > 30)
45716 *status |= FE_HAS_SIGNAL;
45717- if (result.lock_bits & (1 << 6))
45718+ if (result->lock_bits & (1 << 6))
45719 *status |= FE_HAS_LOCK;
45720- if (result.lock_bits & (1 << 5))
45721+ if (result->lock_bits & (1 << 5))
45722 *status |= FE_HAS_SYNC;
45723- if (result.lock_bits & (1 << 4))
45724+ if (result->lock_bits & (1 << 4))
45725 *status |= FE_HAS_CARRIER;
45726- if (result.lock_bits & (1 << 1))
45727+ if (result->lock_bits & (1 << 1))
45728 *status |= FE_HAS_VITERBI;
45729
45730 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45731 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45732 *status &= ~FE_HAS_LOCK;
45733
45734- return 0;
45735+out:
45736+ kfree(cmd);
45737+ kfree(result);
45738+ return ret;
45739 }
45740
45741 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45742 {
45743 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45744- struct dvbt_get_status_msg status;
45745- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45746+ struct dvbt_get_status_msg *status;
45747+ char *cmd;
45748 int ret;
45749
45750- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45751- sizeof(status), 0);
45752+ cmd = kmalloc(1, GFP_KERNEL);
45753+ if (cmd == NULL)
45754+ return -ENOMEM;
45755+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45756+ if (status == NULL) {
45757+ kfree(cmd);
45758+ return -ENOMEM;
45759+ }
45760+
45761+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45762+
45763+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45764+ sizeof(*status), 0);
45765 if (ret < 0)
45766- return ret;
45767+ goto out;
45768
45769- *ber = le32_to_cpu(status.viterbi_error_rate);
45770+ *ber = le32_to_cpu(status->viterbi_error_rate);
45771+out:
45772+ kfree(cmd);
45773+ kfree(status);
45774 return 0;
45775 }
45776
45777 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45778 {
45779 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45780- struct dvbt_get_status_msg status;
45781- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45782+ struct dvbt_get_status_msg *status;
45783+ u8 *cmd;
45784 int ret;
45785
45786- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45787- sizeof(status), 0);
45788+ cmd = kmalloc(1, GFP_KERNEL);
45789+ if (cmd == NULL)
45790+ return -ENOMEM;
45791+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45792+ if (status == NULL) {
45793+ kfree(cmd);
45794+ return -ENOMEM;
45795+ }
45796+
45797+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45798+
45799+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45800+ sizeof(*status), 0);
45801 if (ret < 0) {
45802 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45803 ret);
45804- return ret;
45805+ goto out;
45806 }
45807- *unc = le32_to_cpu(status.uncorrected_block_count);
45808- return 0;
45809+ *unc = le32_to_cpu(status->uncorrected_block_count);
45810+
45811+out:
45812+ kfree(cmd);
45813+ kfree(status);
45814+ return ret;
45815 }
45816
45817 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45818 u16 *strength)
45819 {
45820 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45821- struct dvbt_get_status_msg status;
45822- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45823+ struct dvbt_get_status_msg *status;
45824+ char *cmd;
45825 int ret;
45826
45827- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45828- sizeof(status), 0);
45829+ cmd = kmalloc(1, GFP_KERNEL);
45830+ if (cmd == NULL)
45831+ return -ENOMEM;
45832+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45833+ if (status == NULL) {
45834+ kfree(cmd);
45835+ return -ENOMEM;
45836+ }
45837+
45838+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45839+
45840+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45841+ sizeof(*status), 0);
45842 if (ret < 0) {
45843 err("cinergyt2_fe_read_signal_strength() Failed!"
45844 " (Error=%d)\n", ret);
45845- return ret;
45846+ goto out;
45847 }
45848- *strength = (0xffff - le16_to_cpu(status.gain));
45849+ *strength = (0xffff - le16_to_cpu(status->gain));
45850+
45851+out:
45852+ kfree(cmd);
45853+ kfree(status);
45854 return 0;
45855 }
45856
45857 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45858 {
45859 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45860- struct dvbt_get_status_msg status;
45861- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45862+ struct dvbt_get_status_msg *status;
45863+ char *cmd;
45864 int ret;
45865
45866- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45867- sizeof(status), 0);
45868+ cmd = kmalloc(1, GFP_KERNEL);
45869+ if (cmd == NULL)
45870+ return -ENOMEM;
45871+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45872+ if (status == NULL) {
45873+ kfree(cmd);
45874+ return -ENOMEM;
45875+ }
45876+
45877+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45878+
45879+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45880+ sizeof(*status), 0);
45881 if (ret < 0) {
45882 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45883- return ret;
45884+ goto out;
45885 }
45886- *snr = (status.snr << 8) | status.snr;
45887- return 0;
45888+ *snr = (status->snr << 8) | status->snr;
45889+
45890+out:
45891+ kfree(cmd);
45892+ kfree(status);
45893+ return ret;
45894 }
45895
45896 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45897@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45898 {
45899 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45900 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45901- struct dvbt_set_parameters_msg param;
45902- char result[2];
45903+ struct dvbt_set_parameters_msg *param;
45904+ char *result;
45905 int err;
45906
45907- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45908- param.tps = cpu_to_le16(compute_tps(fep));
45909- param.freq = cpu_to_le32(fep->frequency / 1000);
45910- param.flags = 0;
45911+ result = kmalloc(2, GFP_KERNEL);
45912+ if (result == NULL)
45913+ return -ENOMEM;
45914+ param = kmalloc(sizeof(*param), GFP_KERNEL);
45915+ if (param == NULL) {
45916+ kfree(result);
45917+ return -ENOMEM;
45918+ }
45919+
45920+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45921+ param->tps = cpu_to_le16(compute_tps(fep));
45922+ param->freq = cpu_to_le32(fep->frequency / 1000);
45923+ param->flags = 0;
45924
45925 switch (fep->bandwidth_hz) {
45926 default:
45927 case 8000000:
45928- param.bandwidth = 8;
45929+ param->bandwidth = 8;
45930 break;
45931 case 7000000:
45932- param.bandwidth = 7;
45933+ param->bandwidth = 7;
45934 break;
45935 case 6000000:
45936- param.bandwidth = 6;
45937+ param->bandwidth = 6;
45938 break;
45939 }
45940
45941 err = dvb_usb_generic_rw(state->d,
45942- (char *)&param, sizeof(param),
45943- result, sizeof(result), 0);
45944+ (char *)param, sizeof(*param),
45945+ result, 2, 0);
45946 if (err < 0)
45947 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45948
45949- return (err < 0) ? err : 0;
45950+ kfree(result);
45951+ kfree(param);
45952+ return err;
45953 }
45954
45955 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45956diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45957index 733a7ff..f8b52e3 100644
45958--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45959+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45960@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45961
45962 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45963 {
45964- struct hexline hx;
45965- u8 reset;
45966+ struct hexline *hx;
45967+ u8 *reset;
45968 int ret,pos=0;
45969
45970+ reset = kmalloc(1, GFP_KERNEL);
45971+ if (reset == NULL)
45972+ return -ENOMEM;
45973+
45974+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45975+ if (hx == NULL) {
45976+ kfree(reset);
45977+ return -ENOMEM;
45978+ }
45979+
45980 /* stop the CPU */
45981- reset = 1;
45982- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45983+ reset[0] = 1;
45984+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45985 err("could not stop the USB controller CPU.");
45986
45987- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45988- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45989- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45990+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45991+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45992+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45993
45994- if (ret != hx.len) {
45995+ if (ret != hx->len) {
45996 err("error while transferring firmware "
45997 "(transferred size: %d, block size: %d)",
45998- ret,hx.len);
45999+ ret,hx->len);
46000 ret = -EINVAL;
46001 break;
46002 }
46003 }
46004 if (ret < 0) {
46005 err("firmware download failed at %d with %d",pos,ret);
46006+ kfree(reset);
46007+ kfree(hx);
46008 return ret;
46009 }
46010
46011 if (ret == 0) {
46012 /* restart the CPU */
46013- reset = 0;
46014- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46015+ reset[0] = 0;
46016+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46017 err("could not restart the USB controller CPU.");
46018 ret = -EINVAL;
46019 }
46020 } else
46021 ret = -EIO;
46022
46023+ kfree(reset);
46024+ kfree(hx);
46025+
46026 return ret;
46027 }
46028 EXPORT_SYMBOL(usb_cypress_load_firmware);
46029diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46030index 1a3df10..57997a5 100644
46031--- a/drivers/media/usb/dvb-usb/dw2102.c
46032+++ b/drivers/media/usb/dvb-usb/dw2102.c
46033@@ -118,7 +118,7 @@ struct su3000_state {
46034
46035 struct s6x0_state {
46036 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46037-};
46038+} __no_const;
46039
46040 /* debug */
46041 static int dvb_usb_dw2102_debug;
46042diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46043index 5801ae7..83f71fa 100644
46044--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46045+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46046@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46047 static int technisat_usb2_i2c_access(struct usb_device *udev,
46048 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46049 {
46050- u8 b[64];
46051- int ret, actual_length;
46052+ u8 *b = kmalloc(64, GFP_KERNEL);
46053+ int ret, actual_length, error = 0;
46054+
46055+ if (b == NULL)
46056+ return -ENOMEM;
46057
46058 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46059 debug_dump(tx, txlen, deb_i2c);
46060@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46061
46062 if (ret < 0) {
46063 err("i2c-error: out failed %02x = %d", device_addr, ret);
46064- return -ENODEV;
46065+ error = -ENODEV;
46066+ goto out;
46067 }
46068
46069 ret = usb_bulk_msg(udev,
46070@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46071 b, 64, &actual_length, 1000);
46072 if (ret < 0) {
46073 err("i2c-error: in failed %02x = %d", device_addr, ret);
46074- return -ENODEV;
46075+ error = -ENODEV;
46076+ goto out;
46077 }
46078
46079 if (b[0] != I2C_STATUS_OK) {
46080@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46081 /* handle tuner-i2c-nak */
46082 if (!(b[0] == I2C_STATUS_NAK &&
46083 device_addr == 0x60
46084- /* && device_is_technisat_usb2 */))
46085- return -ENODEV;
46086+ /* && device_is_technisat_usb2 */)) {
46087+ error = -ENODEV;
46088+ goto out;
46089+ }
46090 }
46091
46092 deb_i2c("status: %d, ", b[0]);
46093@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46094
46095 deb_i2c("\n");
46096
46097- return 0;
46098+out:
46099+ kfree(b);
46100+ return error;
46101 }
46102
46103 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46104@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46105 {
46106 int ret;
46107
46108- u8 led[8] = {
46109- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46110- 0
46111- };
46112+ u8 *led = kzalloc(8, GFP_KERNEL);
46113+
46114+ if (led == NULL)
46115+ return -ENOMEM;
46116
46117 if (disable_led_control && state != TECH_LED_OFF)
46118 return 0;
46119
46120+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46121+
46122 switch (state) {
46123 case TECH_LED_ON:
46124 led[1] = 0x82;
46125@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46126 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46127 USB_TYPE_VENDOR | USB_DIR_OUT,
46128 0, 0,
46129- led, sizeof(led), 500);
46130+ led, 8, 500);
46131
46132 mutex_unlock(&d->i2c_mutex);
46133+
46134+ kfree(led);
46135+
46136 return ret;
46137 }
46138
46139 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46140 {
46141 int ret;
46142- u8 b = 0;
46143+ u8 *b = kzalloc(1, GFP_KERNEL);
46144+
46145+ if (b == NULL)
46146+ return -ENOMEM;
46147
46148 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46149 return -EAGAIN;
46150@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46151 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46152 USB_TYPE_VENDOR | USB_DIR_OUT,
46153 (red << 8) | green, 0,
46154- &b, 1, 500);
46155+ b, 1, 500);
46156
46157 mutex_unlock(&d->i2c_mutex);
46158
46159+ kfree(b);
46160+
46161 return ret;
46162 }
46163
46164@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46165 struct dvb_usb_device_description **desc, int *cold)
46166 {
46167 int ret;
46168- u8 version[3];
46169+ u8 *version = kmalloc(3, GFP_KERNEL);
46170
46171 /* first select the interface */
46172 if (usb_set_interface(udev, 0, 1) != 0)
46173@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46174
46175 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46176
46177+ if (version == NULL)
46178+ return 0;
46179+
46180 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46181 GET_VERSION_INFO_VENDOR_REQUEST,
46182 USB_TYPE_VENDOR | USB_DIR_IN,
46183 0, 0,
46184- version, sizeof(version), 500);
46185+ version, 3, 500);
46186
46187 if (ret < 0)
46188 *cold = 1;
46189@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46190 *cold = 0;
46191 }
46192
46193+ kfree(version);
46194+
46195 return 0;
46196 }
46197
46198@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46199
46200 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46201 {
46202- u8 buf[62], *b;
46203+ u8 *buf, *b;
46204 int ret;
46205 struct ir_raw_event ev;
46206
46207+ buf = kmalloc(62, GFP_KERNEL);
46208+
46209+ if (buf == NULL)
46210+ return -ENOMEM;
46211+
46212 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46213 buf[1] = 0x08;
46214 buf[2] = 0x8f;
46215@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46216 GET_IR_DATA_VENDOR_REQUEST,
46217 USB_TYPE_VENDOR | USB_DIR_IN,
46218 0x8080, 0,
46219- buf, sizeof(buf), 500);
46220+ buf, 62, 500);
46221
46222 unlock:
46223 mutex_unlock(&d->i2c_mutex);
46224
46225- if (ret < 0)
46226+ if (ret < 0) {
46227+ kfree(buf);
46228 return ret;
46229+ }
46230
46231- if (ret == 1)
46232+ if (ret == 1) {
46233+ kfree(buf);
46234 return 0; /* no key pressed */
46235+ }
46236
46237 /* decoding */
46238 b = buf+1;
46239@@ -656,6 +689,8 @@ unlock:
46240
46241 ir_raw_event_handle(d->rc_dev);
46242
46243+ kfree(buf);
46244+
46245 return 1;
46246 }
46247
46248diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46249index af63543..0436f20 100644
46250--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46251+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46252@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46253 * by passing a very big num_planes value */
46254 uplane = compat_alloc_user_space(num_planes *
46255 sizeof(struct v4l2_plane));
46256- kp->m.planes = (__force struct v4l2_plane *)uplane;
46257+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46258
46259 while (--num_planes >= 0) {
46260 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46261@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46262 if (num_planes == 0)
46263 return 0;
46264
46265- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46266+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46267 if (get_user(p, &up->m.planes))
46268 return -EFAULT;
46269 uplane32 = compat_ptr(p);
46270@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46271 get_user(kp->flags, &up->flags) ||
46272 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46273 return -EFAULT;
46274- kp->base = (__force void *)compat_ptr(tmp);
46275+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46276 return 0;
46277 }
46278
46279@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46280 n * sizeof(struct v4l2_ext_control32)))
46281 return -EFAULT;
46282 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46283- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46284+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46285 while (--n >= 0) {
46286 u32 id;
46287
46288@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46289 {
46290 struct v4l2_ext_control32 __user *ucontrols;
46291 struct v4l2_ext_control __user *kcontrols =
46292- (__force struct v4l2_ext_control __user *)kp->controls;
46293+ (struct v4l2_ext_control __force_user *)kp->controls;
46294 int n = kp->count;
46295 compat_caddr_t p;
46296
46297@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46298 get_user(tmp, &up->edid) ||
46299 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46300 return -EFAULT;
46301- kp->edid = (__force u8 *)compat_ptr(tmp);
46302+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46303 return 0;
46304 }
46305
46306diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46307index 015f92a..59e311e 100644
46308--- a/drivers/media/v4l2-core/v4l2-device.c
46309+++ b/drivers/media/v4l2-core/v4l2-device.c
46310@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46311 EXPORT_SYMBOL_GPL(v4l2_device_put);
46312
46313 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46314- atomic_t *instance)
46315+ atomic_unchecked_t *instance)
46316 {
46317- int num = atomic_inc_return(instance) - 1;
46318+ int num = atomic_inc_return_unchecked(instance) - 1;
46319 int len = strlen(basename);
46320
46321 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46322diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46323index faac2f4..e39dcd9 100644
46324--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46325+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46326@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
46327 struct file *file, void *fh, void *p);
46328 } u;
46329 void (*debug)(const void *arg, bool write_only);
46330-};
46331+} __do_const;
46332+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46333
46334 /* This control needs a priority check */
46335 #define INFO_FL_PRIO (1 << 0)
46336@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
46337 struct video_device *vfd = video_devdata(file);
46338 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46339 bool write_only = false;
46340- struct v4l2_ioctl_info default_info;
46341+ v4l2_ioctl_info_no_const default_info;
46342 const struct v4l2_ioctl_info *info;
46343 void *fh = file->private_data;
46344 struct v4l2_fh *vfh = NULL;
46345@@ -2422,7 +2423,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46346 ret = -EINVAL;
46347 break;
46348 }
46349- *user_ptr = (void __user *)buf->m.planes;
46350+ *user_ptr = (void __force_user *)buf->m.planes;
46351 *kernel_ptr = (void **)&buf->m.planes;
46352 *array_size = sizeof(struct v4l2_plane) * buf->length;
46353 ret = 1;
46354@@ -2439,7 +2440,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46355 ret = -EINVAL;
46356 break;
46357 }
46358- *user_ptr = (void __user *)edid->edid;
46359+ *user_ptr = (void __force_user *)edid->edid;
46360 *kernel_ptr = (void **)&edid->edid;
46361 *array_size = edid->blocks * 128;
46362 ret = 1;
46363@@ -2457,7 +2458,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46364 ret = -EINVAL;
46365 break;
46366 }
46367- *user_ptr = (void __user *)ctrls->controls;
46368+ *user_ptr = (void __force_user *)ctrls->controls;
46369 *kernel_ptr = (void **)&ctrls->controls;
46370 *array_size = sizeof(struct v4l2_ext_control)
46371 * ctrls->count;
46372@@ -2558,7 +2559,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46373 }
46374
46375 if (has_array_args) {
46376- *kernel_ptr = (void __force *)user_ptr;
46377+ *kernel_ptr = (void __force_kernel *)user_ptr;
46378 if (copy_to_user(user_ptr, mbuf, array_size))
46379 err = -EFAULT;
46380 goto out_array_args;
46381diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
46382index 24696f5..3637780 100644
46383--- a/drivers/memory/omap-gpmc.c
46384+++ b/drivers/memory/omap-gpmc.c
46385@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
46386 };
46387
46388 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
46389-static struct irq_chip gpmc_irq_chip;
46390 static int gpmc_irq_start;
46391
46392 static struct resource gpmc_mem_root;
46393@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
46394
46395 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
46396
46397+static struct irq_chip gpmc_irq_chip = {
46398+ .name = "gpmc",
46399+ .irq_startup = gpmc_irq_noop_ret,
46400+ .irq_enable = gpmc_irq_enable,
46401+ .irq_disable = gpmc_irq_disable,
46402+ .irq_shutdown = gpmc_irq_noop,
46403+ .irq_ack = gpmc_irq_noop,
46404+ .irq_mask = gpmc_irq_noop,
46405+ .irq_unmask = gpmc_irq_noop,
46406+};
46407+
46408 static int gpmc_setup_irq(void)
46409 {
46410 int i;
46411@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
46412 return gpmc_irq_start;
46413 }
46414
46415- gpmc_irq_chip.name = "gpmc";
46416- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
46417- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
46418- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
46419- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
46420- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
46421- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
46422- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
46423-
46424 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
46425 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
46426
46427diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46428index 187f836..679544b 100644
46429--- a/drivers/message/fusion/mptbase.c
46430+++ b/drivers/message/fusion/mptbase.c
46431@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46432 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46433 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46434
46435+#ifdef CONFIG_GRKERNSEC_HIDESYM
46436+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46437+#else
46438 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46439 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46440+#endif
46441+
46442 /*
46443 * Rounding UP to nearest 4-kB boundary here...
46444 */
46445@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46446 ioc->facts.GlobalCredits);
46447
46448 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46449+#ifdef CONFIG_GRKERNSEC_HIDESYM
46450+ NULL, NULL);
46451+#else
46452 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46453+#endif
46454 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46455 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46456 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46457diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46458index 5bdaae1..eced16f 100644
46459--- a/drivers/message/fusion/mptsas.c
46460+++ b/drivers/message/fusion/mptsas.c
46461@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46462 return 0;
46463 }
46464
46465+static inline void
46466+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46467+{
46468+ if (phy_info->port_details) {
46469+ phy_info->port_details->rphy = rphy;
46470+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46471+ ioc->name, rphy));
46472+ }
46473+
46474+ if (rphy) {
46475+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46476+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46477+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46478+ ioc->name, rphy, rphy->dev.release));
46479+ }
46480+}
46481+
46482 /* no mutex */
46483 static void
46484 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46485@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46486 return NULL;
46487 }
46488
46489-static inline void
46490-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46491-{
46492- if (phy_info->port_details) {
46493- phy_info->port_details->rphy = rphy;
46494- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46495- ioc->name, rphy));
46496- }
46497-
46498- if (rphy) {
46499- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46500- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46501- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46502- ioc->name, rphy, rphy->dev.release));
46503- }
46504-}
46505-
46506 static inline struct sas_port *
46507 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46508 {
46509diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46510index b7d87cd..3fb36da 100644
46511--- a/drivers/message/i2o/i2o_proc.c
46512+++ b/drivers/message/i2o/i2o_proc.c
46513@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46514 "Array Controller Device"
46515 };
46516
46517-static char *chtostr(char *tmp, u8 *chars, int n)
46518-{
46519- tmp[0] = 0;
46520- return strncat(tmp, (char *)chars, n);
46521-}
46522-
46523 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46524 char *group)
46525 {
46526@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46527 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46528 {
46529 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46530- static u32 work32[5];
46531- static u8 *work8 = (u8 *) work32;
46532- static u16 *work16 = (u16 *) work32;
46533+ u32 work32[5];
46534+ u8 *work8 = (u8 *) work32;
46535+ u16 *work16 = (u16 *) work32;
46536 int token;
46537 u32 hwcap;
46538
46539@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46540 } *result;
46541
46542 i2o_exec_execute_ddm_table ddm_table;
46543- char tmp[28 + 1];
46544
46545 result = kmalloc(sizeof(*result), GFP_KERNEL);
46546 if (!result)
46547@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46548
46549 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46550 seq_printf(seq, "%-#8x", ddm_table.module_id);
46551- seq_printf(seq, "%-29s",
46552- chtostr(tmp, ddm_table.module_name_version, 28));
46553+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46554 seq_printf(seq, "%9d ", ddm_table.data_size);
46555 seq_printf(seq, "%8d", ddm_table.code_size);
46556
46557@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46558
46559 i2o_driver_result_table *result;
46560 i2o_driver_store_table *dst;
46561- char tmp[28 + 1];
46562
46563 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46564 if (result == NULL)
46565@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46566
46567 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46568 seq_printf(seq, "%-#8x", dst->module_id);
46569- seq_printf(seq, "%-29s",
46570- chtostr(tmp, dst->module_name_version, 28));
46571- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46572+ seq_printf(seq, "%-.28s", dst->module_name_version);
46573+ seq_printf(seq, "%-.8s", dst->date);
46574 seq_printf(seq, "%8d ", dst->module_size);
46575 seq_printf(seq, "%8d ", dst->mpb_size);
46576 seq_printf(seq, "0x%04x", dst->module_flags);
46577@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46578 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46579 {
46580 struct i2o_device *d = (struct i2o_device *)seq->private;
46581- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46582+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46583 // == (allow) 512d bytes (max)
46584- static u16 *work16 = (u16 *) work32;
46585+ u16 *work16 = (u16 *) work32;
46586 int token;
46587- char tmp[16 + 1];
46588
46589 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46590
46591@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46592 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46593 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46594 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46595- seq_printf(seq, "Vendor info : %s\n",
46596- chtostr(tmp, (u8 *) (work32 + 2), 16));
46597- seq_printf(seq, "Product info : %s\n",
46598- chtostr(tmp, (u8 *) (work32 + 6), 16));
46599- seq_printf(seq, "Description : %s\n",
46600- chtostr(tmp, (u8 *) (work32 + 10), 16));
46601- seq_printf(seq, "Product rev. : %s\n",
46602- chtostr(tmp, (u8 *) (work32 + 14), 8));
46603+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46604+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46605+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46606+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46607
46608 seq_printf(seq, "Serial number : ");
46609 print_serial_number(seq, (u8 *) (work32 + 16),
46610@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46611 u8 pad[256]; // allow up to 256 byte (max) serial number
46612 } result;
46613
46614- char tmp[24 + 1];
46615-
46616 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46617
46618 if (token < 0) {
46619@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46620 }
46621
46622 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46623- seq_printf(seq, "Module name : %s\n",
46624- chtostr(tmp, result.module_name, 24));
46625- seq_printf(seq, "Module revision : %s\n",
46626- chtostr(tmp, result.module_rev, 8));
46627+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
46628+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46629
46630 seq_printf(seq, "Serial number : ");
46631 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46632@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46633 u8 instance_number[4];
46634 } result;
46635
46636- char tmp[64 + 1];
46637-
46638 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46639
46640 if (token < 0) {
46641@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46642 return 0;
46643 }
46644
46645- seq_printf(seq, "Device name : %s\n",
46646- chtostr(tmp, result.device_name, 64));
46647- seq_printf(seq, "Service name : %s\n",
46648- chtostr(tmp, result.service_name, 64));
46649- seq_printf(seq, "Physical name : %s\n",
46650- chtostr(tmp, result.physical_location, 64));
46651- seq_printf(seq, "Instance number : %s\n",
46652- chtostr(tmp, result.instance_number, 4));
46653+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
46654+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
46655+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46656+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46657
46658 return 0;
46659 }
46660@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46661 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46662 {
46663 struct i2o_device *d = (struct i2o_device *)seq->private;
46664- static u32 work32[12];
46665- static u16 *work16 = (u16 *) work32;
46666- static u8 *work8 = (u8 *) work32;
46667+ u32 work32[12];
46668+ u16 *work16 = (u16 *) work32;
46669+ u8 *work8 = (u8 *) work32;
46670 int token;
46671
46672 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46673diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46674index 92752fb..a7494f6 100644
46675--- a/drivers/message/i2o/iop.c
46676+++ b/drivers/message/i2o/iop.c
46677@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46678
46679 spin_lock_irqsave(&c->context_list_lock, flags);
46680
46681- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46682- atomic_inc(&c->context_list_counter);
46683+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46684+ atomic_inc_unchecked(&c->context_list_counter);
46685
46686- entry->context = atomic_read(&c->context_list_counter);
46687+ entry->context = atomic_read_unchecked(&c->context_list_counter);
46688
46689 list_add(&entry->list, &c->context_list);
46690
46691@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46692
46693 #if BITS_PER_LONG == 64
46694 spin_lock_init(&c->context_list_lock);
46695- atomic_set(&c->context_list_counter, 0);
46696+ atomic_set_unchecked(&c->context_list_counter, 0);
46697 INIT_LIST_HEAD(&c->context_list);
46698 #endif
46699
46700diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46701index 9a8e185..27ff17d 100644
46702--- a/drivers/mfd/ab8500-debugfs.c
46703+++ b/drivers/mfd/ab8500-debugfs.c
46704@@ -100,7 +100,7 @@ static int irq_last;
46705 static u32 *irq_count;
46706 static int num_irqs;
46707
46708-static struct device_attribute **dev_attr;
46709+static device_attribute_no_const **dev_attr;
46710 static char **event_name;
46711
46712 static u8 avg_sample = SAMPLE_16;
46713diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
46714index 5615522..1eb6f3dc 100644
46715--- a/drivers/mfd/kempld-core.c
46716+++ b/drivers/mfd/kempld-core.c
46717@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
46718 .remove = kempld_remove,
46719 };
46720
46721-static struct dmi_system_id kempld_dmi_table[] __initdata = {
46722+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
46723 {
46724 .ident = "BHL6",
46725 .matches = {
46726diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46727index c880c89..45a7c68 100644
46728--- a/drivers/mfd/max8925-i2c.c
46729+++ b/drivers/mfd/max8925-i2c.c
46730@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46731 const struct i2c_device_id *id)
46732 {
46733 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46734- static struct max8925_chip *chip;
46735+ struct max8925_chip *chip;
46736 struct device_node *node = client->dev.of_node;
46737
46738 if (node && !pdata) {
46739diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46740index 7612d89..70549c2 100644
46741--- a/drivers/mfd/tps65910.c
46742+++ b/drivers/mfd/tps65910.c
46743@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46744 struct tps65910_platform_data *pdata)
46745 {
46746 int ret = 0;
46747- static struct regmap_irq_chip *tps6591x_irqs_chip;
46748+ struct regmap_irq_chip *tps6591x_irqs_chip;
46749
46750 if (!irq) {
46751 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46752diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46753index 1b772ef..01e77d33 100644
46754--- a/drivers/mfd/twl4030-irq.c
46755+++ b/drivers/mfd/twl4030-irq.c
46756@@ -34,6 +34,7 @@
46757 #include <linux/of.h>
46758 #include <linux/irqdomain.h>
46759 #include <linux/i2c/twl.h>
46760+#include <asm/pgtable.h>
46761
46762 #include "twl-core.h"
46763
46764@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46765 * Install an irq handler for each of the SIH modules;
46766 * clone dummy irq_chip since PIH can't *do* anything
46767 */
46768- twl4030_irq_chip = dummy_irq_chip;
46769- twl4030_irq_chip.name = "twl4030";
46770+ pax_open_kernel();
46771+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46772+ *(const char **)&twl4030_irq_chip.name = "twl4030";
46773
46774- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46775+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46776+ pax_close_kernel();
46777
46778 for (i = irq_base; i < irq_end; i++) {
46779 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46780diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46781index 464419b..64bae8d 100644
46782--- a/drivers/misc/c2port/core.c
46783+++ b/drivers/misc/c2port/core.c
46784@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46785 goto error_idr_alloc;
46786 c2dev->id = ret;
46787
46788- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46789+ pax_open_kernel();
46790+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46791+ pax_close_kernel();
46792
46793 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46794 "c2port%d", c2dev->id);
46795diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46796index 8385177..2f54635 100644
46797--- a/drivers/misc/eeprom/sunxi_sid.c
46798+++ b/drivers/misc/eeprom/sunxi_sid.c
46799@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46800
46801 platform_set_drvdata(pdev, sid_data);
46802
46803- sid_bin_attr.size = sid_data->keysize;
46804+ pax_open_kernel();
46805+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46806+ pax_close_kernel();
46807 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46808 return -ENODEV;
46809
46810diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46811index 36f5d52..32311c3 100644
46812--- a/drivers/misc/kgdbts.c
46813+++ b/drivers/misc/kgdbts.c
46814@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46815 char before[BREAK_INSTR_SIZE];
46816 char after[BREAK_INSTR_SIZE];
46817
46818- probe_kernel_read(before, (char *)kgdbts_break_test,
46819+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46820 BREAK_INSTR_SIZE);
46821 init_simple_test();
46822 ts.tst = plant_and_detach_test;
46823@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46824 /* Activate test with initial breakpoint */
46825 if (!is_early)
46826 kgdb_breakpoint();
46827- probe_kernel_read(after, (char *)kgdbts_break_test,
46828+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46829 BREAK_INSTR_SIZE);
46830 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46831 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46832diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46833index 3ef4627..8d00486 100644
46834--- a/drivers/misc/lis3lv02d/lis3lv02d.c
46835+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46836@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46837 * the lid is closed. This leads to interrupts as soon as a little move
46838 * is done.
46839 */
46840- atomic_inc(&lis3->count);
46841+ atomic_inc_unchecked(&lis3->count);
46842
46843 wake_up_interruptible(&lis3->misc_wait);
46844 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46845@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46846 if (lis3->pm_dev)
46847 pm_runtime_get_sync(lis3->pm_dev);
46848
46849- atomic_set(&lis3->count, 0);
46850+ atomic_set_unchecked(&lis3->count, 0);
46851 return 0;
46852 }
46853
46854@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46855 add_wait_queue(&lis3->misc_wait, &wait);
46856 while (true) {
46857 set_current_state(TASK_INTERRUPTIBLE);
46858- data = atomic_xchg(&lis3->count, 0);
46859+ data = atomic_xchg_unchecked(&lis3->count, 0);
46860 if (data)
46861 break;
46862
46863@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46864 struct lis3lv02d, miscdev);
46865
46866 poll_wait(file, &lis3->misc_wait, wait);
46867- if (atomic_read(&lis3->count))
46868+ if (atomic_read_unchecked(&lis3->count))
46869 return POLLIN | POLLRDNORM;
46870 return 0;
46871 }
46872diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46873index c439c82..1f20f57 100644
46874--- a/drivers/misc/lis3lv02d/lis3lv02d.h
46875+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46876@@ -297,7 +297,7 @@ struct lis3lv02d {
46877 struct input_polled_dev *idev; /* input device */
46878 struct platform_device *pdev; /* platform device */
46879 struct regulator_bulk_data regulators[2];
46880- atomic_t count; /* interrupt count after last read */
46881+ atomic_unchecked_t count; /* interrupt count after last read */
46882 union axis_conversion ac; /* hw -> logical axis */
46883 int mapped_btns[3];
46884
46885diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46886index 2f30bad..c4c13d0 100644
46887--- a/drivers/misc/sgi-gru/gruhandles.c
46888+++ b/drivers/misc/sgi-gru/gruhandles.c
46889@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46890 unsigned long nsec;
46891
46892 nsec = CLKS2NSEC(clks);
46893- atomic_long_inc(&mcs_op_statistics[op].count);
46894- atomic_long_add(nsec, &mcs_op_statistics[op].total);
46895+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46896+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46897 if (mcs_op_statistics[op].max < nsec)
46898 mcs_op_statistics[op].max = nsec;
46899 }
46900diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46901index 4f76359..cdfcb2e 100644
46902--- a/drivers/misc/sgi-gru/gruprocfs.c
46903+++ b/drivers/misc/sgi-gru/gruprocfs.c
46904@@ -32,9 +32,9 @@
46905
46906 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46907
46908-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46909+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46910 {
46911- unsigned long val = atomic_long_read(v);
46912+ unsigned long val = atomic_long_read_unchecked(v);
46913
46914 seq_printf(s, "%16lu %s\n", val, id);
46915 }
46916@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46917
46918 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46919 for (op = 0; op < mcsop_last; op++) {
46920- count = atomic_long_read(&mcs_op_statistics[op].count);
46921- total = atomic_long_read(&mcs_op_statistics[op].total);
46922+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46923+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46924 max = mcs_op_statistics[op].max;
46925 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46926 count ? total / count : 0, max);
46927diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46928index 5c3ce24..4915ccb 100644
46929--- a/drivers/misc/sgi-gru/grutables.h
46930+++ b/drivers/misc/sgi-gru/grutables.h
46931@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46932 * GRU statistics.
46933 */
46934 struct gru_stats_s {
46935- atomic_long_t vdata_alloc;
46936- atomic_long_t vdata_free;
46937- atomic_long_t gts_alloc;
46938- atomic_long_t gts_free;
46939- atomic_long_t gms_alloc;
46940- atomic_long_t gms_free;
46941- atomic_long_t gts_double_allocate;
46942- atomic_long_t assign_context;
46943- atomic_long_t assign_context_failed;
46944- atomic_long_t free_context;
46945- atomic_long_t load_user_context;
46946- atomic_long_t load_kernel_context;
46947- atomic_long_t lock_kernel_context;
46948- atomic_long_t unlock_kernel_context;
46949- atomic_long_t steal_user_context;
46950- atomic_long_t steal_kernel_context;
46951- atomic_long_t steal_context_failed;
46952- atomic_long_t nopfn;
46953- atomic_long_t asid_new;
46954- atomic_long_t asid_next;
46955- atomic_long_t asid_wrap;
46956- atomic_long_t asid_reuse;
46957- atomic_long_t intr;
46958- atomic_long_t intr_cbr;
46959- atomic_long_t intr_tfh;
46960- atomic_long_t intr_spurious;
46961- atomic_long_t intr_mm_lock_failed;
46962- atomic_long_t call_os;
46963- atomic_long_t call_os_wait_queue;
46964- atomic_long_t user_flush_tlb;
46965- atomic_long_t user_unload_context;
46966- atomic_long_t user_exception;
46967- atomic_long_t set_context_option;
46968- atomic_long_t check_context_retarget_intr;
46969- atomic_long_t check_context_unload;
46970- atomic_long_t tlb_dropin;
46971- atomic_long_t tlb_preload_page;
46972- atomic_long_t tlb_dropin_fail_no_asid;
46973- atomic_long_t tlb_dropin_fail_upm;
46974- atomic_long_t tlb_dropin_fail_invalid;
46975- atomic_long_t tlb_dropin_fail_range_active;
46976- atomic_long_t tlb_dropin_fail_idle;
46977- atomic_long_t tlb_dropin_fail_fmm;
46978- atomic_long_t tlb_dropin_fail_no_exception;
46979- atomic_long_t tfh_stale_on_fault;
46980- atomic_long_t mmu_invalidate_range;
46981- atomic_long_t mmu_invalidate_page;
46982- atomic_long_t flush_tlb;
46983- atomic_long_t flush_tlb_gru;
46984- atomic_long_t flush_tlb_gru_tgh;
46985- atomic_long_t flush_tlb_gru_zero_asid;
46986+ atomic_long_unchecked_t vdata_alloc;
46987+ atomic_long_unchecked_t vdata_free;
46988+ atomic_long_unchecked_t gts_alloc;
46989+ atomic_long_unchecked_t gts_free;
46990+ atomic_long_unchecked_t gms_alloc;
46991+ atomic_long_unchecked_t gms_free;
46992+ atomic_long_unchecked_t gts_double_allocate;
46993+ atomic_long_unchecked_t assign_context;
46994+ atomic_long_unchecked_t assign_context_failed;
46995+ atomic_long_unchecked_t free_context;
46996+ atomic_long_unchecked_t load_user_context;
46997+ atomic_long_unchecked_t load_kernel_context;
46998+ atomic_long_unchecked_t lock_kernel_context;
46999+ atomic_long_unchecked_t unlock_kernel_context;
47000+ atomic_long_unchecked_t steal_user_context;
47001+ atomic_long_unchecked_t steal_kernel_context;
47002+ atomic_long_unchecked_t steal_context_failed;
47003+ atomic_long_unchecked_t nopfn;
47004+ atomic_long_unchecked_t asid_new;
47005+ atomic_long_unchecked_t asid_next;
47006+ atomic_long_unchecked_t asid_wrap;
47007+ atomic_long_unchecked_t asid_reuse;
47008+ atomic_long_unchecked_t intr;
47009+ atomic_long_unchecked_t intr_cbr;
47010+ atomic_long_unchecked_t intr_tfh;
47011+ atomic_long_unchecked_t intr_spurious;
47012+ atomic_long_unchecked_t intr_mm_lock_failed;
47013+ atomic_long_unchecked_t call_os;
47014+ atomic_long_unchecked_t call_os_wait_queue;
47015+ atomic_long_unchecked_t user_flush_tlb;
47016+ atomic_long_unchecked_t user_unload_context;
47017+ atomic_long_unchecked_t user_exception;
47018+ atomic_long_unchecked_t set_context_option;
47019+ atomic_long_unchecked_t check_context_retarget_intr;
47020+ atomic_long_unchecked_t check_context_unload;
47021+ atomic_long_unchecked_t tlb_dropin;
47022+ atomic_long_unchecked_t tlb_preload_page;
47023+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47024+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47025+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47026+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47027+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47028+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47029+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47030+ atomic_long_unchecked_t tfh_stale_on_fault;
47031+ atomic_long_unchecked_t mmu_invalidate_range;
47032+ atomic_long_unchecked_t mmu_invalidate_page;
47033+ atomic_long_unchecked_t flush_tlb;
47034+ atomic_long_unchecked_t flush_tlb_gru;
47035+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47036+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47037
47038- atomic_long_t copy_gpa;
47039- atomic_long_t read_gpa;
47040+ atomic_long_unchecked_t copy_gpa;
47041+ atomic_long_unchecked_t read_gpa;
47042
47043- atomic_long_t mesq_receive;
47044- atomic_long_t mesq_receive_none;
47045- atomic_long_t mesq_send;
47046- atomic_long_t mesq_send_failed;
47047- atomic_long_t mesq_noop;
47048- atomic_long_t mesq_send_unexpected_error;
47049- atomic_long_t mesq_send_lb_overflow;
47050- atomic_long_t mesq_send_qlimit_reached;
47051- atomic_long_t mesq_send_amo_nacked;
47052- atomic_long_t mesq_send_put_nacked;
47053- atomic_long_t mesq_page_overflow;
47054- atomic_long_t mesq_qf_locked;
47055- atomic_long_t mesq_qf_noop_not_full;
47056- atomic_long_t mesq_qf_switch_head_failed;
47057- atomic_long_t mesq_qf_unexpected_error;
47058- atomic_long_t mesq_noop_unexpected_error;
47059- atomic_long_t mesq_noop_lb_overflow;
47060- atomic_long_t mesq_noop_qlimit_reached;
47061- atomic_long_t mesq_noop_amo_nacked;
47062- atomic_long_t mesq_noop_put_nacked;
47063- atomic_long_t mesq_noop_page_overflow;
47064+ atomic_long_unchecked_t mesq_receive;
47065+ atomic_long_unchecked_t mesq_receive_none;
47066+ atomic_long_unchecked_t mesq_send;
47067+ atomic_long_unchecked_t mesq_send_failed;
47068+ atomic_long_unchecked_t mesq_noop;
47069+ atomic_long_unchecked_t mesq_send_unexpected_error;
47070+ atomic_long_unchecked_t mesq_send_lb_overflow;
47071+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47072+ atomic_long_unchecked_t mesq_send_amo_nacked;
47073+ atomic_long_unchecked_t mesq_send_put_nacked;
47074+ atomic_long_unchecked_t mesq_page_overflow;
47075+ atomic_long_unchecked_t mesq_qf_locked;
47076+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47077+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47078+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47079+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47080+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47081+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47082+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47083+ atomic_long_unchecked_t mesq_noop_put_nacked;
47084+ atomic_long_unchecked_t mesq_noop_page_overflow;
47085
47086 };
47087
47088@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47089 tghop_invalidate, mcsop_last};
47090
47091 struct mcs_op_statistic {
47092- atomic_long_t count;
47093- atomic_long_t total;
47094+ atomic_long_unchecked_t count;
47095+ atomic_long_unchecked_t total;
47096 unsigned long max;
47097 };
47098
47099@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47100
47101 #define STAT(id) do { \
47102 if (gru_options & OPT_STATS) \
47103- atomic_long_inc(&gru_stats.id); \
47104+ atomic_long_inc_unchecked(&gru_stats.id); \
47105 } while (0)
47106
47107 #ifdef CONFIG_SGI_GRU_DEBUG
47108diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47109index c862cd4..0d176fe 100644
47110--- a/drivers/misc/sgi-xp/xp.h
47111+++ b/drivers/misc/sgi-xp/xp.h
47112@@ -288,7 +288,7 @@ struct xpc_interface {
47113 xpc_notify_func, void *);
47114 void (*received) (short, int, void *);
47115 enum xp_retval (*partid_to_nasids) (short, void *);
47116-};
47117+} __no_const;
47118
47119 extern struct xpc_interface xpc_interface;
47120
47121diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47122index 01be66d..e3a0c7e 100644
47123--- a/drivers/misc/sgi-xp/xp_main.c
47124+++ b/drivers/misc/sgi-xp/xp_main.c
47125@@ -78,13 +78,13 @@ xpc_notloaded(void)
47126 }
47127
47128 struct xpc_interface xpc_interface = {
47129- (void (*)(int))xpc_notloaded,
47130- (void (*)(int))xpc_notloaded,
47131- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47132- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47133+ .connect = (void (*)(int))xpc_notloaded,
47134+ .disconnect = (void (*)(int))xpc_notloaded,
47135+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47136+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47137 void *))xpc_notloaded,
47138- (void (*)(short, int, void *))xpc_notloaded,
47139- (enum xp_retval(*)(short, void *))xpc_notloaded
47140+ .received = (void (*)(short, int, void *))xpc_notloaded,
47141+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47142 };
47143 EXPORT_SYMBOL_GPL(xpc_interface);
47144
47145diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47146index b94d5f7..7f494c5 100644
47147--- a/drivers/misc/sgi-xp/xpc.h
47148+++ b/drivers/misc/sgi-xp/xpc.h
47149@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47150 void (*received_payload) (struct xpc_channel *, void *);
47151 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47152 };
47153+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47154
47155 /* struct xpc_partition act_state values (for XPC HB) */
47156
47157@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47158 /* found in xpc_main.c */
47159 extern struct device *xpc_part;
47160 extern struct device *xpc_chan;
47161-extern struct xpc_arch_operations xpc_arch_ops;
47162+extern xpc_arch_operations_no_const xpc_arch_ops;
47163 extern int xpc_disengage_timelimit;
47164 extern int xpc_disengage_timedout;
47165 extern int xpc_activate_IRQ_rcvd;
47166diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47167index 82dc574..8539ab2 100644
47168--- a/drivers/misc/sgi-xp/xpc_main.c
47169+++ b/drivers/misc/sgi-xp/xpc_main.c
47170@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47171 .notifier_call = xpc_system_die,
47172 };
47173
47174-struct xpc_arch_operations xpc_arch_ops;
47175+xpc_arch_operations_no_const xpc_arch_ops;
47176
47177 /*
47178 * Timer function to enforce the timelimit on the partition disengage.
47179@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47180
47181 if (((die_args->trapnr == X86_TRAP_MF) ||
47182 (die_args->trapnr == X86_TRAP_XF)) &&
47183- !user_mode_vm(die_args->regs))
47184+ !user_mode(die_args->regs))
47185 xpc_die_deactivate();
47186
47187 break;
47188diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47189index 4409d79..d7766d0 100644
47190--- a/drivers/mmc/card/block.c
47191+++ b/drivers/mmc/card/block.c
47192@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47193 if (idata->ic.postsleep_min_us)
47194 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47195
47196- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47197+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47198 err = -EFAULT;
47199 goto cmd_rel_host;
47200 }
47201diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47202index 0d0f7a2..45b8d60 100644
47203--- a/drivers/mmc/host/dw_mmc.h
47204+++ b/drivers/mmc/host/dw_mmc.h
47205@@ -276,5 +276,5 @@ struct dw_mci_drv_data {
47206 int (*parse_dt)(struct dw_mci *host);
47207 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
47208 struct dw_mci_tuning_data *tuning_data);
47209-};
47210+} __do_const;
47211 #endif /* _DW_MMC_H_ */
47212diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47213index 8232e9a..7776006 100644
47214--- a/drivers/mmc/host/mmci.c
47215+++ b/drivers/mmc/host/mmci.c
47216@@ -1635,7 +1635,9 @@ static int mmci_probe(struct amba_device *dev,
47217 mmc->caps |= MMC_CAP_CMD23;
47218
47219 if (variant->busy_detect) {
47220- mmci_ops.card_busy = mmci_card_busy;
47221+ pax_open_kernel();
47222+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47223+ pax_close_kernel();
47224 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47225 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47226 mmc->max_busy_timeout = 0;
47227diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47228index 7c71dcd..74cb746 100644
47229--- a/drivers/mmc/host/omap_hsmmc.c
47230+++ b/drivers/mmc/host/omap_hsmmc.c
47231@@ -2120,7 +2120,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47232
47233 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47234 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47235- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47236+ pax_open_kernel();
47237+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47238+ pax_close_kernel();
47239 }
47240
47241 pm_runtime_enable(host->dev);
47242diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47243index af1f7c0..00d368a 100644
47244--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47245+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47246@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47247 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47248 }
47249
47250- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47251- sdhci_esdhc_ops.platform_execute_tuning =
47252+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47253+ pax_open_kernel();
47254+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47255 esdhc_executing_tuning;
47256+ pax_close_kernel();
47257+ }
47258
47259 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47260 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47261diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47262index c45b893..fba0144 100644
47263--- a/drivers/mmc/host/sdhci-s3c.c
47264+++ b/drivers/mmc/host/sdhci-s3c.c
47265@@ -590,9 +590,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47266 * we can use overriding functions instead of default.
47267 */
47268 if (sc->no_divider) {
47269- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47270- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47271- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47272+ pax_open_kernel();
47273+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47274+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47275+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47276+ pax_close_kernel();
47277 }
47278
47279 /* It supports additional host capabilities if needed */
47280diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47281index 423666b..81ff5eb 100644
47282--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47283+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47284@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47285 size_t totlen = 0, thislen;
47286 int ret = 0;
47287 size_t buflen = 0;
47288- static char *buffer;
47289+ char *buffer;
47290
47291 if (!ECCBUF_SIZE) {
47292 /* We should fall back to a general writev implementation.
47293diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47294index b3b7ca1..5dd4634 100644
47295--- a/drivers/mtd/nand/denali.c
47296+++ b/drivers/mtd/nand/denali.c
47297@@ -24,6 +24,7 @@
47298 #include <linux/slab.h>
47299 #include <linux/mtd/mtd.h>
47300 #include <linux/module.h>
47301+#include <linux/slab.h>
47302
47303 #include "denali.h"
47304
47305diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47306index 4f3851a..f477a23 100644
47307--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47308+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47309@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47310
47311 /* first try to map the upper buffer directly */
47312 if (virt_addr_valid(this->upper_buf) &&
47313- !object_is_on_stack(this->upper_buf)) {
47314+ !object_starts_on_stack(this->upper_buf)) {
47315 sg_init_one(sgl, this->upper_buf, this->upper_len);
47316 ret = dma_map_sg(this->dev, sgl, 1, dr);
47317 if (ret == 0)
47318diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47319index 51b9d6a..52af9a7 100644
47320--- a/drivers/mtd/nftlmount.c
47321+++ b/drivers/mtd/nftlmount.c
47322@@ -24,6 +24,7 @@
47323 #include <asm/errno.h>
47324 #include <linux/delay.h>
47325 #include <linux/slab.h>
47326+#include <linux/sched.h>
47327 #include <linux/mtd/mtd.h>
47328 #include <linux/mtd/nand.h>
47329 #include <linux/mtd/nftl.h>
47330diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47331index c23184a..4115c41 100644
47332--- a/drivers/mtd/sm_ftl.c
47333+++ b/drivers/mtd/sm_ftl.c
47334@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47335 #define SM_CIS_VENDOR_OFFSET 0x59
47336 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47337 {
47338- struct attribute_group *attr_group;
47339+ attribute_group_no_const *attr_group;
47340 struct attribute **attributes;
47341 struct sm_sysfs_attribute *vendor_attribute;
47342 char *vendor;
47343diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47344index 7b11243..b3278a3 100644
47345--- a/drivers/net/bonding/bond_netlink.c
47346+++ b/drivers/net/bonding/bond_netlink.c
47347@@ -585,7 +585,7 @@ nla_put_failure:
47348 return -EMSGSIZE;
47349 }
47350
47351-struct rtnl_link_ops bond_link_ops __read_mostly = {
47352+struct rtnl_link_ops bond_link_ops = {
47353 .kind = "bond",
47354 .priv_size = sizeof(struct bonding),
47355 .setup = bond_setup,
47356diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47357index b3b922a..80bba38 100644
47358--- a/drivers/net/caif/caif_hsi.c
47359+++ b/drivers/net/caif/caif_hsi.c
47360@@ -1444,7 +1444,7 @@ err:
47361 return -ENODEV;
47362 }
47363
47364-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47365+static struct rtnl_link_ops caif_hsi_link_ops = {
47366 .kind = "cfhsi",
47367 .priv_size = sizeof(struct cfhsi),
47368 .setup = cfhsi_setup,
47369diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47370index 98d73aa..63ef9da 100644
47371--- a/drivers/net/can/Kconfig
47372+++ b/drivers/net/can/Kconfig
47373@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47374
47375 config CAN_FLEXCAN
47376 tristate "Support for Freescale FLEXCAN based chips"
47377- depends on ARM || PPC
47378+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47379 ---help---
47380 Say Y here if you want to support for Freescale FlexCAN.
47381
47382diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47383index 62ca0e8..3bed607 100644
47384--- a/drivers/net/can/dev.c
47385+++ b/drivers/net/can/dev.c
47386@@ -958,7 +958,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47387 return -EOPNOTSUPP;
47388 }
47389
47390-static struct rtnl_link_ops can_link_ops __read_mostly = {
47391+static struct rtnl_link_ops can_link_ops = {
47392 .kind = "can",
47393 .maxtype = IFLA_CAN_MAX,
47394 .policy = can_policy,
47395diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47396index 674f367..ec3a31f 100644
47397--- a/drivers/net/can/vcan.c
47398+++ b/drivers/net/can/vcan.c
47399@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47400 dev->destructor = free_netdev;
47401 }
47402
47403-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47404+static struct rtnl_link_ops vcan_link_ops = {
47405 .kind = "vcan",
47406 .setup = vcan_setup,
47407 };
47408diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47409index 49adbf1..fff7ff8 100644
47410--- a/drivers/net/dummy.c
47411+++ b/drivers/net/dummy.c
47412@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47413 return 0;
47414 }
47415
47416-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47417+static struct rtnl_link_ops dummy_link_ops = {
47418 .kind = DRV_NAME,
47419 .setup = dummy_setup,
47420 .validate = dummy_validate,
47421diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47422index 0443654..4f0aa18 100644
47423--- a/drivers/net/ethernet/8390/ax88796.c
47424+++ b/drivers/net/ethernet/8390/ax88796.c
47425@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47426 if (ax->plat->reg_offsets)
47427 ei_local->reg_offset = ax->plat->reg_offsets;
47428 else {
47429+ resource_size_t _mem_size = mem_size;
47430+ do_div(_mem_size, 0x18);
47431 ei_local->reg_offset = ax->reg_offsets;
47432 for (ret = 0; ret < 0x18; ret++)
47433- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47434+ ax->reg_offsets[ret] = _mem_size * ret;
47435 }
47436
47437 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47438diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47439index 760c72c..a99728c 100644
47440--- a/drivers/net/ethernet/altera/altera_tse_main.c
47441+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47442@@ -1217,7 +1217,7 @@ static int tse_shutdown(struct net_device *dev)
47443 return 0;
47444 }
47445
47446-static struct net_device_ops altera_tse_netdev_ops = {
47447+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47448 .ndo_open = tse_open,
47449 .ndo_stop = tse_shutdown,
47450 .ndo_start_xmit = tse_start_xmit,
47451@@ -1454,11 +1454,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47452 ndev->netdev_ops = &altera_tse_netdev_ops;
47453 altera_tse_set_ethtool_ops(ndev);
47454
47455+ pax_open_kernel();
47456 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47457
47458 if (priv->hash_filter)
47459 altera_tse_netdev_ops.ndo_set_rx_mode =
47460 tse_set_rx_mode_hashfilter;
47461+ pax_close_kernel();
47462
47463 /* Scatter/gather IO is not supported,
47464 * so it is turned off
47465diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47466index 29a0927..5a348e24 100644
47467--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47468+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47469@@ -1122,14 +1122,14 @@ do { \
47470 * operations, everything works on mask values.
47471 */
47472 #define XMDIO_READ(_pdata, _mmd, _reg) \
47473- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47474+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47475 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47476
47477 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47478 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47479
47480 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47481- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47482+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47483 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47484
47485 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47486diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47487index 8a50b01..39c1ad0 100644
47488--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47489+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47490@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47491
47492 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47493
47494- pdata->hw_if.config_dcb_tc(pdata);
47495+ pdata->hw_if->config_dcb_tc(pdata);
47496
47497 return 0;
47498 }
47499@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47500
47501 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47502
47503- pdata->hw_if.config_dcb_pfc(pdata);
47504+ pdata->hw_if->config_dcb_pfc(pdata);
47505
47506 return 0;
47507 }
47508diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47509index a50891f..b26fe24 100644
47510--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47511+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47512@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
47513
47514 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47515 {
47516- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47517+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47518 struct xgbe_channel *channel;
47519 struct xgbe_ring *ring;
47520 struct xgbe_ring_data *rdata;
47521@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47522
47523 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47524 {
47525- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47526+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47527 struct xgbe_channel *channel;
47528 struct xgbe_ring *ring;
47529 struct xgbe_ring_desc *rdesc;
47530@@ -624,7 +624,7 @@ err_out:
47531 static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
47532 {
47533 struct xgbe_prv_data *pdata = channel->pdata;
47534- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47535+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47536 struct xgbe_ring *ring = channel->rx_ring;
47537 struct xgbe_ring_data *rdata;
47538 int i;
47539@@ -650,17 +650,12 @@ static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
47540 DBGPR("<--xgbe_realloc_rx_buffer\n");
47541 }
47542
47543-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47544-{
47545- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47546-
47547- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47548- desc_if->free_ring_resources = xgbe_free_ring_resources;
47549- desc_if->map_tx_skb = xgbe_map_tx_skb;
47550- desc_if->realloc_rx_buffer = xgbe_realloc_rx_buffer;
47551- desc_if->unmap_rdata = xgbe_unmap_rdata;
47552- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47553- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47554-
47555- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47556-}
47557+const struct xgbe_desc_if default_xgbe_desc_if = {
47558+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47559+ .free_ring_resources = xgbe_free_ring_resources,
47560+ .map_tx_skb = xgbe_map_tx_skb,
47561+ .realloc_rx_buffer = xgbe_realloc_rx_buffer,
47562+ .unmap_rdata = xgbe_unmap_rdata,
47563+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47564+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47565+};
47566diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47567index 4c66cd1..1a20aab 100644
47568--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47569+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47570@@ -2703,7 +2703,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47571
47572 static int xgbe_init(struct xgbe_prv_data *pdata)
47573 {
47574- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47575+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47576 int ret;
47577
47578 DBGPR("-->xgbe_init\n");
47579@@ -2767,108 +2767,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47580 return 0;
47581 }
47582
47583-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47584-{
47585- DBGPR("-->xgbe_init_function_ptrs\n");
47586-
47587- hw_if->tx_complete = xgbe_tx_complete;
47588-
47589- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47590- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47591- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47592- hw_if->set_mac_address = xgbe_set_mac_address;
47593-
47594- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47595- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47596-
47597- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47598- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47599- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47600- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47601- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47602-
47603- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47604- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47605-
47606- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47607- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47608- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47609-
47610- hw_if->enable_tx = xgbe_enable_tx;
47611- hw_if->disable_tx = xgbe_disable_tx;
47612- hw_if->enable_rx = xgbe_enable_rx;
47613- hw_if->disable_rx = xgbe_disable_rx;
47614-
47615- hw_if->powerup_tx = xgbe_powerup_tx;
47616- hw_if->powerdown_tx = xgbe_powerdown_tx;
47617- hw_if->powerup_rx = xgbe_powerup_rx;
47618- hw_if->powerdown_rx = xgbe_powerdown_rx;
47619-
47620- hw_if->dev_xmit = xgbe_dev_xmit;
47621- hw_if->dev_read = xgbe_dev_read;
47622- hw_if->enable_int = xgbe_enable_int;
47623- hw_if->disable_int = xgbe_disable_int;
47624- hw_if->init = xgbe_init;
47625- hw_if->exit = xgbe_exit;
47626+const struct xgbe_hw_if default_xgbe_hw_if = {
47627+ .tx_complete = xgbe_tx_complete,
47628+
47629+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47630+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47631+ .add_mac_addresses = xgbe_add_mac_addresses,
47632+ .set_mac_address = xgbe_set_mac_address,
47633+
47634+ .enable_rx_csum = xgbe_enable_rx_csum,
47635+ .disable_rx_csum = xgbe_disable_rx_csum,
47636+
47637+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47638+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47639+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47640+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47641+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47642+
47643+ .read_mmd_regs = xgbe_read_mmd_regs,
47644+ .write_mmd_regs = xgbe_write_mmd_regs,
47645+
47646+ .set_gmii_speed = xgbe_set_gmii_speed,
47647+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47648+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47649+
47650+ .enable_tx = xgbe_enable_tx,
47651+ .disable_tx = xgbe_disable_tx,
47652+ .enable_rx = xgbe_enable_rx,
47653+ .disable_rx = xgbe_disable_rx,
47654+
47655+ .powerup_tx = xgbe_powerup_tx,
47656+ .powerdown_tx = xgbe_powerdown_tx,
47657+ .powerup_rx = xgbe_powerup_rx,
47658+ .powerdown_rx = xgbe_powerdown_rx,
47659+
47660+ .dev_xmit = xgbe_dev_xmit,
47661+ .dev_read = xgbe_dev_read,
47662+ .enable_int = xgbe_enable_int,
47663+ .disable_int = xgbe_disable_int,
47664+ .init = xgbe_init,
47665+ .exit = xgbe_exit,
47666
47667 /* Descriptor related Sequences have to be initialized here */
47668- hw_if->tx_desc_init = xgbe_tx_desc_init;
47669- hw_if->rx_desc_init = xgbe_rx_desc_init;
47670- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47671- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47672- hw_if->is_last_desc = xgbe_is_last_desc;
47673- hw_if->is_context_desc = xgbe_is_context_desc;
47674- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
47675+ .tx_desc_init = xgbe_tx_desc_init,
47676+ .rx_desc_init = xgbe_rx_desc_init,
47677+ .tx_desc_reset = xgbe_tx_desc_reset,
47678+ .rx_desc_reset = xgbe_rx_desc_reset,
47679+ .is_last_desc = xgbe_is_last_desc,
47680+ .is_context_desc = xgbe_is_context_desc,
47681+ .tx_start_xmit = xgbe_tx_start_xmit,
47682
47683 /* For FLOW ctrl */
47684- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47685- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47686+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47687+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47688
47689 /* For RX coalescing */
47690- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47691- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47692- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47693- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47694+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47695+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47696+ .usec_to_riwt = xgbe_usec_to_riwt,
47697+ .riwt_to_usec = xgbe_riwt_to_usec,
47698
47699 /* For RX and TX threshold config */
47700- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47701- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47702+ .config_rx_threshold = xgbe_config_rx_threshold,
47703+ .config_tx_threshold = xgbe_config_tx_threshold,
47704
47705 /* For RX and TX Store and Forward Mode config */
47706- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47707- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47708+ .config_rsf_mode = xgbe_config_rsf_mode,
47709+ .config_tsf_mode = xgbe_config_tsf_mode,
47710
47711 /* For TX DMA Operating on Second Frame config */
47712- hw_if->config_osp_mode = xgbe_config_osp_mode;
47713+ .config_osp_mode = xgbe_config_osp_mode,
47714
47715 /* For RX and TX PBL config */
47716- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47717- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47718- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47719- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47720- hw_if->config_pblx8 = xgbe_config_pblx8;
47721+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47722+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47723+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47724+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47725+ .config_pblx8 = xgbe_config_pblx8,
47726
47727 /* For MMC statistics support */
47728- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47729- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47730- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47731+ .tx_mmc_int = xgbe_tx_mmc_int,
47732+ .rx_mmc_int = xgbe_rx_mmc_int,
47733+ .read_mmc_stats = xgbe_read_mmc_stats,
47734
47735 /* For PTP config */
47736- hw_if->config_tstamp = xgbe_config_tstamp;
47737- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47738- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47739- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47740- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47741+ .config_tstamp = xgbe_config_tstamp,
47742+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47743+ .set_tstamp_time = xgbe_set_tstamp_time,
47744+ .get_tstamp_time = xgbe_get_tstamp_time,
47745+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47746
47747 /* For Data Center Bridging config */
47748- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47749- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47750+ .config_dcb_tc = xgbe_config_dcb_tc,
47751+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47752
47753 /* For Receive Side Scaling */
47754- hw_if->enable_rss = xgbe_enable_rss;
47755- hw_if->disable_rss = xgbe_disable_rss;
47756- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
47757- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
47758-
47759- DBGPR("<--xgbe_init_function_ptrs\n");
47760-}
47761+ .enable_rss = xgbe_enable_rss,
47762+ .disable_rss = xgbe_disable_rss,
47763+ .set_rss_hash_key = xgbe_set_rss_hash_key,
47764+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
47765+};
47766diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47767index e5ffb2c..e56d30b 100644
47768--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47769+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47770@@ -239,7 +239,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
47771 * support, tell it now
47772 */
47773 if (ring->tx.xmit_more)
47774- pdata->hw_if.tx_start_xmit(channel, ring);
47775+ pdata->hw_if->tx_start_xmit(channel, ring);
47776
47777 return NETDEV_TX_BUSY;
47778 }
47779@@ -267,7 +267,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47780
47781 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47782 {
47783- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47784+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47785 struct xgbe_channel *channel;
47786 enum xgbe_int int_id;
47787 unsigned int i;
47788@@ -289,7 +289,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47789
47790 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47791 {
47792- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47793+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47794 struct xgbe_channel *channel;
47795 enum xgbe_int int_id;
47796 unsigned int i;
47797@@ -312,7 +312,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47798 static irqreturn_t xgbe_isr(int irq, void *data)
47799 {
47800 struct xgbe_prv_data *pdata = data;
47801- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47802+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47803 struct xgbe_channel *channel;
47804 unsigned int dma_isr, dma_ch_isr;
47805 unsigned int mac_isr, mac_tssr;
47806@@ -611,7 +611,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47807
47808 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47809 {
47810- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47811+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47812
47813 DBGPR("-->xgbe_init_tx_coalesce\n");
47814
47815@@ -625,7 +625,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47816
47817 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47818 {
47819- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47820+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47821
47822 DBGPR("-->xgbe_init_rx_coalesce\n");
47823
47824@@ -639,7 +639,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47825
47826 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
47827 {
47828- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47829+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47830 struct xgbe_channel *channel;
47831 struct xgbe_ring *ring;
47832 struct xgbe_ring_data *rdata;
47833@@ -664,7 +664,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
47834
47835 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
47836 {
47837- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47838+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47839 struct xgbe_channel *channel;
47840 struct xgbe_ring *ring;
47841 struct xgbe_ring_data *rdata;
47842@@ -690,7 +690,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
47843 static void xgbe_adjust_link(struct net_device *netdev)
47844 {
47845 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47846- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47847+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47848 struct phy_device *phydev = pdata->phydev;
47849 int new_state = 0;
47850
47851@@ -798,7 +798,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47852 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47853 {
47854 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47855- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47856+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47857 unsigned long flags;
47858
47859 DBGPR("-->xgbe_powerdown\n");
47860@@ -836,7 +836,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47861 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47862 {
47863 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47864- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47865+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47866 unsigned long flags;
47867
47868 DBGPR("-->xgbe_powerup\n");
47869@@ -873,7 +873,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47870
47871 static int xgbe_start(struct xgbe_prv_data *pdata)
47872 {
47873- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47874+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47875 struct net_device *netdev = pdata->netdev;
47876
47877 DBGPR("-->xgbe_start\n");
47878@@ -899,7 +899,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47879
47880 static void xgbe_stop(struct xgbe_prv_data *pdata)
47881 {
47882- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47883+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47884 struct xgbe_channel *channel;
47885 struct net_device *netdev = pdata->netdev;
47886 struct netdev_queue *txq;
47887@@ -932,7 +932,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47888 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47889 {
47890 struct xgbe_channel *channel;
47891- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47892+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47893 unsigned int i;
47894
47895 DBGPR("-->xgbe_restart_dev\n");
47896@@ -1135,7 +1135,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47897 return -ERANGE;
47898 }
47899
47900- pdata->hw_if.config_tstamp(pdata, mac_tscr);
47901+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
47902
47903 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47904
47905@@ -1284,8 +1284,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47906 static int xgbe_open(struct net_device *netdev)
47907 {
47908 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47909- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47910- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47911+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47912+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47913 struct xgbe_channel *channel = NULL;
47914 unsigned int i = 0;
47915 int ret;
47916@@ -1400,8 +1400,8 @@ err_phy_init:
47917 static int xgbe_close(struct net_device *netdev)
47918 {
47919 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47920- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47921- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47922+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47923+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47924 struct xgbe_channel *channel;
47925 unsigned int i;
47926
47927@@ -1442,8 +1442,8 @@ static int xgbe_close(struct net_device *netdev)
47928 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47929 {
47930 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47931- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47932- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47933+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47934+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47935 struct xgbe_channel *channel;
47936 struct xgbe_ring *ring;
47937 struct xgbe_packet_data *packet;
47938@@ -1518,7 +1518,7 @@ tx_netdev_return:
47939 static void xgbe_set_rx_mode(struct net_device *netdev)
47940 {
47941 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47942- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47943+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47944 unsigned int pr_mode, am_mode;
47945
47946 DBGPR("-->xgbe_set_rx_mode\n");
47947@@ -1537,7 +1537,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47948 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47949 {
47950 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47951- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47952+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47953 struct sockaddr *saddr = addr;
47954
47955 DBGPR("-->xgbe_set_mac_address\n");
47956@@ -1604,7 +1604,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47957
47958 DBGPR("-->%s\n", __func__);
47959
47960- pdata->hw_if.read_mmc_stats(pdata);
47961+ pdata->hw_if->read_mmc_stats(pdata);
47962
47963 s->rx_packets = pstats->rxframecount_gb;
47964 s->rx_bytes = pstats->rxoctetcount_gb;
47965@@ -1631,7 +1631,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47966 u16 vid)
47967 {
47968 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47969- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47970+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47971
47972 DBGPR("-->%s\n", __func__);
47973
47974@@ -1647,7 +1647,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47975 u16 vid)
47976 {
47977 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47978- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47979+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47980
47981 DBGPR("-->%s\n", __func__);
47982
47983@@ -1713,7 +1713,7 @@ static int xgbe_set_features(struct net_device *netdev,
47984 netdev_features_t features)
47985 {
47986 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47987- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47988+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47989 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
47990 int ret = 0;
47991
47992@@ -1778,7 +1778,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47993 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47994 {
47995 struct xgbe_prv_data *pdata = channel->pdata;
47996- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47997+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47998 struct xgbe_ring *ring = channel->rx_ring;
47999 struct xgbe_ring_data *rdata;
48000
48001@@ -1819,8 +1819,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48002 static int xgbe_tx_poll(struct xgbe_channel *channel)
48003 {
48004 struct xgbe_prv_data *pdata = channel->pdata;
48005- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48006- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48007+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48008+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48009 struct xgbe_ring *ring = channel->tx_ring;
48010 struct xgbe_ring_data *rdata;
48011 struct xgbe_ring_desc *rdesc;
48012@@ -1891,7 +1891,7 @@ unlock:
48013 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48014 {
48015 struct xgbe_prv_data *pdata = channel->pdata;
48016- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48017+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48018 struct xgbe_ring *ring = channel->rx_ring;
48019 struct xgbe_ring_data *rdata;
48020 struct xgbe_packet_data *packet;
48021diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48022index ebf4893..28108c7 100644
48023--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48024+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48025@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48026
48027 DBGPR("-->%s\n", __func__);
48028
48029- pdata->hw_if.read_mmc_stats(pdata);
48030+ pdata->hw_if->read_mmc_stats(pdata);
48031 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48032 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48033 *data++ = *(u64 *)stat;
48034@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48035 struct ethtool_coalesce *ec)
48036 {
48037 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48038- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48039+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48040 unsigned int riwt;
48041
48042 DBGPR("-->xgbe_get_coalesce\n");
48043@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48044 struct ethtool_coalesce *ec)
48045 {
48046 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48047- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48048+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48049 unsigned int rx_frames, rx_riwt, rx_usecs;
48050 unsigned int tx_frames, tx_usecs;
48051
48052diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48053index dbd3850..4e31b38 100644
48054--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48055+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48056@@ -155,12 +155,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48057 DBGPR("<--xgbe_default_config\n");
48058 }
48059
48060-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48061-{
48062- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48063- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48064-}
48065-
48066 static int xgbe_probe(struct platform_device *pdev)
48067 {
48068 struct xgbe_prv_data *pdata;
48069@@ -281,9 +275,8 @@ static int xgbe_probe(struct platform_device *pdev)
48070 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
48071
48072 /* Set all the function pointers */
48073- xgbe_init_all_fptrs(pdata);
48074- hw_if = &pdata->hw_if;
48075- desc_if = &pdata->desc_if;
48076+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48077+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48078
48079 /* Issue software reset to device */
48080 hw_if->exit(pdata);
48081diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48082index 363b210..b241389 100644
48083--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48084+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48085@@ -126,7 +126,7 @@
48086 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48087 {
48088 struct xgbe_prv_data *pdata = mii->priv;
48089- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48090+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48091 int mmd_data;
48092
48093 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48094@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48095 u16 mmd_val)
48096 {
48097 struct xgbe_prv_data *pdata = mii->priv;
48098- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48099+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48100 int mmd_data = mmd_val;
48101
48102 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48103diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48104index a1bf9d1c..84adcab 100644
48105--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48106+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48107@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48108 tstamp_cc);
48109 u64 nsec;
48110
48111- nsec = pdata->hw_if.get_tstamp_time(pdata);
48112+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48113
48114 return nsec;
48115 }
48116@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48117
48118 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48119
48120- pdata->hw_if.update_tstamp_addend(pdata, addend);
48121+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48122
48123 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48124
48125diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48126index f9ec762..988c969 100644
48127--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48128+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48129@@ -668,8 +668,8 @@ struct xgbe_prv_data {
48130 int dev_irq;
48131 unsigned int per_channel_irq;
48132
48133- struct xgbe_hw_if hw_if;
48134- struct xgbe_desc_if desc_if;
48135+ const struct xgbe_hw_if *hw_if;
48136+ const struct xgbe_desc_if *desc_if;
48137
48138 /* AXI DMA settings */
48139 unsigned int axdomain;
48140@@ -787,6 +787,9 @@ struct xgbe_prv_data {
48141 #endif
48142 };
48143
48144+extern const struct xgbe_hw_if default_xgbe_hw_if;
48145+extern const struct xgbe_desc_if default_xgbe_desc_if;
48146+
48147 /* Function prototypes*/
48148
48149 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48150diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48151index adcacda..fa6e0ae 100644
48152--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48153+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48154@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48155 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48156 {
48157 /* RX_MODE controlling object */
48158- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48159+ bnx2x_init_rx_mode_obj(bp);
48160
48161 /* multicast configuration controlling object */
48162 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48163diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48164index 07cdf9b..b08ecc7 100644
48165--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48166+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48167@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48168 return rc;
48169 }
48170
48171-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48172- struct bnx2x_rx_mode_obj *o)
48173+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48174 {
48175 if (CHIP_IS_E1x(bp)) {
48176- o->wait_comp = bnx2x_empty_rx_mode_wait;
48177- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48178+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48179+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48180 } else {
48181- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48182- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48183+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48184+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48185 }
48186 }
48187
48188diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48189index 86baecb..ff3bb46 100644
48190--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48191+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48192@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48193
48194 /********************* RX MODE ****************/
48195
48196-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48197- struct bnx2x_rx_mode_obj *o);
48198+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48199
48200 /**
48201 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48202diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48203index 31c9f82..e65e986 100644
48204--- a/drivers/net/ethernet/broadcom/tg3.h
48205+++ b/drivers/net/ethernet/broadcom/tg3.h
48206@@ -150,6 +150,7 @@
48207 #define CHIPREV_ID_5750_A0 0x4000
48208 #define CHIPREV_ID_5750_A1 0x4001
48209 #define CHIPREV_ID_5750_A3 0x4003
48210+#define CHIPREV_ID_5750_C1 0x4201
48211 #define CHIPREV_ID_5750_C2 0x4202
48212 #define CHIPREV_ID_5752_A0_HW 0x5000
48213 #define CHIPREV_ID_5752_A0 0x6000
48214diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48215index 903466e..b285864 100644
48216--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48217+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48218@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48219 }
48220
48221 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48222- bna_cb_ioceth_enable,
48223- bna_cb_ioceth_disable,
48224- bna_cb_ioceth_hbfail,
48225- bna_cb_ioceth_reset
48226+ .enable_cbfn = bna_cb_ioceth_enable,
48227+ .disable_cbfn = bna_cb_ioceth_disable,
48228+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48229+ .reset_cbfn = bna_cb_ioceth_reset
48230 };
48231
48232 static void bna_attr_init(struct bna_ioceth *ioceth)
48233diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48234index 8cffcdf..aadf043 100644
48235--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48236+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48237@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48238 */
48239 struct l2t_skb_cb {
48240 arp_failure_handler_func arp_failure_handler;
48241-};
48242+} __no_const;
48243
48244 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48245
48246diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48247index ccf3436..b720d77 100644
48248--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48249+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48250@@ -2277,7 +2277,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48251
48252 int i;
48253 struct adapter *ap = netdev2adap(dev);
48254- static const unsigned int *reg_ranges;
48255+ const unsigned int *reg_ranges;
48256 int arr_size = 0, buf_size = 0;
48257
48258 if (is_t4(ap->params.chip)) {
48259diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48260index badff18..e15c4ec 100644
48261--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48262+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48263@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48264 for (i=0; i<ETH_ALEN; i++) {
48265 tmp.addr[i] = dev->dev_addr[i];
48266 }
48267- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48268+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48269 break;
48270
48271 case DE4X5_SET_HWADDR: /* Set the hardware address */
48272@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48273 spin_lock_irqsave(&lp->lock, flags);
48274 memcpy(&statbuf, &lp->pktStats, ioc->len);
48275 spin_unlock_irqrestore(&lp->lock, flags);
48276- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48277+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48278 return -EFAULT;
48279 break;
48280 }
48281diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48282index d48806b..41cd80f 100644
48283--- a/drivers/net/ethernet/emulex/benet/be_main.c
48284+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48285@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48286
48287 if (wrapped)
48288 newacc += 65536;
48289- ACCESS_ONCE(*acc) = newacc;
48290+ ACCESS_ONCE_RW(*acc) = newacc;
48291 }
48292
48293 static void populate_erx_stats(struct be_adapter *adapter,
48294diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48295index 6d0c5d5..55be363 100644
48296--- a/drivers/net/ethernet/faraday/ftgmac100.c
48297+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48298@@ -30,6 +30,8 @@
48299 #include <linux/netdevice.h>
48300 #include <linux/phy.h>
48301 #include <linux/platform_device.h>
48302+#include <linux/interrupt.h>
48303+#include <linux/irqreturn.h>
48304 #include <net/ip.h>
48305
48306 #include "ftgmac100.h"
48307diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48308index dce5f7b..2433466 100644
48309--- a/drivers/net/ethernet/faraday/ftmac100.c
48310+++ b/drivers/net/ethernet/faraday/ftmac100.c
48311@@ -31,6 +31,8 @@
48312 #include <linux/module.h>
48313 #include <linux/netdevice.h>
48314 #include <linux/platform_device.h>
48315+#include <linux/interrupt.h>
48316+#include <linux/irqreturn.h>
48317
48318 #include "ftmac100.h"
48319
48320diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48321index 6d1ec92..4d5d97d 100644
48322--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48323+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48324@@ -407,7 +407,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48325 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48326
48327 /* Update the base adjustement value. */
48328- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48329+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48330 smp_mb(); /* Force the above update. */
48331 }
48332
48333diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48334index 5fd4b52..87aa34b 100644
48335--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48336+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48337@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48338 }
48339
48340 /* update the base incval used to calculate frequency adjustment */
48341- ACCESS_ONCE(adapter->base_incval) = incval;
48342+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48343 smp_mb();
48344
48345 /* need lock to prevent incorrect read while modifying cyclecounter */
48346diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48347index e3357bf..d4d5348 100644
48348--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48349+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48350@@ -466,8 +466,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48351 wmb();
48352
48353 /* we want to dirty this cache line once */
48354- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48355- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48356+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48357+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48358
48359 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48360
48361diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48362index 2bbd01f..e8baa64 100644
48363--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48364+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48365@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48366 struct __vxge_hw_fifo *fifo;
48367 struct vxge_hw_fifo_config *config;
48368 u32 txdl_size, txdl_per_memblock;
48369- struct vxge_hw_mempool_cbs fifo_mp_callback;
48370+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48371+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48372+ };
48373+
48374 struct __vxge_hw_virtualpath *vpath;
48375
48376 if ((vp == NULL) || (attr == NULL)) {
48377@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48378 goto exit;
48379 }
48380
48381- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48382-
48383 fifo->mempool =
48384 __vxge_hw_mempool_create(vpath->hldev,
48385 fifo->config->memblock_size,
48386diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48387index 2bb48d5..d1a865d 100644
48388--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48389+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48390@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48391 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48392 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48393 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48394- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48395+ pax_open_kernel();
48396+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48397+ pax_close_kernel();
48398 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48399 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48400 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48401diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48402index be7d7a6..a8983f8 100644
48403--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48404+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48405@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48406 case QLCNIC_NON_PRIV_FUNC:
48407 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48408 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48409- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48410+ pax_open_kernel();
48411+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48412+ pax_close_kernel();
48413 break;
48414 case QLCNIC_PRIV_FUNC:
48415 ahw->op_mode = QLCNIC_PRIV_FUNC;
48416 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48417- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48418+ pax_open_kernel();
48419+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48420+ pax_close_kernel();
48421 break;
48422 case QLCNIC_MGMT_FUNC:
48423 ahw->op_mode = QLCNIC_MGMT_FUNC;
48424 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48425- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48426+ pax_open_kernel();
48427+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48428+ pax_close_kernel();
48429 break;
48430 default:
48431 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48432diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48433index c9f57fb..208bdc1 100644
48434--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48435+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48436@@ -1285,7 +1285,7 @@ flash_temp:
48437 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48438 {
48439 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48440- static const struct qlcnic_dump_operations *fw_dump_ops;
48441+ const struct qlcnic_dump_operations *fw_dump_ops;
48442 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48443 u32 entry_offset, dump, no_entries, buf_offset = 0;
48444 int i, k, ops_cnt, ops_index, dump_size = 0;
48445diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48446index 2e2cf80..ebc796d 100644
48447--- a/drivers/net/ethernet/realtek/r8169.c
48448+++ b/drivers/net/ethernet/realtek/r8169.c
48449@@ -788,22 +788,22 @@ struct rtl8169_private {
48450 struct mdio_ops {
48451 void (*write)(struct rtl8169_private *, int, int);
48452 int (*read)(struct rtl8169_private *, int);
48453- } mdio_ops;
48454+ } __no_const mdio_ops;
48455
48456 struct pll_power_ops {
48457 void (*down)(struct rtl8169_private *);
48458 void (*up)(struct rtl8169_private *);
48459- } pll_power_ops;
48460+ } __no_const pll_power_ops;
48461
48462 struct jumbo_ops {
48463 void (*enable)(struct rtl8169_private *);
48464 void (*disable)(struct rtl8169_private *);
48465- } jumbo_ops;
48466+ } __no_const jumbo_ops;
48467
48468 struct csi_ops {
48469 void (*write)(struct rtl8169_private *, int, int);
48470 u32 (*read)(struct rtl8169_private *, int);
48471- } csi_ops;
48472+ } __no_const csi_ops;
48473
48474 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48475 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48476diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48477index 6b861e3..204ac86 100644
48478--- a/drivers/net/ethernet/sfc/ptp.c
48479+++ b/drivers/net/ethernet/sfc/ptp.c
48480@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48481 ptp->start.dma_addr);
48482
48483 /* Clear flag that signals MC ready */
48484- ACCESS_ONCE(*start) = 0;
48485+ ACCESS_ONCE_RW(*start) = 0;
48486 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48487 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48488 EFX_BUG_ON_PARANOID(rc);
48489diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
48490index 10b6173..b605dfd5 100644
48491--- a/drivers/net/ethernet/sfc/selftest.c
48492+++ b/drivers/net/ethernet/sfc/selftest.c
48493@@ -46,7 +46,7 @@ struct efx_loopback_payload {
48494 struct iphdr ip;
48495 struct udphdr udp;
48496 __be16 iteration;
48497- const char msg[64];
48498+ char msg[64];
48499 } __packed;
48500
48501 /* Loopback test source MAC address */
48502diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48503index 08c483b..2c4a553 100644
48504--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48505+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48506@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48507
48508 writel(value, ioaddr + MMC_CNTRL);
48509
48510- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48511- MMC_CNTRL, value);
48512+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48513+// MMC_CNTRL, value);
48514 }
48515
48516 /* To mask all all interrupts.*/
48517diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
48518index a191afc..d218a12 100644
48519--- a/drivers/net/ethernet/via/via-rhine.c
48520+++ b/drivers/net/ethernet/via/via-rhine.c
48521@@ -2513,7 +2513,7 @@ static struct platform_driver rhine_driver_platform = {
48522 }
48523 };
48524
48525-static struct dmi_system_id rhine_dmi_table[] __initdata = {
48526+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
48527 {
48528 .ident = "EPIA-M",
48529 .matches = {
48530diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48531index 384ca4f..dd7d4f9 100644
48532--- a/drivers/net/hyperv/hyperv_net.h
48533+++ b/drivers/net/hyperv/hyperv_net.h
48534@@ -171,7 +171,7 @@ struct rndis_device {
48535 enum rndis_device_state state;
48536 bool link_state;
48537 bool link_change;
48538- atomic_t new_req_id;
48539+ atomic_unchecked_t new_req_id;
48540
48541 spinlock_t request_lock;
48542 struct list_head req_list;
48543diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48544index ec0c40a..c9e42eb 100644
48545--- a/drivers/net/hyperv/rndis_filter.c
48546+++ b/drivers/net/hyperv/rndis_filter.c
48547@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48548 * template
48549 */
48550 set = &rndis_msg->msg.set_req;
48551- set->req_id = atomic_inc_return(&dev->new_req_id);
48552+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48553
48554 /* Add to the request list */
48555 spin_lock_irqsave(&dev->request_lock, flags);
48556@@ -912,7 +912,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48557
48558 /* Setup the rndis set */
48559 halt = &request->request_msg.msg.halt_req;
48560- halt->req_id = atomic_inc_return(&dev->new_req_id);
48561+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48562
48563 /* Ignore return since this msg is optional. */
48564 rndis_filter_send_request(dev, request);
48565diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48566index 34f846b..4a0d5b1 100644
48567--- a/drivers/net/ifb.c
48568+++ b/drivers/net/ifb.c
48569@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48570 return 0;
48571 }
48572
48573-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48574+static struct rtnl_link_ops ifb_link_ops = {
48575 .kind = "ifb",
48576 .priv_size = sizeof(struct ifb_private),
48577 .setup = ifb_setup,
48578diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48579index 612e073..a9f5eda 100644
48580--- a/drivers/net/macvlan.c
48581+++ b/drivers/net/macvlan.c
48582@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48583 free_nskb:
48584 kfree_skb(nskb);
48585 err:
48586- atomic_long_inc(&skb->dev->rx_dropped);
48587+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48588 }
48589
48590 static void macvlan_flush_sources(struct macvlan_port *port,
48591@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48592 int macvlan_link_register(struct rtnl_link_ops *ops)
48593 {
48594 /* common fields */
48595- ops->priv_size = sizeof(struct macvlan_dev);
48596- ops->validate = macvlan_validate;
48597- ops->maxtype = IFLA_MACVLAN_MAX;
48598- ops->policy = macvlan_policy;
48599- ops->changelink = macvlan_changelink;
48600- ops->get_size = macvlan_get_size;
48601- ops->fill_info = macvlan_fill_info;
48602+ pax_open_kernel();
48603+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48604+ *(void **)&ops->validate = macvlan_validate;
48605+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48606+ *(const void **)&ops->policy = macvlan_policy;
48607+ *(void **)&ops->changelink = macvlan_changelink;
48608+ *(void **)&ops->get_size = macvlan_get_size;
48609+ *(void **)&ops->fill_info = macvlan_fill_info;
48610+ pax_close_kernel();
48611
48612 return rtnl_link_register(ops);
48613 };
48614@@ -1545,7 +1547,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48615 return NOTIFY_DONE;
48616 }
48617
48618-static struct notifier_block macvlan_notifier_block __read_mostly = {
48619+static struct notifier_block macvlan_notifier_block = {
48620 .notifier_call = macvlan_device_event,
48621 };
48622
48623diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48624index 4d050ee..012f6dd 100644
48625--- a/drivers/net/macvtap.c
48626+++ b/drivers/net/macvtap.c
48627@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
48628 dev->tx_queue_len = TUN_READQ_SIZE;
48629 }
48630
48631-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48632+static struct rtnl_link_ops macvtap_link_ops = {
48633 .kind = "macvtap",
48634 .setup = macvtap_setup,
48635 .newlink = macvtap_newlink,
48636@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48637
48638 ret = 0;
48639 u = q->flags;
48640- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48641+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48642 put_user(u, &ifr->ifr_flags))
48643 ret = -EFAULT;
48644 macvtap_put_vlan(vlan);
48645@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48646 return NOTIFY_DONE;
48647 }
48648
48649-static struct notifier_block macvtap_notifier_block __read_mostly = {
48650+static struct notifier_block macvtap_notifier_block = {
48651 .notifier_call = macvtap_device_event,
48652 };
48653
48654diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48655index 34924df..a747360 100644
48656--- a/drivers/net/nlmon.c
48657+++ b/drivers/net/nlmon.c
48658@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48659 return 0;
48660 }
48661
48662-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48663+static struct rtnl_link_ops nlmon_link_ops = {
48664 .kind = "nlmon",
48665 .priv_size = sizeof(struct nlmon),
48666 .setup = nlmon_setup,
48667diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
48668index 3fc91e8..6c36337 100644
48669--- a/drivers/net/phy/phy_device.c
48670+++ b/drivers/net/phy/phy_device.c
48671@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
48672 * zero on success.
48673 *
48674 */
48675-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48676+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
48677 struct phy_c45_device_ids *c45_ids) {
48678 int phy_reg;
48679 int i, reg_addr;
48680@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48681 * its return value is in turn returned.
48682 *
48683 */
48684-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48685+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
48686 bool is_c45, struct phy_c45_device_ids *c45_ids)
48687 {
48688 int phy_reg;
48689@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48690 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
48691 {
48692 struct phy_c45_device_ids c45_ids = {0};
48693- u32 phy_id = 0;
48694+ int phy_id = 0;
48695 int r;
48696
48697 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
48698diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48699index af034db..1611c0b2 100644
48700--- a/drivers/net/ppp/ppp_generic.c
48701+++ b/drivers/net/ppp/ppp_generic.c
48702@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48703 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48704 struct ppp_stats stats;
48705 struct ppp_comp_stats cstats;
48706- char *vers;
48707
48708 switch (cmd) {
48709 case SIOCGPPPSTATS:
48710@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48711 break;
48712
48713 case SIOCGPPPVER:
48714- vers = PPP_VERSION;
48715- if (copy_to_user(addr, vers, strlen(vers) + 1))
48716+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48717 break;
48718 err = 0;
48719 break;
48720diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48721index 079f7ad..b2a2bfa7 100644
48722--- a/drivers/net/slip/slhc.c
48723+++ b/drivers/net/slip/slhc.c
48724@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48725 register struct tcphdr *thp;
48726 register struct iphdr *ip;
48727 register struct cstate *cs;
48728- int len, hdrlen;
48729+ long len, hdrlen;
48730 unsigned char *cp = icp;
48731
48732 /* We've got a compressed packet; read the change byte */
48733diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48734index 2c087ef..4859007 100644
48735--- a/drivers/net/team/team.c
48736+++ b/drivers/net/team/team.c
48737@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
48738 return TEAM_DEFAULT_NUM_RX_QUEUES;
48739 }
48740
48741-static struct rtnl_link_ops team_link_ops __read_mostly = {
48742+static struct rtnl_link_ops team_link_ops = {
48743 .kind = DRV_NAME,
48744 .priv_size = sizeof(struct team),
48745 .setup = team_setup,
48746@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
48747 return NOTIFY_DONE;
48748 }
48749
48750-static struct notifier_block team_notifier_block __read_mostly = {
48751+static struct notifier_block team_notifier_block = {
48752 .notifier_call = team_device_event,
48753 };
48754
48755diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48756index 9a409a8..3d44477 100644
48757--- a/drivers/net/tun.c
48758+++ b/drivers/net/tun.c
48759@@ -1425,7 +1425,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48760 return -EINVAL;
48761 }
48762
48763-static struct rtnl_link_ops tun_link_ops __read_mostly = {
48764+static struct rtnl_link_ops tun_link_ops = {
48765 .kind = DRV_NAME,
48766 .priv_size = sizeof(struct tun_struct),
48767 .setup = tun_setup,
48768@@ -1827,7 +1827,7 @@ unlock:
48769 }
48770
48771 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48772- unsigned long arg, int ifreq_len)
48773+ unsigned long arg, size_t ifreq_len)
48774 {
48775 struct tun_file *tfile = file->private_data;
48776 struct tun_struct *tun;
48777@@ -1841,6 +1841,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48778 int le;
48779 int ret;
48780
48781+ if (ifreq_len > sizeof ifr)
48782+ return -EFAULT;
48783+
48784 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48785 if (copy_from_user(&ifr, argp, ifreq_len))
48786 return -EFAULT;
48787diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48788index 9c5aa92..8cd0405 100644
48789--- a/drivers/net/usb/hso.c
48790+++ b/drivers/net/usb/hso.c
48791@@ -71,7 +71,7 @@
48792 #include <asm/byteorder.h>
48793 #include <linux/serial_core.h>
48794 #include <linux/serial.h>
48795-
48796+#include <asm/local.h>
48797
48798 #define MOD_AUTHOR "Option Wireless"
48799 #define MOD_DESCRIPTION "USB High Speed Option driver"
48800@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48801 struct urb *urb;
48802
48803 urb = serial->rx_urb[0];
48804- if (serial->port.count > 0) {
48805+ if (atomic_read(&serial->port.count) > 0) {
48806 count = put_rxbuf_data(urb, serial);
48807 if (count == -1)
48808 return;
48809@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48810 DUMP1(urb->transfer_buffer, urb->actual_length);
48811
48812 /* Anyone listening? */
48813- if (serial->port.count == 0)
48814+ if (atomic_read(&serial->port.count) == 0)
48815 return;
48816
48817 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48818@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48819 tty_port_tty_set(&serial->port, tty);
48820
48821 /* check for port already opened, if not set the termios */
48822- serial->port.count++;
48823- if (serial->port.count == 1) {
48824+ if (atomic_inc_return(&serial->port.count) == 1) {
48825 serial->rx_state = RX_IDLE;
48826 /* Force default termio settings */
48827 _hso_serial_set_termios(tty, NULL);
48828@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48829 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48830 if (result) {
48831 hso_stop_serial_device(serial->parent);
48832- serial->port.count--;
48833+ atomic_dec(&serial->port.count);
48834 kref_put(&serial->parent->ref, hso_serial_ref_free);
48835 }
48836 } else {
48837@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48838
48839 /* reset the rts and dtr */
48840 /* do the actual close */
48841- serial->port.count--;
48842+ atomic_dec(&serial->port.count);
48843
48844- if (serial->port.count <= 0) {
48845- serial->port.count = 0;
48846+ if (atomic_read(&serial->port.count) <= 0) {
48847+ atomic_set(&serial->port.count, 0);
48848 tty_port_tty_set(&serial->port, NULL);
48849 if (!usb_gone)
48850 hso_stop_serial_device(serial->parent);
48851@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48852
48853 /* the actual setup */
48854 spin_lock_irqsave(&serial->serial_lock, flags);
48855- if (serial->port.count)
48856+ if (atomic_read(&serial->port.count))
48857 _hso_serial_set_termios(tty, old);
48858 else
48859 tty->termios = *old;
48860@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48861 D1("Pending read interrupt on port %d\n", i);
48862 spin_lock(&serial->serial_lock);
48863 if (serial->rx_state == RX_IDLE &&
48864- serial->port.count > 0) {
48865+ atomic_read(&serial->port.count) > 0) {
48866 /* Setup and send a ctrl req read on
48867 * port i */
48868 if (!serial->rx_urb_filled[0]) {
48869@@ -3046,7 +3045,7 @@ static int hso_resume(struct usb_interface *iface)
48870 /* Start all serial ports */
48871 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48872 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48873- if (dev2ser(serial_table[i])->port.count) {
48874+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48875 result =
48876 hso_start_serial_device(serial_table[i], GFP_NOIO);
48877 hso_kick_transmit(dev2ser(serial_table[i]));
48878diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48879index bf405f1..fd847ee 100644
48880--- a/drivers/net/usb/r8152.c
48881+++ b/drivers/net/usb/r8152.c
48882@@ -571,7 +571,7 @@ struct r8152 {
48883 void (*unload)(struct r8152 *);
48884 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48885 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48886- } rtl_ops;
48887+ } __no_const rtl_ops;
48888
48889 int intr_interval;
48890 u32 saved_wolopts;
48891diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48892index a2515887..6d13233 100644
48893--- a/drivers/net/usb/sierra_net.c
48894+++ b/drivers/net/usb/sierra_net.c
48895@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48896 /* atomic counter partially included in MAC address to make sure 2 devices
48897 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48898 */
48899-static atomic_t iface_counter = ATOMIC_INIT(0);
48900+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48901
48902 /*
48903 * SYNC Timer Delay definition used to set the expiry time
48904@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48905 dev->net->netdev_ops = &sierra_net_device_ops;
48906
48907 /* change MAC addr to include, ifacenum, and to be unique */
48908- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48909+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48910 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48911
48912 /* we will have to manufacture ethernet headers, prepare template */
48913diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48914index 0ad6c0c..4013638 100644
48915--- a/drivers/net/virtio_net.c
48916+++ b/drivers/net/virtio_net.c
48917@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48918 #define RECEIVE_AVG_WEIGHT 64
48919
48920 /* Minimum alignment for mergeable packet buffers. */
48921-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48922+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48923
48924 #define VIRTNET_DRIVER_VERSION "1.0.0"
48925
48926diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48927index 6c83846..215144b 100644
48928--- a/drivers/net/vxlan.c
48929+++ b/drivers/net/vxlan.c
48930@@ -2702,7 +2702,7 @@ nla_put_failure:
48931 return -EMSGSIZE;
48932 }
48933
48934-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48935+static struct rtnl_link_ops vxlan_link_ops = {
48936 .kind = "vxlan",
48937 .maxtype = IFLA_VXLAN_MAX,
48938 .policy = vxlan_policy,
48939@@ -2749,7 +2749,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48940 return NOTIFY_DONE;
48941 }
48942
48943-static struct notifier_block vxlan_notifier_block __read_mostly = {
48944+static struct notifier_block vxlan_notifier_block = {
48945 .notifier_call = vxlan_lowerdev_event,
48946 };
48947
48948diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48949index 5920c99..ff2e4a5 100644
48950--- a/drivers/net/wan/lmc/lmc_media.c
48951+++ b/drivers/net/wan/lmc/lmc_media.c
48952@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48953 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48954
48955 lmc_media_t lmc_ds3_media = {
48956- lmc_ds3_init, /* special media init stuff */
48957- lmc_ds3_default, /* reset to default state */
48958- lmc_ds3_set_status, /* reset status to state provided */
48959- lmc_dummy_set_1, /* set clock source */
48960- lmc_dummy_set2_1, /* set line speed */
48961- lmc_ds3_set_100ft, /* set cable length */
48962- lmc_ds3_set_scram, /* set scrambler */
48963- lmc_ds3_get_link_status, /* get link status */
48964- lmc_dummy_set_1, /* set link status */
48965- lmc_ds3_set_crc_length, /* set CRC length */
48966- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48967- lmc_ds3_watchdog
48968+ .init = lmc_ds3_init, /* special media init stuff */
48969+ .defaults = lmc_ds3_default, /* reset to default state */
48970+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
48971+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
48972+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48973+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48974+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48975+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
48976+ .set_link_status = lmc_dummy_set_1, /* set link status */
48977+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48978+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48979+ .watchdog = lmc_ds3_watchdog
48980 };
48981
48982 lmc_media_t lmc_hssi_media = {
48983- lmc_hssi_init, /* special media init stuff */
48984- lmc_hssi_default, /* reset to default state */
48985- lmc_hssi_set_status, /* reset status to state provided */
48986- lmc_hssi_set_clock, /* set clock source */
48987- lmc_dummy_set2_1, /* set line speed */
48988- lmc_dummy_set_1, /* set cable length */
48989- lmc_dummy_set_1, /* set scrambler */
48990- lmc_hssi_get_link_status, /* get link status */
48991- lmc_hssi_set_link_status, /* set link status */
48992- lmc_hssi_set_crc_length, /* set CRC length */
48993- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48994- lmc_hssi_watchdog
48995+ .init = lmc_hssi_init, /* special media init stuff */
48996+ .defaults = lmc_hssi_default, /* reset to default state */
48997+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
48998+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48999+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49000+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49001+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49002+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49003+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49004+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49005+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49006+ .watchdog = lmc_hssi_watchdog
49007 };
49008
49009-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49010- lmc_ssi_default, /* reset to default state */
49011- lmc_ssi_set_status, /* reset status to state provided */
49012- lmc_ssi_set_clock, /* set clock source */
49013- lmc_ssi_set_speed, /* set line speed */
49014- lmc_dummy_set_1, /* set cable length */
49015- lmc_dummy_set_1, /* set scrambler */
49016- lmc_ssi_get_link_status, /* get link status */
49017- lmc_ssi_set_link_status, /* set link status */
49018- lmc_ssi_set_crc_length, /* set CRC length */
49019- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49020- lmc_ssi_watchdog
49021+lmc_media_t lmc_ssi_media = {
49022+ .init = lmc_ssi_init, /* special media init stuff */
49023+ .defaults = lmc_ssi_default, /* reset to default state */
49024+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49025+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49026+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49027+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49028+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49029+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49030+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49031+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49032+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49033+ .watchdog = lmc_ssi_watchdog
49034 };
49035
49036 lmc_media_t lmc_t1_media = {
49037- lmc_t1_init, /* special media init stuff */
49038- lmc_t1_default, /* reset to default state */
49039- lmc_t1_set_status, /* reset status to state provided */
49040- lmc_t1_set_clock, /* set clock source */
49041- lmc_dummy_set2_1, /* set line speed */
49042- lmc_dummy_set_1, /* set cable length */
49043- lmc_dummy_set_1, /* set scrambler */
49044- lmc_t1_get_link_status, /* get link status */
49045- lmc_dummy_set_1, /* set link status */
49046- lmc_t1_set_crc_length, /* set CRC length */
49047- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49048- lmc_t1_watchdog
49049+ .init = lmc_t1_init, /* special media init stuff */
49050+ .defaults = lmc_t1_default, /* reset to default state */
49051+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49052+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49053+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49054+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49055+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49056+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49057+ .set_link_status = lmc_dummy_set_1, /* set link status */
49058+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49059+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49060+ .watchdog = lmc_t1_watchdog
49061 };
49062
49063 static void
49064diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49065index feacc3b..5bac0de 100644
49066--- a/drivers/net/wan/z85230.c
49067+++ b/drivers/net/wan/z85230.c
49068@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49069
49070 struct z8530_irqhandler z8530_sync =
49071 {
49072- z8530_rx,
49073- z8530_tx,
49074- z8530_status
49075+ .rx = z8530_rx,
49076+ .tx = z8530_tx,
49077+ .status = z8530_status
49078 };
49079
49080 EXPORT_SYMBOL(z8530_sync);
49081@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49082 }
49083
49084 static struct z8530_irqhandler z8530_dma_sync = {
49085- z8530_dma_rx,
49086- z8530_dma_tx,
49087- z8530_dma_status
49088+ .rx = z8530_dma_rx,
49089+ .tx = z8530_dma_tx,
49090+ .status = z8530_dma_status
49091 };
49092
49093 static struct z8530_irqhandler z8530_txdma_sync = {
49094- z8530_rx,
49095- z8530_dma_tx,
49096- z8530_dma_status
49097+ .rx = z8530_rx,
49098+ .tx = z8530_dma_tx,
49099+ .status = z8530_dma_status
49100 };
49101
49102 /**
49103@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49104
49105 struct z8530_irqhandler z8530_nop=
49106 {
49107- z8530_rx_clear,
49108- z8530_tx_clear,
49109- z8530_status_clear
49110+ .rx = z8530_rx_clear,
49111+ .tx = z8530_tx_clear,
49112+ .status = z8530_status_clear
49113 };
49114
49115
49116diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49117index 0b60295..b8bfa5b 100644
49118--- a/drivers/net/wimax/i2400m/rx.c
49119+++ b/drivers/net/wimax/i2400m/rx.c
49120@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49121 if (i2400m->rx_roq == NULL)
49122 goto error_roq_alloc;
49123
49124- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49125+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49126 GFP_KERNEL);
49127 if (rd == NULL) {
49128 result = -ENOMEM;
49129diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49130index e71a2ce..2268d61 100644
49131--- a/drivers/net/wireless/airo.c
49132+++ b/drivers/net/wireless/airo.c
49133@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49134 struct airo_info *ai = dev->ml_priv;
49135 int ridcode;
49136 int enabled;
49137- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49138+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49139 unsigned char *iobuf;
49140
49141 /* Only super-user can write RIDs */
49142diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49143index da92bfa..5a9001a 100644
49144--- a/drivers/net/wireless/at76c50x-usb.c
49145+++ b/drivers/net/wireless/at76c50x-usb.c
49146@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49147 }
49148
49149 /* Convert timeout from the DFU status to jiffies */
49150-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49151+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49152 {
49153 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49154 | (s->poll_timeout[1] << 8)
49155diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49156index f1946a6..cd367fb 100644
49157--- a/drivers/net/wireless/ath/ath10k/htc.c
49158+++ b/drivers/net/wireless/ath/ath10k/htc.c
49159@@ -851,7 +851,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49160 /* registered target arrival callback from the HIF layer */
49161 int ath10k_htc_init(struct ath10k *ar)
49162 {
49163- struct ath10k_hif_cb htc_callbacks;
49164+ static struct ath10k_hif_cb htc_callbacks = {
49165+ .rx_completion = ath10k_htc_rx_completion_handler,
49166+ .tx_completion = ath10k_htc_tx_completion_handler,
49167+ };
49168 struct ath10k_htc_ep *ep = NULL;
49169 struct ath10k_htc *htc = &ar->htc;
49170
49171@@ -860,8 +863,6 @@ int ath10k_htc_init(struct ath10k *ar)
49172 ath10k_htc_reset_endpoint_states(htc);
49173
49174 /* setup HIF layer callbacks */
49175- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49176- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49177 htc->ar = ar;
49178
49179 /* Get HIF default pipe for HTC message exchange */
49180diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49181index 527179c..a890150 100644
49182--- a/drivers/net/wireless/ath/ath10k/htc.h
49183+++ b/drivers/net/wireless/ath/ath10k/htc.h
49184@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49185
49186 struct ath10k_htc_ops {
49187 void (*target_send_suspend_complete)(struct ath10k *ar);
49188-};
49189+} __no_const;
49190
49191 struct ath10k_htc_ep_ops {
49192 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49193 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49194 void (*ep_tx_credits)(struct ath10k *);
49195-};
49196+} __no_const;
49197
49198 /* service connection information */
49199 struct ath10k_htc_svc_conn_req {
49200diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49201index f816909..e56cd8b 100644
49202--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49203+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49204@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49205 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49206 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49207
49208- ACCESS_ONCE(ads->ds_link) = i->link;
49209- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49210+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49211+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49212
49213 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49214 ctl6 = SM(i->keytype, AR_EncrType);
49215@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49216
49217 if ((i->is_first || i->is_last) &&
49218 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49219- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49220+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49221 | set11nTries(i->rates, 1)
49222 | set11nTries(i->rates, 2)
49223 | set11nTries(i->rates, 3)
49224 | (i->dur_update ? AR_DurUpdateEna : 0)
49225 | SM(0, AR_BurstDur);
49226
49227- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49228+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49229 | set11nRate(i->rates, 1)
49230 | set11nRate(i->rates, 2)
49231 | set11nRate(i->rates, 3);
49232 } else {
49233- ACCESS_ONCE(ads->ds_ctl2) = 0;
49234- ACCESS_ONCE(ads->ds_ctl3) = 0;
49235+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49236+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49237 }
49238
49239 if (!i->is_first) {
49240- ACCESS_ONCE(ads->ds_ctl0) = 0;
49241- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49242- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49243+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49244+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49245+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49246 return;
49247 }
49248
49249@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49250 break;
49251 }
49252
49253- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49254+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49255 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49256 | SM(i->txpower[0], AR_XmitPower0)
49257 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49258@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49259 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49260 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49261
49262- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49263- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49264+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49265+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49266
49267 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49268 return;
49269
49270- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49271+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49272 | set11nPktDurRTSCTS(i->rates, 1);
49273
49274- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49275+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49276 | set11nPktDurRTSCTS(i->rates, 3);
49277
49278- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49279+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49280 | set11nRateFlags(i->rates, 1)
49281 | set11nRateFlags(i->rates, 2)
49282 | set11nRateFlags(i->rates, 3)
49283 | SM(i->rtscts_rate, AR_RTSCTSRate);
49284
49285- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49286- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49287- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49288+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49289+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49290+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49291 }
49292
49293 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49294diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49295index da84b70..83e4978 100644
49296--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49297+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49298@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49299 (i->qcu << AR_TxQcuNum_S) | desc_len;
49300
49301 checksum += val;
49302- ACCESS_ONCE(ads->info) = val;
49303+ ACCESS_ONCE_RW(ads->info) = val;
49304
49305 checksum += i->link;
49306- ACCESS_ONCE(ads->link) = i->link;
49307+ ACCESS_ONCE_RW(ads->link) = i->link;
49308
49309 checksum += i->buf_addr[0];
49310- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49311+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49312 checksum += i->buf_addr[1];
49313- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49314+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49315 checksum += i->buf_addr[2];
49316- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49317+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49318 checksum += i->buf_addr[3];
49319- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49320+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49321
49322 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49323- ACCESS_ONCE(ads->ctl3) = val;
49324+ ACCESS_ONCE_RW(ads->ctl3) = val;
49325 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49326- ACCESS_ONCE(ads->ctl5) = val;
49327+ ACCESS_ONCE_RW(ads->ctl5) = val;
49328 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49329- ACCESS_ONCE(ads->ctl7) = val;
49330+ ACCESS_ONCE_RW(ads->ctl7) = val;
49331 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49332- ACCESS_ONCE(ads->ctl9) = val;
49333+ ACCESS_ONCE_RW(ads->ctl9) = val;
49334
49335 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49336- ACCESS_ONCE(ads->ctl10) = checksum;
49337+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49338
49339 if (i->is_first || i->is_last) {
49340- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49341+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49342 | set11nTries(i->rates, 1)
49343 | set11nTries(i->rates, 2)
49344 | set11nTries(i->rates, 3)
49345 | (i->dur_update ? AR_DurUpdateEna : 0)
49346 | SM(0, AR_BurstDur);
49347
49348- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49349+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49350 | set11nRate(i->rates, 1)
49351 | set11nRate(i->rates, 2)
49352 | set11nRate(i->rates, 3);
49353 } else {
49354- ACCESS_ONCE(ads->ctl13) = 0;
49355- ACCESS_ONCE(ads->ctl14) = 0;
49356+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49357+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49358 }
49359
49360 ads->ctl20 = 0;
49361@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49362
49363 ctl17 = SM(i->keytype, AR_EncrType);
49364 if (!i->is_first) {
49365- ACCESS_ONCE(ads->ctl11) = 0;
49366- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49367- ACCESS_ONCE(ads->ctl15) = 0;
49368- ACCESS_ONCE(ads->ctl16) = 0;
49369- ACCESS_ONCE(ads->ctl17) = ctl17;
49370- ACCESS_ONCE(ads->ctl18) = 0;
49371- ACCESS_ONCE(ads->ctl19) = 0;
49372+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49373+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49374+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49375+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49376+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49377+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49378+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49379 return;
49380 }
49381
49382- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49383+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49384 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49385 | SM(i->txpower[0], AR_XmitPower0)
49386 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49387@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49388 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49389 ctl12 |= SM(val, AR_PAPRDChainMask);
49390
49391- ACCESS_ONCE(ads->ctl12) = ctl12;
49392- ACCESS_ONCE(ads->ctl17) = ctl17;
49393+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49394+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49395
49396- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49397+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49398 | set11nPktDurRTSCTS(i->rates, 1);
49399
49400- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49401+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49402 | set11nPktDurRTSCTS(i->rates, 3);
49403
49404- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49405+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49406 | set11nRateFlags(i->rates, 1)
49407 | set11nRateFlags(i->rates, 2)
49408 | set11nRateFlags(i->rates, 3)
49409 | SM(i->rtscts_rate, AR_RTSCTSRate);
49410
49411- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49412+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49413
49414- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49415- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49416- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49417+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49418+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49419+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49420 }
49421
49422 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49423diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49424index 1cbd335..27dfb40 100644
49425--- a/drivers/net/wireless/ath/ath9k/hw.h
49426+++ b/drivers/net/wireless/ath/ath9k/hw.h
49427@@ -640,7 +640,7 @@ struct ath_hw_private_ops {
49428
49429 /* ANI */
49430 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49431-};
49432+} __no_const;
49433
49434 /**
49435 * struct ath_spec_scan - parameters for Atheros spectral scan
49436@@ -716,7 +716,7 @@ struct ath_hw_ops {
49437 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49438 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49439 #endif
49440-};
49441+} __no_const;
49442
49443 struct ath_nf_limits {
49444 s16 max;
49445diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49446index 62b0bf4..4ae094c 100644
49447--- a/drivers/net/wireless/ath/ath9k/main.c
49448+++ b/drivers/net/wireless/ath/ath9k/main.c
49449@@ -2546,16 +2546,18 @@ void ath9k_fill_chanctx_ops(void)
49450 if (!ath9k_is_chanctx_enabled())
49451 return;
49452
49453- ath9k_ops.hw_scan = ath9k_hw_scan;
49454- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49455- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49456- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49457- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49458- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49459- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49460- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49461- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49462- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49463+ pax_open_kernel();
49464+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49465+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49466+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49467+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49468+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49469+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49470+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49471+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49472+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49473+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49474+ pax_close_kernel();
49475 }
49476
49477 #endif
49478diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49479index 058a9f2..d5cb1ba 100644
49480--- a/drivers/net/wireless/b43/phy_lp.c
49481+++ b/drivers/net/wireless/b43/phy_lp.c
49482@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49483 {
49484 struct ssb_bus *bus = dev->dev->sdev->bus;
49485
49486- static const struct b206x_channel *chandata = NULL;
49487+ const struct b206x_channel *chandata = NULL;
49488 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49489 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49490 u16 old_comm15, scale;
49491diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49492index dc1d20c..f7a4f06 100644
49493--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49494+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49495@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49496 */
49497 if (il3945_mod_params.disable_hw_scan) {
49498 D_INFO("Disabling hw_scan\n");
49499- il3945_mac_ops.hw_scan = NULL;
49500+ pax_open_kernel();
49501+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49502+ pax_close_kernel();
49503 }
49504
49505 D_INFO("*** LOAD DRIVER ***\n");
49506diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49507index 0ffb6ff..c0b7f0e 100644
49508--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49509+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49510@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49511 {
49512 struct iwl_priv *priv = file->private_data;
49513 char buf[64];
49514- int buf_size;
49515+ size_t buf_size;
49516 u32 offset, len;
49517
49518 memset(buf, 0, sizeof(buf));
49519@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49520 struct iwl_priv *priv = file->private_data;
49521
49522 char buf[8];
49523- int buf_size;
49524+ size_t buf_size;
49525 u32 reset_flag;
49526
49527 memset(buf, 0, sizeof(buf));
49528@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49529 {
49530 struct iwl_priv *priv = file->private_data;
49531 char buf[8];
49532- int buf_size;
49533+ size_t buf_size;
49534 int ht40;
49535
49536 memset(buf, 0, sizeof(buf));
49537@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49538 {
49539 struct iwl_priv *priv = file->private_data;
49540 char buf[8];
49541- int buf_size;
49542+ size_t buf_size;
49543 int value;
49544
49545 memset(buf, 0, sizeof(buf));
49546@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49547 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49548 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49549
49550-static const char *fmt_value = " %-30s %10u\n";
49551-static const char *fmt_hex = " %-30s 0x%02X\n";
49552-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49553-static const char *fmt_header =
49554+static const char fmt_value[] = " %-30s %10u\n";
49555+static const char fmt_hex[] = " %-30s 0x%02X\n";
49556+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49557+static const char fmt_header[] =
49558 "%-32s current cumulative delta max\n";
49559
49560 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49561@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49562 {
49563 struct iwl_priv *priv = file->private_data;
49564 char buf[8];
49565- int buf_size;
49566+ size_t buf_size;
49567 int clear;
49568
49569 memset(buf, 0, sizeof(buf));
49570@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49571 {
49572 struct iwl_priv *priv = file->private_data;
49573 char buf[8];
49574- int buf_size;
49575+ size_t buf_size;
49576 int trace;
49577
49578 memset(buf, 0, sizeof(buf));
49579@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49580 {
49581 struct iwl_priv *priv = file->private_data;
49582 char buf[8];
49583- int buf_size;
49584+ size_t buf_size;
49585 int missed;
49586
49587 memset(buf, 0, sizeof(buf));
49588@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49589
49590 struct iwl_priv *priv = file->private_data;
49591 char buf[8];
49592- int buf_size;
49593+ size_t buf_size;
49594 int plcp;
49595
49596 memset(buf, 0, sizeof(buf));
49597@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49598
49599 struct iwl_priv *priv = file->private_data;
49600 char buf[8];
49601- int buf_size;
49602+ size_t buf_size;
49603 int flush;
49604
49605 memset(buf, 0, sizeof(buf));
49606@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49607
49608 struct iwl_priv *priv = file->private_data;
49609 char buf[8];
49610- int buf_size;
49611+ size_t buf_size;
49612 int rts;
49613
49614 if (!priv->cfg->ht_params)
49615@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49616 {
49617 struct iwl_priv *priv = file->private_data;
49618 char buf[8];
49619- int buf_size;
49620+ size_t buf_size;
49621
49622 memset(buf, 0, sizeof(buf));
49623 buf_size = min(count, sizeof(buf) - 1);
49624@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49625 struct iwl_priv *priv = file->private_data;
49626 u32 event_log_flag;
49627 char buf[8];
49628- int buf_size;
49629+ size_t buf_size;
49630
49631 /* check that the interface is up */
49632 if (!iwl_is_ready(priv))
49633@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49634 struct iwl_priv *priv = file->private_data;
49635 char buf[8];
49636 u32 calib_disabled;
49637- int buf_size;
49638+ size_t buf_size;
49639
49640 memset(buf, 0, sizeof(buf));
49641 buf_size = min(count, sizeof(buf) - 1);
49642diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49643index 523fe0c..0d9473b 100644
49644--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49645+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49646@@ -1781,7 +1781,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49647 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49648
49649 char buf[8];
49650- int buf_size;
49651+ size_t buf_size;
49652 u32 reset_flag;
49653
49654 memset(buf, 0, sizeof(buf));
49655@@ -1802,7 +1802,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49656 {
49657 struct iwl_trans *trans = file->private_data;
49658 char buf[8];
49659- int buf_size;
49660+ size_t buf_size;
49661 int csr;
49662
49663 memset(buf, 0, sizeof(buf));
49664diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49665index ef58a88..fafa731 100644
49666--- a/drivers/net/wireless/mac80211_hwsim.c
49667+++ b/drivers/net/wireless/mac80211_hwsim.c
49668@@ -3066,20 +3066,20 @@ static int __init init_mac80211_hwsim(void)
49669 if (channels < 1)
49670 return -EINVAL;
49671
49672- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49673- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49674- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49675- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49676- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49677- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49678- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49679- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49680- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49681- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49682- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49683- mac80211_hwsim_assign_vif_chanctx;
49684- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49685- mac80211_hwsim_unassign_vif_chanctx;
49686+ pax_open_kernel();
49687+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49688+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49689+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49690+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49691+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49692+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49693+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49694+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49695+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49696+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49697+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49698+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49699+ pax_close_kernel();
49700
49701 spin_lock_init(&hwsim_radio_lock);
49702 INIT_LIST_HEAD(&hwsim_radios);
49703diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49704index 1a4facd..a2ecbbd 100644
49705--- a/drivers/net/wireless/rndis_wlan.c
49706+++ b/drivers/net/wireless/rndis_wlan.c
49707@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49708
49709 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49710
49711- if (rts_threshold < 0 || rts_threshold > 2347)
49712+ if (rts_threshold > 2347)
49713 rts_threshold = 2347;
49714
49715 tmp = cpu_to_le32(rts_threshold);
49716diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49717index 9bb398b..b0cc047 100644
49718--- a/drivers/net/wireless/rt2x00/rt2x00.h
49719+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49720@@ -375,7 +375,7 @@ struct rt2x00_intf {
49721 * for hardware which doesn't support hardware
49722 * sequence counting.
49723 */
49724- atomic_t seqno;
49725+ atomic_unchecked_t seqno;
49726 };
49727
49728 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49729diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49730index 66ff364..3ce34f7 100644
49731--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49732+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49733@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49734 * sequence counter given by mac80211.
49735 */
49736 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49737- seqno = atomic_add_return(0x10, &intf->seqno);
49738+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49739 else
49740- seqno = atomic_read(&intf->seqno);
49741+ seqno = atomic_read_unchecked(&intf->seqno);
49742
49743 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49744 hdr->seq_ctrl |= cpu_to_le16(seqno);
49745diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49746index b661f896..ddf7d2b 100644
49747--- a/drivers/net/wireless/ti/wl1251/sdio.c
49748+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49749@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49750
49751 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49752
49753- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49754- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49755+ pax_open_kernel();
49756+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49757+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49758+ pax_close_kernel();
49759
49760 wl1251_info("using dedicated interrupt line");
49761 } else {
49762- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49763- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49764+ pax_open_kernel();
49765+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49766+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49767+ pax_close_kernel();
49768
49769 wl1251_info("using SDIO interrupt");
49770 }
49771diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49772index d6d0d6d..60c23a0 100644
49773--- a/drivers/net/wireless/ti/wl12xx/main.c
49774+++ b/drivers/net/wireless/ti/wl12xx/main.c
49775@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49776 sizeof(wl->conf.mem));
49777
49778 /* read data preparation is only needed by wl127x */
49779- wl->ops->prepare_read = wl127x_prepare_read;
49780+ pax_open_kernel();
49781+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49782+ pax_close_kernel();
49783
49784 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49785 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49786@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49787 sizeof(wl->conf.mem));
49788
49789 /* read data preparation is only needed by wl127x */
49790- wl->ops->prepare_read = wl127x_prepare_read;
49791+ pax_open_kernel();
49792+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49793+ pax_close_kernel();
49794
49795 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49796 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49797diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49798index 8e56261..9140678 100644
49799--- a/drivers/net/wireless/ti/wl18xx/main.c
49800+++ b/drivers/net/wireless/ti/wl18xx/main.c
49801@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49802 }
49803
49804 if (!checksum_param) {
49805- wl18xx_ops.set_rx_csum = NULL;
49806- wl18xx_ops.init_vif = NULL;
49807+ pax_open_kernel();
49808+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
49809+ *(void **)&wl18xx_ops.init_vif = NULL;
49810+ pax_close_kernel();
49811 }
49812
49813 /* Enable 11a Band only if we have 5G antennas */
49814diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49815index a912dc0..a8225ba 100644
49816--- a/drivers/net/wireless/zd1211rw/zd_usb.c
49817+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49818@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49819 {
49820 struct zd_usb *usb = urb->context;
49821 struct zd_usb_interrupt *intr = &usb->intr;
49822- int len;
49823+ unsigned int len;
49824 u16 int_num;
49825
49826 ZD_ASSERT(in_interrupt());
49827diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49828index ce2e2cf..f81e500 100644
49829--- a/drivers/nfc/nfcwilink.c
49830+++ b/drivers/nfc/nfcwilink.c
49831@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49832
49833 static int nfcwilink_probe(struct platform_device *pdev)
49834 {
49835- static struct nfcwilink *drv;
49836+ struct nfcwilink *drv;
49837 int rc;
49838 __u32 protocols;
49839
49840diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
49841index f2596c8..50d53af 100644
49842--- a/drivers/nfc/st21nfca/st21nfca.c
49843+++ b/drivers/nfc/st21nfca/st21nfca.c
49844@@ -559,7 +559,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
49845 goto exit;
49846 }
49847
49848- gate = uid_skb->data;
49849+ memcpy(gate, uid_skb->data, uid_skb->len);
49850 *len = uid_skb->len;
49851 exit:
49852 kfree_skb(uid_skb);
49853diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
49854index 5100742..6ad4e6d 100644
49855--- a/drivers/of/fdt.c
49856+++ b/drivers/of/fdt.c
49857@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
49858 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
49859 return 0;
49860 }
49861- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
49862+ pax_open_kernel();
49863+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
49864+ pax_close_kernel();
49865 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
49866 }
49867 late_initcall(of_fdt_raw_init);
49868diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49869index d93b2b6..ae50401 100644
49870--- a/drivers/oprofile/buffer_sync.c
49871+++ b/drivers/oprofile/buffer_sync.c
49872@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49873 if (cookie == NO_COOKIE)
49874 offset = pc;
49875 if (cookie == INVALID_COOKIE) {
49876- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49877+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49878 offset = pc;
49879 }
49880 if (cookie != last_cookie) {
49881@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49882 /* add userspace sample */
49883
49884 if (!mm) {
49885- atomic_inc(&oprofile_stats.sample_lost_no_mm);
49886+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49887 return 0;
49888 }
49889
49890 cookie = lookup_dcookie(mm, s->eip, &offset);
49891
49892 if (cookie == INVALID_COOKIE) {
49893- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49894+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49895 return 0;
49896 }
49897
49898@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49899 /* ignore backtraces if failed to add a sample */
49900 if (state == sb_bt_start) {
49901 state = sb_bt_ignore;
49902- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49903+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49904 }
49905 }
49906 release_mm(mm);
49907diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49908index c0cc4e7..44d4e54 100644
49909--- a/drivers/oprofile/event_buffer.c
49910+++ b/drivers/oprofile/event_buffer.c
49911@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49912 }
49913
49914 if (buffer_pos == buffer_size) {
49915- atomic_inc(&oprofile_stats.event_lost_overflow);
49916+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49917 return;
49918 }
49919
49920diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49921index ed2c3ec..deda85a 100644
49922--- a/drivers/oprofile/oprof.c
49923+++ b/drivers/oprofile/oprof.c
49924@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49925 if (oprofile_ops.switch_events())
49926 return;
49927
49928- atomic_inc(&oprofile_stats.multiplex_counter);
49929+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49930 start_switch_worker();
49931 }
49932
49933diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49934index ee2cfce..7f8f699 100644
49935--- a/drivers/oprofile/oprofile_files.c
49936+++ b/drivers/oprofile/oprofile_files.c
49937@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49938
49939 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49940
49941-static ssize_t timeout_read(struct file *file, char __user *buf,
49942+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49943 size_t count, loff_t *offset)
49944 {
49945 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49946diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49947index 59659ce..6c860a0 100644
49948--- a/drivers/oprofile/oprofile_stats.c
49949+++ b/drivers/oprofile/oprofile_stats.c
49950@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49951 cpu_buf->sample_invalid_eip = 0;
49952 }
49953
49954- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49955- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49956- atomic_set(&oprofile_stats.event_lost_overflow, 0);
49957- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49958- atomic_set(&oprofile_stats.multiplex_counter, 0);
49959+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49960+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49961+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49962+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49963+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49964 }
49965
49966
49967diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49968index 1fc622b..8c48fc3 100644
49969--- a/drivers/oprofile/oprofile_stats.h
49970+++ b/drivers/oprofile/oprofile_stats.h
49971@@ -13,11 +13,11 @@
49972 #include <linux/atomic.h>
49973
49974 struct oprofile_stat_struct {
49975- atomic_t sample_lost_no_mm;
49976- atomic_t sample_lost_no_mapping;
49977- atomic_t bt_lost_no_mapping;
49978- atomic_t event_lost_overflow;
49979- atomic_t multiplex_counter;
49980+ atomic_unchecked_t sample_lost_no_mm;
49981+ atomic_unchecked_t sample_lost_no_mapping;
49982+ atomic_unchecked_t bt_lost_no_mapping;
49983+ atomic_unchecked_t event_lost_overflow;
49984+ atomic_unchecked_t multiplex_counter;
49985 };
49986
49987 extern struct oprofile_stat_struct oprofile_stats;
49988diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49989index 3f49345..c750d0b 100644
49990--- a/drivers/oprofile/oprofilefs.c
49991+++ b/drivers/oprofile/oprofilefs.c
49992@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49993
49994 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49995 {
49996- atomic_t *val = file->private_data;
49997- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49998+ atomic_unchecked_t *val = file->private_data;
49999+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50000 }
50001
50002
50003@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50004
50005
50006 int oprofilefs_create_ro_atomic(struct dentry *root,
50007- char const *name, atomic_t *val)
50008+ char const *name, atomic_unchecked_t *val)
50009 {
50010 return __oprofilefs_create_file(root, name,
50011 &atomic_ro_fops, 0444, val);
50012diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50013index bdef916..88c7dee 100644
50014--- a/drivers/oprofile/timer_int.c
50015+++ b/drivers/oprofile/timer_int.c
50016@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50017 return NOTIFY_OK;
50018 }
50019
50020-static struct notifier_block __refdata oprofile_cpu_notifier = {
50021+static struct notifier_block oprofile_cpu_notifier = {
50022 .notifier_call = oprofile_cpu_notify,
50023 };
50024
50025diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50026index 3b47080..6cd05dd 100644
50027--- a/drivers/parport/procfs.c
50028+++ b/drivers/parport/procfs.c
50029@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50030
50031 *ppos += len;
50032
50033- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50034+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50035 }
50036
50037 #ifdef CONFIG_PARPORT_1284
50038@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50039
50040 *ppos += len;
50041
50042- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50043+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50044 }
50045 #endif /* IEEE1284.3 support. */
50046
50047diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50048index 6ca2399..68d866b 100644
50049--- a/drivers/pci/hotplug/acpiphp_ibm.c
50050+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50051@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50052 goto init_cleanup;
50053 }
50054
50055- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50056+ pax_open_kernel();
50057+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50058+ pax_close_kernel();
50059 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50060
50061 return retval;
50062diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50063index 66b7bbe..26bee78 100644
50064--- a/drivers/pci/hotplug/cpcihp_generic.c
50065+++ b/drivers/pci/hotplug/cpcihp_generic.c
50066@@ -73,7 +73,6 @@ static u16 port;
50067 static unsigned int enum_bit;
50068 static u8 enum_mask;
50069
50070-static struct cpci_hp_controller_ops generic_hpc_ops;
50071 static struct cpci_hp_controller generic_hpc;
50072
50073 static int __init validate_parameters(void)
50074@@ -139,6 +138,10 @@ static int query_enum(void)
50075 return ((value & enum_mask) == enum_mask);
50076 }
50077
50078+static struct cpci_hp_controller_ops generic_hpc_ops = {
50079+ .query_enum = query_enum,
50080+};
50081+
50082 static int __init cpcihp_generic_init(void)
50083 {
50084 int status;
50085@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50086 pci_dev_put(dev);
50087
50088 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50089- generic_hpc_ops.query_enum = query_enum;
50090 generic_hpc.ops = &generic_hpc_ops;
50091
50092 status = cpci_hp_register_controller(&generic_hpc);
50093diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50094index 7ecf34e..effed62 100644
50095--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50096+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50097@@ -59,7 +59,6 @@
50098 /* local variables */
50099 static bool debug;
50100 static bool poll;
50101-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50102 static struct cpci_hp_controller zt5550_hpc;
50103
50104 /* Primary cPCI bus bridge device */
50105@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50106 return 0;
50107 }
50108
50109+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50110+ .query_enum = zt5550_hc_query_enum,
50111+};
50112+
50113 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50114 {
50115 int status;
50116@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50117 dbg("returned from zt5550_hc_config");
50118
50119 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50120- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50121 zt5550_hpc.ops = &zt5550_hpc_ops;
50122 if (!poll) {
50123 zt5550_hpc.irq = hc_dev->irq;
50124 zt5550_hpc.irq_flags = IRQF_SHARED;
50125 zt5550_hpc.dev_id = hc_dev;
50126
50127- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50128- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50129- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50130+ pax_open_kernel();
50131+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50132+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50133+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50134+ pax_open_kernel();
50135 } else {
50136 info("using ENUM# polling mode");
50137 }
50138diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50139index 1e08ff8c..3cd145f 100644
50140--- a/drivers/pci/hotplug/cpqphp_nvram.c
50141+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50142@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50143
50144 void compaq_nvram_init (void __iomem *rom_start)
50145 {
50146+#ifndef CONFIG_PAX_KERNEXEC
50147 if (rom_start)
50148 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50149+#endif
50150
50151 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50152
50153diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50154index 56d8486..f26113f 100644
50155--- a/drivers/pci/hotplug/pci_hotplug_core.c
50156+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50157@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50158 return -EINVAL;
50159 }
50160
50161- slot->ops->owner = owner;
50162- slot->ops->mod_name = mod_name;
50163+ pax_open_kernel();
50164+ *(struct module **)&slot->ops->owner = owner;
50165+ *(const char **)&slot->ops->mod_name = mod_name;
50166+ pax_close_kernel();
50167
50168 mutex_lock(&pci_hp_mutex);
50169 /*
50170diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50171index 07aa722..84514b4 100644
50172--- a/drivers/pci/hotplug/pciehp_core.c
50173+++ b/drivers/pci/hotplug/pciehp_core.c
50174@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50175 struct slot *slot = ctrl->slot;
50176 struct hotplug_slot *hotplug = NULL;
50177 struct hotplug_slot_info *info = NULL;
50178- struct hotplug_slot_ops *ops = NULL;
50179+ hotplug_slot_ops_no_const *ops = NULL;
50180 char name[SLOT_NAME_SIZE];
50181 int retval = -ENOMEM;
50182
50183diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50184index fd60806..ab6c565 100644
50185--- a/drivers/pci/msi.c
50186+++ b/drivers/pci/msi.c
50187@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
50188 {
50189 struct attribute **msi_attrs;
50190 struct attribute *msi_attr;
50191- struct device_attribute *msi_dev_attr;
50192- struct attribute_group *msi_irq_group;
50193+ device_attribute_no_const *msi_dev_attr;
50194+ attribute_group_no_const *msi_irq_group;
50195 const struct attribute_group **msi_irq_groups;
50196 struct msi_desc *entry;
50197 int ret = -ENOMEM;
50198@@ -573,7 +573,7 @@ error_attrs:
50199 count = 0;
50200 msi_attr = msi_attrs[count];
50201 while (msi_attr) {
50202- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
50203+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
50204 kfree(msi_attr->name);
50205 kfree(msi_dev_attr);
50206 ++count;
50207diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
50208index 312f23a..d21181c 100644
50209--- a/drivers/pci/pci-sysfs.c
50210+++ b/drivers/pci/pci-sysfs.c
50211@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50212 {
50213 /* allocate attribute structure, piggyback attribute name */
50214 int name_len = write_combine ? 13 : 10;
50215- struct bin_attribute *res_attr;
50216+ bin_attribute_no_const *res_attr;
50217 int retval;
50218
50219 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50220@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50221 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50222 {
50223 int retval;
50224- struct bin_attribute *attr;
50225+ bin_attribute_no_const *attr;
50226
50227 /* If the device has VPD, try to expose it in sysfs. */
50228 if (dev->vpd) {
50229@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50230 {
50231 int retval;
50232 int rom_size = 0;
50233- struct bin_attribute *attr;
50234+ bin_attribute_no_const *attr;
50235
50236 if (!sysfs_initialized)
50237 return -EACCES;
50238diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50239index d54632a..198c84d 100644
50240--- a/drivers/pci/pci.h
50241+++ b/drivers/pci/pci.h
50242@@ -93,7 +93,7 @@ struct pci_vpd_ops {
50243 struct pci_vpd {
50244 unsigned int len;
50245 const struct pci_vpd_ops *ops;
50246- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50247+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50248 };
50249
50250 int pci_vpd_pci22_init(struct pci_dev *dev);
50251diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50252index e1e7026..d28dd33 100644
50253--- a/drivers/pci/pcie/aspm.c
50254+++ b/drivers/pci/pcie/aspm.c
50255@@ -27,9 +27,9 @@
50256 #define MODULE_PARAM_PREFIX "pcie_aspm."
50257
50258 /* Note: those are not register definitions */
50259-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50260-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50261-#define ASPM_STATE_L1 (4) /* L1 state */
50262+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50263+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50264+#define ASPM_STATE_L1 (4U) /* L1 state */
50265 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50266 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50267
50268diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
50269index be35da2..ec16cdb 100644
50270--- a/drivers/pci/pcie/portdrv_pci.c
50271+++ b/drivers/pci/pcie/portdrv_pci.c
50272@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
50273 return 0;
50274 }
50275
50276-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
50277+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
50278 /*
50279 * Boxes that should not use MSI for PCIe PME signaling.
50280 */
50281diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50282index 23212f8..65e945b 100644
50283--- a/drivers/pci/probe.c
50284+++ b/drivers/pci/probe.c
50285@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50286 u16 orig_cmd;
50287 struct pci_bus_region region, inverted_region;
50288
50289- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50290+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50291
50292 /* No printks while decoding is disabled! */
50293 if (!dev->mmio_always_on) {
50294diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50295index 3f155e7..0f4b1f0 100644
50296--- a/drivers/pci/proc.c
50297+++ b/drivers/pci/proc.c
50298@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50299 static int __init pci_proc_init(void)
50300 {
50301 struct pci_dev *dev = NULL;
50302+
50303+#ifdef CONFIG_GRKERNSEC_PROC_ADD
50304+#ifdef CONFIG_GRKERNSEC_PROC_USER
50305+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50306+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50307+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50308+#endif
50309+#else
50310 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
50311+#endif
50312 proc_create("devices", 0, proc_bus_pci_dir,
50313 &proc_bus_pci_dev_operations);
50314 proc_initialized = 1;
50315diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
50316index b84fdd6..b89d829 100644
50317--- a/drivers/platform/chrome/chromeos_laptop.c
50318+++ b/drivers/platform/chrome/chromeos_laptop.c
50319@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50320 .callback = chromeos_laptop_dmi_matched, \
50321 .driver_data = (void *)&board_
50322
50323-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50324+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50325 {
50326 .ident = "Samsung Series 5 550",
50327 .matches = {
50328diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
50329index 3474920..acc9581 100644
50330--- a/drivers/platform/chrome/chromeos_pstore.c
50331+++ b/drivers/platform/chrome/chromeos_pstore.c
50332@@ -13,7 +13,7 @@
50333 #include <linux/platform_device.h>
50334 #include <linux/pstore_ram.h>
50335
50336-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
50337+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
50338 {
50339 /*
50340 * Today all Chromebooks/boxes ship with Google_* as version and
50341diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50342index 1e1e594..8fe59c5 100644
50343--- a/drivers/platform/x86/alienware-wmi.c
50344+++ b/drivers/platform/x86/alienware-wmi.c
50345@@ -150,7 +150,7 @@ struct wmax_led_args {
50346 } __packed;
50347
50348 static struct platform_device *platform_device;
50349-static struct device_attribute *zone_dev_attrs;
50350+static device_attribute_no_const *zone_dev_attrs;
50351 static struct attribute **zone_attrs;
50352 static struct platform_zone *zone_data;
50353
50354@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
50355 }
50356 };
50357
50358-static struct attribute_group zone_attribute_group = {
50359+static attribute_group_no_const zone_attribute_group = {
50360 .name = "rgb_zones",
50361 };
50362
50363diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50364index 7543a56..367ca8ed 100644
50365--- a/drivers/platform/x86/asus-wmi.c
50366+++ b/drivers/platform/x86/asus-wmi.c
50367@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
50368 int err;
50369 u32 retval = -1;
50370
50371+#ifdef CONFIG_GRKERNSEC_KMEM
50372+ return -EPERM;
50373+#endif
50374+
50375 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50376
50377 if (err < 0)
50378@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
50379 int err;
50380 u32 retval = -1;
50381
50382+#ifdef CONFIG_GRKERNSEC_KMEM
50383+ return -EPERM;
50384+#endif
50385+
50386 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50387 &retval);
50388
50389@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
50390 union acpi_object *obj;
50391 acpi_status status;
50392
50393+#ifdef CONFIG_GRKERNSEC_KMEM
50394+ return -EPERM;
50395+#endif
50396+
50397 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50398 1, asus->debug.method_id,
50399 &input, &output);
50400diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
50401index 15c0fab..f674006 100644
50402--- a/drivers/platform/x86/compal-laptop.c
50403+++ b/drivers/platform/x86/compal-laptop.c
50404@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
50405 return 1;
50406 }
50407
50408-static struct dmi_system_id __initdata compal_dmi_table[] = {
50409+static const struct dmi_system_id __initconst compal_dmi_table[] = {
50410 {
50411 .ident = "FL90/IFL90",
50412 .matches = {
50413diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
50414index 458e6c9..089aee7 100644
50415--- a/drivers/platform/x86/hdaps.c
50416+++ b/drivers/platform/x86/hdaps.c
50417@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
50418 "ThinkPad T42p", so the order of the entries matters.
50419 If your ThinkPad is not recognized, please update to latest
50420 BIOS. This is especially the case for some R52 ThinkPads. */
50421-static struct dmi_system_id __initdata hdaps_whitelist[] = {
50422+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
50423 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
50424 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
50425 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
50426diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
50427index 97c2be1..2ee50ce 100644
50428--- a/drivers/platform/x86/ibm_rtl.c
50429+++ b/drivers/platform/x86/ibm_rtl.c
50430@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
50431 }
50432
50433
50434-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
50435+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
50436 { \
50437 .matches = { \
50438 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
50439diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
50440index a4a4258..a58a04c 100644
50441--- a/drivers/platform/x86/intel_oaktrail.c
50442+++ b/drivers/platform/x86/intel_oaktrail.c
50443@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
50444 return 0;
50445 }
50446
50447-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
50448+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
50449 {
50450 .ident = "OakTrail platform",
50451 .matches = {
50452diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50453index 0859877..59d596d 100644
50454--- a/drivers/platform/x86/msi-laptop.c
50455+++ b/drivers/platform/x86/msi-laptop.c
50456@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
50457 return 1;
50458 }
50459
50460-static struct dmi_system_id __initdata msi_dmi_table[] = {
50461+static const struct dmi_system_id __initconst msi_dmi_table[] = {
50462 {
50463 .ident = "MSI S270",
50464 .matches = {
50465@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50466
50467 if (!quirks->ec_read_only) {
50468 /* allow userland write sysfs file */
50469- dev_attr_bluetooth.store = store_bluetooth;
50470- dev_attr_wlan.store = store_wlan;
50471- dev_attr_threeg.store = store_threeg;
50472- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50473- dev_attr_wlan.attr.mode |= S_IWUSR;
50474- dev_attr_threeg.attr.mode |= S_IWUSR;
50475+ pax_open_kernel();
50476+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50477+ *(void **)&dev_attr_wlan.store = store_wlan;
50478+ *(void **)&dev_attr_threeg.store = store_threeg;
50479+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50480+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50481+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50482+ pax_close_kernel();
50483 }
50484
50485 /* disable hardware control by fn key */
50486diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50487index 6d2bac0..ec2b029 100644
50488--- a/drivers/platform/x86/msi-wmi.c
50489+++ b/drivers/platform/x86/msi-wmi.c
50490@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50491 static void msi_wmi_notify(u32 value, void *context)
50492 {
50493 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50494- static struct key_entry *key;
50495+ struct key_entry *key;
50496 union acpi_object *obj;
50497 acpi_status status;
50498
50499diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
50500index ce364a4..5074643 100644
50501--- a/drivers/platform/x86/samsung-laptop.c
50502+++ b/drivers/platform/x86/samsung-laptop.c
50503@@ -1465,7 +1465,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
50504 return 0;
50505 }
50506
50507-static struct dmi_system_id __initdata samsung_dmi_table[] = {
50508+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
50509 {
50510 .matches = {
50511 DMI_MATCH(DMI_SYS_VENDOR,
50512diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
50513index e6aac72..e11ff24 100644
50514--- a/drivers/platform/x86/samsung-q10.c
50515+++ b/drivers/platform/x86/samsung-q10.c
50516@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
50517 return 1;
50518 }
50519
50520-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
50521+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
50522 {
50523 .ident = "Samsung Q10",
50524 .matches = {
50525diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50526index 6dd1c0e..78b9f0a 100644
50527--- a/drivers/platform/x86/sony-laptop.c
50528+++ b/drivers/platform/x86/sony-laptop.c
50529@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50530 }
50531
50532 /* High speed charging function */
50533-static struct device_attribute *hsc_handle;
50534+static device_attribute_no_const *hsc_handle;
50535
50536 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50537 struct device_attribute *attr,
50538@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50539 }
50540
50541 /* low battery function */
50542-static struct device_attribute *lowbatt_handle;
50543+static device_attribute_no_const *lowbatt_handle;
50544
50545 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50546 struct device_attribute *attr,
50547@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50548 }
50549
50550 /* fan speed function */
50551-static struct device_attribute *fan_handle, *hsf_handle;
50552+static device_attribute_no_const *fan_handle, *hsf_handle;
50553
50554 static ssize_t sony_nc_hsfan_store(struct device *dev,
50555 struct device_attribute *attr,
50556@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50557 }
50558
50559 /* USB charge function */
50560-static struct device_attribute *uc_handle;
50561+static device_attribute_no_const *uc_handle;
50562
50563 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50564 struct device_attribute *attr,
50565@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50566 }
50567
50568 /* Panel ID function */
50569-static struct device_attribute *panel_handle;
50570+static device_attribute_no_const *panel_handle;
50571
50572 static ssize_t sony_nc_panelid_show(struct device *dev,
50573 struct device_attribute *attr, char *buffer)
50574@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50575 }
50576
50577 /* smart connect function */
50578-static struct device_attribute *sc_handle;
50579+static device_attribute_no_const *sc_handle;
50580
50581 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50582 struct device_attribute *attr,
50583@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
50584 .drv.pm = &sony_pic_pm,
50585 };
50586
50587-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
50588+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
50589 {
50590 .ident = "Sony Vaio",
50591 .matches = {
50592diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50593index c3d11fa..f83cded 100644
50594--- a/drivers/platform/x86/thinkpad_acpi.c
50595+++ b/drivers/platform/x86/thinkpad_acpi.c
50596@@ -2092,7 +2092,7 @@ static int hotkey_mask_get(void)
50597 return 0;
50598 }
50599
50600-void static hotkey_mask_warn_incomplete_mask(void)
50601+static void hotkey_mask_warn_incomplete_mask(void)
50602 {
50603 /* log only what the user can fix... */
50604 const u32 wantedmask = hotkey_driver_mask &
50605@@ -2436,10 +2436,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50606 && !tp_features.bright_unkfw)
50607 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50608 }
50609+}
50610
50611 #undef TPACPI_COMPARE_KEY
50612 #undef TPACPI_MAY_SEND_KEY
50613-}
50614
50615 /*
50616 * Polling driver
50617diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50618index 438d4c7..ca8a2fb 100644
50619--- a/drivers/pnp/pnpbios/bioscalls.c
50620+++ b/drivers/pnp/pnpbios/bioscalls.c
50621@@ -59,7 +59,7 @@ do { \
50622 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50623 } while(0)
50624
50625-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50626+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50627 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50628
50629 /*
50630@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50631
50632 cpu = get_cpu();
50633 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50634+
50635+ pax_open_kernel();
50636 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50637+ pax_close_kernel();
50638
50639 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50640 spin_lock_irqsave(&pnp_bios_lock, flags);
50641@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50642 :"memory");
50643 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50644
50645+ pax_open_kernel();
50646 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50647+ pax_close_kernel();
50648+
50649 put_cpu();
50650
50651 /* If we get here and this is set then the PnP BIOS faulted on us. */
50652@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50653 return status;
50654 }
50655
50656-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50657+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50658 {
50659 int i;
50660
50661@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50662 pnp_bios_callpoint.offset = header->fields.pm16offset;
50663 pnp_bios_callpoint.segment = PNP_CS16;
50664
50665+ pax_open_kernel();
50666+
50667 for_each_possible_cpu(i) {
50668 struct desc_struct *gdt = get_cpu_gdt_table(i);
50669 if (!gdt)
50670@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50671 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50672 (unsigned long)__va(header->fields.pm16dseg));
50673 }
50674+
50675+ pax_close_kernel();
50676 }
50677diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
50678index 074569e..d807bef 100644
50679--- a/drivers/pnp/pnpbios/core.c
50680+++ b/drivers/pnp/pnpbios/core.c
50681@@ -493,7 +493,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
50682 return 0;
50683 }
50684
50685-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
50686+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
50687 { /* PnPBIOS GPF on boot */
50688 .callback = exploding_pnp_bios,
50689 .ident = "Higraded P14H",
50690diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50691index 0c52e2a..3421ab7 100644
50692--- a/drivers/power/pda_power.c
50693+++ b/drivers/power/pda_power.c
50694@@ -37,7 +37,11 @@ static int polling;
50695
50696 #if IS_ENABLED(CONFIG_USB_PHY)
50697 static struct usb_phy *transceiver;
50698-static struct notifier_block otg_nb;
50699+static int otg_handle_notification(struct notifier_block *nb,
50700+ unsigned long event, void *unused);
50701+static struct notifier_block otg_nb = {
50702+ .notifier_call = otg_handle_notification
50703+};
50704 #endif
50705
50706 static struct regulator *ac_draw;
50707@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50708
50709 #if IS_ENABLED(CONFIG_USB_PHY)
50710 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50711- otg_nb.notifier_call = otg_handle_notification;
50712 ret = usb_register_notifier(transceiver, &otg_nb);
50713 if (ret) {
50714 dev_err(dev, "failure to register otg notifier\n");
50715diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50716index cc439fd..8fa30df 100644
50717--- a/drivers/power/power_supply.h
50718+++ b/drivers/power/power_supply.h
50719@@ -16,12 +16,12 @@ struct power_supply;
50720
50721 #ifdef CONFIG_SYSFS
50722
50723-extern void power_supply_init_attrs(struct device_type *dev_type);
50724+extern void power_supply_init_attrs(void);
50725 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50726
50727 #else
50728
50729-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50730+static inline void power_supply_init_attrs(void) {}
50731 #define power_supply_uevent NULL
50732
50733 #endif /* CONFIG_SYSFS */
50734diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50735index 694e8cd..9f03483 100644
50736--- a/drivers/power/power_supply_core.c
50737+++ b/drivers/power/power_supply_core.c
50738@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50739 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50740 EXPORT_SYMBOL_GPL(power_supply_notifier);
50741
50742-static struct device_type power_supply_dev_type;
50743+extern const struct attribute_group *power_supply_attr_groups[];
50744+static struct device_type power_supply_dev_type = {
50745+ .groups = power_supply_attr_groups,
50746+};
50747
50748 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50749 struct power_supply *supply)
50750@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50751 return PTR_ERR(power_supply_class);
50752
50753 power_supply_class->dev_uevent = power_supply_uevent;
50754- power_supply_init_attrs(&power_supply_dev_type);
50755+ power_supply_init_attrs();
50756
50757 return 0;
50758 }
50759diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50760index 62653f5..d0bb485 100644
50761--- a/drivers/power/power_supply_sysfs.c
50762+++ b/drivers/power/power_supply_sysfs.c
50763@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50764 .is_visible = power_supply_attr_is_visible,
50765 };
50766
50767-static const struct attribute_group *power_supply_attr_groups[] = {
50768+const struct attribute_group *power_supply_attr_groups[] = {
50769 &power_supply_attr_group,
50770 NULL,
50771 };
50772
50773-void power_supply_init_attrs(struct device_type *dev_type)
50774+void power_supply_init_attrs(void)
50775 {
50776 int i;
50777
50778- dev_type->groups = power_supply_attr_groups;
50779-
50780 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50781 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50782 }
50783diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50784index 84419af..268ede8 100644
50785--- a/drivers/powercap/powercap_sys.c
50786+++ b/drivers/powercap/powercap_sys.c
50787@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50788 struct device_attribute name_attr;
50789 };
50790
50791+static ssize_t show_constraint_name(struct device *dev,
50792+ struct device_attribute *dev_attr,
50793+ char *buf);
50794+
50795 static struct powercap_constraint_attr
50796- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50797+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50798+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50799+ .power_limit_attr = {
50800+ .attr = {
50801+ .name = NULL,
50802+ .mode = S_IWUSR | S_IRUGO
50803+ },
50804+ .show = show_constraint_power_limit_uw,
50805+ .store = store_constraint_power_limit_uw
50806+ },
50807+
50808+ .time_window_attr = {
50809+ .attr = {
50810+ .name = NULL,
50811+ .mode = S_IWUSR | S_IRUGO
50812+ },
50813+ .show = show_constraint_time_window_us,
50814+ .store = store_constraint_time_window_us
50815+ },
50816+
50817+ .max_power_attr = {
50818+ .attr = {
50819+ .name = NULL,
50820+ .mode = S_IRUGO
50821+ },
50822+ .show = show_constraint_max_power_uw,
50823+ .store = NULL
50824+ },
50825+
50826+ .min_power_attr = {
50827+ .attr = {
50828+ .name = NULL,
50829+ .mode = S_IRUGO
50830+ },
50831+ .show = show_constraint_min_power_uw,
50832+ .store = NULL
50833+ },
50834+
50835+ .max_time_window_attr = {
50836+ .attr = {
50837+ .name = NULL,
50838+ .mode = S_IRUGO
50839+ },
50840+ .show = show_constraint_max_time_window_us,
50841+ .store = NULL
50842+ },
50843+
50844+ .min_time_window_attr = {
50845+ .attr = {
50846+ .name = NULL,
50847+ .mode = S_IRUGO
50848+ },
50849+ .show = show_constraint_min_time_window_us,
50850+ .store = NULL
50851+ },
50852+
50853+ .name_attr = {
50854+ .attr = {
50855+ .name = NULL,
50856+ .mode = S_IRUGO
50857+ },
50858+ .show = show_constraint_name,
50859+ .store = NULL
50860+ }
50861+ }
50862+};
50863
50864 /* A list of powercap control_types */
50865 static LIST_HEAD(powercap_cntrl_list);
50866@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50867 }
50868
50869 static int create_constraint_attribute(int id, const char *name,
50870- int mode,
50871- struct device_attribute *dev_attr,
50872- ssize_t (*show)(struct device *,
50873- struct device_attribute *, char *),
50874- ssize_t (*store)(struct device *,
50875- struct device_attribute *,
50876- const char *, size_t)
50877- )
50878+ struct device_attribute *dev_attr)
50879 {
50880+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50881
50882- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50883- id, name);
50884- if (!dev_attr->attr.name)
50885+ if (!name)
50886 return -ENOMEM;
50887- dev_attr->attr.mode = mode;
50888- dev_attr->show = show;
50889- dev_attr->store = store;
50890+
50891+ pax_open_kernel();
50892+ *(const char **)&dev_attr->attr.name = name;
50893+ pax_close_kernel();
50894
50895 return 0;
50896 }
50897@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50898
50899 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50900 ret = create_constraint_attribute(i, "power_limit_uw",
50901- S_IWUSR | S_IRUGO,
50902- &constraint_attrs[i].power_limit_attr,
50903- show_constraint_power_limit_uw,
50904- store_constraint_power_limit_uw);
50905+ &constraint_attrs[i].power_limit_attr);
50906 if (ret)
50907 goto err_alloc;
50908 ret = create_constraint_attribute(i, "time_window_us",
50909- S_IWUSR | S_IRUGO,
50910- &constraint_attrs[i].time_window_attr,
50911- show_constraint_time_window_us,
50912- store_constraint_time_window_us);
50913+ &constraint_attrs[i].time_window_attr);
50914 if (ret)
50915 goto err_alloc;
50916- ret = create_constraint_attribute(i, "name", S_IRUGO,
50917- &constraint_attrs[i].name_attr,
50918- show_constraint_name,
50919- NULL);
50920+ ret = create_constraint_attribute(i, "name",
50921+ &constraint_attrs[i].name_attr);
50922 if (ret)
50923 goto err_alloc;
50924- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50925- &constraint_attrs[i].max_power_attr,
50926- show_constraint_max_power_uw,
50927- NULL);
50928+ ret = create_constraint_attribute(i, "max_power_uw",
50929+ &constraint_attrs[i].max_power_attr);
50930 if (ret)
50931 goto err_alloc;
50932- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50933- &constraint_attrs[i].min_power_attr,
50934- show_constraint_min_power_uw,
50935- NULL);
50936+ ret = create_constraint_attribute(i, "min_power_uw",
50937+ &constraint_attrs[i].min_power_attr);
50938 if (ret)
50939 goto err_alloc;
50940 ret = create_constraint_attribute(i, "max_time_window_us",
50941- S_IRUGO,
50942- &constraint_attrs[i].max_time_window_attr,
50943- show_constraint_max_time_window_us,
50944- NULL);
50945+ &constraint_attrs[i].max_time_window_attr);
50946 if (ret)
50947 goto err_alloc;
50948 ret = create_constraint_attribute(i, "min_time_window_us",
50949- S_IRUGO,
50950- &constraint_attrs[i].min_time_window_attr,
50951- show_constraint_min_time_window_us,
50952- NULL);
50953+ &constraint_attrs[i].min_time_window_attr);
50954 if (ret)
50955 goto err_alloc;
50956
50957@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50958 power_zone->zone_dev_attrs[count++] =
50959 &dev_attr_max_energy_range_uj.attr;
50960 if (power_zone->ops->get_energy_uj) {
50961+ pax_open_kernel();
50962 if (power_zone->ops->reset_energy_uj)
50963- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50964+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50965 else
50966- dev_attr_energy_uj.attr.mode = S_IRUGO;
50967+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50968+ pax_close_kernel();
50969 power_zone->zone_dev_attrs[count++] =
50970 &dev_attr_energy_uj.attr;
50971 }
50972diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50973index 9c5d414..c7900ce 100644
50974--- a/drivers/ptp/ptp_private.h
50975+++ b/drivers/ptp/ptp_private.h
50976@@ -51,7 +51,7 @@ struct ptp_clock {
50977 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50978 wait_queue_head_t tsev_wq;
50979 int defunct; /* tells readers to go away when clock is being removed */
50980- struct device_attribute *pin_dev_attr;
50981+ device_attribute_no_const *pin_dev_attr;
50982 struct attribute **pin_attr;
50983 struct attribute_group pin_attr_group;
50984 };
50985diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50986index 302e626..12579af 100644
50987--- a/drivers/ptp/ptp_sysfs.c
50988+++ b/drivers/ptp/ptp_sysfs.c
50989@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50990 goto no_pin_attr;
50991
50992 for (i = 0; i < n_pins; i++) {
50993- struct device_attribute *da = &ptp->pin_dev_attr[i];
50994+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50995 sysfs_attr_init(&da->attr);
50996 da->attr.name = info->pin_config[i].name;
50997 da->attr.mode = 0644;
50998diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50999index a5761d0..a2a4540 100644
51000--- a/drivers/regulator/core.c
51001+++ b/drivers/regulator/core.c
51002@@ -3591,7 +3591,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51003 {
51004 const struct regulation_constraints *constraints = NULL;
51005 const struct regulator_init_data *init_data;
51006- static atomic_t regulator_no = ATOMIC_INIT(0);
51007+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
51008 struct regulator_dev *rdev;
51009 struct device *dev;
51010 int ret, i;
51011@@ -3665,7 +3665,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51012 rdev->dev.class = &regulator_class;
51013 rdev->dev.parent = dev;
51014 dev_set_name(&rdev->dev, "regulator.%d",
51015- atomic_inc_return(&regulator_no) - 1);
51016+ atomic_inc_return_unchecked(&regulator_no) - 1);
51017 ret = device_register(&rdev->dev);
51018 if (ret != 0) {
51019 put_device(&rdev->dev);
51020diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51021index 7eee2ca..4024513 100644
51022--- a/drivers/regulator/max8660.c
51023+++ b/drivers/regulator/max8660.c
51024@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51025 max8660->shadow_regs[MAX8660_OVER1] = 5;
51026 } else {
51027 /* Otherwise devices can be toggled via software */
51028- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51029- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51030+ pax_open_kernel();
51031+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51032+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51033+ pax_close_kernel();
51034 }
51035
51036 /*
51037diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51038index c3d55c2..0dddfe6 100644
51039--- a/drivers/regulator/max8973-regulator.c
51040+++ b/drivers/regulator/max8973-regulator.c
51041@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51042 if (!pdata || !pdata->enable_ext_control) {
51043 max->desc.enable_reg = MAX8973_VOUT;
51044 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51045- max->ops.enable = regulator_enable_regmap;
51046- max->ops.disable = regulator_disable_regmap;
51047- max->ops.is_enabled = regulator_is_enabled_regmap;
51048+ pax_open_kernel();
51049+ *(void **)&max->ops.enable = regulator_enable_regmap;
51050+ *(void **)&max->ops.disable = regulator_disable_regmap;
51051+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51052+ pax_close_kernel();
51053 }
51054
51055 if (pdata) {
51056diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51057index 0d17c92..a29f627 100644
51058--- a/drivers/regulator/mc13892-regulator.c
51059+++ b/drivers/regulator/mc13892-regulator.c
51060@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51061 mc13xxx_unlock(mc13892);
51062
51063 /* update mc13892_vcam ops */
51064- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51065+ pax_open_kernel();
51066+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51067 sizeof(struct regulator_ops));
51068- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51069- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51070+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51071+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51072+ pax_close_kernel();
51073 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51074
51075 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51076diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51077index 5b2e761..c8c8a4a 100644
51078--- a/drivers/rtc/rtc-cmos.c
51079+++ b/drivers/rtc/rtc-cmos.c
51080@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51081 hpet_rtc_timer_init();
51082
51083 /* export at least the first block of NVRAM */
51084- nvram.size = address_space - NVRAM_OFFSET;
51085+ pax_open_kernel();
51086+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51087+ pax_close_kernel();
51088 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51089 if (retval < 0) {
51090 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51091diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51092index d049393..bb20be0 100644
51093--- a/drivers/rtc/rtc-dev.c
51094+++ b/drivers/rtc/rtc-dev.c
51095@@ -16,6 +16,7 @@
51096 #include <linux/module.h>
51097 #include <linux/rtc.h>
51098 #include <linux/sched.h>
51099+#include <linux/grsecurity.h>
51100 #include "rtc-core.h"
51101
51102 static dev_t rtc_devt;
51103@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51104 if (copy_from_user(&tm, uarg, sizeof(tm)))
51105 return -EFAULT;
51106
51107+ gr_log_timechange();
51108+
51109 return rtc_set_time(rtc, &tm);
51110
51111 case RTC_PIE_ON:
51112diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51113index 4ffabb3..1f87fca 100644
51114--- a/drivers/rtc/rtc-ds1307.c
51115+++ b/drivers/rtc/rtc-ds1307.c
51116@@ -107,7 +107,7 @@ struct ds1307 {
51117 u8 offset; /* register's offset */
51118 u8 regs[11];
51119 u16 nvram_offset;
51120- struct bin_attribute *nvram;
51121+ bin_attribute_no_const *nvram;
51122 enum ds_type type;
51123 unsigned long flags;
51124 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51125diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51126index 90abb5b..e0bf6dd 100644
51127--- a/drivers/rtc/rtc-m48t59.c
51128+++ b/drivers/rtc/rtc-m48t59.c
51129@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51130 if (IS_ERR(m48t59->rtc))
51131 return PTR_ERR(m48t59->rtc);
51132
51133- m48t59_nvram_attr.size = pdata->offset;
51134+ pax_open_kernel();
51135+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51136+ pax_close_kernel();
51137
51138 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51139 if (ret)
51140diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51141index e693af6..2e525b6 100644
51142--- a/drivers/scsi/bfa/bfa_fcpim.h
51143+++ b/drivers/scsi/bfa/bfa_fcpim.h
51144@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51145
51146 struct bfa_itn_s {
51147 bfa_isr_func_t isr;
51148-};
51149+} __no_const;
51150
51151 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51152 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51153diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51154index 0f19455..ef7adb5 100644
51155--- a/drivers/scsi/bfa/bfa_fcs.c
51156+++ b/drivers/scsi/bfa/bfa_fcs.c
51157@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51158 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51159
51160 static struct bfa_fcs_mod_s fcs_modules[] = {
51161- { bfa_fcs_port_attach, NULL, NULL },
51162- { bfa_fcs_uf_attach, NULL, NULL },
51163- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51164- bfa_fcs_fabric_modexit },
51165+ {
51166+ .attach = bfa_fcs_port_attach,
51167+ .modinit = NULL,
51168+ .modexit = NULL
51169+ },
51170+ {
51171+ .attach = bfa_fcs_uf_attach,
51172+ .modinit = NULL,
51173+ .modexit = NULL
51174+ },
51175+ {
51176+ .attach = bfa_fcs_fabric_attach,
51177+ .modinit = bfa_fcs_fabric_modinit,
51178+ .modexit = bfa_fcs_fabric_modexit
51179+ },
51180 };
51181
51182 /*
51183diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51184index ff75ef8..2dfe00a 100644
51185--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51186+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51187@@ -89,15 +89,26 @@ static struct {
51188 void (*offline) (struct bfa_fcs_lport_s *port);
51189 } __port_action[] = {
51190 {
51191- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51192- bfa_fcs_lport_unknown_offline}, {
51193- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51194- bfa_fcs_lport_fab_offline}, {
51195- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51196- bfa_fcs_lport_n2n_offline}, {
51197- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
51198- bfa_fcs_lport_loop_offline},
51199- };
51200+ .init = bfa_fcs_lport_unknown_init,
51201+ .online = bfa_fcs_lport_unknown_online,
51202+ .offline = bfa_fcs_lport_unknown_offline
51203+ },
51204+ {
51205+ .init = bfa_fcs_lport_fab_init,
51206+ .online = bfa_fcs_lport_fab_online,
51207+ .offline = bfa_fcs_lport_fab_offline
51208+ },
51209+ {
51210+ .init = bfa_fcs_lport_n2n_init,
51211+ .online = bfa_fcs_lport_n2n_online,
51212+ .offline = bfa_fcs_lport_n2n_offline
51213+ },
51214+ {
51215+ .init = bfa_fcs_lport_loop_init,
51216+ .online = bfa_fcs_lport_loop_online,
51217+ .offline = bfa_fcs_lport_loop_offline
51218+ },
51219+};
51220
51221 /*
51222 * fcs_port_sm FCS logical port state machine
51223diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
51224index a38aafa0..fe8f03b 100644
51225--- a/drivers/scsi/bfa/bfa_ioc.h
51226+++ b/drivers/scsi/bfa/bfa_ioc.h
51227@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
51228 bfa_ioc_disable_cbfn_t disable_cbfn;
51229 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
51230 bfa_ioc_reset_cbfn_t reset_cbfn;
51231-};
51232+} __no_const;
51233
51234 /*
51235 * IOC event notification mechanism.
51236@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
51237 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
51238 enum bfi_ioc_state fwstate);
51239 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
51240-};
51241+} __no_const;
51242
51243 /*
51244 * Queue element to wait for room in request queue. FIFO order is
51245diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
51246index a14c784..6de6790 100644
51247--- a/drivers/scsi/bfa/bfa_modules.h
51248+++ b/drivers/scsi/bfa/bfa_modules.h
51249@@ -78,12 +78,12 @@ enum {
51250 \
51251 extern struct bfa_module_s hal_mod_ ## __mod; \
51252 struct bfa_module_s hal_mod_ ## __mod = { \
51253- bfa_ ## __mod ## _meminfo, \
51254- bfa_ ## __mod ## _attach, \
51255- bfa_ ## __mod ## _detach, \
51256- bfa_ ## __mod ## _start, \
51257- bfa_ ## __mod ## _stop, \
51258- bfa_ ## __mod ## _iocdisable, \
51259+ .meminfo = bfa_ ## __mod ## _meminfo, \
51260+ .attach = bfa_ ## __mod ## _attach, \
51261+ .detach = bfa_ ## __mod ## _detach, \
51262+ .start = bfa_ ## __mod ## _start, \
51263+ .stop = bfa_ ## __mod ## _stop, \
51264+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
51265 }
51266
51267 #define BFA_CACHELINE_SZ (256)
51268diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
51269index 045c4e1..13de803 100644
51270--- a/drivers/scsi/fcoe/fcoe_sysfs.c
51271+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
51272@@ -33,8 +33,8 @@
51273 */
51274 #include "libfcoe.h"
51275
51276-static atomic_t ctlr_num;
51277-static atomic_t fcf_num;
51278+static atomic_unchecked_t ctlr_num;
51279+static atomic_unchecked_t fcf_num;
51280
51281 /*
51282 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
51283@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
51284 if (!ctlr)
51285 goto out;
51286
51287- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
51288+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
51289 ctlr->f = f;
51290 ctlr->mode = FIP_CONN_TYPE_FABRIC;
51291 INIT_LIST_HEAD(&ctlr->fcfs);
51292@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
51293 fcf->dev.parent = &ctlr->dev;
51294 fcf->dev.bus = &fcoe_bus_type;
51295 fcf->dev.type = &fcoe_fcf_device_type;
51296- fcf->id = atomic_inc_return(&fcf_num) - 1;
51297+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
51298 fcf->state = FCOE_FCF_STATE_UNKNOWN;
51299
51300 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
51301@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
51302 {
51303 int error;
51304
51305- atomic_set(&ctlr_num, 0);
51306- atomic_set(&fcf_num, 0);
51307+ atomic_set_unchecked(&ctlr_num, 0);
51308+ atomic_set_unchecked(&fcf_num, 0);
51309
51310 error = bus_register(&fcoe_bus_type);
51311 if (error)
51312diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
51313index 8bb173e..20236b4 100644
51314--- a/drivers/scsi/hosts.c
51315+++ b/drivers/scsi/hosts.c
51316@@ -42,7 +42,7 @@
51317 #include "scsi_logging.h"
51318
51319
51320-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51321+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51322
51323
51324 static void scsi_host_cls_release(struct device *dev)
51325@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
51326 * subtract one because we increment first then return, but we need to
51327 * know what the next host number was before increment
51328 */
51329- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
51330+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
51331 shost->dma_channel = 0xff;
51332
51333 /* These three are default values which can be overridden */
51334diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
51335index 6bb4611..0203251 100644
51336--- a/drivers/scsi/hpsa.c
51337+++ b/drivers/scsi/hpsa.c
51338@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
51339 struct reply_queue_buffer *rq = &h->reply_queue[q];
51340
51341 if (h->transMethod & CFGTBL_Trans_io_accel1)
51342- return h->access.command_completed(h, q);
51343+ return h->access->command_completed(h, q);
51344
51345 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
51346- return h->access.command_completed(h, q);
51347+ return h->access->command_completed(h, q);
51348
51349 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
51350 a = rq->head[rq->current_entry];
51351@@ -5360,7 +5360,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51352 while (!list_empty(&h->reqQ)) {
51353 c = list_entry(h->reqQ.next, struct CommandList, list);
51354 /* can't do anything if fifo is full */
51355- if ((h->access.fifo_full(h))) {
51356+ if ((h->access->fifo_full(h))) {
51357 h->fifo_recently_full = 1;
51358 dev_warn(&h->pdev->dev, "fifo full\n");
51359 break;
51360@@ -5376,7 +5376,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51361 atomic_inc(&h->commands_outstanding);
51362 spin_unlock_irqrestore(&h->lock, *flags);
51363 /* Tell the controller execute command */
51364- h->access.submit_command(h, c);
51365+ h->access->submit_command(h, c);
51366 spin_lock_irqsave(&h->lock, *flags);
51367 }
51368 }
51369@@ -5392,17 +5392,17 @@ static void lock_and_start_io(struct ctlr_info *h)
51370
51371 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
51372 {
51373- return h->access.command_completed(h, q);
51374+ return h->access->command_completed(h, q);
51375 }
51376
51377 static inline bool interrupt_pending(struct ctlr_info *h)
51378 {
51379- return h->access.intr_pending(h);
51380+ return h->access->intr_pending(h);
51381 }
51382
51383 static inline long interrupt_not_for_us(struct ctlr_info *h)
51384 {
51385- return (h->access.intr_pending(h) == 0) ||
51386+ return (h->access->intr_pending(h) == 0) ||
51387 (h->interrupts_enabled == 0);
51388 }
51389
51390@@ -6343,7 +6343,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
51391 if (prod_index < 0)
51392 return -ENODEV;
51393 h->product_name = products[prod_index].product_name;
51394- h->access = *(products[prod_index].access);
51395+ h->access = products[prod_index].access;
51396
51397 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
51398 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
51399@@ -6690,7 +6690,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
51400 unsigned long flags;
51401 u32 lockup_detected;
51402
51403- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51404+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51405 spin_lock_irqsave(&h->lock, flags);
51406 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
51407 if (!lockup_detected) {
51408@@ -6937,7 +6937,7 @@ reinit_after_soft_reset:
51409 }
51410
51411 /* make sure the board interrupts are off */
51412- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51413+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51414
51415 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
51416 goto clean2;
51417@@ -6972,7 +6972,7 @@ reinit_after_soft_reset:
51418 * fake ones to scoop up any residual completions.
51419 */
51420 spin_lock_irqsave(&h->lock, flags);
51421- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51422+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51423 spin_unlock_irqrestore(&h->lock, flags);
51424 free_irqs(h);
51425 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
51426@@ -6991,9 +6991,9 @@ reinit_after_soft_reset:
51427 dev_info(&h->pdev->dev, "Board READY.\n");
51428 dev_info(&h->pdev->dev,
51429 "Waiting for stale completions to drain.\n");
51430- h->access.set_intr_mask(h, HPSA_INTR_ON);
51431+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51432 msleep(10000);
51433- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51434+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51435
51436 rc = controller_reset_failed(h->cfgtable);
51437 if (rc)
51438@@ -7019,7 +7019,7 @@ reinit_after_soft_reset:
51439 h->drv_req_rescan = 0;
51440
51441 /* Turn the interrupts on so we can service requests */
51442- h->access.set_intr_mask(h, HPSA_INTR_ON);
51443+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51444
51445 hpsa_hba_inquiry(h);
51446 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51447@@ -7084,7 +7084,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51448 * To write all data in the battery backed cache to disks
51449 */
51450 hpsa_flush_cache(h);
51451- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51452+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51453 hpsa_free_irqs_and_disable_msix(h);
51454 }
51455
51456@@ -7202,7 +7202,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51457 CFGTBL_Trans_enable_directed_msix |
51458 (trans_support & (CFGTBL_Trans_io_accel1 |
51459 CFGTBL_Trans_io_accel2));
51460- struct access_method access = SA5_performant_access;
51461+ struct access_method *access = &SA5_performant_access;
51462
51463 /* This is a bit complicated. There are 8 registers on
51464 * the controller which we write to to tell it 8 different
51465@@ -7244,7 +7244,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51466 * perform the superfluous readl() after each command submission.
51467 */
51468 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51469- access = SA5_performant_access_no_read;
51470+ access = &SA5_performant_access_no_read;
51471
51472 /* Controller spec: zero out this buffer. */
51473 for (i = 0; i < h->nreply_queues; i++)
51474@@ -7274,12 +7274,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51475 * enable outbound interrupt coalescing in accelerator mode;
51476 */
51477 if (trans_support & CFGTBL_Trans_io_accel1) {
51478- access = SA5_ioaccel_mode1_access;
51479+ access = &SA5_ioaccel_mode1_access;
51480 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51481 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51482 } else {
51483 if (trans_support & CFGTBL_Trans_io_accel2) {
51484- access = SA5_ioaccel_mode2_access;
51485+ access = &SA5_ioaccel_mode2_access;
51486 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51487 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51488 }
51489diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51490index 8e06d9e..396e0a1 100644
51491--- a/drivers/scsi/hpsa.h
51492+++ b/drivers/scsi/hpsa.h
51493@@ -127,7 +127,7 @@ struct ctlr_info {
51494 unsigned int msix_vector;
51495 unsigned int msi_vector;
51496 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51497- struct access_method access;
51498+ struct access_method *access;
51499 char hba_mode_enabled;
51500
51501 /* queue and queue Info */
51502@@ -523,43 +523,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51503 }
51504
51505 static struct access_method SA5_access = {
51506- SA5_submit_command,
51507- SA5_intr_mask,
51508- SA5_fifo_full,
51509- SA5_intr_pending,
51510- SA5_completed,
51511+ .submit_command = SA5_submit_command,
51512+ .set_intr_mask = SA5_intr_mask,
51513+ .fifo_full = SA5_fifo_full,
51514+ .intr_pending = SA5_intr_pending,
51515+ .command_completed = SA5_completed,
51516 };
51517
51518 static struct access_method SA5_ioaccel_mode1_access = {
51519- SA5_submit_command,
51520- SA5_performant_intr_mask,
51521- SA5_fifo_full,
51522- SA5_ioaccel_mode1_intr_pending,
51523- SA5_ioaccel_mode1_completed,
51524+ .submit_command = SA5_submit_command,
51525+ .set_intr_mask = SA5_performant_intr_mask,
51526+ .fifo_full = SA5_fifo_full,
51527+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51528+ .command_completed = SA5_ioaccel_mode1_completed,
51529 };
51530
51531 static struct access_method SA5_ioaccel_mode2_access = {
51532- SA5_submit_command_ioaccel2,
51533- SA5_performant_intr_mask,
51534- SA5_fifo_full,
51535- SA5_performant_intr_pending,
51536- SA5_performant_completed,
51537+ .submit_command = SA5_submit_command_ioaccel2,
51538+ .set_intr_mask = SA5_performant_intr_mask,
51539+ .fifo_full = SA5_fifo_full,
51540+ .intr_pending = SA5_performant_intr_pending,
51541+ .command_completed = SA5_performant_completed,
51542 };
51543
51544 static struct access_method SA5_performant_access = {
51545- SA5_submit_command,
51546- SA5_performant_intr_mask,
51547- SA5_fifo_full,
51548- SA5_performant_intr_pending,
51549- SA5_performant_completed,
51550+ .submit_command = SA5_submit_command,
51551+ .set_intr_mask = SA5_performant_intr_mask,
51552+ .fifo_full = SA5_fifo_full,
51553+ .intr_pending = SA5_performant_intr_pending,
51554+ .command_completed = SA5_performant_completed,
51555 };
51556
51557 static struct access_method SA5_performant_access_no_read = {
51558- SA5_submit_command_no_read,
51559- SA5_performant_intr_mask,
51560- SA5_fifo_full,
51561- SA5_performant_intr_pending,
51562- SA5_performant_completed,
51563+ .submit_command = SA5_submit_command_no_read,
51564+ .set_intr_mask = SA5_performant_intr_mask,
51565+ .fifo_full = SA5_fifo_full,
51566+ .intr_pending = SA5_performant_intr_pending,
51567+ .command_completed = SA5_performant_completed,
51568 };
51569
51570 struct board_type {
51571diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51572index 1b3a094..068e683 100644
51573--- a/drivers/scsi/libfc/fc_exch.c
51574+++ b/drivers/scsi/libfc/fc_exch.c
51575@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51576 u16 pool_max_index;
51577
51578 struct {
51579- atomic_t no_free_exch;
51580- atomic_t no_free_exch_xid;
51581- atomic_t xid_not_found;
51582- atomic_t xid_busy;
51583- atomic_t seq_not_found;
51584- atomic_t non_bls_resp;
51585+ atomic_unchecked_t no_free_exch;
51586+ atomic_unchecked_t no_free_exch_xid;
51587+ atomic_unchecked_t xid_not_found;
51588+ atomic_unchecked_t xid_busy;
51589+ atomic_unchecked_t seq_not_found;
51590+ atomic_unchecked_t non_bls_resp;
51591 } stats;
51592 };
51593
51594@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51595 /* allocate memory for exchange */
51596 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51597 if (!ep) {
51598- atomic_inc(&mp->stats.no_free_exch);
51599+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51600 goto out;
51601 }
51602 memset(ep, 0, sizeof(*ep));
51603@@ -874,7 +874,7 @@ out:
51604 return ep;
51605 err:
51606 spin_unlock_bh(&pool->lock);
51607- atomic_inc(&mp->stats.no_free_exch_xid);
51608+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51609 mempool_free(ep, mp->ep_pool);
51610 return NULL;
51611 }
51612@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51613 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51614 ep = fc_exch_find(mp, xid);
51615 if (!ep) {
51616- atomic_inc(&mp->stats.xid_not_found);
51617+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51618 reject = FC_RJT_OX_ID;
51619 goto out;
51620 }
51621@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51622 ep = fc_exch_find(mp, xid);
51623 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51624 if (ep) {
51625- atomic_inc(&mp->stats.xid_busy);
51626+ atomic_inc_unchecked(&mp->stats.xid_busy);
51627 reject = FC_RJT_RX_ID;
51628 goto rel;
51629 }
51630@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51631 }
51632 xid = ep->xid; /* get our XID */
51633 } else if (!ep) {
51634- atomic_inc(&mp->stats.xid_not_found);
51635+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51636 reject = FC_RJT_RX_ID; /* XID not found */
51637 goto out;
51638 }
51639@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51640 } else {
51641 sp = &ep->seq;
51642 if (sp->id != fh->fh_seq_id) {
51643- atomic_inc(&mp->stats.seq_not_found);
51644+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51645 if (f_ctl & FC_FC_END_SEQ) {
51646 /*
51647 * Update sequence_id based on incoming last
51648@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51649
51650 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51651 if (!ep) {
51652- atomic_inc(&mp->stats.xid_not_found);
51653+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51654 goto out;
51655 }
51656 if (ep->esb_stat & ESB_ST_COMPLETE) {
51657- atomic_inc(&mp->stats.xid_not_found);
51658+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51659 goto rel;
51660 }
51661 if (ep->rxid == FC_XID_UNKNOWN)
51662 ep->rxid = ntohs(fh->fh_rx_id);
51663 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51664- atomic_inc(&mp->stats.xid_not_found);
51665+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51666 goto rel;
51667 }
51668 if (ep->did != ntoh24(fh->fh_s_id) &&
51669 ep->did != FC_FID_FLOGI) {
51670- atomic_inc(&mp->stats.xid_not_found);
51671+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51672 goto rel;
51673 }
51674 sof = fr_sof(fp);
51675@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51676 sp->ssb_stat |= SSB_ST_RESP;
51677 sp->id = fh->fh_seq_id;
51678 } else if (sp->id != fh->fh_seq_id) {
51679- atomic_inc(&mp->stats.seq_not_found);
51680+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51681 goto rel;
51682 }
51683
51684@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51685 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51686
51687 if (!sp)
51688- atomic_inc(&mp->stats.xid_not_found);
51689+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51690 else
51691- atomic_inc(&mp->stats.non_bls_resp);
51692+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51693
51694 fc_frame_free(fp);
51695 }
51696@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51697
51698 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51699 mp = ema->mp;
51700- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51701+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51702 st->fc_no_free_exch_xid +=
51703- atomic_read(&mp->stats.no_free_exch_xid);
51704- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51705- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51706- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51707- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51708+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51709+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51710+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51711+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51712+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51713 }
51714 }
51715 EXPORT_SYMBOL(fc_exch_update_stats);
51716diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51717index 932d9cc..50c7ee9 100644
51718--- a/drivers/scsi/libsas/sas_ata.c
51719+++ b/drivers/scsi/libsas/sas_ata.c
51720@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
51721 .postreset = ata_std_postreset,
51722 .error_handler = ata_std_error_handler,
51723 .post_internal_cmd = sas_ata_post_internal,
51724- .qc_defer = ata_std_qc_defer,
51725+ .qc_defer = ata_std_qc_defer,
51726 .qc_prep = ata_noop_qc_prep,
51727 .qc_issue = sas_ata_qc_issue,
51728 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51729diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51730index 434e903..5a4a79b 100644
51731--- a/drivers/scsi/lpfc/lpfc.h
51732+++ b/drivers/scsi/lpfc/lpfc.h
51733@@ -430,7 +430,7 @@ struct lpfc_vport {
51734 struct dentry *debug_nodelist;
51735 struct dentry *vport_debugfs_root;
51736 struct lpfc_debugfs_trc *disc_trc;
51737- atomic_t disc_trc_cnt;
51738+ atomic_unchecked_t disc_trc_cnt;
51739 #endif
51740 uint8_t stat_data_enabled;
51741 uint8_t stat_data_blocked;
51742@@ -880,8 +880,8 @@ struct lpfc_hba {
51743 struct timer_list fabric_block_timer;
51744 unsigned long bit_flags;
51745 #define FABRIC_COMANDS_BLOCKED 0
51746- atomic_t num_rsrc_err;
51747- atomic_t num_cmd_success;
51748+ atomic_unchecked_t num_rsrc_err;
51749+ atomic_unchecked_t num_cmd_success;
51750 unsigned long last_rsrc_error_time;
51751 unsigned long last_ramp_down_time;
51752 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51753@@ -916,7 +916,7 @@ struct lpfc_hba {
51754
51755 struct dentry *debug_slow_ring_trc;
51756 struct lpfc_debugfs_trc *slow_ring_trc;
51757- atomic_t slow_ring_trc_cnt;
51758+ atomic_unchecked_t slow_ring_trc_cnt;
51759 /* iDiag debugfs sub-directory */
51760 struct dentry *idiag_root;
51761 struct dentry *idiag_pci_cfg;
51762diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51763index 5633e7d..8272114 100644
51764--- a/drivers/scsi/lpfc/lpfc_debugfs.c
51765+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51766@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51767
51768 #include <linux/debugfs.h>
51769
51770-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51771+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51772 static unsigned long lpfc_debugfs_start_time = 0L;
51773
51774 /* iDiag */
51775@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51776 lpfc_debugfs_enable = 0;
51777
51778 len = 0;
51779- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51780+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51781 (lpfc_debugfs_max_disc_trc - 1);
51782 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51783 dtp = vport->disc_trc + i;
51784@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51785 lpfc_debugfs_enable = 0;
51786
51787 len = 0;
51788- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51789+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51790 (lpfc_debugfs_max_slow_ring_trc - 1);
51791 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51792 dtp = phba->slow_ring_trc + i;
51793@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51794 !vport || !vport->disc_trc)
51795 return;
51796
51797- index = atomic_inc_return(&vport->disc_trc_cnt) &
51798+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51799 (lpfc_debugfs_max_disc_trc - 1);
51800 dtp = vport->disc_trc + index;
51801 dtp->fmt = fmt;
51802 dtp->data1 = data1;
51803 dtp->data2 = data2;
51804 dtp->data3 = data3;
51805- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51806+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51807 dtp->jif = jiffies;
51808 #endif
51809 return;
51810@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51811 !phba || !phba->slow_ring_trc)
51812 return;
51813
51814- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51815+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51816 (lpfc_debugfs_max_slow_ring_trc - 1);
51817 dtp = phba->slow_ring_trc + index;
51818 dtp->fmt = fmt;
51819 dtp->data1 = data1;
51820 dtp->data2 = data2;
51821 dtp->data3 = data3;
51822- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51823+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51824 dtp->jif = jiffies;
51825 #endif
51826 return;
51827@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51828 "slow_ring buffer\n");
51829 goto debug_failed;
51830 }
51831- atomic_set(&phba->slow_ring_trc_cnt, 0);
51832+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51833 memset(phba->slow_ring_trc, 0,
51834 (sizeof(struct lpfc_debugfs_trc) *
51835 lpfc_debugfs_max_slow_ring_trc));
51836@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51837 "buffer\n");
51838 goto debug_failed;
51839 }
51840- atomic_set(&vport->disc_trc_cnt, 0);
51841+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51842
51843 snprintf(name, sizeof(name), "discovery_trace");
51844 vport->debug_disc_trc =
51845diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51846index 0b2c53a..aec2b45 100644
51847--- a/drivers/scsi/lpfc/lpfc_init.c
51848+++ b/drivers/scsi/lpfc/lpfc_init.c
51849@@ -11290,8 +11290,10 @@ lpfc_init(void)
51850 "misc_register returned with status %d", error);
51851
51852 if (lpfc_enable_npiv) {
51853- lpfc_transport_functions.vport_create = lpfc_vport_create;
51854- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51855+ pax_open_kernel();
51856+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51857+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51858+ pax_close_kernel();
51859 }
51860 lpfc_transport_template =
51861 fc_attach_transport(&lpfc_transport_functions);
51862diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51863index 4f9222e..f1850e3 100644
51864--- a/drivers/scsi/lpfc/lpfc_scsi.c
51865+++ b/drivers/scsi/lpfc/lpfc_scsi.c
51866@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51867 unsigned long expires;
51868
51869 spin_lock_irqsave(&phba->hbalock, flags);
51870- atomic_inc(&phba->num_rsrc_err);
51871+ atomic_inc_unchecked(&phba->num_rsrc_err);
51872 phba->last_rsrc_error_time = jiffies;
51873
51874 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51875@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51876 unsigned long num_rsrc_err, num_cmd_success;
51877 int i;
51878
51879- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51880- num_cmd_success = atomic_read(&phba->num_cmd_success);
51881+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51882+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51883
51884 /*
51885 * The error and success command counters are global per
51886@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51887 }
51888 }
51889 lpfc_destroy_vport_work_array(phba, vports);
51890- atomic_set(&phba->num_rsrc_err, 0);
51891- atomic_set(&phba->num_cmd_success, 0);
51892+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
51893+ atomic_set_unchecked(&phba->num_cmd_success, 0);
51894 }
51895
51896 /**
51897diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51898index 6a1c036..38e0e8d 100644
51899--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51900+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51901@@ -1508,7 +1508,7 @@ _scsih_get_resync(struct device *dev)
51902 {
51903 struct scsi_device *sdev = to_scsi_device(dev);
51904 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51905- static struct _raid_device *raid_device;
51906+ struct _raid_device *raid_device;
51907 unsigned long flags;
51908 Mpi2RaidVolPage0_t vol_pg0;
51909 Mpi2ConfigReply_t mpi_reply;
51910@@ -1560,7 +1560,7 @@ _scsih_get_state(struct device *dev)
51911 {
51912 struct scsi_device *sdev = to_scsi_device(dev);
51913 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51914- static struct _raid_device *raid_device;
51915+ struct _raid_device *raid_device;
51916 unsigned long flags;
51917 Mpi2RaidVolPage0_t vol_pg0;
51918 Mpi2ConfigReply_t mpi_reply;
51919@@ -6602,7 +6602,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51920 Mpi2EventDataIrOperationStatus_t *event_data =
51921 (Mpi2EventDataIrOperationStatus_t *)
51922 fw_event->event_data;
51923- static struct _raid_device *raid_device;
51924+ struct _raid_device *raid_device;
51925 unsigned long flags;
51926 u16 handle;
51927
51928@@ -7073,7 +7073,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51929 u64 sas_address;
51930 struct _sas_device *sas_device;
51931 struct _sas_node *expander_device;
51932- static struct _raid_device *raid_device;
51933+ struct _raid_device *raid_device;
51934 u8 retry_count;
51935 unsigned long flags;
51936
51937diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51938index 8c27b6a..607f56e 100644
51939--- a/drivers/scsi/pmcraid.c
51940+++ b/drivers/scsi/pmcraid.c
51941@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51942 res->scsi_dev = scsi_dev;
51943 scsi_dev->hostdata = res;
51944 res->change_detected = 0;
51945- atomic_set(&res->read_failures, 0);
51946- atomic_set(&res->write_failures, 0);
51947+ atomic_set_unchecked(&res->read_failures, 0);
51948+ atomic_set_unchecked(&res->write_failures, 0);
51949 rc = 0;
51950 }
51951 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51952@@ -2646,9 +2646,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51953
51954 /* If this was a SCSI read/write command keep count of errors */
51955 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51956- atomic_inc(&res->read_failures);
51957+ atomic_inc_unchecked(&res->read_failures);
51958 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51959- atomic_inc(&res->write_failures);
51960+ atomic_inc_unchecked(&res->write_failures);
51961
51962 if (!RES_IS_GSCSI(res->cfg_entry) &&
51963 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51964@@ -3474,7 +3474,7 @@ static int pmcraid_queuecommand_lck(
51965 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51966 * hrrq_id assigned here in queuecommand
51967 */
51968- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51969+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51970 pinstance->num_hrrq;
51971 cmd->cmd_done = pmcraid_io_done;
51972
51973@@ -3788,7 +3788,7 @@ static long pmcraid_ioctl_passthrough(
51974 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51975 * hrrq_id assigned here in queuecommand
51976 */
51977- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51978+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51979 pinstance->num_hrrq;
51980
51981 if (request_size) {
51982@@ -4426,7 +4426,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51983
51984 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51985 /* add resources only after host is added into system */
51986- if (!atomic_read(&pinstance->expose_resources))
51987+ if (!atomic_read_unchecked(&pinstance->expose_resources))
51988 return;
51989
51990 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51991@@ -5243,8 +5243,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51992 init_waitqueue_head(&pinstance->reset_wait_q);
51993
51994 atomic_set(&pinstance->outstanding_cmds, 0);
51995- atomic_set(&pinstance->last_message_id, 0);
51996- atomic_set(&pinstance->expose_resources, 0);
51997+ atomic_set_unchecked(&pinstance->last_message_id, 0);
51998+ atomic_set_unchecked(&pinstance->expose_resources, 0);
51999
52000 INIT_LIST_HEAD(&pinstance->free_res_q);
52001 INIT_LIST_HEAD(&pinstance->used_res_q);
52002@@ -5957,7 +5957,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52003 /* Schedule worker thread to handle CCN and take care of adding and
52004 * removing devices to OS
52005 */
52006- atomic_set(&pinstance->expose_resources, 1);
52007+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52008 schedule_work(&pinstance->worker_q);
52009 return rc;
52010
52011diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52012index e1d150f..6c6df44 100644
52013--- a/drivers/scsi/pmcraid.h
52014+++ b/drivers/scsi/pmcraid.h
52015@@ -748,7 +748,7 @@ struct pmcraid_instance {
52016 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52017
52018 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52019- atomic_t last_message_id;
52020+ atomic_unchecked_t last_message_id;
52021
52022 /* configuration table */
52023 struct pmcraid_config_table *cfg_table;
52024@@ -777,7 +777,7 @@ struct pmcraid_instance {
52025 atomic_t outstanding_cmds;
52026
52027 /* should add/delete resources to mid-layer now ?*/
52028- atomic_t expose_resources;
52029+ atomic_unchecked_t expose_resources;
52030
52031
52032
52033@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52034 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52035 };
52036 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52037- atomic_t read_failures; /* count of failed READ commands */
52038- atomic_t write_failures; /* count of failed WRITE commands */
52039+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52040+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52041
52042 /* To indicate add/delete/modify during CCN */
52043 u8 change_detected;
52044diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52045index 82b92c4..3178171 100644
52046--- a/drivers/scsi/qla2xxx/qla_attr.c
52047+++ b/drivers/scsi/qla2xxx/qla_attr.c
52048@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52049 return 0;
52050 }
52051
52052-struct fc_function_template qla2xxx_transport_functions = {
52053+fc_function_template_no_const qla2xxx_transport_functions = {
52054
52055 .show_host_node_name = 1,
52056 .show_host_port_name = 1,
52057@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52058 .bsg_timeout = qla24xx_bsg_timeout,
52059 };
52060
52061-struct fc_function_template qla2xxx_transport_vport_functions = {
52062+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52063
52064 .show_host_node_name = 1,
52065 .show_host_port_name = 1,
52066diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52067index 7686bfe..4710893 100644
52068--- a/drivers/scsi/qla2xxx/qla_gbl.h
52069+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52070@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52071 struct device_attribute;
52072 extern struct device_attribute *qla2x00_host_attrs[];
52073 struct fc_function_template;
52074-extern struct fc_function_template qla2xxx_transport_functions;
52075-extern struct fc_function_template qla2xxx_transport_vport_functions;
52076+extern fc_function_template_no_const qla2xxx_transport_functions;
52077+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52078 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52079 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52080 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52081diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52082index cce1cbc..5b9f0fe 100644
52083--- a/drivers/scsi/qla2xxx/qla_os.c
52084+++ b/drivers/scsi/qla2xxx/qla_os.c
52085@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52086 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52087 /* Ok, a 64bit DMA mask is applicable. */
52088 ha->flags.enable_64bit_addressing = 1;
52089- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52090- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52091+ pax_open_kernel();
52092+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52093+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52094+ pax_close_kernel();
52095 return;
52096 }
52097 }
52098diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52099index 8f6d0fb..1b21097 100644
52100--- a/drivers/scsi/qla4xxx/ql4_def.h
52101+++ b/drivers/scsi/qla4xxx/ql4_def.h
52102@@ -305,7 +305,7 @@ struct ddb_entry {
52103 * (4000 only) */
52104 atomic_t relogin_timer; /* Max Time to wait for
52105 * relogin to complete */
52106- atomic_t relogin_retry_count; /* Num of times relogin has been
52107+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52108 * retried */
52109 uint32_t default_time2wait; /* Default Min time between
52110 * relogins (+aens) */
52111diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52112index 6d25879..3031a9f 100644
52113--- a/drivers/scsi/qla4xxx/ql4_os.c
52114+++ b/drivers/scsi/qla4xxx/ql4_os.c
52115@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52116 */
52117 if (!iscsi_is_session_online(cls_sess)) {
52118 /* Reset retry relogin timer */
52119- atomic_inc(&ddb_entry->relogin_retry_count);
52120+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52121 DEBUG2(ql4_printk(KERN_INFO, ha,
52122 "%s: index[%d] relogin timed out-retrying"
52123 " relogin (%d), retry (%d)\n", __func__,
52124 ddb_entry->fw_ddb_index,
52125- atomic_read(&ddb_entry->relogin_retry_count),
52126+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52127 ddb_entry->default_time2wait + 4));
52128 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52129 atomic_set(&ddb_entry->retry_relogin_timer,
52130@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52131
52132 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52133 atomic_set(&ddb_entry->relogin_timer, 0);
52134- atomic_set(&ddb_entry->relogin_retry_count, 0);
52135+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52136 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52137 ddb_entry->default_relogin_timeout =
52138 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52139diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52140index 7129701..b49c4e5 100644
52141--- a/drivers/scsi/scsi_lib.c
52142+++ b/drivers/scsi/scsi_lib.c
52143@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52144 shost = sdev->host;
52145 scsi_init_cmd_errh(cmd);
52146 cmd->result = DID_NO_CONNECT << 16;
52147- atomic_inc(&cmd->device->iorequest_cnt);
52148+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52149
52150 /*
52151 * SCSI request completion path will do scsi_device_unbusy(),
52152@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52153
52154 INIT_LIST_HEAD(&cmd->eh_entry);
52155
52156- atomic_inc(&cmd->device->iodone_cnt);
52157+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52158 if (cmd->result)
52159- atomic_inc(&cmd->device->ioerr_cnt);
52160+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52161
52162 disposition = scsi_decide_disposition(cmd);
52163 if (disposition != SUCCESS &&
52164@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52165 struct Scsi_Host *host = cmd->device->host;
52166 int rtn = 0;
52167
52168- atomic_inc(&cmd->device->iorequest_cnt);
52169+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52170
52171 /* check if the device is still usable */
52172 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52173diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52174index 1ac38e7..6acc656 100644
52175--- a/drivers/scsi/scsi_sysfs.c
52176+++ b/drivers/scsi/scsi_sysfs.c
52177@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52178 char *buf) \
52179 { \
52180 struct scsi_device *sdev = to_scsi_device(dev); \
52181- unsigned long long count = atomic_read(&sdev->field); \
52182+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52183 return snprintf(buf, 20, "0x%llx\n", count); \
52184 } \
52185 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52186diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52187index 5d6f348..18778a6b 100644
52188--- a/drivers/scsi/scsi_transport_fc.c
52189+++ b/drivers/scsi/scsi_transport_fc.c
52190@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52191 * Netlink Infrastructure
52192 */
52193
52194-static atomic_t fc_event_seq;
52195+static atomic_unchecked_t fc_event_seq;
52196
52197 /**
52198 * fc_get_event_number - Obtain the next sequential FC event number
52199@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
52200 u32
52201 fc_get_event_number(void)
52202 {
52203- return atomic_add_return(1, &fc_event_seq);
52204+ return atomic_add_return_unchecked(1, &fc_event_seq);
52205 }
52206 EXPORT_SYMBOL(fc_get_event_number);
52207
52208@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
52209 {
52210 int error;
52211
52212- atomic_set(&fc_event_seq, 0);
52213+ atomic_set_unchecked(&fc_event_seq, 0);
52214
52215 error = transport_class_register(&fc_host_class);
52216 if (error)
52217@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
52218 char *cp;
52219
52220 *val = simple_strtoul(buf, &cp, 0);
52221- if ((*cp && (*cp != '\n')) || (*val < 0))
52222+ if (*cp && (*cp != '\n'))
52223 return -EINVAL;
52224 /*
52225 * Check for overflow; dev_loss_tmo is u32
52226diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
52227index 67d43e3..8cee73c 100644
52228--- a/drivers/scsi/scsi_transport_iscsi.c
52229+++ b/drivers/scsi/scsi_transport_iscsi.c
52230@@ -79,7 +79,7 @@ struct iscsi_internal {
52231 struct transport_container session_cont;
52232 };
52233
52234-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
52235+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
52236 static struct workqueue_struct *iscsi_eh_timer_workq;
52237
52238 static DEFINE_IDA(iscsi_sess_ida);
52239@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
52240 int err;
52241
52242 ihost = shost->shost_data;
52243- session->sid = atomic_add_return(1, &iscsi_session_nr);
52244+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
52245
52246 if (target_id == ISCSI_MAX_TARGET) {
52247 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
52248@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
52249 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
52250 ISCSI_TRANSPORT_VERSION);
52251
52252- atomic_set(&iscsi_session_nr, 0);
52253+ atomic_set_unchecked(&iscsi_session_nr, 0);
52254
52255 err = class_register(&iscsi_transport_class);
52256 if (err)
52257diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
52258index ae45bd9..c32a586 100644
52259--- a/drivers/scsi/scsi_transport_srp.c
52260+++ b/drivers/scsi/scsi_transport_srp.c
52261@@ -35,7 +35,7 @@
52262 #include "scsi_priv.h"
52263
52264 struct srp_host_attrs {
52265- atomic_t next_port_id;
52266+ atomic_unchecked_t next_port_id;
52267 };
52268 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
52269
52270@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
52271 struct Scsi_Host *shost = dev_to_shost(dev);
52272 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
52273
52274- atomic_set(&srp_host->next_port_id, 0);
52275+ atomic_set_unchecked(&srp_host->next_port_id, 0);
52276 return 0;
52277 }
52278
52279@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
52280 rport_fast_io_fail_timedout);
52281 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
52282
52283- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
52284+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
52285 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
52286
52287 transport_setup_device(&rport->dev);
52288diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
52289index 05ea0d4..5af8049 100644
52290--- a/drivers/scsi/sd.c
52291+++ b/drivers/scsi/sd.c
52292@@ -3006,7 +3006,7 @@ static int sd_probe(struct device *dev)
52293 sdkp->disk = gd;
52294 sdkp->index = index;
52295 atomic_set(&sdkp->openers, 0);
52296- atomic_set(&sdkp->device->ioerr_cnt, 0);
52297+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
52298
52299 if (!sdp->request_queue->rq_timeout) {
52300 if (sdp->type != TYPE_MOD)
52301diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
52302index dbf8e77..0d565c7 100644
52303--- a/drivers/scsi/sg.c
52304+++ b/drivers/scsi/sg.c
52305@@ -1098,7 +1098,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
52306 sdp->disk->disk_name,
52307 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
52308 NULL,
52309- (char *)arg);
52310+ (char __user *)arg);
52311 case BLKTRACESTART:
52312 return blk_trace_startstop(sdp->device->request_queue, 1);
52313 case BLKTRACESTOP:
52314diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
52315index 011a336..fb2b7a0 100644
52316--- a/drivers/soc/tegra/fuse/fuse-tegra.c
52317+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
52318@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
52319 return i;
52320 }
52321
52322-static struct bin_attribute fuse_bin_attr = {
52323+static bin_attribute_no_const fuse_bin_attr = {
52324 .attr = { .name = "fuse", .mode = S_IRUGO, },
52325 .read = fuse_read,
52326 };
52327diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
52328index a17f533..a2ff039 100644
52329--- a/drivers/spi/spi.c
52330+++ b/drivers/spi/spi.c
52331@@ -2239,7 +2239,7 @@ int spi_bus_unlock(struct spi_master *master)
52332 EXPORT_SYMBOL_GPL(spi_bus_unlock);
52333
52334 /* portable code must never pass more than 32 bytes */
52335-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
52336+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
52337
52338 static u8 *buf;
52339
52340diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
52341index b41429f..2de5373 100644
52342--- a/drivers/staging/android/timed_output.c
52343+++ b/drivers/staging/android/timed_output.c
52344@@ -25,7 +25,7 @@
52345 #include "timed_output.h"
52346
52347 static struct class *timed_output_class;
52348-static atomic_t device_count;
52349+static atomic_unchecked_t device_count;
52350
52351 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
52352 char *buf)
52353@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
52354 timed_output_class = class_create(THIS_MODULE, "timed_output");
52355 if (IS_ERR(timed_output_class))
52356 return PTR_ERR(timed_output_class);
52357- atomic_set(&device_count, 0);
52358+ atomic_set_unchecked(&device_count, 0);
52359 timed_output_class->dev_groups = timed_output_groups;
52360 }
52361
52362@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
52363 if (ret < 0)
52364 return ret;
52365
52366- tdev->index = atomic_inc_return(&device_count);
52367+ tdev->index = atomic_inc_return_unchecked(&device_count);
52368 tdev->dev = device_create(timed_output_class, NULL,
52369 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
52370 if (IS_ERR(tdev->dev))
52371diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
52372index f143cb6..6fb8255 100644
52373--- a/drivers/staging/comedi/comedi_fops.c
52374+++ b/drivers/staging/comedi/comedi_fops.c
52375@@ -273,8 +273,8 @@ static void comedi_file_reset(struct file *file)
52376 }
52377 cfp->last_attached = dev->attached;
52378 cfp->last_detach_count = dev->detach_count;
52379- ACCESS_ONCE(cfp->read_subdev) = read_s;
52380- ACCESS_ONCE(cfp->write_subdev) = write_s;
52381+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
52382+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
52383 }
52384
52385 static void comedi_file_check(struct file *file)
52386@@ -1885,7 +1885,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52387 !(s_old->async->cmd.flags & CMDF_WRITE))
52388 return -EBUSY;
52389
52390- ACCESS_ONCE(cfp->read_subdev) = s_new;
52391+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
52392 return 0;
52393 }
52394
52395@@ -1927,7 +1927,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52396 (s_old->async->cmd.flags & CMDF_WRITE))
52397 return -EBUSY;
52398
52399- ACCESS_ONCE(cfp->write_subdev) = s_new;
52400+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
52401 return 0;
52402 }
52403
52404diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
52405index 001348c..cfaac8a 100644
52406--- a/drivers/staging/gdm724x/gdm_tty.c
52407+++ b/drivers/staging/gdm724x/gdm_tty.c
52408@@ -44,7 +44,7 @@
52409 #define gdm_tty_send_control(n, r, v, d, l) (\
52410 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
52411
52412-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
52413+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
52414
52415 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
52416 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
52417diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
52418index 503b2d7..c904931 100644
52419--- a/drivers/staging/line6/driver.c
52420+++ b/drivers/staging/line6/driver.c
52421@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52422 {
52423 struct usb_device *usbdev = line6->usbdev;
52424 int ret;
52425- unsigned char len;
52426+ unsigned char *plen;
52427
52428 /* query the serial number: */
52429 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52430@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52431 return ret;
52432 }
52433
52434+ plen = kmalloc(1, GFP_KERNEL);
52435+ if (plen == NULL)
52436+ return -ENOMEM;
52437+
52438 /* Wait for data length. We'll get 0xff until length arrives. */
52439 do {
52440 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52441 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52442 USB_DIR_IN,
52443- 0x0012, 0x0000, &len, 1,
52444+ 0x0012, 0x0000, plen, 1,
52445 LINE6_TIMEOUT * HZ);
52446 if (ret < 0) {
52447 dev_err(line6->ifcdev,
52448 "receive length failed (error %d)\n", ret);
52449+ kfree(plen);
52450 return ret;
52451 }
52452- } while (len == 0xff);
52453+ } while (*plen == 0xff);
52454
52455- if (len != datalen) {
52456+ if (*plen != datalen) {
52457 /* should be equal or something went wrong */
52458 dev_err(line6->ifcdev,
52459 "length mismatch (expected %d, got %d)\n",
52460- (int)datalen, (int)len);
52461+ (int)datalen, (int)*plen);
52462+ kfree(plen);
52463 return -EINVAL;
52464 }
52465+ kfree(plen);
52466
52467 /* receive the result: */
52468 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52469@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52470 {
52471 struct usb_device *usbdev = line6->usbdev;
52472 int ret;
52473- unsigned char status;
52474+ unsigned char *status;
52475
52476 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52477 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
52478@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52479 return ret;
52480 }
52481
52482+ status = kmalloc(1, GFP_KERNEL);
52483+ if (status == NULL)
52484+ return -ENOMEM;
52485+
52486 do {
52487 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
52488 0x67,
52489 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52490 USB_DIR_IN,
52491 0x0012, 0x0000,
52492- &status, 1, LINE6_TIMEOUT * HZ);
52493+ status, 1, LINE6_TIMEOUT * HZ);
52494
52495 if (ret < 0) {
52496 dev_err(line6->ifcdev,
52497 "receiving status failed (error %d)\n", ret);
52498+ kfree(status);
52499 return ret;
52500 }
52501- } while (status == 0xff);
52502+ } while (*status == 0xff);
52503
52504- if (status != 0) {
52505+ if (*status != 0) {
52506 dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
52507+ kfree(status);
52508 return -EINVAL;
52509 }
52510
52511+ kfree(status);
52512+
52513 return 0;
52514 }
52515
52516diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
52517index 6943715..0a93632 100644
52518--- a/drivers/staging/line6/toneport.c
52519+++ b/drivers/staging/line6/toneport.c
52520@@ -11,6 +11,7 @@
52521 */
52522
52523 #include <linux/wait.h>
52524+#include <linux/slab.h>
52525 #include <sound/control.h>
52526
52527 #include "audio.h"
52528@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
52529 */
52530 static void toneport_setup(struct usb_line6_toneport *toneport)
52531 {
52532- int ticks;
52533+ int *ticks;
52534 struct usb_line6 *line6 = &toneport->line6;
52535 struct usb_device *usbdev = line6->usbdev;
52536 u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
52537
52538+ ticks = kmalloc(sizeof(int), GFP_KERNEL);
52539+ if (ticks == NULL)
52540+ return;
52541+
52542 /* sync time on device with host: */
52543- ticks = (int)get_seconds();
52544- line6_write_data(line6, 0x80c6, &ticks, 4);
52545+ *ticks = (int)get_seconds();
52546+ line6_write_data(line6, 0x80c6, ticks, sizeof(int));
52547+
52548+ kfree(ticks);
52549
52550 /* enable device: */
52551 toneport_send_cmd(usbdev, 0x0301, 0x0000);
52552diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52553index 463da07..e791ce9 100644
52554--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52555+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52556@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52557 return 0;
52558 }
52559
52560-sfw_test_client_ops_t brw_test_client;
52561-void brw_init_test_client(void)
52562-{
52563- brw_test_client.tso_init = brw_client_init;
52564- brw_test_client.tso_fini = brw_client_fini;
52565- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52566- brw_test_client.tso_done_rpc = brw_client_done_rpc;
52567+sfw_test_client_ops_t brw_test_client = {
52568+ .tso_init = brw_client_init,
52569+ .tso_fini = brw_client_fini,
52570+ .tso_prep_rpc = brw_client_prep_rpc,
52571+ .tso_done_rpc = brw_client_done_rpc,
52572 };
52573
52574 srpc_service_t brw_test_service;
52575diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52576index cc9d182..8fabce3 100644
52577--- a/drivers/staging/lustre/lnet/selftest/framework.c
52578+++ b/drivers/staging/lustre/lnet/selftest/framework.c
52579@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
52580
52581 extern sfw_test_client_ops_t ping_test_client;
52582 extern srpc_service_t ping_test_service;
52583-extern void ping_init_test_client(void);
52584 extern void ping_init_test_service(void);
52585
52586 extern sfw_test_client_ops_t brw_test_client;
52587 extern srpc_service_t brw_test_service;
52588-extern void brw_init_test_client(void);
52589 extern void brw_init_test_service(void);
52590
52591
52592@@ -1675,12 +1673,10 @@ sfw_startup (void)
52593 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52594 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52595
52596- brw_init_test_client();
52597 brw_init_test_service();
52598 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52599 LASSERT (rc == 0);
52600
52601- ping_init_test_client();
52602 ping_init_test_service();
52603 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52604 LASSERT (rc == 0);
52605diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52606index d8c0df6..5041cbb 100644
52607--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52608+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52609@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52610 return 0;
52611 }
52612
52613-sfw_test_client_ops_t ping_test_client;
52614-void ping_init_test_client(void)
52615-{
52616- ping_test_client.tso_init = ping_client_init;
52617- ping_test_client.tso_fini = ping_client_fini;
52618- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52619- ping_test_client.tso_done_rpc = ping_client_done_rpc;
52620-}
52621+sfw_test_client_ops_t ping_test_client = {
52622+ .tso_init = ping_client_init,
52623+ .tso_fini = ping_client_fini,
52624+ .tso_prep_rpc = ping_client_prep_rpc,
52625+ .tso_done_rpc = ping_client_done_rpc,
52626+};
52627
52628 srpc_service_t ping_test_service;
52629 void ping_init_test_service(void)
52630diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52631index 83bc0a9..12ba00a 100644
52632--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52633+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52634@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52635 ldlm_completion_callback lcs_completion;
52636 ldlm_blocking_callback lcs_blocking;
52637 ldlm_glimpse_callback lcs_glimpse;
52638-};
52639+} __no_const;
52640
52641 /* ldlm_lockd.c */
52642 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52643diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52644index 2a88b80..62e7e5f 100644
52645--- a/drivers/staging/lustre/lustre/include/obd.h
52646+++ b/drivers/staging/lustre/lustre/include/obd.h
52647@@ -1362,7 +1362,7 @@ struct md_ops {
52648 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52649 * wrapper function in include/linux/obd_class.h.
52650 */
52651-};
52652+} __no_const;
52653
52654 struct lsm_operations {
52655 void (*lsm_free)(struct lov_stripe_md *);
52656diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52657index a4c252f..b21acac 100644
52658--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52659+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52660@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52661 int added = (mode == LCK_NL);
52662 int overlaps = 0;
52663 int splitted = 0;
52664- const struct ldlm_callback_suite null_cbs = { NULL };
52665+ const struct ldlm_callback_suite null_cbs = { };
52666
52667 CDEBUG(D_DLMTRACE,
52668 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52669diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52670index 83d3f08..b03adad 100644
52671--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52672+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52673@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52674 void __user *buffer, size_t *lenp, loff_t *ppos)
52675 {
52676 int rc, max_delay_cs;
52677- struct ctl_table dummy = *table;
52678+ ctl_table_no_const dummy = *table;
52679 long d;
52680
52681 dummy.data = &max_delay_cs;
52682@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52683 void __user *buffer, size_t *lenp, loff_t *ppos)
52684 {
52685 int rc, min_delay_cs;
52686- struct ctl_table dummy = *table;
52687+ ctl_table_no_const dummy = *table;
52688 long d;
52689
52690 dummy.data = &min_delay_cs;
52691@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52692 void __user *buffer, size_t *lenp, loff_t *ppos)
52693 {
52694 int rc, backoff;
52695- struct ctl_table dummy = *table;
52696+ ctl_table_no_const dummy = *table;
52697
52698 dummy.data = &backoff;
52699 dummy.proc_handler = &proc_dointvec;
52700diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52701index 2c4fc74..b04ca79 100644
52702--- a/drivers/staging/lustre/lustre/libcfs/module.c
52703+++ b/drivers/staging/lustre/lustre/libcfs/module.c
52704@@ -315,11 +315,11 @@ out:
52705
52706
52707 struct cfs_psdev_ops libcfs_psdev_ops = {
52708- libcfs_psdev_open,
52709- libcfs_psdev_release,
52710- NULL,
52711- NULL,
52712- libcfs_ioctl
52713+ .p_open = libcfs_psdev_open,
52714+ .p_close = libcfs_psdev_release,
52715+ .p_read = NULL,
52716+ .p_write = NULL,
52717+ .p_ioctl = libcfs_ioctl
52718 };
52719
52720 extern int insert_proc(void);
52721diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52722index fcbe836..8a7ada4 100644
52723--- a/drivers/staging/octeon/ethernet-rx.c
52724+++ b/drivers/staging/octeon/ethernet-rx.c
52725@@ -352,14 +352,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52726 /* Increment RX stats for virtual ports */
52727 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52728 #ifdef CONFIG_64BIT
52729- atomic64_add(1,
52730+ atomic64_add_unchecked(1,
52731 (atomic64_t *)&priv->stats.rx_packets);
52732- atomic64_add(skb->len,
52733+ atomic64_add_unchecked(skb->len,
52734 (atomic64_t *)&priv->stats.rx_bytes);
52735 #else
52736- atomic_add(1,
52737+ atomic_add_unchecked(1,
52738 (atomic_t *)&priv->stats.rx_packets);
52739- atomic_add(skb->len,
52740+ atomic_add_unchecked(skb->len,
52741 (atomic_t *)&priv->stats.rx_bytes);
52742 #endif
52743 }
52744@@ -371,10 +371,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52745 dev->name);
52746 */
52747 #ifdef CONFIG_64BIT
52748- atomic64_add(1,
52749+ atomic64_add_unchecked(1,
52750 (atomic64_t *)&priv->stats.rx_dropped);
52751 #else
52752- atomic_add(1,
52753+ atomic_add_unchecked(1,
52754 (atomic_t *)&priv->stats.rx_dropped);
52755 #endif
52756 dev_kfree_skb_irq(skb);
52757diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52758index ee32149..052d1836 100644
52759--- a/drivers/staging/octeon/ethernet.c
52760+++ b/drivers/staging/octeon/ethernet.c
52761@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52762 * since the RX tasklet also increments it.
52763 */
52764 #ifdef CONFIG_64BIT
52765- atomic64_add(rx_status.dropped_packets,
52766- (atomic64_t *)&priv->stats.rx_dropped);
52767+ atomic64_add_unchecked(rx_status.dropped_packets,
52768+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52769 #else
52770- atomic_add(rx_status.dropped_packets,
52771- (atomic_t *)&priv->stats.rx_dropped);
52772+ atomic_add_unchecked(rx_status.dropped_packets,
52773+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
52774 #endif
52775 }
52776
52777diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52778index 3b476d8..f522d68 100644
52779--- a/drivers/staging/rtl8188eu/include/hal_intf.h
52780+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52781@@ -225,7 +225,7 @@ struct hal_ops {
52782
52783 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52784 void (*hal_reset_security_engine)(struct adapter *adapter);
52785-};
52786+} __no_const;
52787
52788 enum rt_eeprom_type {
52789 EEPROM_93C46,
52790diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52791index 070cc03..6806e37 100644
52792--- a/drivers/staging/rtl8712/rtl871x_io.h
52793+++ b/drivers/staging/rtl8712/rtl871x_io.h
52794@@ -108,7 +108,7 @@ struct _io_ops {
52795 u8 *pmem);
52796 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52797 u8 *pmem);
52798-};
52799+} __no_const;
52800
52801 struct io_req {
52802 struct list_head list;
52803diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52804index 46dad63..fe4acdc 100644
52805--- a/drivers/staging/unisys/visorchipset/visorchipset.h
52806+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52807@@ -226,7 +226,7 @@ struct visorchipset_busdev_notifiers {
52808 void (*device_resume)(ulong bus_no, ulong dev_no);
52809 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
52810 ulong *max_size);
52811-};
52812+} __no_const;
52813
52814 /* These functions live inside visorchipset, and will be called to indicate
52815 * responses to specific events (by code outside of visorchipset).
52816@@ -241,7 +241,7 @@ struct visorchipset_busdev_responders {
52817 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
52818 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
52819 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
52820-};
52821+} __no_const;
52822
52823 /** Register functions (in the bus driver) to get called by visorchipset
52824 * whenever a bus or device appears for which this service partition is
52825diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52826index 9512af6..045bf5a 100644
52827--- a/drivers/target/sbp/sbp_target.c
52828+++ b/drivers/target/sbp/sbp_target.c
52829@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52830
52831 #define SESSION_MAINTENANCE_INTERVAL HZ
52832
52833-static atomic_t login_id = ATOMIC_INIT(0);
52834+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52835
52836 static void session_maintenance_work(struct work_struct *);
52837 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52838@@ -444,7 +444,7 @@ static void sbp_management_request_login(
52839 login->lun = se_lun;
52840 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52841 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52842- login->login_id = atomic_inc_return(&login_id);
52843+ login->login_id = atomic_inc_return_unchecked(&login_id);
52844
52845 login->tgt_agt = sbp_target_agent_register(login);
52846 if (IS_ERR(login->tgt_agt)) {
52847diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52848index 54da2a4..3dd6f57 100644
52849--- a/drivers/target/target_core_device.c
52850+++ b/drivers/target/target_core_device.c
52851@@ -1469,7 +1469,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52852 spin_lock_init(&dev->se_tmr_lock);
52853 spin_lock_init(&dev->qf_cmd_lock);
52854 sema_init(&dev->caw_sem, 1);
52855- atomic_set(&dev->dev_ordered_id, 0);
52856+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
52857 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52858 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52859 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52860diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52861index ac3cbab..f0d1dd2 100644
52862--- a/drivers/target/target_core_transport.c
52863+++ b/drivers/target/target_core_transport.c
52864@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52865 * Used to determine when ORDERED commands should go from
52866 * Dormant to Active status.
52867 */
52868- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52869+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52870 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52871 cmd->se_ordered_id, cmd->sam_task_attr,
52872 dev->transport->name);
52873diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52874index 65a98a9..d93d3a8 100644
52875--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52876+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52877@@ -277,8 +277,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52878 platform_set_drvdata(pdev, priv);
52879
52880 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52881- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52882- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52883+ pax_open_kernel();
52884+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52885+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52886+ pax_close_kernel();
52887 }
52888 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52889 priv, &int3400_thermal_ops,
52890diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52891index d717f3d..cae1cc3e 100644
52892--- a/drivers/thermal/of-thermal.c
52893+++ b/drivers/thermal/of-thermal.c
52894@@ -31,6 +31,7 @@
52895 #include <linux/export.h>
52896 #include <linux/string.h>
52897 #include <linux/thermal.h>
52898+#include <linux/mm.h>
52899
52900 #include "thermal_core.h"
52901
52902@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52903 tz->ops = ops;
52904 tz->sensor_data = data;
52905
52906- tzd->ops->get_temp = of_thermal_get_temp;
52907- tzd->ops->get_trend = of_thermal_get_trend;
52908- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
52909+ pax_open_kernel();
52910+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52911+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52912+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
52913+ pax_close_kernel();
52914 mutex_unlock(&tzd->lock);
52915
52916 return tzd;
52917@@ -541,9 +544,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52918 return;
52919
52920 mutex_lock(&tzd->lock);
52921- tzd->ops->get_temp = NULL;
52922- tzd->ops->get_trend = NULL;
52923- tzd->ops->set_emul_temp = NULL;
52924+ pax_open_kernel();
52925+ *(void **)&tzd->ops->get_temp = NULL;
52926+ *(void **)&tzd->ops->get_trend = NULL;
52927+ *(void **)&tzd->ops->set_emul_temp = NULL;
52928+ pax_close_kernel();
52929
52930 tz->ops = NULL;
52931 tz->sensor_data = NULL;
52932diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
52933index 9ea3d9d..53e8792 100644
52934--- a/drivers/thermal/x86_pkg_temp_thermal.c
52935+++ b/drivers/thermal/x86_pkg_temp_thermal.c
52936@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
52937 return NOTIFY_OK;
52938 }
52939
52940-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
52941+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
52942 .notifier_call = pkg_temp_thermal_cpu_callback,
52943 };
52944
52945diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52946index fd66f57..48e6376 100644
52947--- a/drivers/tty/cyclades.c
52948+++ b/drivers/tty/cyclades.c
52949@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52950 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52951 info->port.count);
52952 #endif
52953- info->port.count++;
52954+ atomic_inc(&info->port.count);
52955 #ifdef CY_DEBUG_COUNT
52956 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52957- current->pid, info->port.count);
52958+ current->pid, atomic_read(&info->port.count));
52959 #endif
52960
52961 /*
52962@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52963 for (j = 0; j < cy_card[i].nports; j++) {
52964 info = &cy_card[i].ports[j];
52965
52966- if (info->port.count) {
52967+ if (atomic_read(&info->port.count)) {
52968 /* XXX is the ldisc num worth this? */
52969 struct tty_struct *tty;
52970 struct tty_ldisc *ld;
52971diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52972index 4fcec1d..5a036f7 100644
52973--- a/drivers/tty/hvc/hvc_console.c
52974+++ b/drivers/tty/hvc/hvc_console.c
52975@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52976
52977 spin_lock_irqsave(&hp->port.lock, flags);
52978 /* Check and then increment for fast path open. */
52979- if (hp->port.count++ > 0) {
52980+ if (atomic_inc_return(&hp->port.count) > 1) {
52981 spin_unlock_irqrestore(&hp->port.lock, flags);
52982 hvc_kick();
52983 return 0;
52984@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52985
52986 spin_lock_irqsave(&hp->port.lock, flags);
52987
52988- if (--hp->port.count == 0) {
52989+ if (atomic_dec_return(&hp->port.count) == 0) {
52990 spin_unlock_irqrestore(&hp->port.lock, flags);
52991 /* We are done with the tty pointer now. */
52992 tty_port_tty_set(&hp->port, NULL);
52993@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52994 */
52995 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52996 } else {
52997- if (hp->port.count < 0)
52998+ if (atomic_read(&hp->port.count) < 0)
52999 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53000- hp->vtermno, hp->port.count);
53001+ hp->vtermno, atomic_read(&hp->port.count));
53002 spin_unlock_irqrestore(&hp->port.lock, flags);
53003 }
53004 }
53005@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53006 * open->hangup case this can be called after the final close so prevent
53007 * that from happening for now.
53008 */
53009- if (hp->port.count <= 0) {
53010+ if (atomic_read(&hp->port.count) <= 0) {
53011 spin_unlock_irqrestore(&hp->port.lock, flags);
53012 return;
53013 }
53014
53015- hp->port.count = 0;
53016+ atomic_set(&hp->port.count, 0);
53017 spin_unlock_irqrestore(&hp->port.lock, flags);
53018 tty_port_tty_set(&hp->port, NULL);
53019
53020@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53021 return -EPIPE;
53022
53023 /* FIXME what's this (unprotected) check for? */
53024- if (hp->port.count <= 0)
53025+ if (atomic_read(&hp->port.count) <= 0)
53026 return -EIO;
53027
53028 spin_lock_irqsave(&hp->lock, flags);
53029diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53030index 81ff7e1..dfb7b71 100644
53031--- a/drivers/tty/hvc/hvcs.c
53032+++ b/drivers/tty/hvc/hvcs.c
53033@@ -83,6 +83,7 @@
53034 #include <asm/hvcserver.h>
53035 #include <asm/uaccess.h>
53036 #include <asm/vio.h>
53037+#include <asm/local.h>
53038
53039 /*
53040 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53041@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53042
53043 spin_lock_irqsave(&hvcsd->lock, flags);
53044
53045- if (hvcsd->port.count > 0) {
53046+ if (atomic_read(&hvcsd->port.count) > 0) {
53047 spin_unlock_irqrestore(&hvcsd->lock, flags);
53048 printk(KERN_INFO "HVCS: vterm state unchanged. "
53049 "The hvcs device node is still in use.\n");
53050@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53051 }
53052 }
53053
53054- hvcsd->port.count = 0;
53055+ atomic_set(&hvcsd->port.count, 0);
53056 hvcsd->port.tty = tty;
53057 tty->driver_data = hvcsd;
53058
53059@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53060 unsigned long flags;
53061
53062 spin_lock_irqsave(&hvcsd->lock, flags);
53063- hvcsd->port.count++;
53064+ atomic_inc(&hvcsd->port.count);
53065 hvcsd->todo_mask |= HVCS_SCHED_READ;
53066 spin_unlock_irqrestore(&hvcsd->lock, flags);
53067
53068@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53069 hvcsd = tty->driver_data;
53070
53071 spin_lock_irqsave(&hvcsd->lock, flags);
53072- if (--hvcsd->port.count == 0) {
53073+ if (atomic_dec_and_test(&hvcsd->port.count)) {
53074
53075 vio_disable_interrupts(hvcsd->vdev);
53076
53077@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53078
53079 free_irq(irq, hvcsd);
53080 return;
53081- } else if (hvcsd->port.count < 0) {
53082+ } else if (atomic_read(&hvcsd->port.count) < 0) {
53083 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
53084 " is missmanaged.\n",
53085- hvcsd->vdev->unit_address, hvcsd->port.count);
53086+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
53087 }
53088
53089 spin_unlock_irqrestore(&hvcsd->lock, flags);
53090@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53091
53092 spin_lock_irqsave(&hvcsd->lock, flags);
53093 /* Preserve this so that we know how many kref refs to put */
53094- temp_open_count = hvcsd->port.count;
53095+ temp_open_count = atomic_read(&hvcsd->port.count);
53096
53097 /*
53098 * Don't kref put inside the spinlock because the destruction
53099@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53100 tty->driver_data = NULL;
53101 hvcsd->port.tty = NULL;
53102
53103- hvcsd->port.count = 0;
53104+ atomic_set(&hvcsd->port.count, 0);
53105
53106 /* This will drop any buffered data on the floor which is OK in a hangup
53107 * scenario. */
53108@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
53109 * the middle of a write operation? This is a crummy place to do this
53110 * but we want to keep it all in the spinlock.
53111 */
53112- if (hvcsd->port.count <= 0) {
53113+ if (atomic_read(&hvcsd->port.count) <= 0) {
53114 spin_unlock_irqrestore(&hvcsd->lock, flags);
53115 return -ENODEV;
53116 }
53117@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
53118 {
53119 struct hvcs_struct *hvcsd = tty->driver_data;
53120
53121- if (!hvcsd || hvcsd->port.count <= 0)
53122+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
53123 return 0;
53124
53125 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
53126diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
53127index 4190199..06d5bfa 100644
53128--- a/drivers/tty/hvc/hvsi.c
53129+++ b/drivers/tty/hvc/hvsi.c
53130@@ -85,7 +85,7 @@ struct hvsi_struct {
53131 int n_outbuf;
53132 uint32_t vtermno;
53133 uint32_t virq;
53134- atomic_t seqno; /* HVSI packet sequence number */
53135+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
53136 uint16_t mctrl;
53137 uint8_t state; /* HVSI protocol state */
53138 uint8_t flags;
53139@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
53140
53141 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
53142 packet.hdr.len = sizeof(struct hvsi_query_response);
53143- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53144+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53145 packet.verb = VSV_SEND_VERSION_NUMBER;
53146 packet.u.version = HVSI_VERSION;
53147 packet.query_seqno = query_seqno+1;
53148@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
53149
53150 packet.hdr.type = VS_QUERY_PACKET_HEADER;
53151 packet.hdr.len = sizeof(struct hvsi_query);
53152- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53153+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53154 packet.verb = verb;
53155
53156 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
53157@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
53158 int wrote;
53159
53160 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
53161- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53162+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53163 packet.hdr.len = sizeof(struct hvsi_control);
53164 packet.verb = VSV_SET_MODEM_CTL;
53165 packet.mask = HVSI_TSDTR;
53166@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
53167 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
53168
53169 packet.hdr.type = VS_DATA_PACKET_HEADER;
53170- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53171+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53172 packet.hdr.len = count + sizeof(struct hvsi_header);
53173 memcpy(&packet.data, buf, count);
53174
53175@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
53176 struct hvsi_control packet __ALIGNED__;
53177
53178 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
53179- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53180+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53181 packet.hdr.len = 6;
53182 packet.verb = VSV_CLOSE_PROTOCOL;
53183
53184@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
53185
53186 tty_port_tty_set(&hp->port, tty);
53187 spin_lock_irqsave(&hp->lock, flags);
53188- hp->port.count++;
53189+ atomic_inc(&hp->port.count);
53190 atomic_set(&hp->seqno, 0);
53191 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
53192 spin_unlock_irqrestore(&hp->lock, flags);
53193@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53194
53195 spin_lock_irqsave(&hp->lock, flags);
53196
53197- if (--hp->port.count == 0) {
53198+ if (atomic_dec_return(&hp->port.count) == 0) {
53199 tty_port_tty_set(&hp->port, NULL);
53200 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
53201
53202@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53203
53204 spin_lock_irqsave(&hp->lock, flags);
53205 }
53206- } else if (hp->port.count < 0)
53207+ } else if (atomic_read(&hp->port.count) < 0)
53208 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
53209- hp - hvsi_ports, hp->port.count);
53210+ hp - hvsi_ports, atomic_read(&hp->port.count));
53211
53212 spin_unlock_irqrestore(&hp->lock, flags);
53213 }
53214@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
53215 tty_port_tty_set(&hp->port, NULL);
53216
53217 spin_lock_irqsave(&hp->lock, flags);
53218- hp->port.count = 0;
53219+ atomic_set(&hp->port.count, 0);
53220 hp->n_outbuf = 0;
53221 spin_unlock_irqrestore(&hp->lock, flags);
53222 }
53223diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
53224index a270f04..7c77b5d 100644
53225--- a/drivers/tty/hvc/hvsi_lib.c
53226+++ b/drivers/tty/hvc/hvsi_lib.c
53227@@ -8,7 +8,7 @@
53228
53229 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
53230 {
53231- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
53232+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
53233
53234 /* Assumes that always succeeds, works in practice */
53235 return pv->put_chars(pv->termno, (char *)packet, packet->len);
53236@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
53237
53238 /* Reset state */
53239 pv->established = 0;
53240- atomic_set(&pv->seqno, 0);
53241+ atomic_set_unchecked(&pv->seqno, 0);
53242
53243 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
53244
53245diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
53246index 345cebb..d5a1e9e 100644
53247--- a/drivers/tty/ipwireless/tty.c
53248+++ b/drivers/tty/ipwireless/tty.c
53249@@ -28,6 +28,7 @@
53250 #include <linux/tty_driver.h>
53251 #include <linux/tty_flip.h>
53252 #include <linux/uaccess.h>
53253+#include <asm/local.h>
53254
53255 #include "tty.h"
53256 #include "network.h"
53257@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53258 return -ENODEV;
53259
53260 mutex_lock(&tty->ipw_tty_mutex);
53261- if (tty->port.count == 0)
53262+ if (atomic_read(&tty->port.count) == 0)
53263 tty->tx_bytes_queued = 0;
53264
53265- tty->port.count++;
53266+ atomic_inc(&tty->port.count);
53267
53268 tty->port.tty = linux_tty;
53269 linux_tty->driver_data = tty;
53270@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53271
53272 static void do_ipw_close(struct ipw_tty *tty)
53273 {
53274- tty->port.count--;
53275-
53276- if (tty->port.count == 0) {
53277+ if (atomic_dec_return(&tty->port.count) == 0) {
53278 struct tty_struct *linux_tty = tty->port.tty;
53279
53280 if (linux_tty != NULL) {
53281@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
53282 return;
53283
53284 mutex_lock(&tty->ipw_tty_mutex);
53285- if (tty->port.count == 0) {
53286+ if (atomic_read(&tty->port.count) == 0) {
53287 mutex_unlock(&tty->ipw_tty_mutex);
53288 return;
53289 }
53290@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
53291
53292 mutex_lock(&tty->ipw_tty_mutex);
53293
53294- if (!tty->port.count) {
53295+ if (!atomic_read(&tty->port.count)) {
53296 mutex_unlock(&tty->ipw_tty_mutex);
53297 return;
53298 }
53299@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
53300 return -ENODEV;
53301
53302 mutex_lock(&tty->ipw_tty_mutex);
53303- if (!tty->port.count) {
53304+ if (!atomic_read(&tty->port.count)) {
53305 mutex_unlock(&tty->ipw_tty_mutex);
53306 return -EINVAL;
53307 }
53308@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
53309 if (!tty)
53310 return -ENODEV;
53311
53312- if (!tty->port.count)
53313+ if (!atomic_read(&tty->port.count))
53314 return -EINVAL;
53315
53316 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
53317@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
53318 if (!tty)
53319 return 0;
53320
53321- if (!tty->port.count)
53322+ if (!atomic_read(&tty->port.count))
53323 return 0;
53324
53325 return tty->tx_bytes_queued;
53326@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
53327 if (!tty)
53328 return -ENODEV;
53329
53330- if (!tty->port.count)
53331+ if (!atomic_read(&tty->port.count))
53332 return -EINVAL;
53333
53334 return get_control_lines(tty);
53335@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
53336 if (!tty)
53337 return -ENODEV;
53338
53339- if (!tty->port.count)
53340+ if (!atomic_read(&tty->port.count))
53341 return -EINVAL;
53342
53343 return set_control_lines(tty, set, clear);
53344@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
53345 if (!tty)
53346 return -ENODEV;
53347
53348- if (!tty->port.count)
53349+ if (!atomic_read(&tty->port.count))
53350 return -EINVAL;
53351
53352 /* FIXME: Exactly how is the tty object locked here .. */
53353@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
53354 * are gone */
53355 mutex_lock(&ttyj->ipw_tty_mutex);
53356 }
53357- while (ttyj->port.count)
53358+ while (atomic_read(&ttyj->port.count))
53359 do_ipw_close(ttyj);
53360 ipwireless_disassociate_network_ttys(network,
53361 ttyj->channel_idx);
53362diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
53363index 14c54e0..1efd4f2 100644
53364--- a/drivers/tty/moxa.c
53365+++ b/drivers/tty/moxa.c
53366@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
53367 }
53368
53369 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
53370- ch->port.count++;
53371+ atomic_inc(&ch->port.count);
53372 tty->driver_data = ch;
53373 tty_port_tty_set(&ch->port, tty);
53374 mutex_lock(&ch->port.mutex);
53375diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
53376index c434376..114ce13 100644
53377--- a/drivers/tty/n_gsm.c
53378+++ b/drivers/tty/n_gsm.c
53379@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
53380 spin_lock_init(&dlci->lock);
53381 mutex_init(&dlci->mutex);
53382 dlci->fifo = &dlci->_fifo;
53383- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
53384+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
53385 kfree(dlci);
53386 return NULL;
53387 }
53388@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
53389 struct gsm_dlci *dlci = tty->driver_data;
53390 struct tty_port *port = &dlci->port;
53391
53392- port->count++;
53393+ atomic_inc(&port->count);
53394 tty_port_tty_set(port, tty);
53395
53396 dlci->modem_rx = 0;
53397diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
53398index 6f8cf3a..c690dfb 100644
53399--- a/drivers/tty/n_tty.c
53400+++ b/drivers/tty/n_tty.c
53401@@ -115,7 +115,7 @@ struct n_tty_data {
53402 int minimum_to_wake;
53403
53404 /* consumer-published */
53405- size_t read_tail;
53406+ size_t read_tail __intentional_overflow(-1);
53407 size_t line_start;
53408
53409 /* protected by output lock */
53410@@ -2555,6 +2555,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
53411 {
53412 *ops = tty_ldisc_N_TTY;
53413 ops->owner = NULL;
53414- ops->refcount = ops->flags = 0;
53415+ atomic_set(&ops->refcount, 0);
53416+ ops->flags = 0;
53417 }
53418 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
53419diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
53420index 6e1f150..c3ba598 100644
53421--- a/drivers/tty/pty.c
53422+++ b/drivers/tty/pty.c
53423@@ -850,8 +850,10 @@ static void __init unix98_pty_init(void)
53424 panic("Couldn't register Unix98 pts driver");
53425
53426 /* Now create the /dev/ptmx special device */
53427+ pax_open_kernel();
53428 tty_default_fops(&ptmx_fops);
53429- ptmx_fops.open = ptmx_open;
53430+ *(void **)&ptmx_fops.open = ptmx_open;
53431+ pax_close_kernel();
53432
53433 cdev_init(&ptmx_cdev, &ptmx_fops);
53434 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
53435diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
53436index 383c4c7..d408e21 100644
53437--- a/drivers/tty/rocket.c
53438+++ b/drivers/tty/rocket.c
53439@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53440 tty->driver_data = info;
53441 tty_port_tty_set(port, tty);
53442
53443- if (port->count++ == 0) {
53444+ if (atomic_inc_return(&port->count) == 1) {
53445 atomic_inc(&rp_num_ports_open);
53446
53447 #ifdef ROCKET_DEBUG_OPEN
53448@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53449 #endif
53450 }
53451 #ifdef ROCKET_DEBUG_OPEN
53452- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
53453+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
53454 #endif
53455
53456 /*
53457@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
53458 spin_unlock_irqrestore(&info->port.lock, flags);
53459 return;
53460 }
53461- if (info->port.count)
53462+ if (atomic_read(&info->port.count))
53463 atomic_dec(&rp_num_ports_open);
53464 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
53465 spin_unlock_irqrestore(&info->port.lock, flags);
53466diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53467index aa28209..e08fb85 100644
53468--- a/drivers/tty/serial/ioc4_serial.c
53469+++ b/drivers/tty/serial/ioc4_serial.c
53470@@ -437,7 +437,7 @@ struct ioc4_soft {
53471 } is_intr_info[MAX_IOC4_INTR_ENTS];
53472
53473 /* Number of entries active in the above array */
53474- atomic_t is_num_intrs;
53475+ atomic_unchecked_t is_num_intrs;
53476 } is_intr_type[IOC4_NUM_INTR_TYPES];
53477
53478 /* is_ir_lock must be held while
53479@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53480 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53481 || (type == IOC4_OTHER_INTR_TYPE)));
53482
53483- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53484+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53485 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53486
53487 /* Save off the lower level interrupt handler */
53488@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53489
53490 soft = arg;
53491 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53492- num_intrs = (int)atomic_read(
53493+ num_intrs = (int)atomic_read_unchecked(
53494 &soft->is_intr_type[intr_type].is_num_intrs);
53495
53496 this_mir = this_ir = pending_intrs(soft, intr_type);
53497diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53498index 129dc5b..1da5bb8 100644
53499--- a/drivers/tty/serial/kgdb_nmi.c
53500+++ b/drivers/tty/serial/kgdb_nmi.c
53501@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53502 * I/O utilities that messages sent to the console will automatically
53503 * be displayed on the dbg_io.
53504 */
53505- dbg_io_ops->is_console = true;
53506+ pax_open_kernel();
53507+ *(int *)&dbg_io_ops->is_console = true;
53508+ pax_close_kernel();
53509
53510 return 0;
53511 }
53512diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53513index a260cde..6b2b5ce 100644
53514--- a/drivers/tty/serial/kgdboc.c
53515+++ b/drivers/tty/serial/kgdboc.c
53516@@ -24,8 +24,9 @@
53517 #define MAX_CONFIG_LEN 40
53518
53519 static struct kgdb_io kgdboc_io_ops;
53520+static struct kgdb_io kgdboc_io_ops_console;
53521
53522-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53523+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53524 static int configured = -1;
53525
53526 static char config[MAX_CONFIG_LEN];
53527@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53528 kgdboc_unregister_kbd();
53529 if (configured == 1)
53530 kgdb_unregister_io_module(&kgdboc_io_ops);
53531+ else if (configured == 2)
53532+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
53533 }
53534
53535 static int configure_kgdboc(void)
53536@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53537 int err;
53538 char *cptr = config;
53539 struct console *cons;
53540+ int is_console = 0;
53541
53542 err = kgdboc_option_setup(config);
53543 if (err || !strlen(config) || isspace(config[0]))
53544 goto noconfig;
53545
53546 err = -ENODEV;
53547- kgdboc_io_ops.is_console = 0;
53548 kgdb_tty_driver = NULL;
53549
53550 kgdboc_use_kms = 0;
53551@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53552 int idx;
53553 if (cons->device && cons->device(cons, &idx) == p &&
53554 idx == tty_line) {
53555- kgdboc_io_ops.is_console = 1;
53556+ is_console = 1;
53557 break;
53558 }
53559 cons = cons->next;
53560@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53561 kgdb_tty_line = tty_line;
53562
53563 do_register:
53564- err = kgdb_register_io_module(&kgdboc_io_ops);
53565+ if (is_console) {
53566+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53567+ configured = 2;
53568+ } else {
53569+ err = kgdb_register_io_module(&kgdboc_io_ops);
53570+ configured = 1;
53571+ }
53572 if (err)
53573 goto noconfig;
53574
53575@@ -205,8 +214,6 @@ do_register:
53576 if (err)
53577 goto nmi_con_failed;
53578
53579- configured = 1;
53580-
53581 return 0;
53582
53583 nmi_con_failed:
53584@@ -223,7 +230,7 @@ noconfig:
53585 static int __init init_kgdboc(void)
53586 {
53587 /* Already configured? */
53588- if (configured == 1)
53589+ if (configured >= 1)
53590 return 0;
53591
53592 return configure_kgdboc();
53593@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53594 if (config[len - 1] == '\n')
53595 config[len - 1] = '\0';
53596
53597- if (configured == 1)
53598+ if (configured >= 1)
53599 cleanup_kgdboc();
53600
53601 /* Go and configure with the new params. */
53602@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53603 .post_exception = kgdboc_post_exp_handler,
53604 };
53605
53606+static struct kgdb_io kgdboc_io_ops_console = {
53607+ .name = "kgdboc",
53608+ .read_char = kgdboc_get_char,
53609+ .write_char = kgdboc_put_char,
53610+ .pre_exception = kgdboc_pre_exp_handler,
53611+ .post_exception = kgdboc_post_exp_handler,
53612+ .is_console = 1
53613+};
53614+
53615 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53616 /* This is only available if kgdboc is a built in for early debugging */
53617 static int __init kgdboc_early_init(char *opt)
53618diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53619index c88b522..e763029 100644
53620--- a/drivers/tty/serial/msm_serial.c
53621+++ b/drivers/tty/serial/msm_serial.c
53622@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53623 .cons = MSM_CONSOLE,
53624 };
53625
53626-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53627+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53628
53629 static const struct of_device_id msm_uartdm_table[] = {
53630 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53631@@ -1052,7 +1052,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53632 line = pdev->id;
53633
53634 if (line < 0)
53635- line = atomic_inc_return(&msm_uart_next_id) - 1;
53636+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53637
53638 if (unlikely(line < 0 || line >= UART_NR))
53639 return -ENXIO;
53640diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53641index 107e807..d4a02fa 100644
53642--- a/drivers/tty/serial/samsung.c
53643+++ b/drivers/tty/serial/samsung.c
53644@@ -480,11 +480,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53645 }
53646 }
53647
53648+static int s3c64xx_serial_startup(struct uart_port *port);
53649 static int s3c24xx_serial_startup(struct uart_port *port)
53650 {
53651 struct s3c24xx_uart_port *ourport = to_ourport(port);
53652 int ret;
53653
53654+ /* Startup sequence is different for s3c64xx and higher SoC's */
53655+ if (s3c24xx_serial_has_interrupt_mask(port))
53656+ return s3c64xx_serial_startup(port);
53657+
53658 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53659 port, (unsigned long long)port->mapbase, port->membase);
53660
53661@@ -1169,10 +1174,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53662 /* setup info for port */
53663 port->dev = &platdev->dev;
53664
53665- /* Startup sequence is different for s3c64xx and higher SoC's */
53666- if (s3c24xx_serial_has_interrupt_mask(port))
53667- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53668-
53669 port->uartclk = 1;
53670
53671 if (cfg->uart_flags & UPF_CONS_FLOW) {
53672diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53673index 984605b..e538330 100644
53674--- a/drivers/tty/serial/serial_core.c
53675+++ b/drivers/tty/serial/serial_core.c
53676@@ -1396,7 +1396,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53677 state = drv->state + tty->index;
53678 port = &state->port;
53679 spin_lock_irq(&port->lock);
53680- --port->count;
53681+ atomic_dec(&port->count);
53682 spin_unlock_irq(&port->lock);
53683 return;
53684 }
53685@@ -1406,7 +1406,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53686
53687 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53688
53689- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53690+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53691 return;
53692
53693 /*
53694@@ -1530,7 +1530,7 @@ static void uart_hangup(struct tty_struct *tty)
53695 uart_flush_buffer(tty);
53696 uart_shutdown(tty, state);
53697 spin_lock_irqsave(&port->lock, flags);
53698- port->count = 0;
53699+ atomic_set(&port->count, 0);
53700 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53701 spin_unlock_irqrestore(&port->lock, flags);
53702 tty_port_tty_set(port, NULL);
53703@@ -1617,7 +1617,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53704 pr_debug("uart_open(%d) called\n", line);
53705
53706 spin_lock_irq(&port->lock);
53707- ++port->count;
53708+ atomic_inc(&port->count);
53709 spin_unlock_irq(&port->lock);
53710
53711 /*
53712diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53713index b799170..87dafd5 100644
53714--- a/drivers/tty/synclink.c
53715+++ b/drivers/tty/synclink.c
53716@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53717
53718 if (debug_level >= DEBUG_LEVEL_INFO)
53719 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53720- __FILE__,__LINE__, info->device_name, info->port.count);
53721+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53722
53723 if (tty_port_close_start(&info->port, tty, filp) == 0)
53724 goto cleanup;
53725@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53726 cleanup:
53727 if (debug_level >= DEBUG_LEVEL_INFO)
53728 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53729- tty->driver->name, info->port.count);
53730+ tty->driver->name, atomic_read(&info->port.count));
53731
53732 } /* end of mgsl_close() */
53733
53734@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53735
53736 mgsl_flush_buffer(tty);
53737 shutdown(info);
53738-
53739- info->port.count = 0;
53740+
53741+ atomic_set(&info->port.count, 0);
53742 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53743 info->port.tty = NULL;
53744
53745@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53746
53747 if (debug_level >= DEBUG_LEVEL_INFO)
53748 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53749- __FILE__,__LINE__, tty->driver->name, port->count );
53750+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53751
53752 spin_lock_irqsave(&info->irq_spinlock, flags);
53753- port->count--;
53754+ atomic_dec(&port->count);
53755 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53756 port->blocked_open++;
53757
53758@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53759
53760 if (debug_level >= DEBUG_LEVEL_INFO)
53761 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53762- __FILE__,__LINE__, tty->driver->name, port->count );
53763+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53764
53765 tty_unlock(tty);
53766 schedule();
53767@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53768
53769 /* FIXME: Racy on hangup during close wait */
53770 if (!tty_hung_up_p(filp))
53771- port->count++;
53772+ atomic_inc(&port->count);
53773 port->blocked_open--;
53774
53775 if (debug_level >= DEBUG_LEVEL_INFO)
53776 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53777- __FILE__,__LINE__, tty->driver->name, port->count );
53778+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53779
53780 if (!retval)
53781 port->flags |= ASYNC_NORMAL_ACTIVE;
53782@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53783
53784 if (debug_level >= DEBUG_LEVEL_INFO)
53785 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53786- __FILE__,__LINE__,tty->driver->name, info->port.count);
53787+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53788
53789 /* If port is closing, signal caller to try again */
53790 if (info->port.flags & ASYNC_CLOSING){
53791@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53792 spin_unlock_irqrestore(&info->netlock, flags);
53793 goto cleanup;
53794 }
53795- info->port.count++;
53796+ atomic_inc(&info->port.count);
53797 spin_unlock_irqrestore(&info->netlock, flags);
53798
53799- if (info->port.count == 1) {
53800+ if (atomic_read(&info->port.count) == 1) {
53801 /* 1st open on this device, init hardware */
53802 retval = startup(info);
53803 if (retval < 0)
53804@@ -3442,8 +3442,8 @@ cleanup:
53805 if (retval) {
53806 if (tty->count == 1)
53807 info->port.tty = NULL; /* tty layer will release tty struct */
53808- if(info->port.count)
53809- info->port.count--;
53810+ if (atomic_read(&info->port.count))
53811+ atomic_dec(&info->port.count);
53812 }
53813
53814 return retval;
53815@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53816 unsigned short new_crctype;
53817
53818 /* return error if TTY interface open */
53819- if (info->port.count)
53820+ if (atomic_read(&info->port.count))
53821 return -EBUSY;
53822
53823 switch (encoding)
53824@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53825
53826 /* arbitrate between network and tty opens */
53827 spin_lock_irqsave(&info->netlock, flags);
53828- if (info->port.count != 0 || info->netcount != 0) {
53829+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53830 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53831 spin_unlock_irqrestore(&info->netlock, flags);
53832 return -EBUSY;
53833@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53834 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53835
53836 /* return error if TTY interface open */
53837- if (info->port.count)
53838+ if (atomic_read(&info->port.count))
53839 return -EBUSY;
53840
53841 if (cmd != SIOCWANDEV)
53842diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53843index 0e8c39b..e0cb171 100644
53844--- a/drivers/tty/synclink_gt.c
53845+++ b/drivers/tty/synclink_gt.c
53846@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53847 tty->driver_data = info;
53848 info->port.tty = tty;
53849
53850- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53851+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53852
53853 /* If port is closing, signal caller to try again */
53854 if (info->port.flags & ASYNC_CLOSING){
53855@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53856 mutex_unlock(&info->port.mutex);
53857 goto cleanup;
53858 }
53859- info->port.count++;
53860+ atomic_inc(&info->port.count);
53861 spin_unlock_irqrestore(&info->netlock, flags);
53862
53863- if (info->port.count == 1) {
53864+ if (atomic_read(&info->port.count) == 1) {
53865 /* 1st open on this device, init hardware */
53866 retval = startup(info);
53867 if (retval < 0) {
53868@@ -715,8 +715,8 @@ cleanup:
53869 if (retval) {
53870 if (tty->count == 1)
53871 info->port.tty = NULL; /* tty layer will release tty struct */
53872- if(info->port.count)
53873- info->port.count--;
53874+ if(atomic_read(&info->port.count))
53875+ atomic_dec(&info->port.count);
53876 }
53877
53878 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53879@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53880
53881 if (sanity_check(info, tty->name, "close"))
53882 return;
53883- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53884+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53885
53886 if (tty_port_close_start(&info->port, tty, filp) == 0)
53887 goto cleanup;
53888@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53889 tty_port_close_end(&info->port, tty);
53890 info->port.tty = NULL;
53891 cleanup:
53892- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53893+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53894 }
53895
53896 static void hangup(struct tty_struct *tty)
53897@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53898 shutdown(info);
53899
53900 spin_lock_irqsave(&info->port.lock, flags);
53901- info->port.count = 0;
53902+ atomic_set(&info->port.count, 0);
53903 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53904 info->port.tty = NULL;
53905 spin_unlock_irqrestore(&info->port.lock, flags);
53906@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53907 unsigned short new_crctype;
53908
53909 /* return error if TTY interface open */
53910- if (info->port.count)
53911+ if (atomic_read(&info->port.count))
53912 return -EBUSY;
53913
53914 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53915@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53916
53917 /* arbitrate between network and tty opens */
53918 spin_lock_irqsave(&info->netlock, flags);
53919- if (info->port.count != 0 || info->netcount != 0) {
53920+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53921 DBGINFO(("%s hdlc_open busy\n", dev->name));
53922 spin_unlock_irqrestore(&info->netlock, flags);
53923 return -EBUSY;
53924@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53925 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53926
53927 /* return error if TTY interface open */
53928- if (info->port.count)
53929+ if (atomic_read(&info->port.count))
53930 return -EBUSY;
53931
53932 if (cmd != SIOCWANDEV)
53933@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53934 if (port == NULL)
53935 continue;
53936 spin_lock(&port->lock);
53937- if ((port->port.count || port->netcount) &&
53938+ if ((atomic_read(&port->port.count) || port->netcount) &&
53939 port->pending_bh && !port->bh_running &&
53940 !port->bh_requested) {
53941 DBGISR(("%s bh queued\n", port->device_name));
53942@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53943 add_wait_queue(&port->open_wait, &wait);
53944
53945 spin_lock_irqsave(&info->lock, flags);
53946- port->count--;
53947+ atomic_dec(&port->count);
53948 spin_unlock_irqrestore(&info->lock, flags);
53949 port->blocked_open++;
53950
53951@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53952 remove_wait_queue(&port->open_wait, &wait);
53953
53954 if (!tty_hung_up_p(filp))
53955- port->count++;
53956+ atomic_inc(&port->count);
53957 port->blocked_open--;
53958
53959 if (!retval)
53960diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53961index c3f9091..abe4601 100644
53962--- a/drivers/tty/synclinkmp.c
53963+++ b/drivers/tty/synclinkmp.c
53964@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53965
53966 if (debug_level >= DEBUG_LEVEL_INFO)
53967 printk("%s(%d):%s open(), old ref count = %d\n",
53968- __FILE__,__LINE__,tty->driver->name, info->port.count);
53969+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53970
53971 /* If port is closing, signal caller to try again */
53972 if (info->port.flags & ASYNC_CLOSING){
53973@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53974 spin_unlock_irqrestore(&info->netlock, flags);
53975 goto cleanup;
53976 }
53977- info->port.count++;
53978+ atomic_inc(&info->port.count);
53979 spin_unlock_irqrestore(&info->netlock, flags);
53980
53981- if (info->port.count == 1) {
53982+ if (atomic_read(&info->port.count) == 1) {
53983 /* 1st open on this device, init hardware */
53984 retval = startup(info);
53985 if (retval < 0)
53986@@ -796,8 +796,8 @@ cleanup:
53987 if (retval) {
53988 if (tty->count == 1)
53989 info->port.tty = NULL; /* tty layer will release tty struct */
53990- if(info->port.count)
53991- info->port.count--;
53992+ if(atomic_read(&info->port.count))
53993+ atomic_dec(&info->port.count);
53994 }
53995
53996 return retval;
53997@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53998
53999 if (debug_level >= DEBUG_LEVEL_INFO)
54000 printk("%s(%d):%s close() entry, count=%d\n",
54001- __FILE__,__LINE__, info->device_name, info->port.count);
54002+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54003
54004 if (tty_port_close_start(&info->port, tty, filp) == 0)
54005 goto cleanup;
54006@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54007 cleanup:
54008 if (debug_level >= DEBUG_LEVEL_INFO)
54009 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54010- tty->driver->name, info->port.count);
54011+ tty->driver->name, atomic_read(&info->port.count));
54012 }
54013
54014 /* Called by tty_hangup() when a hangup is signaled.
54015@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54016 shutdown(info);
54017
54018 spin_lock_irqsave(&info->port.lock, flags);
54019- info->port.count = 0;
54020+ atomic_set(&info->port.count, 0);
54021 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54022 info->port.tty = NULL;
54023 spin_unlock_irqrestore(&info->port.lock, flags);
54024@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54025 unsigned short new_crctype;
54026
54027 /* return error if TTY interface open */
54028- if (info->port.count)
54029+ if (atomic_read(&info->port.count))
54030 return -EBUSY;
54031
54032 switch (encoding)
54033@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
54034
54035 /* arbitrate between network and tty opens */
54036 spin_lock_irqsave(&info->netlock, flags);
54037- if (info->port.count != 0 || info->netcount != 0) {
54038+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54039 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54040 spin_unlock_irqrestore(&info->netlock, flags);
54041 return -EBUSY;
54042@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54043 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54044
54045 /* return error if TTY interface open */
54046- if (info->port.count)
54047+ if (atomic_read(&info->port.count))
54048 return -EBUSY;
54049
54050 if (cmd != SIOCWANDEV)
54051@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
54052 * do not request bottom half processing if the
54053 * device is not open in a normal mode.
54054 */
54055- if ( port && (port->port.count || port->netcount) &&
54056+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
54057 port->pending_bh && !port->bh_running &&
54058 !port->bh_requested ) {
54059 if ( debug_level >= DEBUG_LEVEL_ISR )
54060@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54061
54062 if (debug_level >= DEBUG_LEVEL_INFO)
54063 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
54064- __FILE__,__LINE__, tty->driver->name, port->count );
54065+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54066
54067 spin_lock_irqsave(&info->lock, flags);
54068- port->count--;
54069+ atomic_dec(&port->count);
54070 spin_unlock_irqrestore(&info->lock, flags);
54071 port->blocked_open++;
54072
54073@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54074
54075 if (debug_level >= DEBUG_LEVEL_INFO)
54076 printk("%s(%d):%s block_til_ready() count=%d\n",
54077- __FILE__,__LINE__, tty->driver->name, port->count );
54078+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54079
54080 tty_unlock(tty);
54081 schedule();
54082@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54083 set_current_state(TASK_RUNNING);
54084 remove_wait_queue(&port->open_wait, &wait);
54085 if (!tty_hung_up_p(filp))
54086- port->count++;
54087+ atomic_inc(&port->count);
54088 port->blocked_open--;
54089
54090 if (debug_level >= DEBUG_LEVEL_INFO)
54091 printk("%s(%d):%s block_til_ready() after, count=%d\n",
54092- __FILE__,__LINE__, tty->driver->name, port->count );
54093+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54094
54095 if (!retval)
54096 port->flags |= ASYNC_NORMAL_ACTIVE;
54097diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
54098index 42bad18..447d7a2 100644
54099--- a/drivers/tty/sysrq.c
54100+++ b/drivers/tty/sysrq.c
54101@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
54102 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
54103 size_t count, loff_t *ppos)
54104 {
54105- if (count) {
54106+ if (count && capable(CAP_SYS_ADMIN)) {
54107 char c;
54108
54109 if (get_user(c, buf))
54110diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
54111index 2bb4dfc..a7f6e86 100644
54112--- a/drivers/tty/tty_io.c
54113+++ b/drivers/tty/tty_io.c
54114@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
54115
54116 void tty_default_fops(struct file_operations *fops)
54117 {
54118- *fops = tty_fops;
54119+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
54120 }
54121
54122 /*
54123diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
54124index 3737f55..7cef448 100644
54125--- a/drivers/tty/tty_ldisc.c
54126+++ b/drivers/tty/tty_ldisc.c
54127@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
54128 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54129 tty_ldiscs[disc] = new_ldisc;
54130 new_ldisc->num = disc;
54131- new_ldisc->refcount = 0;
54132+ atomic_set(&new_ldisc->refcount, 0);
54133 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54134
54135 return ret;
54136@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
54137 return -EINVAL;
54138
54139 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54140- if (tty_ldiscs[disc]->refcount)
54141+ if (atomic_read(&tty_ldiscs[disc]->refcount))
54142 ret = -EBUSY;
54143 else
54144 tty_ldiscs[disc] = NULL;
54145@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
54146 if (ldops) {
54147 ret = ERR_PTR(-EAGAIN);
54148 if (try_module_get(ldops->owner)) {
54149- ldops->refcount++;
54150+ atomic_inc(&ldops->refcount);
54151 ret = ldops;
54152 }
54153 }
54154@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
54155 unsigned long flags;
54156
54157 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54158- ldops->refcount--;
54159+ atomic_dec(&ldops->refcount);
54160 module_put(ldops->owner);
54161 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54162 }
54163diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
54164index 40b31835..94d92ae 100644
54165--- a/drivers/tty/tty_port.c
54166+++ b/drivers/tty/tty_port.c
54167@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
54168 unsigned long flags;
54169
54170 spin_lock_irqsave(&port->lock, flags);
54171- port->count = 0;
54172+ atomic_set(&port->count, 0);
54173 port->flags &= ~ASYNC_NORMAL_ACTIVE;
54174 tty = port->tty;
54175 if (tty)
54176@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54177
54178 /* The port lock protects the port counts */
54179 spin_lock_irqsave(&port->lock, flags);
54180- port->count--;
54181+ atomic_dec(&port->count);
54182 port->blocked_open++;
54183 spin_unlock_irqrestore(&port->lock, flags);
54184
54185@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54186 we must not mess that up further */
54187 spin_lock_irqsave(&port->lock, flags);
54188 if (!tty_hung_up_p(filp))
54189- port->count++;
54190+ atomic_inc(&port->count);
54191 port->blocked_open--;
54192 if (retval == 0)
54193 port->flags |= ASYNC_NORMAL_ACTIVE;
54194@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
54195 return 0;
54196
54197 spin_lock_irqsave(&port->lock, flags);
54198- if (tty->count == 1 && port->count != 1) {
54199+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
54200 printk(KERN_WARNING
54201 "tty_port_close_start: tty->count = 1 port count = %d.\n",
54202- port->count);
54203- port->count = 1;
54204+ atomic_read(&port->count));
54205+ atomic_set(&port->count, 1);
54206 }
54207- if (--port->count < 0) {
54208+ if (atomic_dec_return(&port->count) < 0) {
54209 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
54210- port->count);
54211- port->count = 0;
54212+ atomic_read(&port->count));
54213+ atomic_set(&port->count, 0);
54214 }
54215
54216- if (port->count) {
54217+ if (atomic_read(&port->count)) {
54218 spin_unlock_irqrestore(&port->lock, flags);
54219 return 0;
54220 }
54221@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
54222 struct file *filp)
54223 {
54224 spin_lock_irq(&port->lock);
54225- ++port->count;
54226+ atomic_inc(&port->count);
54227 spin_unlock_irq(&port->lock);
54228 tty_port_tty_set(port, tty);
54229
54230diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
54231index 8a89f6e..50b32af 100644
54232--- a/drivers/tty/vt/keyboard.c
54233+++ b/drivers/tty/vt/keyboard.c
54234@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
54235 kbd->kbdmode == VC_OFF) &&
54236 value != KVAL(K_SAK))
54237 return; /* SAK is allowed even in raw mode */
54238+
54239+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
54240+ {
54241+ void *func = fn_handler[value];
54242+ if (func == fn_show_state || func == fn_show_ptregs ||
54243+ func == fn_show_mem)
54244+ return;
54245+ }
54246+#endif
54247+
54248 fn_handler[value](vc);
54249 }
54250
54251@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54252 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
54253 return -EFAULT;
54254
54255- if (!capable(CAP_SYS_TTY_CONFIG))
54256- perm = 0;
54257-
54258 switch (cmd) {
54259 case KDGKBENT:
54260 /* Ensure another thread doesn't free it under us */
54261@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54262 spin_unlock_irqrestore(&kbd_event_lock, flags);
54263 return put_user(val, &user_kbe->kb_value);
54264 case KDSKBENT:
54265+ if (!capable(CAP_SYS_TTY_CONFIG))
54266+ perm = 0;
54267+
54268 if (!perm)
54269 return -EPERM;
54270 if (!i && v == K_NOSUCHMAP) {
54271@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54272 int i, j, k;
54273 int ret;
54274
54275- if (!capable(CAP_SYS_TTY_CONFIG))
54276- perm = 0;
54277-
54278 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
54279 if (!kbs) {
54280 ret = -ENOMEM;
54281@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54282 kfree(kbs);
54283 return ((p && *p) ? -EOVERFLOW : 0);
54284 case KDSKBSENT:
54285+ if (!capable(CAP_SYS_TTY_CONFIG))
54286+ perm = 0;
54287+
54288 if (!perm) {
54289 ret = -EPERM;
54290 goto reterr;
54291diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
54292index 6276f13..84f2449 100644
54293--- a/drivers/uio/uio.c
54294+++ b/drivers/uio/uio.c
54295@@ -25,6 +25,7 @@
54296 #include <linux/kobject.h>
54297 #include <linux/cdev.h>
54298 #include <linux/uio_driver.h>
54299+#include <asm/local.h>
54300
54301 #define UIO_MAX_DEVICES (1U << MINORBITS)
54302
54303@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
54304 struct device_attribute *attr, char *buf)
54305 {
54306 struct uio_device *idev = dev_get_drvdata(dev);
54307- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
54308+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
54309 }
54310 static DEVICE_ATTR_RO(event);
54311
54312@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
54313 {
54314 struct uio_device *idev = info->uio_dev;
54315
54316- atomic_inc(&idev->event);
54317+ atomic_inc_unchecked(&idev->event);
54318 wake_up_interruptible(&idev->wait);
54319 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
54320 }
54321@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
54322 }
54323
54324 listener->dev = idev;
54325- listener->event_count = atomic_read(&idev->event);
54326+ listener->event_count = atomic_read_unchecked(&idev->event);
54327 filep->private_data = listener;
54328
54329 if (idev->info->open) {
54330@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
54331 return -EIO;
54332
54333 poll_wait(filep, &idev->wait, wait);
54334- if (listener->event_count != atomic_read(&idev->event))
54335+ if (listener->event_count != atomic_read_unchecked(&idev->event))
54336 return POLLIN | POLLRDNORM;
54337 return 0;
54338 }
54339@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
54340 do {
54341 set_current_state(TASK_INTERRUPTIBLE);
54342
54343- event_count = atomic_read(&idev->event);
54344+ event_count = atomic_read_unchecked(&idev->event);
54345 if (event_count != listener->event_count) {
54346 if (copy_to_user(buf, &event_count, count))
54347 retval = -EFAULT;
54348@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
54349 static int uio_find_mem_index(struct vm_area_struct *vma)
54350 {
54351 struct uio_device *idev = vma->vm_private_data;
54352+ unsigned long size;
54353
54354 if (vma->vm_pgoff < MAX_UIO_MAPS) {
54355- if (idev->info->mem[vma->vm_pgoff].size == 0)
54356+ size = idev->info->mem[vma->vm_pgoff].size;
54357+ if (size == 0)
54358+ return -1;
54359+ if (vma->vm_end - vma->vm_start > size)
54360 return -1;
54361 return (int)vma->vm_pgoff;
54362 }
54363@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
54364 idev->owner = owner;
54365 idev->info = info;
54366 init_waitqueue_head(&idev->wait);
54367- atomic_set(&idev->event, 0);
54368+ atomic_set_unchecked(&idev->event, 0);
54369
54370 ret = uio_get_minor(idev);
54371 if (ret)
54372diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
54373index 813d4d3..a71934f 100644
54374--- a/drivers/usb/atm/cxacru.c
54375+++ b/drivers/usb/atm/cxacru.c
54376@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
54377 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
54378 if (ret < 2)
54379 return -EINVAL;
54380- if (index < 0 || index > 0x7f)
54381+ if (index > 0x7f)
54382 return -EINVAL;
54383 pos += tmp;
54384
54385diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
54386index dada014..1d0d517 100644
54387--- a/drivers/usb/atm/usbatm.c
54388+++ b/drivers/usb/atm/usbatm.c
54389@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54390 if (printk_ratelimit())
54391 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
54392 __func__, vpi, vci);
54393- atomic_inc(&vcc->stats->rx_err);
54394+ atomic_inc_unchecked(&vcc->stats->rx_err);
54395 return;
54396 }
54397
54398@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54399 if (length > ATM_MAX_AAL5_PDU) {
54400 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
54401 __func__, length, vcc);
54402- atomic_inc(&vcc->stats->rx_err);
54403+ atomic_inc_unchecked(&vcc->stats->rx_err);
54404 goto out;
54405 }
54406
54407@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54408 if (sarb->len < pdu_length) {
54409 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
54410 __func__, pdu_length, sarb->len, vcc);
54411- atomic_inc(&vcc->stats->rx_err);
54412+ atomic_inc_unchecked(&vcc->stats->rx_err);
54413 goto out;
54414 }
54415
54416 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
54417 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
54418 __func__, vcc);
54419- atomic_inc(&vcc->stats->rx_err);
54420+ atomic_inc_unchecked(&vcc->stats->rx_err);
54421 goto out;
54422 }
54423
54424@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54425 if (printk_ratelimit())
54426 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
54427 __func__, length);
54428- atomic_inc(&vcc->stats->rx_drop);
54429+ atomic_inc_unchecked(&vcc->stats->rx_drop);
54430 goto out;
54431 }
54432
54433@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54434
54435 vcc->push(vcc, skb);
54436
54437- atomic_inc(&vcc->stats->rx);
54438+ atomic_inc_unchecked(&vcc->stats->rx);
54439 out:
54440 skb_trim(sarb, 0);
54441 }
54442@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
54443 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
54444
54445 usbatm_pop(vcc, skb);
54446- atomic_inc(&vcc->stats->tx);
54447+ atomic_inc_unchecked(&vcc->stats->tx);
54448
54449 skb = skb_dequeue(&instance->sndqueue);
54450 }
54451@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
54452 if (!left--)
54453 return sprintf(page,
54454 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
54455- atomic_read(&atm_dev->stats.aal5.tx),
54456- atomic_read(&atm_dev->stats.aal5.tx_err),
54457- atomic_read(&atm_dev->stats.aal5.rx),
54458- atomic_read(&atm_dev->stats.aal5.rx_err),
54459- atomic_read(&atm_dev->stats.aal5.rx_drop));
54460+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
54461+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
54462+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
54463+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
54464+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
54465
54466 if (!left--) {
54467 if (instance->disconnected)
54468diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54469index 2a3bbdf..91d72cf 100644
54470--- a/drivers/usb/core/devices.c
54471+++ b/drivers/usb/core/devices.c
54472@@ -126,7 +126,7 @@ static const char format_endpt[] =
54473 * time it gets called.
54474 */
54475 static struct device_connect_event {
54476- atomic_t count;
54477+ atomic_unchecked_t count;
54478 wait_queue_head_t wait;
54479 } device_event = {
54480 .count = ATOMIC_INIT(1),
54481@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54482
54483 void usbfs_conn_disc_event(void)
54484 {
54485- atomic_add(2, &device_event.count);
54486+ atomic_add_unchecked(2, &device_event.count);
54487 wake_up(&device_event.wait);
54488 }
54489
54490@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54491
54492 poll_wait(file, &device_event.wait, wait);
54493
54494- event_count = atomic_read(&device_event.count);
54495+ event_count = atomic_read_unchecked(&device_event.count);
54496 if (file->f_version != event_count) {
54497 file->f_version = event_count;
54498 return POLLIN | POLLRDNORM;
54499diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54500index e500243..401300f 100644
54501--- a/drivers/usb/core/devio.c
54502+++ b/drivers/usb/core/devio.c
54503@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54504 struct usb_dev_state *ps = file->private_data;
54505 struct usb_device *dev = ps->dev;
54506 ssize_t ret = 0;
54507- unsigned len;
54508+ size_t len;
54509 loff_t pos;
54510 int i;
54511
54512@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54513 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54514 struct usb_config_descriptor *config =
54515 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54516- unsigned int length = le16_to_cpu(config->wTotalLength);
54517+ size_t length = le16_to_cpu(config->wTotalLength);
54518
54519 if (*ppos < pos + length) {
54520
54521 /* The descriptor may claim to be longer than it
54522 * really is. Here is the actual allocated length. */
54523- unsigned alloclen =
54524+ size_t alloclen =
54525 le16_to_cpu(dev->config[i].desc.wTotalLength);
54526
54527- len = length - (*ppos - pos);
54528+ len = length + pos - *ppos;
54529 if (len > nbytes)
54530 len = nbytes;
54531
54532 /* Simply don't write (skip over) unallocated parts */
54533 if (alloclen > (*ppos - pos)) {
54534- alloclen -= (*ppos - pos);
54535+ alloclen = alloclen + pos - *ppos;
54536 if (copy_to_user(buf,
54537 dev->rawdescriptors[i] + (*ppos - pos),
54538 min(len, alloclen))) {
54539diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54540index 45a915c..09f9735 100644
54541--- a/drivers/usb/core/hcd.c
54542+++ b/drivers/usb/core/hcd.c
54543@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54544 */
54545 usb_get_urb(urb);
54546 atomic_inc(&urb->use_count);
54547- atomic_inc(&urb->dev->urbnum);
54548+ atomic_inc_unchecked(&urb->dev->urbnum);
54549 usbmon_urb_submit(&hcd->self, urb);
54550
54551 /* NOTE requirements on root-hub callers (usbfs and the hub
54552@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54553 urb->hcpriv = NULL;
54554 INIT_LIST_HEAD(&urb->urb_list);
54555 atomic_dec(&urb->use_count);
54556- atomic_dec(&urb->dev->urbnum);
54557+ atomic_dec_unchecked(&urb->dev->urbnum);
54558 if (atomic_read(&urb->reject))
54559 wake_up(&usb_kill_urb_queue);
54560 usb_put_urb(urb);
54561diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54562index b4bfa3a..008f926 100644
54563--- a/drivers/usb/core/hub.c
54564+++ b/drivers/usb/core/hub.c
54565@@ -26,6 +26,7 @@
54566 #include <linux/mutex.h>
54567 #include <linux/random.h>
54568 #include <linux/pm_qos.h>
54569+#include <linux/grsecurity.h>
54570
54571 #include <asm/uaccess.h>
54572 #include <asm/byteorder.h>
54573@@ -4664,6 +4665,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54574 goto done;
54575 return;
54576 }
54577+
54578+ if (gr_handle_new_usb())
54579+ goto done;
54580+
54581 if (hub_is_superspeed(hub->hdev))
54582 unit_load = 150;
54583 else
54584diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54585index f368d20..0c30ac5 100644
54586--- a/drivers/usb/core/message.c
54587+++ b/drivers/usb/core/message.c
54588@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54589 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54590 * error number.
54591 */
54592-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54593+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54594 __u8 requesttype, __u16 value, __u16 index, void *data,
54595 __u16 size, int timeout)
54596 {
54597@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54598 * If successful, 0. Otherwise a negative error number. The number of actual
54599 * bytes transferred will be stored in the @actual_length parameter.
54600 */
54601-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54602+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54603 void *data, int len, int *actual_length, int timeout)
54604 {
54605 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54606@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54607 * bytes transferred will be stored in the @actual_length parameter.
54608 *
54609 */
54610-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54611+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54612 void *data, int len, int *actual_length, int timeout)
54613 {
54614 struct urb *urb;
54615diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54616index d269738..7340cd7 100644
54617--- a/drivers/usb/core/sysfs.c
54618+++ b/drivers/usb/core/sysfs.c
54619@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54620 struct usb_device *udev;
54621
54622 udev = to_usb_device(dev);
54623- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54624+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54625 }
54626 static DEVICE_ATTR_RO(urbnum);
54627
54628diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54629index b1fb9ae..4224885 100644
54630--- a/drivers/usb/core/usb.c
54631+++ b/drivers/usb/core/usb.c
54632@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54633 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54634 dev->state = USB_STATE_ATTACHED;
54635 dev->lpm_disable_count = 1;
54636- atomic_set(&dev->urbnum, 0);
54637+ atomic_set_unchecked(&dev->urbnum, 0);
54638
54639 INIT_LIST_HEAD(&dev->ep0.urb_list);
54640 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54641diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54642index 8cfc319..4868255 100644
54643--- a/drivers/usb/early/ehci-dbgp.c
54644+++ b/drivers/usb/early/ehci-dbgp.c
54645@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54646
54647 #ifdef CONFIG_KGDB
54648 static struct kgdb_io kgdbdbgp_io_ops;
54649-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54650+static struct kgdb_io kgdbdbgp_io_ops_console;
54651+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54652 #else
54653 #define dbgp_kgdb_mode (0)
54654 #endif
54655@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54656 .write_char = kgdbdbgp_write_char,
54657 };
54658
54659+static struct kgdb_io kgdbdbgp_io_ops_console = {
54660+ .name = "kgdbdbgp",
54661+ .read_char = kgdbdbgp_read_char,
54662+ .write_char = kgdbdbgp_write_char,
54663+ .is_console = 1
54664+};
54665+
54666 static int kgdbdbgp_wait_time;
54667
54668 static int __init kgdbdbgp_parse_config(char *str)
54669@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54670 ptr++;
54671 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54672 }
54673- kgdb_register_io_module(&kgdbdbgp_io_ops);
54674- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54675+ if (early_dbgp_console.index != -1)
54676+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54677+ else
54678+ kgdb_register_io_module(&kgdbdbgp_io_ops);
54679
54680 return 0;
54681 }
54682diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54683index e971584..03495ab 100644
54684--- a/drivers/usb/gadget/function/f_uac1.c
54685+++ b/drivers/usb/gadget/function/f_uac1.c
54686@@ -14,6 +14,7 @@
54687 #include <linux/module.h>
54688 #include <linux/device.h>
54689 #include <linux/atomic.h>
54690+#include <linux/module.h>
54691
54692 #include "u_uac1.h"
54693
54694diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54695index 491082a..dfd7d17 100644
54696--- a/drivers/usb/gadget/function/u_serial.c
54697+++ b/drivers/usb/gadget/function/u_serial.c
54698@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54699 spin_lock_irq(&port->port_lock);
54700
54701 /* already open? Great. */
54702- if (port->port.count) {
54703+ if (atomic_read(&port->port.count)) {
54704 status = 0;
54705- port->port.count++;
54706+ atomic_inc(&port->port.count);
54707
54708 /* currently opening/closing? wait ... */
54709 } else if (port->openclose) {
54710@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54711 tty->driver_data = port;
54712 port->port.tty = tty;
54713
54714- port->port.count = 1;
54715+ atomic_set(&port->port.count, 1);
54716 port->openclose = false;
54717
54718 /* if connected, start the I/O stream */
54719@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54720
54721 spin_lock_irq(&port->port_lock);
54722
54723- if (port->port.count != 1) {
54724- if (port->port.count == 0)
54725+ if (atomic_read(&port->port.count) != 1) {
54726+ if (atomic_read(&port->port.count) == 0)
54727 WARN_ON(1);
54728 else
54729- --port->port.count;
54730+ atomic_dec(&port->port.count);
54731 goto exit;
54732 }
54733
54734@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54735 * and sleep if necessary
54736 */
54737 port->openclose = true;
54738- port->port.count = 0;
54739+ atomic_set(&port->port.count, 0);
54740
54741 gser = port->port_usb;
54742 if (gser && gser->disconnect)
54743@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54744 int cond;
54745
54746 spin_lock_irq(&port->port_lock);
54747- cond = (port->port.count == 0) && !port->openclose;
54748+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54749 spin_unlock_irq(&port->port_lock);
54750 return cond;
54751 }
54752@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54753 /* if it's already open, start I/O ... and notify the serial
54754 * protocol about open/close status (connect/disconnect).
54755 */
54756- if (port->port.count) {
54757+ if (atomic_read(&port->port.count)) {
54758 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54759 gs_start_io(port);
54760 if (gser->connect)
54761@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54762
54763 port->port_usb = NULL;
54764 gser->ioport = NULL;
54765- if (port->port.count > 0 || port->openclose) {
54766+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
54767 wake_up_interruptible(&port->drain_wait);
54768 if (port->port.tty)
54769 tty_hangup(port->port.tty);
54770@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54771
54772 /* finally, free any unused/unusable I/O buffers */
54773 spin_lock_irqsave(&port->port_lock, flags);
54774- if (port->port.count == 0 && !port->openclose)
54775+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
54776 gs_buf_free(&port->port_write_buf);
54777 gs_free_requests(gser->out, &port->read_pool, NULL);
54778 gs_free_requests(gser->out, &port->read_queue, NULL);
54779diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54780index 53842a1..2bef3b6 100644
54781--- a/drivers/usb/gadget/function/u_uac1.c
54782+++ b/drivers/usb/gadget/function/u_uac1.c
54783@@ -17,6 +17,7 @@
54784 #include <linux/ctype.h>
54785 #include <linux/random.h>
54786 #include <linux/syscalls.h>
54787+#include <linux/module.h>
54788
54789 #include "u_uac1.h"
54790
54791diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54792index 118edb7..7a6415f 100644
54793--- a/drivers/usb/host/ehci-hub.c
54794+++ b/drivers/usb/host/ehci-hub.c
54795@@ -769,7 +769,7 @@ static struct urb *request_single_step_set_feature_urb(
54796 urb->transfer_flags = URB_DIR_IN;
54797 usb_get_urb(urb);
54798 atomic_inc(&urb->use_count);
54799- atomic_inc(&urb->dev->urbnum);
54800+ atomic_inc_unchecked(&urb->dev->urbnum);
54801 urb->setup_dma = dma_map_single(
54802 hcd->self.controller,
54803 urb->setup_packet,
54804@@ -836,7 +836,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54805 urb->status = -EINPROGRESS;
54806 usb_get_urb(urb);
54807 atomic_inc(&urb->use_count);
54808- atomic_inc(&urb->dev->urbnum);
54809+ atomic_inc_unchecked(&urb->dev->urbnum);
54810 retval = submit_single_step_set_feature(hcd, urb, 0);
54811 if (!retval && !wait_for_completion_timeout(&done,
54812 msecs_to_jiffies(2000))) {
54813diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54814index 1db0626..4948782 100644
54815--- a/drivers/usb/host/hwa-hc.c
54816+++ b/drivers/usb/host/hwa-hc.c
54817@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54818 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54819 struct wahc *wa = &hwahc->wa;
54820 struct device *dev = &wa->usb_iface->dev;
54821- u8 mas_le[UWB_NUM_MAS/8];
54822+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54823+
54824+ if (mas_le == NULL)
54825+ return -ENOMEM;
54826
54827 /* Set the stream index */
54828 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54829@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54830 WUSB_REQ_SET_WUSB_MAS,
54831 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54832 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54833- mas_le, 32, USB_CTRL_SET_TIMEOUT);
54834+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54835 if (result < 0)
54836 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54837 out:
54838+ kfree(mas_le);
54839+
54840 return result;
54841 }
54842
54843diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54844index b3d245e..99549ed 100644
54845--- a/drivers/usb/misc/appledisplay.c
54846+++ b/drivers/usb/misc/appledisplay.c
54847@@ -84,7 +84,7 @@ struct appledisplay {
54848 struct mutex sysfslock; /* concurrent read and write */
54849 };
54850
54851-static atomic_t count_displays = ATOMIC_INIT(0);
54852+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54853 static struct workqueue_struct *wq;
54854
54855 static void appledisplay_complete(struct urb *urb)
54856@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54857
54858 /* Register backlight device */
54859 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54860- atomic_inc_return(&count_displays) - 1);
54861+ atomic_inc_return_unchecked(&count_displays) - 1);
54862 memset(&props, 0, sizeof(struct backlight_properties));
54863 props.type = BACKLIGHT_RAW;
54864 props.max_brightness = 0xff;
54865diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54866index 29fa1c3..a57b08e 100644
54867--- a/drivers/usb/serial/console.c
54868+++ b/drivers/usb/serial/console.c
54869@@ -125,7 +125,7 @@ static int usb_console_setup(struct console *co, char *options)
54870
54871 info->port = port;
54872
54873- ++port->port.count;
54874+ atomic_inc(&port->port.count);
54875 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54876 if (serial->type->set_termios) {
54877 /*
54878@@ -173,7 +173,7 @@ static int usb_console_setup(struct console *co, char *options)
54879 }
54880 /* Now that any required fake tty operations are completed restore
54881 * the tty port count */
54882- --port->port.count;
54883+ atomic_dec(&port->port.count);
54884 /* The console is special in terms of closing the device so
54885 * indicate this port is now acting as a system console. */
54886 port->port.console = 1;
54887@@ -186,7 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
54888 put_tty:
54889 tty_kref_put(tty);
54890 reset_open_count:
54891- port->port.count = 0;
54892+ atomic_set(&port->port.count, 0);
54893 usb_autopm_put_interface(serial->interface);
54894 error_get_interface:
54895 usb_serial_put(serial);
54896@@ -197,7 +197,7 @@ static int usb_console_setup(struct console *co, char *options)
54897 static void usb_console_write(struct console *co,
54898 const char *buf, unsigned count)
54899 {
54900- static struct usbcons_info *info = &usbcons_info;
54901+ struct usbcons_info *info = &usbcons_info;
54902 struct usb_serial_port *port = info->port;
54903 struct usb_serial *serial;
54904 int retval = -ENODEV;
54905diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54906index 307e339..6aa97cb 100644
54907--- a/drivers/usb/storage/usb.h
54908+++ b/drivers/usb/storage/usb.h
54909@@ -63,7 +63,7 @@ struct us_unusual_dev {
54910 __u8 useProtocol;
54911 __u8 useTransport;
54912 int (*initFunction)(struct us_data *);
54913-};
54914+} __do_const;
54915
54916
54917 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54918diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54919index a863a98..d272795 100644
54920--- a/drivers/usb/usbip/vhci.h
54921+++ b/drivers/usb/usbip/vhci.h
54922@@ -83,7 +83,7 @@ struct vhci_hcd {
54923 unsigned resuming:1;
54924 unsigned long re_timeout;
54925
54926- atomic_t seqnum;
54927+ atomic_unchecked_t seqnum;
54928
54929 /*
54930 * NOTE:
54931diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54932index 1ae9d40..c62604b 100644
54933--- a/drivers/usb/usbip/vhci_hcd.c
54934+++ b/drivers/usb/usbip/vhci_hcd.c
54935@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54936
54937 spin_lock(&vdev->priv_lock);
54938
54939- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54940+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54941 if (priv->seqnum == 0xffff)
54942 dev_info(&urb->dev->dev, "seqnum max\n");
54943
54944@@ -684,7 +684,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54945 return -ENOMEM;
54946 }
54947
54948- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54949+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54950 if (unlink->seqnum == 0xffff)
54951 pr_info("seqnum max\n");
54952
54953@@ -888,7 +888,7 @@ static int vhci_start(struct usb_hcd *hcd)
54954 vdev->rhport = rhport;
54955 }
54956
54957- atomic_set(&vhci->seqnum, 0);
54958+ atomic_set_unchecked(&vhci->seqnum, 0);
54959 spin_lock_init(&vhci->lock);
54960
54961 hcd->power_budget = 0; /* no limit */
54962diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54963index 00e4a54..d676f85 100644
54964--- a/drivers/usb/usbip/vhci_rx.c
54965+++ b/drivers/usb/usbip/vhci_rx.c
54966@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54967 if (!urb) {
54968 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54969 pr_info("max seqnum %d\n",
54970- atomic_read(&the_controller->seqnum));
54971+ atomic_read_unchecked(&the_controller->seqnum));
54972 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54973 return;
54974 }
54975diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54976index edc7267..9f65ce2 100644
54977--- a/drivers/usb/wusbcore/wa-hc.h
54978+++ b/drivers/usb/wusbcore/wa-hc.h
54979@@ -240,7 +240,7 @@ struct wahc {
54980 spinlock_t xfer_list_lock;
54981 struct work_struct xfer_enqueue_work;
54982 struct work_struct xfer_error_work;
54983- atomic_t xfer_id_count;
54984+ atomic_unchecked_t xfer_id_count;
54985
54986 kernel_ulong_t quirks;
54987 };
54988@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54989 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54990 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54991 wa->dto_in_use = 0;
54992- atomic_set(&wa->xfer_id_count, 1);
54993+ atomic_set_unchecked(&wa->xfer_id_count, 1);
54994 /* init the buf in URBs */
54995 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54996 usb_init_urb(&(wa->buf_in_urbs[index]));
54997diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54998index 69af4fd..da390d7 100644
54999--- a/drivers/usb/wusbcore/wa-xfer.c
55000+++ b/drivers/usb/wusbcore/wa-xfer.c
55001@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55002 */
55003 static void wa_xfer_id_init(struct wa_xfer *xfer)
55004 {
55005- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55006+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55007 }
55008
55009 /* Return the xfer's ID. */
55010diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
55011index f018d8d..ccab63f 100644
55012--- a/drivers/vfio/vfio.c
55013+++ b/drivers/vfio/vfio.c
55014@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
55015 return 0;
55016
55017 /* TODO Prevent device auto probing */
55018- WARN("Device %s added to live group %d!\n", dev_name(dev),
55019+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55020 iommu_group_id(group->iommu_group));
55021
55022 return 0;
55023diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
55024index 9484d56..d415d69 100644
55025--- a/drivers/vhost/net.c
55026+++ b/drivers/vhost/net.c
55027@@ -650,10 +650,8 @@ static void handle_rx(struct vhost_net *net)
55028 break;
55029 }
55030 /* TODO: Should check and handle checksum. */
55031-
55032- hdr.num_buffers = cpu_to_vhost16(vq, headcount);
55033 if (likely(mergeable) &&
55034- memcpy_toiovecend(nvq->hdr, (void *)&hdr.num_buffers,
55035+ memcpy_toiovecend(nvq->hdr, (unsigned char *)&headcount,
55036 offsetof(typeof(hdr), num_buffers),
55037 sizeof hdr.num_buffers)) {
55038 vq_err(vq, "Failed num_buffers write");
55039diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55040index 3bb02c6..a01ff38 100644
55041--- a/drivers/vhost/vringh.c
55042+++ b/drivers/vhost/vringh.c
55043@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55044 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
55045 {
55046 __virtio16 v = 0;
55047- int rc = get_user(v, (__force __virtio16 __user *)p);
55048+ int rc = get_user(v, (__force_user __virtio16 *)p);
55049 *val = vringh16_to_cpu(vrh, v);
55050 return rc;
55051 }
55052@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
55053 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
55054 {
55055 __virtio16 v = cpu_to_vringh16(vrh, val);
55056- return put_user(v, (__force __virtio16 __user *)p);
55057+ return put_user(v, (__force_user __virtio16 *)p);
55058 }
55059
55060 static inline int copydesc_user(void *dst, const void *src, size_t len)
55061 {
55062- return copy_from_user(dst, (__force void __user *)src, len) ?
55063+ return copy_from_user(dst, (void __force_user *)src, len) ?
55064 -EFAULT : 0;
55065 }
55066
55067@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
55068 const struct vring_used_elem *src,
55069 unsigned int num)
55070 {
55071- return copy_to_user((__force void __user *)dst, src,
55072+ return copy_to_user((void __force_user *)dst, src,
55073 sizeof(*dst) * num) ? -EFAULT : 0;
55074 }
55075
55076 static inline int xfer_from_user(void *src, void *dst, size_t len)
55077 {
55078- return copy_from_user(dst, (__force void __user *)src, len) ?
55079+ return copy_from_user(dst, (void __force_user *)src, len) ?
55080 -EFAULT : 0;
55081 }
55082
55083 static inline int xfer_to_user(void *dst, void *src, size_t len)
55084 {
55085- return copy_to_user((__force void __user *)dst, src, len) ?
55086+ return copy_to_user((void __force_user *)dst, src, len) ?
55087 -EFAULT : 0;
55088 }
55089
55090@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
55091 vrh->last_used_idx = 0;
55092 vrh->vring.num = num;
55093 /* vring expects kernel addresses, but only used via accessors. */
55094- vrh->vring.desc = (__force struct vring_desc *)desc;
55095- vrh->vring.avail = (__force struct vring_avail *)avail;
55096- vrh->vring.used = (__force struct vring_used *)used;
55097+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
55098+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
55099+ vrh->vring.used = (__force_kernel struct vring_used *)used;
55100 return 0;
55101 }
55102 EXPORT_SYMBOL(vringh_init_user);
55103@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
55104
55105 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
55106 {
55107- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
55108+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
55109 return 0;
55110 }
55111
55112diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
55113index 84a110a..96312c3 100644
55114--- a/drivers/video/backlight/kb3886_bl.c
55115+++ b/drivers/video/backlight/kb3886_bl.c
55116@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
55117 static unsigned long kb3886bl_flags;
55118 #define KB3886BL_SUSPENDED 0x01
55119
55120-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
55121+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
55122 {
55123 .ident = "Sahara Touch-iT",
55124 .matches = {
55125diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
55126index 1b0b233..6f34c2c 100644
55127--- a/drivers/video/fbdev/arcfb.c
55128+++ b/drivers/video/fbdev/arcfb.c
55129@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
55130 return -ENOSPC;
55131
55132 err = 0;
55133- if ((count + p) > fbmemlength) {
55134+ if (count > (fbmemlength - p)) {
55135 count = fbmemlength - p;
55136 err = -ENOSPC;
55137 }
55138diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
55139index aedf2fb..47c9aca 100644
55140--- a/drivers/video/fbdev/aty/aty128fb.c
55141+++ b/drivers/video/fbdev/aty/aty128fb.c
55142@@ -149,7 +149,7 @@ enum {
55143 };
55144
55145 /* Must match above enum */
55146-static char * const r128_family[] = {
55147+static const char * const r128_family[] = {
55148 "AGP",
55149 "PCI",
55150 "PRO AGP",
55151diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
55152index 37ec09b..98f8862 100644
55153--- a/drivers/video/fbdev/aty/atyfb_base.c
55154+++ b/drivers/video/fbdev/aty/atyfb_base.c
55155@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
55156 par->accel_flags = var->accel_flags; /* hack */
55157
55158 if (var->accel_flags) {
55159- info->fbops->fb_sync = atyfb_sync;
55160+ pax_open_kernel();
55161+ *(void **)&info->fbops->fb_sync = atyfb_sync;
55162+ pax_close_kernel();
55163 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55164 } else {
55165- info->fbops->fb_sync = NULL;
55166+ pax_open_kernel();
55167+ *(void **)&info->fbops->fb_sync = NULL;
55168+ pax_close_kernel();
55169 info->flags |= FBINFO_HWACCEL_DISABLED;
55170 }
55171
55172diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
55173index 2fa0317..4983f2a 100644
55174--- a/drivers/video/fbdev/aty/mach64_cursor.c
55175+++ b/drivers/video/fbdev/aty/mach64_cursor.c
55176@@ -8,6 +8,7 @@
55177 #include "../core/fb_draw.h"
55178
55179 #include <asm/io.h>
55180+#include <asm/pgtable.h>
55181
55182 #ifdef __sparc__
55183 #include <asm/fbio.h>
55184@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
55185 info->sprite.buf_align = 16; /* and 64 lines tall. */
55186 info->sprite.flags = FB_PIXMAP_IO;
55187
55188- info->fbops->fb_cursor = atyfb_cursor;
55189+ pax_open_kernel();
55190+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
55191+ pax_close_kernel();
55192
55193 return 0;
55194 }
55195diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
55196index d6cab1f..112f680 100644
55197--- a/drivers/video/fbdev/core/fb_defio.c
55198+++ b/drivers/video/fbdev/core/fb_defio.c
55199@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
55200
55201 BUG_ON(!fbdefio);
55202 mutex_init(&fbdefio->lock);
55203- info->fbops->fb_mmap = fb_deferred_io_mmap;
55204+ pax_open_kernel();
55205+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
55206+ pax_close_kernel();
55207 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
55208 INIT_LIST_HEAD(&fbdefio->pagelist);
55209 if (fbdefio->delay == 0) /* set a default of 1 s */
55210@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
55211 page->mapping = NULL;
55212 }
55213
55214- info->fbops->fb_mmap = NULL;
55215+ *(void **)&info->fbops->fb_mmap = NULL;
55216 mutex_destroy(&fbdefio->lock);
55217 }
55218 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
55219diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
55220index 0705d88..d9429bf 100644
55221--- a/drivers/video/fbdev/core/fbmem.c
55222+++ b/drivers/video/fbdev/core/fbmem.c
55223@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
55224 __u32 data;
55225 int err;
55226
55227- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
55228+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
55229
55230 data = (__u32) (unsigned long) fix->smem_start;
55231 err |= put_user(data, &fix32->smem_start);
55232diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
55233index 4254336..282567e 100644
55234--- a/drivers/video/fbdev/hyperv_fb.c
55235+++ b/drivers/video/fbdev/hyperv_fb.c
55236@@ -240,7 +240,7 @@ static uint screen_fb_size;
55237 static inline int synthvid_send(struct hv_device *hdev,
55238 struct synthvid_msg *msg)
55239 {
55240- static atomic64_t request_id = ATOMIC64_INIT(0);
55241+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
55242 int ret;
55243
55244 msg->pipe_hdr.type = PIPE_MSG_DATA;
55245@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
55246
55247 ret = vmbus_sendpacket(hdev->channel, msg,
55248 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
55249- atomic64_inc_return(&request_id),
55250+ atomic64_inc_return_unchecked(&request_id),
55251 VM_PKT_DATA_INBAND, 0);
55252
55253 if (ret)
55254diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
55255index 7672d2e..b56437f 100644
55256--- a/drivers/video/fbdev/i810/i810_accel.c
55257+++ b/drivers/video/fbdev/i810/i810_accel.c
55258@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
55259 }
55260 }
55261 printk("ringbuffer lockup!!!\n");
55262+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
55263 i810_report_error(mmio);
55264 par->dev_flags |= LOCKUP;
55265 info->pixmap.scan_align = 1;
55266diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55267index a01147f..5d896f8 100644
55268--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55269+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55270@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
55271
55272 #ifdef CONFIG_FB_MATROX_MYSTIQUE
55273 struct matrox_switch matrox_mystique = {
55274- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
55275+ .preinit = MGA1064_preinit,
55276+ .reset = MGA1064_reset,
55277+ .init = MGA1064_init,
55278+ .restore = MGA1064_restore,
55279 };
55280 EXPORT_SYMBOL(matrox_mystique);
55281 #endif
55282
55283 #ifdef CONFIG_FB_MATROX_G
55284 struct matrox_switch matrox_G100 = {
55285- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
55286+ .preinit = MGAG100_preinit,
55287+ .reset = MGAG100_reset,
55288+ .init = MGAG100_init,
55289+ .restore = MGAG100_restore,
55290 };
55291 EXPORT_SYMBOL(matrox_G100);
55292 #endif
55293diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55294index 195ad7c..09743fc 100644
55295--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55296+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55297@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
55298 }
55299
55300 struct matrox_switch matrox_millennium = {
55301- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
55302+ .preinit = Ti3026_preinit,
55303+ .reset = Ti3026_reset,
55304+ .init = Ti3026_init,
55305+ .restore = Ti3026_restore
55306 };
55307 EXPORT_SYMBOL(matrox_millennium);
55308 #endif
55309diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55310index fe92eed..106e085 100644
55311--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55312+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55313@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
55314 struct mb862xxfb_par *par = info->par;
55315
55316 if (info->var.bits_per_pixel == 32) {
55317- info->fbops->fb_fillrect = cfb_fillrect;
55318- info->fbops->fb_copyarea = cfb_copyarea;
55319- info->fbops->fb_imageblit = cfb_imageblit;
55320+ pax_open_kernel();
55321+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55322+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55323+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55324+ pax_close_kernel();
55325 } else {
55326 outreg(disp, GC_L0EM, 3);
55327- info->fbops->fb_fillrect = mb86290fb_fillrect;
55328- info->fbops->fb_copyarea = mb86290fb_copyarea;
55329- info->fbops->fb_imageblit = mb86290fb_imageblit;
55330+ pax_open_kernel();
55331+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
55332+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
55333+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
55334+ pax_close_kernel();
55335 }
55336 outreg(draw, GDC_REG_DRAW_BASE, 0);
55337 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
55338diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
55339index def0412..fed6529 100644
55340--- a/drivers/video/fbdev/nvidia/nvidia.c
55341+++ b/drivers/video/fbdev/nvidia/nvidia.c
55342@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
55343 info->fix.line_length = (info->var.xres_virtual *
55344 info->var.bits_per_pixel) >> 3;
55345 if (info->var.accel_flags) {
55346- info->fbops->fb_imageblit = nvidiafb_imageblit;
55347- info->fbops->fb_fillrect = nvidiafb_fillrect;
55348- info->fbops->fb_copyarea = nvidiafb_copyarea;
55349- info->fbops->fb_sync = nvidiafb_sync;
55350+ pax_open_kernel();
55351+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
55352+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
55353+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
55354+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
55355+ pax_close_kernel();
55356 info->pixmap.scan_align = 4;
55357 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55358 info->flags |= FBINFO_READS_FAST;
55359 NVResetGraphics(info);
55360 } else {
55361- info->fbops->fb_imageblit = cfb_imageblit;
55362- info->fbops->fb_fillrect = cfb_fillrect;
55363- info->fbops->fb_copyarea = cfb_copyarea;
55364- info->fbops->fb_sync = NULL;
55365+ pax_open_kernel();
55366+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55367+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55368+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55369+ *(void **)&info->fbops->fb_sync = NULL;
55370+ pax_close_kernel();
55371 info->pixmap.scan_align = 1;
55372 info->flags |= FBINFO_HWACCEL_DISABLED;
55373 info->flags &= ~FBINFO_READS_FAST;
55374@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
55375 info->pixmap.size = 8 * 1024;
55376 info->pixmap.flags = FB_PIXMAP_SYSTEM;
55377
55378- if (!hwcur)
55379- info->fbops->fb_cursor = NULL;
55380+ if (!hwcur) {
55381+ pax_open_kernel();
55382+ *(void **)&info->fbops->fb_cursor = NULL;
55383+ pax_close_kernel();
55384+ }
55385
55386 info->var.accel_flags = (!noaccel);
55387
55388diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
55389index 2412a0d..294215b 100644
55390--- a/drivers/video/fbdev/omap2/dss/display.c
55391+++ b/drivers/video/fbdev/omap2/dss/display.c
55392@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
55393 if (dssdev->name == NULL)
55394 dssdev->name = dssdev->alias;
55395
55396+ pax_open_kernel();
55397 if (drv && drv->get_resolution == NULL)
55398- drv->get_resolution = omapdss_default_get_resolution;
55399+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
55400 if (drv && drv->get_recommended_bpp == NULL)
55401- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55402+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55403 if (drv && drv->get_timings == NULL)
55404- drv->get_timings = omapdss_default_get_timings;
55405+ *(void **)&drv->get_timings = omapdss_default_get_timings;
55406+ pax_close_kernel();
55407
55408 mutex_lock(&panel_list_mutex);
55409 list_add_tail(&dssdev->panel_list, &panel_list);
55410diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
55411index 83433cb..71e9b98 100644
55412--- a/drivers/video/fbdev/s1d13xxxfb.c
55413+++ b/drivers/video/fbdev/s1d13xxxfb.c
55414@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55415
55416 switch(prod_id) {
55417 case S1D13506_PROD_ID: /* activate acceleration */
55418- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55419- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55420+ pax_open_kernel();
55421+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55422+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55423+ pax_close_kernel();
55424 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55425 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55426 break;
55427diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55428index d3013cd..95b8285 100644
55429--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
55430+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55431@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55432 }
55433
55434 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55435- lcdc_sys_write_index,
55436- lcdc_sys_write_data,
55437- lcdc_sys_read_data,
55438+ .write_index = lcdc_sys_write_index,
55439+ .write_data = lcdc_sys_write_data,
55440+ .read_data = lcdc_sys_read_data,
55441 };
55442
55443 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55444diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
55445index 9279e5f..d5f5276 100644
55446--- a/drivers/video/fbdev/smscufx.c
55447+++ b/drivers/video/fbdev/smscufx.c
55448@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55449 fb_deferred_io_cleanup(info);
55450 kfree(info->fbdefio);
55451 info->fbdefio = NULL;
55452- info->fbops->fb_mmap = ufx_ops_mmap;
55453+ pax_open_kernel();
55454+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55455+ pax_close_kernel();
55456 }
55457
55458 pr_debug("released /dev/fb%d user=%d count=%d",
55459diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
55460index ff2b873..626a8d5 100644
55461--- a/drivers/video/fbdev/udlfb.c
55462+++ b/drivers/video/fbdev/udlfb.c
55463@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55464 dlfb_urb_completion(urb);
55465
55466 error:
55467- atomic_add(bytes_sent, &dev->bytes_sent);
55468- atomic_add(bytes_identical, &dev->bytes_identical);
55469- atomic_add(width*height*2, &dev->bytes_rendered);
55470+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55471+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55472+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55473 end_cycles = get_cycles();
55474- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55475+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55476 >> 10)), /* Kcycles */
55477 &dev->cpu_kcycles_used);
55478
55479@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55480 dlfb_urb_completion(urb);
55481
55482 error:
55483- atomic_add(bytes_sent, &dev->bytes_sent);
55484- atomic_add(bytes_identical, &dev->bytes_identical);
55485- atomic_add(bytes_rendered, &dev->bytes_rendered);
55486+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55487+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55488+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55489 end_cycles = get_cycles();
55490- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55491+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55492 >> 10)), /* Kcycles */
55493 &dev->cpu_kcycles_used);
55494 }
55495@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55496 fb_deferred_io_cleanup(info);
55497 kfree(info->fbdefio);
55498 info->fbdefio = NULL;
55499- info->fbops->fb_mmap = dlfb_ops_mmap;
55500+ pax_open_kernel();
55501+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55502+ pax_close_kernel();
55503 }
55504
55505 pr_warn("released /dev/fb%d user=%d count=%d\n",
55506@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55507 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55508 struct dlfb_data *dev = fb_info->par;
55509 return snprintf(buf, PAGE_SIZE, "%u\n",
55510- atomic_read(&dev->bytes_rendered));
55511+ atomic_read_unchecked(&dev->bytes_rendered));
55512 }
55513
55514 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55515@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55516 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55517 struct dlfb_data *dev = fb_info->par;
55518 return snprintf(buf, PAGE_SIZE, "%u\n",
55519- atomic_read(&dev->bytes_identical));
55520+ atomic_read_unchecked(&dev->bytes_identical));
55521 }
55522
55523 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55524@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55525 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55526 struct dlfb_data *dev = fb_info->par;
55527 return snprintf(buf, PAGE_SIZE, "%u\n",
55528- atomic_read(&dev->bytes_sent));
55529+ atomic_read_unchecked(&dev->bytes_sent));
55530 }
55531
55532 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55533@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55534 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55535 struct dlfb_data *dev = fb_info->par;
55536 return snprintf(buf, PAGE_SIZE, "%u\n",
55537- atomic_read(&dev->cpu_kcycles_used));
55538+ atomic_read_unchecked(&dev->cpu_kcycles_used));
55539 }
55540
55541 static ssize_t edid_show(
55542@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55543 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55544 struct dlfb_data *dev = fb_info->par;
55545
55546- atomic_set(&dev->bytes_rendered, 0);
55547- atomic_set(&dev->bytes_identical, 0);
55548- atomic_set(&dev->bytes_sent, 0);
55549- atomic_set(&dev->cpu_kcycles_used, 0);
55550+ atomic_set_unchecked(&dev->bytes_rendered, 0);
55551+ atomic_set_unchecked(&dev->bytes_identical, 0);
55552+ atomic_set_unchecked(&dev->bytes_sent, 0);
55553+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55554
55555 return count;
55556 }
55557diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55558index d32d1c4..46722e6 100644
55559--- a/drivers/video/fbdev/uvesafb.c
55560+++ b/drivers/video/fbdev/uvesafb.c
55561@@ -19,6 +19,7 @@
55562 #include <linux/io.h>
55563 #include <linux/mutex.h>
55564 #include <linux/slab.h>
55565+#include <linux/moduleloader.h>
55566 #include <video/edid.h>
55567 #include <video/uvesafb.h>
55568 #ifdef CONFIG_X86
55569@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55570 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55571 par->pmi_setpal = par->ypan = 0;
55572 } else {
55573+
55574+#ifdef CONFIG_PAX_KERNEXEC
55575+#ifdef CONFIG_MODULES
55576+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55577+#endif
55578+ if (!par->pmi_code) {
55579+ par->pmi_setpal = par->ypan = 0;
55580+ return 0;
55581+ }
55582+#endif
55583+
55584 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55585 + task->t.regs.edi);
55586+
55587+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55588+ pax_open_kernel();
55589+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55590+ pax_close_kernel();
55591+
55592+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55593+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55594+#else
55595 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55596 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55597+#endif
55598+
55599 printk(KERN_INFO "uvesafb: protected mode interface info at "
55600 "%04x:%04x\n",
55601 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55602@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55603 par->ypan = ypan;
55604
55605 if (par->pmi_setpal || par->ypan) {
55606+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55607 if (__supported_pte_mask & _PAGE_NX) {
55608 par->pmi_setpal = par->ypan = 0;
55609 printk(KERN_WARNING "uvesafb: NX protection is active, "
55610 "better not use the PMI.\n");
55611- } else {
55612+ } else
55613+#endif
55614 uvesafb_vbe_getpmi(task, par);
55615- }
55616 }
55617 #else
55618 /* The protected mode interface is not available on non-x86. */
55619@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55620 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55621
55622 /* Disable blanking if the user requested so. */
55623- if (!blank)
55624- info->fbops->fb_blank = NULL;
55625+ if (!blank) {
55626+ pax_open_kernel();
55627+ *(void **)&info->fbops->fb_blank = NULL;
55628+ pax_close_kernel();
55629+ }
55630
55631 /*
55632 * Find out how much IO memory is required for the mode with
55633@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55634 info->flags = FBINFO_FLAG_DEFAULT |
55635 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55636
55637- if (!par->ypan)
55638- info->fbops->fb_pan_display = NULL;
55639+ if (!par->ypan) {
55640+ pax_open_kernel();
55641+ *(void **)&info->fbops->fb_pan_display = NULL;
55642+ pax_close_kernel();
55643+ }
55644 }
55645
55646 static void uvesafb_init_mtrr(struct fb_info *info)
55647@@ -1786,6 +1816,11 @@ out_mode:
55648 out:
55649 kfree(par->vbe_modes);
55650
55651+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55652+ if (par->pmi_code)
55653+ module_memfree_exec(par->pmi_code);
55654+#endif
55655+
55656 framebuffer_release(info);
55657 return err;
55658 }
55659@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
55660 kfree(par->vbe_state_orig);
55661 kfree(par->vbe_state_saved);
55662
55663+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55664+ if (par->pmi_code)
55665+ module_memfree_exec(par->pmi_code);
55666+#endif
55667+
55668 framebuffer_release(info);
55669 }
55670 return 0;
55671diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55672index d79a0ac..2d0c3d4 100644
55673--- a/drivers/video/fbdev/vesafb.c
55674+++ b/drivers/video/fbdev/vesafb.c
55675@@ -9,6 +9,7 @@
55676 */
55677
55678 #include <linux/module.h>
55679+#include <linux/moduleloader.h>
55680 #include <linux/kernel.h>
55681 #include <linux/errno.h>
55682 #include <linux/string.h>
55683@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55684 static int vram_total; /* Set total amount of memory */
55685 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55686 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55687-static void (*pmi_start)(void) __read_mostly;
55688-static void (*pmi_pal) (void) __read_mostly;
55689+static void (*pmi_start)(void) __read_only;
55690+static void (*pmi_pal) (void) __read_only;
55691 static int depth __read_mostly;
55692 static int vga_compat __read_mostly;
55693 /* --------------------------------------------------------------------- */
55694@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55695 unsigned int size_remap;
55696 unsigned int size_total;
55697 char *option = NULL;
55698+ void *pmi_code = NULL;
55699
55700 /* ignore error return of fb_get_options */
55701 fb_get_options("vesafb", &option);
55702@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55703 size_remap = size_total;
55704 vesafb_fix.smem_len = size_remap;
55705
55706-#ifndef __i386__
55707- screen_info.vesapm_seg = 0;
55708-#endif
55709-
55710 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55711 printk(KERN_WARNING
55712 "vesafb: cannot reserve video memory at 0x%lx\n",
55713@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55714 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55715 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55716
55717+#ifdef __i386__
55718+
55719+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55720+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
55721+ if (!pmi_code)
55722+#elif !defined(CONFIG_PAX_KERNEXEC)
55723+ if (0)
55724+#endif
55725+
55726+#endif
55727+ screen_info.vesapm_seg = 0;
55728+
55729 if (screen_info.vesapm_seg) {
55730- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55731- screen_info.vesapm_seg,screen_info.vesapm_off);
55732+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55733+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55734 }
55735
55736 if (screen_info.vesapm_seg < 0xc000)
55737@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55738
55739 if (ypan || pmi_setpal) {
55740 unsigned short *pmi_base;
55741+
55742 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55743- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55744- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55745+
55746+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55747+ pax_open_kernel();
55748+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55749+#else
55750+ pmi_code = pmi_base;
55751+#endif
55752+
55753+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55754+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55755+
55756+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55757+ pmi_start = ktva_ktla(pmi_start);
55758+ pmi_pal = ktva_ktla(pmi_pal);
55759+ pax_close_kernel();
55760+#endif
55761+
55762 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55763 if (pmi_base[3]) {
55764 printk(KERN_INFO "vesafb: pmi: ports = ");
55765@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55766 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55767 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55768
55769- if (!ypan)
55770- info->fbops->fb_pan_display = NULL;
55771+ if (!ypan) {
55772+ pax_open_kernel();
55773+ *(void **)&info->fbops->fb_pan_display = NULL;
55774+ pax_close_kernel();
55775+ }
55776
55777 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55778 err = -ENOMEM;
55779@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55780 fb_info(info, "%s frame buffer device\n", info->fix.id);
55781 return 0;
55782 err:
55783+
55784+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55785+ module_memfree_exec(pmi_code);
55786+#endif
55787+
55788 if (info->screen_base)
55789 iounmap(info->screen_base);
55790 framebuffer_release(info);
55791diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55792index 88714ae..16c2e11 100644
55793--- a/drivers/video/fbdev/via/via_clock.h
55794+++ b/drivers/video/fbdev/via/via_clock.h
55795@@ -56,7 +56,7 @@ struct via_clock {
55796
55797 void (*set_engine_pll_state)(u8 state);
55798 void (*set_engine_pll)(struct via_pll_config config);
55799-};
55800+} __no_const;
55801
55802
55803 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55804diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55805index 3c14e43..2630570 100644
55806--- a/drivers/video/logo/logo_linux_clut224.ppm
55807+++ b/drivers/video/logo/logo_linux_clut224.ppm
55808@@ -2,1603 +2,1123 @@ P3
55809 # Standard 224-color Linux logo
55810 80 80
55811 255
55812- 0 0 0 0 0 0 0 0 0 0 0 0
55813- 0 0 0 0 0 0 0 0 0 0 0 0
55814- 0 0 0 0 0 0 0 0 0 0 0 0
55815- 0 0 0 0 0 0 0 0 0 0 0 0
55816- 0 0 0 0 0 0 0 0 0 0 0 0
55817- 0 0 0 0 0 0 0 0 0 0 0 0
55818- 0 0 0 0 0 0 0 0 0 0 0 0
55819- 0 0 0 0 0 0 0 0 0 0 0 0
55820- 0 0 0 0 0 0 0 0 0 0 0 0
55821- 6 6 6 6 6 6 10 10 10 10 10 10
55822- 10 10 10 6 6 6 6 6 6 6 6 6
55823- 0 0 0 0 0 0 0 0 0 0 0 0
55824- 0 0 0 0 0 0 0 0 0 0 0 0
55825- 0 0 0 0 0 0 0 0 0 0 0 0
55826- 0 0 0 0 0 0 0 0 0 0 0 0
55827- 0 0 0 0 0 0 0 0 0 0 0 0
55828- 0 0 0 0 0 0 0 0 0 0 0 0
55829- 0 0 0 0 0 0 0 0 0 0 0 0
55830- 0 0 0 0 0 0 0 0 0 0 0 0
55831- 0 0 0 0 0 0 0 0 0 0 0 0
55832- 0 0 0 0 0 0 0 0 0 0 0 0
55833- 0 0 0 0 0 0 0 0 0 0 0 0
55834- 0 0 0 0 0 0 0 0 0 0 0 0
55835- 0 0 0 0 0 0 0 0 0 0 0 0
55836- 0 0 0 0 0 0 0 0 0 0 0 0
55837- 0 0 0 0 0 0 0 0 0 0 0 0
55838- 0 0 0 0 0 0 0 0 0 0 0 0
55839- 0 0 0 0 0 0 0 0 0 0 0 0
55840- 0 0 0 6 6 6 10 10 10 14 14 14
55841- 22 22 22 26 26 26 30 30 30 34 34 34
55842- 30 30 30 30 30 30 26 26 26 18 18 18
55843- 14 14 14 10 10 10 6 6 6 0 0 0
55844- 0 0 0 0 0 0 0 0 0 0 0 0
55845- 0 0 0 0 0 0 0 0 0 0 0 0
55846- 0 0 0 0 0 0 0 0 0 0 0 0
55847- 0 0 0 0 0 0 0 0 0 0 0 0
55848- 0 0 0 0 0 0 0 0 0 0 0 0
55849- 0 0 0 0 0 0 0 0 0 0 0 0
55850- 0 0 0 0 0 0 0 0 0 0 0 0
55851- 0 0 0 0 0 0 0 0 0 0 0 0
55852- 0 0 0 0 0 0 0 0 0 0 0 0
55853- 0 0 0 0 0 1 0 0 1 0 0 0
55854- 0 0 0 0 0 0 0 0 0 0 0 0
55855- 0 0 0 0 0 0 0 0 0 0 0 0
55856- 0 0 0 0 0 0 0 0 0 0 0 0
55857- 0 0 0 0 0 0 0 0 0 0 0 0
55858- 0 0 0 0 0 0 0 0 0 0 0 0
55859- 0 0 0 0 0 0 0 0 0 0 0 0
55860- 6 6 6 14 14 14 26 26 26 42 42 42
55861- 54 54 54 66 66 66 78 78 78 78 78 78
55862- 78 78 78 74 74 74 66 66 66 54 54 54
55863- 42 42 42 26 26 26 18 18 18 10 10 10
55864- 6 6 6 0 0 0 0 0 0 0 0 0
55865- 0 0 0 0 0 0 0 0 0 0 0 0
55866- 0 0 0 0 0 0 0 0 0 0 0 0
55867- 0 0 0 0 0 0 0 0 0 0 0 0
55868- 0 0 0 0 0 0 0 0 0 0 0 0
55869- 0 0 0 0 0 0 0 0 0 0 0 0
55870- 0 0 0 0 0 0 0 0 0 0 0 0
55871- 0 0 0 0 0 0 0 0 0 0 0 0
55872- 0 0 0 0 0 0 0 0 0 0 0 0
55873- 0 0 1 0 0 0 0 0 0 0 0 0
55874- 0 0 0 0 0 0 0 0 0 0 0 0
55875- 0 0 0 0 0 0 0 0 0 0 0 0
55876- 0 0 0 0 0 0 0 0 0 0 0 0
55877- 0 0 0 0 0 0 0 0 0 0 0 0
55878- 0 0 0 0 0 0 0 0 0 0 0 0
55879- 0 0 0 0 0 0 0 0 0 10 10 10
55880- 22 22 22 42 42 42 66 66 66 86 86 86
55881- 66 66 66 38 38 38 38 38 38 22 22 22
55882- 26 26 26 34 34 34 54 54 54 66 66 66
55883- 86 86 86 70 70 70 46 46 46 26 26 26
55884- 14 14 14 6 6 6 0 0 0 0 0 0
55885- 0 0 0 0 0 0 0 0 0 0 0 0
55886- 0 0 0 0 0 0 0 0 0 0 0 0
55887- 0 0 0 0 0 0 0 0 0 0 0 0
55888- 0 0 0 0 0 0 0 0 0 0 0 0
55889- 0 0 0 0 0 0 0 0 0 0 0 0
55890- 0 0 0 0 0 0 0 0 0 0 0 0
55891- 0 0 0 0 0 0 0 0 0 0 0 0
55892- 0 0 0 0 0 0 0 0 0 0 0 0
55893- 0 0 1 0 0 1 0 0 1 0 0 0
55894- 0 0 0 0 0 0 0 0 0 0 0 0
55895- 0 0 0 0 0 0 0 0 0 0 0 0
55896- 0 0 0 0 0 0 0 0 0 0 0 0
55897- 0 0 0 0 0 0 0 0 0 0 0 0
55898- 0 0 0 0 0 0 0 0 0 0 0 0
55899- 0 0 0 0 0 0 10 10 10 26 26 26
55900- 50 50 50 82 82 82 58 58 58 6 6 6
55901- 2 2 6 2 2 6 2 2 6 2 2 6
55902- 2 2 6 2 2 6 2 2 6 2 2 6
55903- 6 6 6 54 54 54 86 86 86 66 66 66
55904- 38 38 38 18 18 18 6 6 6 0 0 0
55905- 0 0 0 0 0 0 0 0 0 0 0 0
55906- 0 0 0 0 0 0 0 0 0 0 0 0
55907- 0 0 0 0 0 0 0 0 0 0 0 0
55908- 0 0 0 0 0 0 0 0 0 0 0 0
55909- 0 0 0 0 0 0 0 0 0 0 0 0
55910- 0 0 0 0 0 0 0 0 0 0 0 0
55911- 0 0 0 0 0 0 0 0 0 0 0 0
55912- 0 0 0 0 0 0 0 0 0 0 0 0
55913- 0 0 0 0 0 0 0 0 0 0 0 0
55914- 0 0 0 0 0 0 0 0 0 0 0 0
55915- 0 0 0 0 0 0 0 0 0 0 0 0
55916- 0 0 0 0 0 0 0 0 0 0 0 0
55917- 0 0 0 0 0 0 0 0 0 0 0 0
55918- 0 0 0 0 0 0 0 0 0 0 0 0
55919- 0 0 0 6 6 6 22 22 22 50 50 50
55920- 78 78 78 34 34 34 2 2 6 2 2 6
55921- 2 2 6 2 2 6 2 2 6 2 2 6
55922- 2 2 6 2 2 6 2 2 6 2 2 6
55923- 2 2 6 2 2 6 6 6 6 70 70 70
55924- 78 78 78 46 46 46 22 22 22 6 6 6
55925- 0 0 0 0 0 0 0 0 0 0 0 0
55926- 0 0 0 0 0 0 0 0 0 0 0 0
55927- 0 0 0 0 0 0 0 0 0 0 0 0
55928- 0 0 0 0 0 0 0 0 0 0 0 0
55929- 0 0 0 0 0 0 0 0 0 0 0 0
55930- 0 0 0 0 0 0 0 0 0 0 0 0
55931- 0 0 0 0 0 0 0 0 0 0 0 0
55932- 0 0 0 0 0 0 0 0 0 0 0 0
55933- 0 0 1 0 0 1 0 0 1 0 0 0
55934- 0 0 0 0 0 0 0 0 0 0 0 0
55935- 0 0 0 0 0 0 0 0 0 0 0 0
55936- 0 0 0 0 0 0 0 0 0 0 0 0
55937- 0 0 0 0 0 0 0 0 0 0 0 0
55938- 0 0 0 0 0 0 0 0 0 0 0 0
55939- 6 6 6 18 18 18 42 42 42 82 82 82
55940- 26 26 26 2 2 6 2 2 6 2 2 6
55941- 2 2 6 2 2 6 2 2 6 2 2 6
55942- 2 2 6 2 2 6 2 2 6 14 14 14
55943- 46 46 46 34 34 34 6 6 6 2 2 6
55944- 42 42 42 78 78 78 42 42 42 18 18 18
55945- 6 6 6 0 0 0 0 0 0 0 0 0
55946- 0 0 0 0 0 0 0 0 0 0 0 0
55947- 0 0 0 0 0 0 0 0 0 0 0 0
55948- 0 0 0 0 0 0 0 0 0 0 0 0
55949- 0 0 0 0 0 0 0 0 0 0 0 0
55950- 0 0 0 0 0 0 0 0 0 0 0 0
55951- 0 0 0 0 0 0 0 0 0 0 0 0
55952- 0 0 0 0 0 0 0 0 0 0 0 0
55953- 0 0 1 0 0 0 0 0 1 0 0 0
55954- 0 0 0 0 0 0 0 0 0 0 0 0
55955- 0 0 0 0 0 0 0 0 0 0 0 0
55956- 0 0 0 0 0 0 0 0 0 0 0 0
55957- 0 0 0 0 0 0 0 0 0 0 0 0
55958- 0 0 0 0 0 0 0 0 0 0 0 0
55959- 10 10 10 30 30 30 66 66 66 58 58 58
55960- 2 2 6 2 2 6 2 2 6 2 2 6
55961- 2 2 6 2 2 6 2 2 6 2 2 6
55962- 2 2 6 2 2 6 2 2 6 26 26 26
55963- 86 86 86 101 101 101 46 46 46 10 10 10
55964- 2 2 6 58 58 58 70 70 70 34 34 34
55965- 10 10 10 0 0 0 0 0 0 0 0 0
55966- 0 0 0 0 0 0 0 0 0 0 0 0
55967- 0 0 0 0 0 0 0 0 0 0 0 0
55968- 0 0 0 0 0 0 0 0 0 0 0 0
55969- 0 0 0 0 0 0 0 0 0 0 0 0
55970- 0 0 0 0 0 0 0 0 0 0 0 0
55971- 0 0 0 0 0 0 0 0 0 0 0 0
55972- 0 0 0 0 0 0 0 0 0 0 0 0
55973- 0 0 1 0 0 1 0 0 1 0 0 0
55974- 0 0 0 0 0 0 0 0 0 0 0 0
55975- 0 0 0 0 0 0 0 0 0 0 0 0
55976- 0 0 0 0 0 0 0 0 0 0 0 0
55977- 0 0 0 0 0 0 0 0 0 0 0 0
55978- 0 0 0 0 0 0 0 0 0 0 0 0
55979- 14 14 14 42 42 42 86 86 86 10 10 10
55980- 2 2 6 2 2 6 2 2 6 2 2 6
55981- 2 2 6 2 2 6 2 2 6 2 2 6
55982- 2 2 6 2 2 6 2 2 6 30 30 30
55983- 94 94 94 94 94 94 58 58 58 26 26 26
55984- 2 2 6 6 6 6 78 78 78 54 54 54
55985- 22 22 22 6 6 6 0 0 0 0 0 0
55986- 0 0 0 0 0 0 0 0 0 0 0 0
55987- 0 0 0 0 0 0 0 0 0 0 0 0
55988- 0 0 0 0 0 0 0 0 0 0 0 0
55989- 0 0 0 0 0 0 0 0 0 0 0 0
55990- 0 0 0 0 0 0 0 0 0 0 0 0
55991- 0 0 0 0 0 0 0 0 0 0 0 0
55992- 0 0 0 0 0 0 0 0 0 0 0 0
55993- 0 0 0 0 0 0 0 0 0 0 0 0
55994- 0 0 0 0 0 0 0 0 0 0 0 0
55995- 0 0 0 0 0 0 0 0 0 0 0 0
55996- 0 0 0 0 0 0 0 0 0 0 0 0
55997- 0 0 0 0 0 0 0 0 0 0 0 0
55998- 0 0 0 0 0 0 0 0 0 6 6 6
55999- 22 22 22 62 62 62 62 62 62 2 2 6
56000- 2 2 6 2 2 6 2 2 6 2 2 6
56001- 2 2 6 2 2 6 2 2 6 2 2 6
56002- 2 2 6 2 2 6 2 2 6 26 26 26
56003- 54 54 54 38 38 38 18 18 18 10 10 10
56004- 2 2 6 2 2 6 34 34 34 82 82 82
56005- 38 38 38 14 14 14 0 0 0 0 0 0
56006- 0 0 0 0 0 0 0 0 0 0 0 0
56007- 0 0 0 0 0 0 0 0 0 0 0 0
56008- 0 0 0 0 0 0 0 0 0 0 0 0
56009- 0 0 0 0 0 0 0 0 0 0 0 0
56010- 0 0 0 0 0 0 0 0 0 0 0 0
56011- 0 0 0 0 0 0 0 0 0 0 0 0
56012- 0 0 0 0 0 0 0 0 0 0 0 0
56013- 0 0 0 0 0 1 0 0 1 0 0 0
56014- 0 0 0 0 0 0 0 0 0 0 0 0
56015- 0 0 0 0 0 0 0 0 0 0 0 0
56016- 0 0 0 0 0 0 0 0 0 0 0 0
56017- 0 0 0 0 0 0 0 0 0 0 0 0
56018- 0 0 0 0 0 0 0 0 0 6 6 6
56019- 30 30 30 78 78 78 30 30 30 2 2 6
56020- 2 2 6 2 2 6 2 2 6 2 2 6
56021- 2 2 6 2 2 6 2 2 6 2 2 6
56022- 2 2 6 2 2 6 2 2 6 10 10 10
56023- 10 10 10 2 2 6 2 2 6 2 2 6
56024- 2 2 6 2 2 6 2 2 6 78 78 78
56025- 50 50 50 18 18 18 6 6 6 0 0 0
56026- 0 0 0 0 0 0 0 0 0 0 0 0
56027- 0 0 0 0 0 0 0 0 0 0 0 0
56028- 0 0 0 0 0 0 0 0 0 0 0 0
56029- 0 0 0 0 0 0 0 0 0 0 0 0
56030- 0 0 0 0 0 0 0 0 0 0 0 0
56031- 0 0 0 0 0 0 0 0 0 0 0 0
56032- 0 0 0 0 0 0 0 0 0 0 0 0
56033- 0 0 1 0 0 0 0 0 0 0 0 0
56034- 0 0 0 0 0 0 0 0 0 0 0 0
56035- 0 0 0 0 0 0 0 0 0 0 0 0
56036- 0 0 0 0 0 0 0 0 0 0 0 0
56037- 0 0 0 0 0 0 0 0 0 0 0 0
56038- 0 0 0 0 0 0 0 0 0 10 10 10
56039- 38 38 38 86 86 86 14 14 14 2 2 6
56040- 2 2 6 2 2 6 2 2 6 2 2 6
56041- 2 2 6 2 2 6 2 2 6 2 2 6
56042- 2 2 6 2 2 6 2 2 6 2 2 6
56043- 2 2 6 2 2 6 2 2 6 2 2 6
56044- 2 2 6 2 2 6 2 2 6 54 54 54
56045- 66 66 66 26 26 26 6 6 6 0 0 0
56046- 0 0 0 0 0 0 0 0 0 0 0 0
56047- 0 0 0 0 0 0 0 0 0 0 0 0
56048- 0 0 0 0 0 0 0 0 0 0 0 0
56049- 0 0 0 0 0 0 0 0 0 0 0 0
56050- 0 0 0 0 0 0 0 0 0 0 0 0
56051- 0 0 0 0 0 0 0 0 0 0 0 0
56052- 0 0 0 0 0 0 0 0 0 0 0 0
56053- 0 0 0 0 0 1 0 0 1 0 0 0
56054- 0 0 0 0 0 0 0 0 0 0 0 0
56055- 0 0 0 0 0 0 0 0 0 0 0 0
56056- 0 0 0 0 0 0 0 0 0 0 0 0
56057- 0 0 0 0 0 0 0 0 0 0 0 0
56058- 0 0 0 0 0 0 0 0 0 14 14 14
56059- 42 42 42 82 82 82 2 2 6 2 2 6
56060- 2 2 6 6 6 6 10 10 10 2 2 6
56061- 2 2 6 2 2 6 2 2 6 2 2 6
56062- 2 2 6 2 2 6 2 2 6 6 6 6
56063- 14 14 14 10 10 10 2 2 6 2 2 6
56064- 2 2 6 2 2 6 2 2 6 18 18 18
56065- 82 82 82 34 34 34 10 10 10 0 0 0
56066- 0 0 0 0 0 0 0 0 0 0 0 0
56067- 0 0 0 0 0 0 0 0 0 0 0 0
56068- 0 0 0 0 0 0 0 0 0 0 0 0
56069- 0 0 0 0 0 0 0 0 0 0 0 0
56070- 0 0 0 0 0 0 0 0 0 0 0 0
56071- 0 0 0 0 0 0 0 0 0 0 0 0
56072- 0 0 0 0 0 0 0 0 0 0 0 0
56073- 0 0 1 0 0 0 0 0 0 0 0 0
56074- 0 0 0 0 0 0 0 0 0 0 0 0
56075- 0 0 0 0 0 0 0 0 0 0 0 0
56076- 0 0 0 0 0 0 0 0 0 0 0 0
56077- 0 0 0 0 0 0 0 0 0 0 0 0
56078- 0 0 0 0 0 0 0 0 0 14 14 14
56079- 46 46 46 86 86 86 2 2 6 2 2 6
56080- 6 6 6 6 6 6 22 22 22 34 34 34
56081- 6 6 6 2 2 6 2 2 6 2 2 6
56082- 2 2 6 2 2 6 18 18 18 34 34 34
56083- 10 10 10 50 50 50 22 22 22 2 2 6
56084- 2 2 6 2 2 6 2 2 6 10 10 10
56085- 86 86 86 42 42 42 14 14 14 0 0 0
56086- 0 0 0 0 0 0 0 0 0 0 0 0
56087- 0 0 0 0 0 0 0 0 0 0 0 0
56088- 0 0 0 0 0 0 0 0 0 0 0 0
56089- 0 0 0 0 0 0 0 0 0 0 0 0
56090- 0 0 0 0 0 0 0 0 0 0 0 0
56091- 0 0 0 0 0 0 0 0 0 0 0 0
56092- 0 0 0 0 0 0 0 0 0 0 0 0
56093- 0 0 1 0 0 1 0 0 1 0 0 0
56094- 0 0 0 0 0 0 0 0 0 0 0 0
56095- 0 0 0 0 0 0 0 0 0 0 0 0
56096- 0 0 0 0 0 0 0 0 0 0 0 0
56097- 0 0 0 0 0 0 0 0 0 0 0 0
56098- 0 0 0 0 0 0 0 0 0 14 14 14
56099- 46 46 46 86 86 86 2 2 6 2 2 6
56100- 38 38 38 116 116 116 94 94 94 22 22 22
56101- 22 22 22 2 2 6 2 2 6 2 2 6
56102- 14 14 14 86 86 86 138 138 138 162 162 162
56103-154 154 154 38 38 38 26 26 26 6 6 6
56104- 2 2 6 2 2 6 2 2 6 2 2 6
56105- 86 86 86 46 46 46 14 14 14 0 0 0
56106- 0 0 0 0 0 0 0 0 0 0 0 0
56107- 0 0 0 0 0 0 0 0 0 0 0 0
56108- 0 0 0 0 0 0 0 0 0 0 0 0
56109- 0 0 0 0 0 0 0 0 0 0 0 0
56110- 0 0 0 0 0 0 0 0 0 0 0 0
56111- 0 0 0 0 0 0 0 0 0 0 0 0
56112- 0 0 0 0 0 0 0 0 0 0 0 0
56113- 0 0 0 0 0 0 0 0 0 0 0 0
56114- 0 0 0 0 0 0 0 0 0 0 0 0
56115- 0 0 0 0 0 0 0 0 0 0 0 0
56116- 0 0 0 0 0 0 0 0 0 0 0 0
56117- 0 0 0 0 0 0 0 0 0 0 0 0
56118- 0 0 0 0 0 0 0 0 0 14 14 14
56119- 46 46 46 86 86 86 2 2 6 14 14 14
56120-134 134 134 198 198 198 195 195 195 116 116 116
56121- 10 10 10 2 2 6 2 2 6 6 6 6
56122-101 98 89 187 187 187 210 210 210 218 218 218
56123-214 214 214 134 134 134 14 14 14 6 6 6
56124- 2 2 6 2 2 6 2 2 6 2 2 6
56125- 86 86 86 50 50 50 18 18 18 6 6 6
56126- 0 0 0 0 0 0 0 0 0 0 0 0
56127- 0 0 0 0 0 0 0 0 0 0 0 0
56128- 0 0 0 0 0 0 0 0 0 0 0 0
56129- 0 0 0 0 0 0 0 0 0 0 0 0
56130- 0 0 0 0 0 0 0 0 0 0 0 0
56131- 0 0 0 0 0 0 0 0 0 0 0 0
56132- 0 0 0 0 0 0 0 0 1 0 0 0
56133- 0 0 1 0 0 1 0 0 1 0 0 0
56134- 0 0 0 0 0 0 0 0 0 0 0 0
56135- 0 0 0 0 0 0 0 0 0 0 0 0
56136- 0 0 0 0 0 0 0 0 0 0 0 0
56137- 0 0 0 0 0 0 0 0 0 0 0 0
56138- 0 0 0 0 0 0 0 0 0 14 14 14
56139- 46 46 46 86 86 86 2 2 6 54 54 54
56140-218 218 218 195 195 195 226 226 226 246 246 246
56141- 58 58 58 2 2 6 2 2 6 30 30 30
56142-210 210 210 253 253 253 174 174 174 123 123 123
56143-221 221 221 234 234 234 74 74 74 2 2 6
56144- 2 2 6 2 2 6 2 2 6 2 2 6
56145- 70 70 70 58 58 58 22 22 22 6 6 6
56146- 0 0 0 0 0 0 0 0 0 0 0 0
56147- 0 0 0 0 0 0 0 0 0 0 0 0
56148- 0 0 0 0 0 0 0 0 0 0 0 0
56149- 0 0 0 0 0 0 0 0 0 0 0 0
56150- 0 0 0 0 0 0 0 0 0 0 0 0
56151- 0 0 0 0 0 0 0 0 0 0 0 0
56152- 0 0 0 0 0 0 0 0 0 0 0 0
56153- 0 0 0 0 0 0 0 0 0 0 0 0
56154- 0 0 0 0 0 0 0 0 0 0 0 0
56155- 0 0 0 0 0 0 0 0 0 0 0 0
56156- 0 0 0 0 0 0 0 0 0 0 0 0
56157- 0 0 0 0 0 0 0 0 0 0 0 0
56158- 0 0 0 0 0 0 0 0 0 14 14 14
56159- 46 46 46 82 82 82 2 2 6 106 106 106
56160-170 170 170 26 26 26 86 86 86 226 226 226
56161-123 123 123 10 10 10 14 14 14 46 46 46
56162-231 231 231 190 190 190 6 6 6 70 70 70
56163- 90 90 90 238 238 238 158 158 158 2 2 6
56164- 2 2 6 2 2 6 2 2 6 2 2 6
56165- 70 70 70 58 58 58 22 22 22 6 6 6
56166- 0 0 0 0 0 0 0 0 0 0 0 0
56167- 0 0 0 0 0 0 0 0 0 0 0 0
56168- 0 0 0 0 0 0 0 0 0 0 0 0
56169- 0 0 0 0 0 0 0 0 0 0 0 0
56170- 0 0 0 0 0 0 0 0 0 0 0 0
56171- 0 0 0 0 0 0 0 0 0 0 0 0
56172- 0 0 0 0 0 0 0 0 1 0 0 0
56173- 0 0 1 0 0 1 0 0 1 0 0 0
56174- 0 0 0 0 0 0 0 0 0 0 0 0
56175- 0 0 0 0 0 0 0 0 0 0 0 0
56176- 0 0 0 0 0 0 0 0 0 0 0 0
56177- 0 0 0 0 0 0 0 0 0 0 0 0
56178- 0 0 0 0 0 0 0 0 0 14 14 14
56179- 42 42 42 86 86 86 6 6 6 116 116 116
56180-106 106 106 6 6 6 70 70 70 149 149 149
56181-128 128 128 18 18 18 38 38 38 54 54 54
56182-221 221 221 106 106 106 2 2 6 14 14 14
56183- 46 46 46 190 190 190 198 198 198 2 2 6
56184- 2 2 6 2 2 6 2 2 6 2 2 6
56185- 74 74 74 62 62 62 22 22 22 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
56190- 0 0 0 0 0 0 0 0 0 0 0 0
56191- 0 0 0 0 0 0 0 0 0 0 0 0
56192- 0 0 0 0 0 0 0 0 1 0 0 0
56193- 0 0 1 0 0 0 0 0 1 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 14 14 14
56199- 42 42 42 94 94 94 14 14 14 101 101 101
56200-128 128 128 2 2 6 18 18 18 116 116 116
56201-118 98 46 121 92 8 121 92 8 98 78 10
56202-162 162 162 106 106 106 2 2 6 2 2 6
56203- 2 2 6 195 195 195 195 195 195 6 6 6
56204- 2 2 6 2 2 6 2 2 6 2 2 6
56205- 74 74 74 62 62 62 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
56209- 0 0 0 0 0 0 0 0 0 0 0 0
56210- 0 0 0 0 0 0 0 0 0 0 0 0
56211- 0 0 0 0 0 0 0 0 0 0 0 0
56212- 0 0 0 0 0 0 0 0 1 0 0 1
56213- 0 0 1 0 0 0 0 0 1 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 10 10 10
56219- 38 38 38 90 90 90 14 14 14 58 58 58
56220-210 210 210 26 26 26 54 38 6 154 114 10
56221-226 170 11 236 186 11 225 175 15 184 144 12
56222-215 174 15 175 146 61 37 26 9 2 2 6
56223- 70 70 70 246 246 246 138 138 138 2 2 6
56224- 2 2 6 2 2 6 2 2 6 2 2 6
56225- 70 70 70 66 66 66 26 26 26 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
56229- 0 0 0 0 0 0 0 0 0 0 0 0
56230- 0 0 0 0 0 0 0 0 0 0 0 0
56231- 0 0 0 0 0 0 0 0 0 0 0 0
56232- 0 0 0 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 10 10 10
56239- 38 38 38 86 86 86 14 14 14 10 10 10
56240-195 195 195 188 164 115 192 133 9 225 175 15
56241-239 182 13 234 190 10 232 195 16 232 200 30
56242-245 207 45 241 208 19 232 195 16 184 144 12
56243-218 194 134 211 206 186 42 42 42 2 2 6
56244- 2 2 6 2 2 6 2 2 6 2 2 6
56245- 50 50 50 74 74 74 30 30 30 6 6 6
56246- 0 0 0 0 0 0 0 0 0 0 0 0
56247- 0 0 0 0 0 0 0 0 0 0 0 0
56248- 0 0 0 0 0 0 0 0 0 0 0 0
56249- 0 0 0 0 0 0 0 0 0 0 0 0
56250- 0 0 0 0 0 0 0 0 0 0 0 0
56251- 0 0 0 0 0 0 0 0 0 0 0 0
56252- 0 0 0 0 0 0 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 10 10 10
56259- 34 34 34 86 86 86 14 14 14 2 2 6
56260-121 87 25 192 133 9 219 162 10 239 182 13
56261-236 186 11 232 195 16 241 208 19 244 214 54
56262-246 218 60 246 218 38 246 215 20 241 208 19
56263-241 208 19 226 184 13 121 87 25 2 2 6
56264- 2 2 6 2 2 6 2 2 6 2 2 6
56265- 50 50 50 82 82 82 34 34 34 10 10 10
56266- 0 0 0 0 0 0 0 0 0 0 0 0
56267- 0 0 0 0 0 0 0 0 0 0 0 0
56268- 0 0 0 0 0 0 0 0 0 0 0 0
56269- 0 0 0 0 0 0 0 0 0 0 0 0
56270- 0 0 0 0 0 0 0 0 0 0 0 0
56271- 0 0 0 0 0 0 0 0 0 0 0 0
56272- 0 0 0 0 0 0 0 0 0 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 10 10 10
56279- 34 34 34 82 82 82 30 30 30 61 42 6
56280-180 123 7 206 145 10 230 174 11 239 182 13
56281-234 190 10 238 202 15 241 208 19 246 218 74
56282-246 218 38 246 215 20 246 215 20 246 215 20
56283-226 184 13 215 174 15 184 144 12 6 6 6
56284- 2 2 6 2 2 6 2 2 6 2 2 6
56285- 26 26 26 94 94 94 42 42 42 14 14 14
56286- 0 0 0 0 0 0 0 0 0 0 0 0
56287- 0 0 0 0 0 0 0 0 0 0 0 0
56288- 0 0 0 0 0 0 0 0 0 0 0 0
56289- 0 0 0 0 0 0 0 0 0 0 0 0
56290- 0 0 0 0 0 0 0 0 0 0 0 0
56291- 0 0 0 0 0 0 0 0 0 0 0 0
56292- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
56299- 30 30 30 78 78 78 50 50 50 104 69 6
56300-192 133 9 216 158 10 236 178 12 236 186 11
56301-232 195 16 241 208 19 244 214 54 245 215 43
56302-246 215 20 246 215 20 241 208 19 198 155 10
56303-200 144 11 216 158 10 156 118 10 2 2 6
56304- 2 2 6 2 2 6 2 2 6 2 2 6
56305- 6 6 6 90 90 90 54 54 54 18 18 18
56306- 6 6 6 0 0 0 0 0 0 0 0 0
56307- 0 0 0 0 0 0 0 0 0 0 0 0
56308- 0 0 0 0 0 0 0 0 0 0 0 0
56309- 0 0 0 0 0 0 0 0 0 0 0 0
56310- 0 0 0 0 0 0 0 0 0 0 0 0
56311- 0 0 0 0 0 0 0 0 0 0 0 0
56312- 0 0 0 0 0 0 0 0 0 0 0 0
56313- 0 0 0 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 10 10 10
56319- 30 30 30 78 78 78 46 46 46 22 22 22
56320-137 92 6 210 162 10 239 182 13 238 190 10
56321-238 202 15 241 208 19 246 215 20 246 215 20
56322-241 208 19 203 166 17 185 133 11 210 150 10
56323-216 158 10 210 150 10 102 78 10 2 2 6
56324- 6 6 6 54 54 54 14 14 14 2 2 6
56325- 2 2 6 62 62 62 74 74 74 30 30 30
56326- 10 10 10 0 0 0 0 0 0 0 0 0
56327- 0 0 0 0 0 0 0 0 0 0 0 0
56328- 0 0 0 0 0 0 0 0 0 0 0 0
56329- 0 0 0 0 0 0 0 0 0 0 0 0
56330- 0 0 0 0 0 0 0 0 0 0 0 0
56331- 0 0 0 0 0 0 0 0 0 0 0 0
56332- 0 0 0 0 0 0 0 0 0 0 0 0
56333- 0 0 0 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 10 10 10
56339- 34 34 34 78 78 78 50 50 50 6 6 6
56340- 94 70 30 139 102 15 190 146 13 226 184 13
56341-232 200 30 232 195 16 215 174 15 190 146 13
56342-168 122 10 192 133 9 210 150 10 213 154 11
56343-202 150 34 182 157 106 101 98 89 2 2 6
56344- 2 2 6 78 78 78 116 116 116 58 58 58
56345- 2 2 6 22 22 22 90 90 90 46 46 46
56346- 18 18 18 6 6 6 0 0 0 0 0 0
56347- 0 0 0 0 0 0 0 0 0 0 0 0
56348- 0 0 0 0 0 0 0 0 0 0 0 0
56349- 0 0 0 0 0 0 0 0 0 0 0 0
56350- 0 0 0 0 0 0 0 0 0 0 0 0
56351- 0 0 0 0 0 0 0 0 0 0 0 0
56352- 0 0 0 0 0 0 0 0 0 0 0 0
56353- 0 0 0 0 0 0 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 10 10 10
56359- 38 38 38 86 86 86 50 50 50 6 6 6
56360-128 128 128 174 154 114 156 107 11 168 122 10
56361-198 155 10 184 144 12 197 138 11 200 144 11
56362-206 145 10 206 145 10 197 138 11 188 164 115
56363-195 195 195 198 198 198 174 174 174 14 14 14
56364- 2 2 6 22 22 22 116 116 116 116 116 116
56365- 22 22 22 2 2 6 74 74 74 70 70 70
56366- 30 30 30 10 10 10 0 0 0 0 0 0
56367- 0 0 0 0 0 0 0 0 0 0 0 0
56368- 0 0 0 0 0 0 0 0 0 0 0 0
56369- 0 0 0 0 0 0 0 0 0 0 0 0
56370- 0 0 0 0 0 0 0 0 0 0 0 0
56371- 0 0 0 0 0 0 0 0 0 0 0 0
56372- 0 0 0 0 0 0 0 0 0 0 0 0
56373- 0 0 0 0 0 0 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 6 6 6 18 18 18
56379- 50 50 50 101 101 101 26 26 26 10 10 10
56380-138 138 138 190 190 190 174 154 114 156 107 11
56381-197 138 11 200 144 11 197 138 11 192 133 9
56382-180 123 7 190 142 34 190 178 144 187 187 187
56383-202 202 202 221 221 221 214 214 214 66 66 66
56384- 2 2 6 2 2 6 50 50 50 62 62 62
56385- 6 6 6 2 2 6 10 10 10 90 90 90
56386- 50 50 50 18 18 18 6 6 6 0 0 0
56387- 0 0 0 0 0 0 0 0 0 0 0 0
56388- 0 0 0 0 0 0 0 0 0 0 0 0
56389- 0 0 0 0 0 0 0 0 0 0 0 0
56390- 0 0 0 0 0 0 0 0 0 0 0 0
56391- 0 0 0 0 0 0 0 0 0 0 0 0
56392- 0 0 0 0 0 0 0 0 0 0 0 0
56393- 0 0 0 0 0 0 0 0 0 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 10 10 10 34 34 34
56399- 74 74 74 74 74 74 2 2 6 6 6 6
56400-144 144 144 198 198 198 190 190 190 178 166 146
56401-154 121 60 156 107 11 156 107 11 168 124 44
56402-174 154 114 187 187 187 190 190 190 210 210 210
56403-246 246 246 253 253 253 253 253 253 182 182 182
56404- 6 6 6 2 2 6 2 2 6 2 2 6
56405- 2 2 6 2 2 6 2 2 6 62 62 62
56406- 74 74 74 34 34 34 14 14 14 0 0 0
56407- 0 0 0 0 0 0 0 0 0 0 0 0
56408- 0 0 0 0 0 0 0 0 0 0 0 0
56409- 0 0 0 0 0 0 0 0 0 0 0 0
56410- 0 0 0 0 0 0 0 0 0 0 0 0
56411- 0 0 0 0 0 0 0 0 0 0 0 0
56412- 0 0 0 0 0 0 0 0 0 0 0 0
56413- 0 0 0 0 0 0 0 0 0 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 10 10 10 22 22 22 54 54 54
56419- 94 94 94 18 18 18 2 2 6 46 46 46
56420-234 234 234 221 221 221 190 190 190 190 190 190
56421-190 190 190 187 187 187 187 187 187 190 190 190
56422-190 190 190 195 195 195 214 214 214 242 242 242
56423-253 253 253 253 253 253 253 253 253 253 253 253
56424- 82 82 82 2 2 6 2 2 6 2 2 6
56425- 2 2 6 2 2 6 2 2 6 14 14 14
56426- 86 86 86 54 54 54 22 22 22 6 6 6
56427- 0 0 0 0 0 0 0 0 0 0 0 0
56428- 0 0 0 0 0 0 0 0 0 0 0 0
56429- 0 0 0 0 0 0 0 0 0 0 0 0
56430- 0 0 0 0 0 0 0 0 0 0 0 0
56431- 0 0 0 0 0 0 0 0 0 0 0 0
56432- 0 0 0 0 0 0 0 0 0 0 0 0
56433- 0 0 0 0 0 0 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
56439- 46 46 46 18 18 18 6 6 6 182 182 182
56440-253 253 253 246 246 246 206 206 206 190 190 190
56441-190 190 190 190 190 190 190 190 190 190 190 190
56442-206 206 206 231 231 231 250 250 250 253 253 253
56443-253 253 253 253 253 253 253 253 253 253 253 253
56444-202 202 202 14 14 14 2 2 6 2 2 6
56445- 2 2 6 2 2 6 2 2 6 2 2 6
56446- 42 42 42 86 86 86 42 42 42 18 18 18
56447- 6 6 6 0 0 0 0 0 0 0 0 0
56448- 0 0 0 0 0 0 0 0 0 0 0 0
56449- 0 0 0 0 0 0 0 0 0 0 0 0
56450- 0 0 0 0 0 0 0 0 0 0 0 0
56451- 0 0 0 0 0 0 0 0 0 0 0 0
56452- 0 0 0 0 0 0 0 0 0 0 0 0
56453- 0 0 0 0 0 0 0 0 0 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 6 6 6
56458- 14 14 14 38 38 38 74 74 74 66 66 66
56459- 2 2 6 6 6 6 90 90 90 250 250 250
56460-253 253 253 253 253 253 238 238 238 198 198 198
56461-190 190 190 190 190 190 195 195 195 221 221 221
56462-246 246 246 253 253 253 253 253 253 253 253 253
56463-253 253 253 253 253 253 253 253 253 253 253 253
56464-253 253 253 82 82 82 2 2 6 2 2 6
56465- 2 2 6 2 2 6 2 2 6 2 2 6
56466- 2 2 6 78 78 78 70 70 70 34 34 34
56467- 14 14 14 6 6 6 0 0 0 0 0 0
56468- 0 0 0 0 0 0 0 0 0 0 0 0
56469- 0 0 0 0 0 0 0 0 0 0 0 0
56470- 0 0 0 0 0 0 0 0 0 0 0 0
56471- 0 0 0 0 0 0 0 0 0 0 0 0
56472- 0 0 0 0 0 0 0 0 0 0 0 0
56473- 0 0 0 0 0 0 0 0 0 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 14 14 14
56478- 34 34 34 66 66 66 78 78 78 6 6 6
56479- 2 2 6 18 18 18 218 218 218 253 253 253
56480-253 253 253 253 253 253 253 253 253 246 246 246
56481-226 226 226 231 231 231 246 246 246 253 253 253
56482-253 253 253 253 253 253 253 253 253 253 253 253
56483-253 253 253 253 253 253 253 253 253 253 253 253
56484-253 253 253 178 178 178 2 2 6 2 2 6
56485- 2 2 6 2 2 6 2 2 6 2 2 6
56486- 2 2 6 18 18 18 90 90 90 62 62 62
56487- 30 30 30 10 10 10 0 0 0 0 0 0
56488- 0 0 0 0 0 0 0 0 0 0 0 0
56489- 0 0 0 0 0 0 0 0 0 0 0 0
56490- 0 0 0 0 0 0 0 0 0 0 0 0
56491- 0 0 0 0 0 0 0 0 0 0 0 0
56492- 0 0 0 0 0 0 0 0 0 0 0 0
56493- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 26 26 26
56498- 58 58 58 90 90 90 18 18 18 2 2 6
56499- 2 2 6 110 110 110 253 253 253 253 253 253
56500-253 253 253 253 253 253 253 253 253 253 253 253
56501-250 250 250 253 253 253 253 253 253 253 253 253
56502-253 253 253 253 253 253 253 253 253 253 253 253
56503-253 253 253 253 253 253 253 253 253 253 253 253
56504-253 253 253 231 231 231 18 18 18 2 2 6
56505- 2 2 6 2 2 6 2 2 6 2 2 6
56506- 2 2 6 2 2 6 18 18 18 94 94 94
56507- 54 54 54 26 26 26 10 10 10 0 0 0
56508- 0 0 0 0 0 0 0 0 0 0 0 0
56509- 0 0 0 0 0 0 0 0 0 0 0 0
56510- 0 0 0 0 0 0 0 0 0 0 0 0
56511- 0 0 0 0 0 0 0 0 0 0 0 0
56512- 0 0 0 0 0 0 0 0 0 0 0 0
56513- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 22 22 22 50 50 50
56518- 90 90 90 26 26 26 2 2 6 2 2 6
56519- 14 14 14 195 195 195 250 250 250 253 253 253
56520-253 253 253 253 253 253 253 253 253 253 253 253
56521-253 253 253 253 253 253 253 253 253 253 253 253
56522-253 253 253 253 253 253 253 253 253 253 253 253
56523-253 253 253 253 253 253 253 253 253 253 253 253
56524-250 250 250 242 242 242 54 54 54 2 2 6
56525- 2 2 6 2 2 6 2 2 6 2 2 6
56526- 2 2 6 2 2 6 2 2 6 38 38 38
56527- 86 86 86 50 50 50 22 22 22 6 6 6
56528- 0 0 0 0 0 0 0 0 0 0 0 0
56529- 0 0 0 0 0 0 0 0 0 0 0 0
56530- 0 0 0 0 0 0 0 0 0 0 0 0
56531- 0 0 0 0 0 0 0 0 0 0 0 0
56532- 0 0 0 0 0 0 0 0 0 0 0 0
56533- 0 0 0 0 0 0 0 0 0 0 0 0
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- 6 6 6 14 14 14 38 38 38 82 82 82
56538- 34 34 34 2 2 6 2 2 6 2 2 6
56539- 42 42 42 195 195 195 246 246 246 253 253 253
56540-253 253 253 253 253 253 253 253 253 250 250 250
56541-242 242 242 242 242 242 250 250 250 253 253 253
56542-253 253 253 253 253 253 253 253 253 253 253 253
56543-253 253 253 250 250 250 246 246 246 238 238 238
56544-226 226 226 231 231 231 101 101 101 6 6 6
56545- 2 2 6 2 2 6 2 2 6 2 2 6
56546- 2 2 6 2 2 6 2 2 6 2 2 6
56547- 38 38 38 82 82 82 42 42 42 14 14 14
56548- 6 6 6 0 0 0 0 0 0 0 0 0
56549- 0 0 0 0 0 0 0 0 0 0 0 0
56550- 0 0 0 0 0 0 0 0 0 0 0 0
56551- 0 0 0 0 0 0 0 0 0 0 0 0
56552- 0 0 0 0 0 0 0 0 0 0 0 0
56553- 0 0 0 0 0 0 0 0 0 0 0 0
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- 10 10 10 26 26 26 62 62 62 66 66 66
56558- 2 2 6 2 2 6 2 2 6 6 6 6
56559- 70 70 70 170 170 170 206 206 206 234 234 234
56560-246 246 246 250 250 250 250 250 250 238 238 238
56561-226 226 226 231 231 231 238 238 238 250 250 250
56562-250 250 250 250 250 250 246 246 246 231 231 231
56563-214 214 214 206 206 206 202 202 202 202 202 202
56564-198 198 198 202 202 202 182 182 182 18 18 18
56565- 2 2 6 2 2 6 2 2 6 2 2 6
56566- 2 2 6 2 2 6 2 2 6 2 2 6
56567- 2 2 6 62 62 62 66 66 66 30 30 30
56568- 10 10 10 0 0 0 0 0 0 0 0 0
56569- 0 0 0 0 0 0 0 0 0 0 0 0
56570- 0 0 0 0 0 0 0 0 0 0 0 0
56571- 0 0 0 0 0 0 0 0 0 0 0 0
56572- 0 0 0 0 0 0 0 0 0 0 0 0
56573- 0 0 0 0 0 0 0 0 0 0 0 0
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- 14 14 14 42 42 42 82 82 82 18 18 18
56578- 2 2 6 2 2 6 2 2 6 10 10 10
56579- 94 94 94 182 182 182 218 218 218 242 242 242
56580-250 250 250 253 253 253 253 253 253 250 250 250
56581-234 234 234 253 253 253 253 253 253 253 253 253
56582-253 253 253 253 253 253 253 253 253 246 246 246
56583-238 238 238 226 226 226 210 210 210 202 202 202
56584-195 195 195 195 195 195 210 210 210 158 158 158
56585- 6 6 6 14 14 14 50 50 50 14 14 14
56586- 2 2 6 2 2 6 2 2 6 2 2 6
56587- 2 2 6 6 6 6 86 86 86 46 46 46
56588- 18 18 18 6 6 6 0 0 0 0 0 0
56589- 0 0 0 0 0 0 0 0 0 0 0 0
56590- 0 0 0 0 0 0 0 0 0 0 0 0
56591- 0 0 0 0 0 0 0 0 0 0 0 0
56592- 0 0 0 0 0 0 0 0 0 0 0 0
56593- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6
56597- 22 22 22 54 54 54 70 70 70 2 2 6
56598- 2 2 6 10 10 10 2 2 6 22 22 22
56599-166 166 166 231 231 231 250 250 250 253 253 253
56600-253 253 253 253 253 253 253 253 253 250 250 250
56601-242 242 242 253 253 253 253 253 253 253 253 253
56602-253 253 253 253 253 253 253 253 253 253 253 253
56603-253 253 253 253 253 253 253 253 253 246 246 246
56604-231 231 231 206 206 206 198 198 198 226 226 226
56605- 94 94 94 2 2 6 6 6 6 38 38 38
56606- 30 30 30 2 2 6 2 2 6 2 2 6
56607- 2 2 6 2 2 6 62 62 62 66 66 66
56608- 26 26 26 10 10 10 0 0 0 0 0 0
56609- 0 0 0 0 0 0 0 0 0 0 0 0
56610- 0 0 0 0 0 0 0 0 0 0 0 0
56611- 0 0 0 0 0 0 0 0 0 0 0 0
56612- 0 0 0 0 0 0 0 0 0 0 0 0
56613- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
56617- 30 30 30 74 74 74 50 50 50 2 2 6
56618- 26 26 26 26 26 26 2 2 6 106 106 106
56619-238 238 238 253 253 253 253 253 253 253 253 253
56620-253 253 253 253 253 253 253 253 253 253 253 253
56621-253 253 253 253 253 253 253 253 253 253 253 253
56622-253 253 253 253 253 253 253 253 253 253 253 253
56623-253 253 253 253 253 253 253 253 253 253 253 253
56624-253 253 253 246 246 246 218 218 218 202 202 202
56625-210 210 210 14 14 14 2 2 6 2 2 6
56626- 30 30 30 22 22 22 2 2 6 2 2 6
56627- 2 2 6 2 2 6 18 18 18 86 86 86
56628- 42 42 42 14 14 14 0 0 0 0 0 0
56629- 0 0 0 0 0 0 0 0 0 0 0 0
56630- 0 0 0 0 0 0 0 0 0 0 0 0
56631- 0 0 0 0 0 0 0 0 0 0 0 0
56632- 0 0 0 0 0 0 0 0 0 0 0 0
56633- 0 0 0 0 0 0 0 0 0 0 0 0
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 14 14 14
56637- 42 42 42 90 90 90 22 22 22 2 2 6
56638- 42 42 42 2 2 6 18 18 18 218 218 218
56639-253 253 253 253 253 253 253 253 253 253 253 253
56640-253 253 253 253 253 253 253 253 253 253 253 253
56641-253 253 253 253 253 253 253 253 253 253 253 253
56642-253 253 253 253 253 253 253 253 253 253 253 253
56643-253 253 253 253 253 253 253 253 253 253 253 253
56644-253 253 253 253 253 253 250 250 250 221 221 221
56645-218 218 218 101 101 101 2 2 6 14 14 14
56646- 18 18 18 38 38 38 10 10 10 2 2 6
56647- 2 2 6 2 2 6 2 2 6 78 78 78
56648- 58 58 58 22 22 22 6 6 6 0 0 0
56649- 0 0 0 0 0 0 0 0 0 0 0 0
56650- 0 0 0 0 0 0 0 0 0 0 0 0
56651- 0 0 0 0 0 0 0 0 0 0 0 0
56652- 0 0 0 0 0 0 0 0 0 0 0 0
56653- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 18 18 18
56657- 54 54 54 82 82 82 2 2 6 26 26 26
56658- 22 22 22 2 2 6 123 123 123 253 253 253
56659-253 253 253 253 253 253 253 253 253 253 253 253
56660-253 253 253 253 253 253 253 253 253 253 253 253
56661-253 253 253 253 253 253 253 253 253 253 253 253
56662-253 253 253 253 253 253 253 253 253 253 253 253
56663-253 253 253 253 253 253 253 253 253 253 253 253
56664-253 253 253 253 253 253 253 253 253 250 250 250
56665-238 238 238 198 198 198 6 6 6 38 38 38
56666- 58 58 58 26 26 26 38 38 38 2 2 6
56667- 2 2 6 2 2 6 2 2 6 46 46 46
56668- 78 78 78 30 30 30 10 10 10 0 0 0
56669- 0 0 0 0 0 0 0 0 0 0 0 0
56670- 0 0 0 0 0 0 0 0 0 0 0 0
56671- 0 0 0 0 0 0 0 0 0 0 0 0
56672- 0 0 0 0 0 0 0 0 0 0 0 0
56673- 0 0 0 0 0 0 0 0 0 0 0 0
56674- 0 0 0 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 10 10 10 30 30 30
56677- 74 74 74 58 58 58 2 2 6 42 42 42
56678- 2 2 6 22 22 22 231 231 231 253 253 253
56679-253 253 253 253 253 253 253 253 253 253 253 253
56680-253 253 253 253 253 253 253 253 253 250 250 250
56681-253 253 253 253 253 253 253 253 253 253 253 253
56682-253 253 253 253 253 253 253 253 253 253 253 253
56683-253 253 253 253 253 253 253 253 253 253 253 253
56684-253 253 253 253 253 253 253 253 253 253 253 253
56685-253 253 253 246 246 246 46 46 46 38 38 38
56686- 42 42 42 14 14 14 38 38 38 14 14 14
56687- 2 2 6 2 2 6 2 2 6 6 6 6
56688- 86 86 86 46 46 46 14 14 14 0 0 0
56689- 0 0 0 0 0 0 0 0 0 0 0 0
56690- 0 0 0 0 0 0 0 0 0 0 0 0
56691- 0 0 0 0 0 0 0 0 0 0 0 0
56692- 0 0 0 0 0 0 0 0 0 0 0 0
56693- 0 0 0 0 0 0 0 0 0 0 0 0
56694- 0 0 0 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 6 6 6 14 14 14 42 42 42
56697- 90 90 90 18 18 18 18 18 18 26 26 26
56698- 2 2 6 116 116 116 253 253 253 253 253 253
56699-253 253 253 253 253 253 253 253 253 253 253 253
56700-253 253 253 253 253 253 250 250 250 238 238 238
56701-253 253 253 253 253 253 253 253 253 253 253 253
56702-253 253 253 253 253 253 253 253 253 253 253 253
56703-253 253 253 253 253 253 253 253 253 253 253 253
56704-253 253 253 253 253 253 253 253 253 253 253 253
56705-253 253 253 253 253 253 94 94 94 6 6 6
56706- 2 2 6 2 2 6 10 10 10 34 34 34
56707- 2 2 6 2 2 6 2 2 6 2 2 6
56708- 74 74 74 58 58 58 22 22 22 6 6 6
56709- 0 0 0 0 0 0 0 0 0 0 0 0
56710- 0 0 0 0 0 0 0 0 0 0 0 0
56711- 0 0 0 0 0 0 0 0 0 0 0 0
56712- 0 0 0 0 0 0 0 0 0 0 0 0
56713- 0 0 0 0 0 0 0 0 0 0 0 0
56714- 0 0 0 0 0 0 0 0 0 0 0 0
56715- 0 0 0 0 0 0 0 0 0 0 0 0
56716- 0 0 0 10 10 10 26 26 26 66 66 66
56717- 82 82 82 2 2 6 38 38 38 6 6 6
56718- 14 14 14 210 210 210 253 253 253 253 253 253
56719-253 253 253 253 253 253 253 253 253 253 253 253
56720-253 253 253 253 253 253 246 246 246 242 242 242
56721-253 253 253 253 253 253 253 253 253 253 253 253
56722-253 253 253 253 253 253 253 253 253 253 253 253
56723-253 253 253 253 253 253 253 253 253 253 253 253
56724-253 253 253 253 253 253 253 253 253 253 253 253
56725-253 253 253 253 253 253 144 144 144 2 2 6
56726- 2 2 6 2 2 6 2 2 6 46 46 46
56727- 2 2 6 2 2 6 2 2 6 2 2 6
56728- 42 42 42 74 74 74 30 30 30 10 10 10
56729- 0 0 0 0 0 0 0 0 0 0 0 0
56730- 0 0 0 0 0 0 0 0 0 0 0 0
56731- 0 0 0 0 0 0 0 0 0 0 0 0
56732- 0 0 0 0 0 0 0 0 0 0 0 0
56733- 0 0 0 0 0 0 0 0 0 0 0 0
56734- 0 0 0 0 0 0 0 0 0 0 0 0
56735- 0 0 0 0 0 0 0 0 0 0 0 0
56736- 6 6 6 14 14 14 42 42 42 90 90 90
56737- 26 26 26 6 6 6 42 42 42 2 2 6
56738- 74 74 74 250 250 250 253 253 253 253 253 253
56739-253 253 253 253 253 253 253 253 253 253 253 253
56740-253 253 253 253 253 253 242 242 242 242 242 242
56741-253 253 253 253 253 253 253 253 253 253 253 253
56742-253 253 253 253 253 253 253 253 253 253 253 253
56743-253 253 253 253 253 253 253 253 253 253 253 253
56744-253 253 253 253 253 253 253 253 253 253 253 253
56745-253 253 253 253 253 253 182 182 182 2 2 6
56746- 2 2 6 2 2 6 2 2 6 46 46 46
56747- 2 2 6 2 2 6 2 2 6 2 2 6
56748- 10 10 10 86 86 86 38 38 38 10 10 10
56749- 0 0 0 0 0 0 0 0 0 0 0 0
56750- 0 0 0 0 0 0 0 0 0 0 0 0
56751- 0 0 0 0 0 0 0 0 0 0 0 0
56752- 0 0 0 0 0 0 0 0 0 0 0 0
56753- 0 0 0 0 0 0 0 0 0 0 0 0
56754- 0 0 0 0 0 0 0 0 0 0 0 0
56755- 0 0 0 0 0 0 0 0 0 0 0 0
56756- 10 10 10 26 26 26 66 66 66 82 82 82
56757- 2 2 6 22 22 22 18 18 18 2 2 6
56758-149 149 149 253 253 253 253 253 253 253 253 253
56759-253 253 253 253 253 253 253 253 253 253 253 253
56760-253 253 253 253 253 253 234 234 234 242 242 242
56761-253 253 253 253 253 253 253 253 253 253 253 253
56762-253 253 253 253 253 253 253 253 253 253 253 253
56763-253 253 253 253 253 253 253 253 253 253 253 253
56764-253 253 253 253 253 253 253 253 253 253 253 253
56765-253 253 253 253 253 253 206 206 206 2 2 6
56766- 2 2 6 2 2 6 2 2 6 38 38 38
56767- 2 2 6 2 2 6 2 2 6 2 2 6
56768- 6 6 6 86 86 86 46 46 46 14 14 14
56769- 0 0 0 0 0 0 0 0 0 0 0 0
56770- 0 0 0 0 0 0 0 0 0 0 0 0
56771- 0 0 0 0 0 0 0 0 0 0 0 0
56772- 0 0 0 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 0 0 0 0 0 0 0 0 0
56775- 0 0 0 0 0 0 0 0 0 6 6 6
56776- 18 18 18 46 46 46 86 86 86 18 18 18
56777- 2 2 6 34 34 34 10 10 10 6 6 6
56778-210 210 210 253 253 253 253 253 253 253 253 253
56779-253 253 253 253 253 253 253 253 253 253 253 253
56780-253 253 253 253 253 253 234 234 234 242 242 242
56781-253 253 253 253 253 253 253 253 253 253 253 253
56782-253 253 253 253 253 253 253 253 253 253 253 253
56783-253 253 253 253 253 253 253 253 253 253 253 253
56784-253 253 253 253 253 253 253 253 253 253 253 253
56785-253 253 253 253 253 253 221 221 221 6 6 6
56786- 2 2 6 2 2 6 6 6 6 30 30 30
56787- 2 2 6 2 2 6 2 2 6 2 2 6
56788- 2 2 6 82 82 82 54 54 54 18 18 18
56789- 6 6 6 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 0 0 0 0 0 0 0 0 0 10 10 10
56796- 26 26 26 66 66 66 62 62 62 2 2 6
56797- 2 2 6 38 38 38 10 10 10 26 26 26
56798-238 238 238 253 253 253 253 253 253 253 253 253
56799-253 253 253 253 253 253 253 253 253 253 253 253
56800-253 253 253 253 253 253 231 231 231 238 238 238
56801-253 253 253 253 253 253 253 253 253 253 253 253
56802-253 253 253 253 253 253 253 253 253 253 253 253
56803-253 253 253 253 253 253 253 253 253 253 253 253
56804-253 253 253 253 253 253 253 253 253 253 253 253
56805-253 253 253 253 253 253 231 231 231 6 6 6
56806- 2 2 6 2 2 6 10 10 10 30 30 30
56807- 2 2 6 2 2 6 2 2 6 2 2 6
56808- 2 2 6 66 66 66 58 58 58 22 22 22
56809- 6 6 6 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 0 0 0 0 0 0 0 0 0
56814- 0 0 0 0 0 0 0 0 0 0 0 0
56815- 0 0 0 0 0 0 0 0 0 10 10 10
56816- 38 38 38 78 78 78 6 6 6 2 2 6
56817- 2 2 6 46 46 46 14 14 14 42 42 42
56818-246 246 246 253 253 253 253 253 253 253 253 253
56819-253 253 253 253 253 253 253 253 253 253 253 253
56820-253 253 253 253 253 253 231 231 231 242 242 242
56821-253 253 253 253 253 253 253 253 253 253 253 253
56822-253 253 253 253 253 253 253 253 253 253 253 253
56823-253 253 253 253 253 253 253 253 253 253 253 253
56824-253 253 253 253 253 253 253 253 253 253 253 253
56825-253 253 253 253 253 253 234 234 234 10 10 10
56826- 2 2 6 2 2 6 22 22 22 14 14 14
56827- 2 2 6 2 2 6 2 2 6 2 2 6
56828- 2 2 6 66 66 66 62 62 62 22 22 22
56829- 6 6 6 0 0 0 0 0 0 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 6 6 6 18 18 18
56836- 50 50 50 74 74 74 2 2 6 2 2 6
56837- 14 14 14 70 70 70 34 34 34 62 62 62
56838-250 250 250 253 253 253 253 253 253 253 253 253
56839-253 253 253 253 253 253 253 253 253 253 253 253
56840-253 253 253 253 253 253 231 231 231 246 246 246
56841-253 253 253 253 253 253 253 253 253 253 253 253
56842-253 253 253 253 253 253 253 253 253 253 253 253
56843-253 253 253 253 253 253 253 253 253 253 253 253
56844-253 253 253 253 253 253 253 253 253 253 253 253
56845-253 253 253 253 253 253 234 234 234 14 14 14
56846- 2 2 6 2 2 6 30 30 30 2 2 6
56847- 2 2 6 2 2 6 2 2 6 2 2 6
56848- 2 2 6 66 66 66 62 62 62 22 22 22
56849- 6 6 6 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 0 6 6 6 18 18 18
56856- 54 54 54 62 62 62 2 2 6 2 2 6
56857- 2 2 6 30 30 30 46 46 46 70 70 70
56858-250 250 250 253 253 253 253 253 253 253 253 253
56859-253 253 253 253 253 253 253 253 253 253 253 253
56860-253 253 253 253 253 253 231 231 231 246 246 246
56861-253 253 253 253 253 253 253 253 253 253 253 253
56862-253 253 253 253 253 253 253 253 253 253 253 253
56863-253 253 253 253 253 253 253 253 253 253 253 253
56864-253 253 253 253 253 253 253 253 253 253 253 253
56865-253 253 253 253 253 253 226 226 226 10 10 10
56866- 2 2 6 6 6 6 30 30 30 2 2 6
56867- 2 2 6 2 2 6 2 2 6 2 2 6
56868- 2 2 6 66 66 66 58 58 58 22 22 22
56869- 6 6 6 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 0 0 0 0 0 0 0 0 0
56875- 0 0 0 0 0 0 6 6 6 22 22 22
56876- 58 58 58 62 62 62 2 2 6 2 2 6
56877- 2 2 6 2 2 6 30 30 30 78 78 78
56878-250 250 250 253 253 253 253 253 253 253 253 253
56879-253 253 253 253 253 253 253 253 253 253 253 253
56880-253 253 253 253 253 253 231 231 231 246 246 246
56881-253 253 253 253 253 253 253 253 253 253 253 253
56882-253 253 253 253 253 253 253 253 253 253 253 253
56883-253 253 253 253 253 253 253 253 253 253 253 253
56884-253 253 253 253 253 253 253 253 253 253 253 253
56885-253 253 253 253 253 253 206 206 206 2 2 6
56886- 22 22 22 34 34 34 18 14 6 22 22 22
56887- 26 26 26 18 18 18 6 6 6 2 2 6
56888- 2 2 6 82 82 82 54 54 54 18 18 18
56889- 6 6 6 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 0 0 0 0 0 0 0 0 0 0 0 0
56895- 0 0 0 0 0 0 6 6 6 26 26 26
56896- 62 62 62 106 106 106 74 54 14 185 133 11
56897-210 162 10 121 92 8 6 6 6 62 62 62
56898-238 238 238 253 253 253 253 253 253 253 253 253
56899-253 253 253 253 253 253 253 253 253 253 253 253
56900-253 253 253 253 253 253 231 231 231 246 246 246
56901-253 253 253 253 253 253 253 253 253 253 253 253
56902-253 253 253 253 253 253 253 253 253 253 253 253
56903-253 253 253 253 253 253 253 253 253 253 253 253
56904-253 253 253 253 253 253 253 253 253 253 253 253
56905-253 253 253 253 253 253 158 158 158 18 18 18
56906- 14 14 14 2 2 6 2 2 6 2 2 6
56907- 6 6 6 18 18 18 66 66 66 38 38 38
56908- 6 6 6 94 94 94 50 50 50 18 18 18
56909- 6 6 6 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 6 6 6
56915- 10 10 10 10 10 10 18 18 18 38 38 38
56916- 78 78 78 142 134 106 216 158 10 242 186 14
56917-246 190 14 246 190 14 156 118 10 10 10 10
56918- 90 90 90 238 238 238 253 253 253 253 253 253
56919-253 253 253 253 253 253 253 253 253 253 253 253
56920-253 253 253 253 253 253 231 231 231 250 250 250
56921-253 253 253 253 253 253 253 253 253 253 253 253
56922-253 253 253 253 253 253 253 253 253 253 253 253
56923-253 253 253 253 253 253 253 253 253 253 253 253
56924-253 253 253 253 253 253 253 253 253 246 230 190
56925-238 204 91 238 204 91 181 142 44 37 26 9
56926- 2 2 6 2 2 6 2 2 6 2 2 6
56927- 2 2 6 2 2 6 38 38 38 46 46 46
56928- 26 26 26 106 106 106 54 54 54 18 18 18
56929- 6 6 6 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 6 6 6 14 14 14 22 22 22
56935- 30 30 30 38 38 38 50 50 50 70 70 70
56936-106 106 106 190 142 34 226 170 11 242 186 14
56937-246 190 14 246 190 14 246 190 14 154 114 10
56938- 6 6 6 74 74 74 226 226 226 253 253 253
56939-253 253 253 253 253 253 253 253 253 253 253 253
56940-253 253 253 253 253 253 231 231 231 250 250 250
56941-253 253 253 253 253 253 253 253 253 253 253 253
56942-253 253 253 253 253 253 253 253 253 253 253 253
56943-253 253 253 253 253 253 253 253 253 253 253 253
56944-253 253 253 253 253 253 253 253 253 228 184 62
56945-241 196 14 241 208 19 232 195 16 38 30 10
56946- 2 2 6 2 2 6 2 2 6 2 2 6
56947- 2 2 6 6 6 6 30 30 30 26 26 26
56948-203 166 17 154 142 90 66 66 66 26 26 26
56949- 6 6 6 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 6 6 6 18 18 18 38 38 38 58 58 58
56955- 78 78 78 86 86 86 101 101 101 123 123 123
56956-175 146 61 210 150 10 234 174 13 246 186 14
56957-246 190 14 246 190 14 246 190 14 238 190 10
56958-102 78 10 2 2 6 46 46 46 198 198 198
56959-253 253 253 253 253 253 253 253 253 253 253 253
56960-253 253 253 253 253 253 234 234 234 242 242 242
56961-253 253 253 253 253 253 253 253 253 253 253 253
56962-253 253 253 253 253 253 253 253 253 253 253 253
56963-253 253 253 253 253 253 253 253 253 253 253 253
56964-253 253 253 253 253 253 253 253 253 224 178 62
56965-242 186 14 241 196 14 210 166 10 22 18 6
56966- 2 2 6 2 2 6 2 2 6 2 2 6
56967- 2 2 6 2 2 6 6 6 6 121 92 8
56968-238 202 15 232 195 16 82 82 82 34 34 34
56969- 10 10 10 0 0 0 0 0 0 0 0 0
56970- 0 0 0 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 14 14 14 38 38 38 70 70 70 154 122 46
56975-190 142 34 200 144 11 197 138 11 197 138 11
56976-213 154 11 226 170 11 242 186 14 246 190 14
56977-246 190 14 246 190 14 246 190 14 246 190 14
56978-225 175 15 46 32 6 2 2 6 22 22 22
56979-158 158 158 250 250 250 253 253 253 253 253 253
56980-253 253 253 253 253 253 253 253 253 253 253 253
56981-253 253 253 253 253 253 253 253 253 253 253 253
56982-253 253 253 253 253 253 253 253 253 253 253 253
56983-253 253 253 253 253 253 253 253 253 253 253 253
56984-253 253 253 250 250 250 242 242 242 224 178 62
56985-239 182 13 236 186 11 213 154 11 46 32 6
56986- 2 2 6 2 2 6 2 2 6 2 2 6
56987- 2 2 6 2 2 6 61 42 6 225 175 15
56988-238 190 10 236 186 11 112 100 78 42 42 42
56989- 14 14 14 0 0 0 0 0 0 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 6 6 6
56994- 22 22 22 54 54 54 154 122 46 213 154 11
56995-226 170 11 230 174 11 226 170 11 226 170 11
56996-236 178 12 242 186 14 246 190 14 246 190 14
56997-246 190 14 246 190 14 246 190 14 246 190 14
56998-241 196 14 184 144 12 10 10 10 2 2 6
56999- 6 6 6 116 116 116 242 242 242 253 253 253
57000-253 253 253 253 253 253 253 253 253 253 253 253
57001-253 253 253 253 253 253 253 253 253 253 253 253
57002-253 253 253 253 253 253 253 253 253 253 253 253
57003-253 253 253 253 253 253 253 253 253 253 253 253
57004-253 253 253 231 231 231 198 198 198 214 170 54
57005-236 178 12 236 178 12 210 150 10 137 92 6
57006- 18 14 6 2 2 6 2 2 6 2 2 6
57007- 6 6 6 70 47 6 200 144 11 236 178 12
57008-239 182 13 239 182 13 124 112 88 58 58 58
57009- 22 22 22 6 6 6 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 10 10 10
57014- 30 30 30 70 70 70 180 133 36 226 170 11
57015-239 182 13 242 186 14 242 186 14 246 186 14
57016-246 190 14 246 190 14 246 190 14 246 190 14
57017-246 190 14 246 190 14 246 190 14 246 190 14
57018-246 190 14 232 195 16 98 70 6 2 2 6
57019- 2 2 6 2 2 6 66 66 66 221 221 221
57020-253 253 253 253 253 253 253 253 253 253 253 253
57021-253 253 253 253 253 253 253 253 253 253 253 253
57022-253 253 253 253 253 253 253 253 253 253 253 253
57023-253 253 253 253 253 253 253 253 253 253 253 253
57024-253 253 253 206 206 206 198 198 198 214 166 58
57025-230 174 11 230 174 11 216 158 10 192 133 9
57026-163 110 8 116 81 8 102 78 10 116 81 8
57027-167 114 7 197 138 11 226 170 11 239 182 13
57028-242 186 14 242 186 14 162 146 94 78 78 78
57029- 34 34 34 14 14 14 6 6 6 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 6 6 6
57034- 30 30 30 78 78 78 190 142 34 226 170 11
57035-239 182 13 246 190 14 246 190 14 246 190 14
57036-246 190 14 246 190 14 246 190 14 246 190 14
57037-246 190 14 246 190 14 246 190 14 246 190 14
57038-246 190 14 241 196 14 203 166 17 22 18 6
57039- 2 2 6 2 2 6 2 2 6 38 38 38
57040-218 218 218 253 253 253 253 253 253 253 253 253
57041-253 253 253 253 253 253 253 253 253 253 253 253
57042-253 253 253 253 253 253 253 253 253 253 253 253
57043-253 253 253 253 253 253 253 253 253 253 253 253
57044-250 250 250 206 206 206 198 198 198 202 162 69
57045-226 170 11 236 178 12 224 166 10 210 150 10
57046-200 144 11 197 138 11 192 133 9 197 138 11
57047-210 150 10 226 170 11 242 186 14 246 190 14
57048-246 190 14 246 186 14 225 175 15 124 112 88
57049- 62 62 62 30 30 30 14 14 14 6 6 6
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 10 10 10
57054- 30 30 30 78 78 78 174 135 50 224 166 10
57055-239 182 13 246 190 14 246 190 14 246 190 14
57056-246 190 14 246 190 14 246 190 14 246 190 14
57057-246 190 14 246 190 14 246 190 14 246 190 14
57058-246 190 14 246 190 14 241 196 14 139 102 15
57059- 2 2 6 2 2 6 2 2 6 2 2 6
57060- 78 78 78 250 250 250 253 253 253 253 253 253
57061-253 253 253 253 253 253 253 253 253 253 253 253
57062-253 253 253 253 253 253 253 253 253 253 253 253
57063-253 253 253 253 253 253 253 253 253 253 253 253
57064-250 250 250 214 214 214 198 198 198 190 150 46
57065-219 162 10 236 178 12 234 174 13 224 166 10
57066-216 158 10 213 154 11 213 154 11 216 158 10
57067-226 170 11 239 182 13 246 190 14 246 190 14
57068-246 190 14 246 190 14 242 186 14 206 162 42
57069-101 101 101 58 58 58 30 30 30 14 14 14
57070- 6 6 6 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 10 10 10
57074- 30 30 30 74 74 74 174 135 50 216 158 10
57075-236 178 12 246 190 14 246 190 14 246 190 14
57076-246 190 14 246 190 14 246 190 14 246 190 14
57077-246 190 14 246 190 14 246 190 14 246 190 14
57078-246 190 14 246 190 14 241 196 14 226 184 13
57079- 61 42 6 2 2 6 2 2 6 2 2 6
57080- 22 22 22 238 238 238 253 253 253 253 253 253
57081-253 253 253 253 253 253 253 253 253 253 253 253
57082-253 253 253 253 253 253 253 253 253 253 253 253
57083-253 253 253 253 253 253 253 253 253 253 253 253
57084-253 253 253 226 226 226 187 187 187 180 133 36
57085-216 158 10 236 178 12 239 182 13 236 178 12
57086-230 174 11 226 170 11 226 170 11 230 174 11
57087-236 178 12 242 186 14 246 190 14 246 190 14
57088-246 190 14 246 190 14 246 186 14 239 182 13
57089-206 162 42 106 106 106 66 66 66 34 34 34
57090- 14 14 14 6 6 6 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 6 6 6
57094- 26 26 26 70 70 70 163 133 67 213 154 11
57095-236 178 12 246 190 14 246 190 14 246 190 14
57096-246 190 14 246 190 14 246 190 14 246 190 14
57097-246 190 14 246 190 14 246 190 14 246 190 14
57098-246 190 14 246 190 14 246 190 14 241 196 14
57099-190 146 13 18 14 6 2 2 6 2 2 6
57100- 46 46 46 246 246 246 253 253 253 253 253 253
57101-253 253 253 253 253 253 253 253 253 253 253 253
57102-253 253 253 253 253 253 253 253 253 253 253 253
57103-253 253 253 253 253 253 253 253 253 253 253 253
57104-253 253 253 221 221 221 86 86 86 156 107 11
57105-216 158 10 236 178 12 242 186 14 246 186 14
57106-242 186 14 239 182 13 239 182 13 242 186 14
57107-242 186 14 246 186 14 246 190 14 246 190 14
57108-246 190 14 246 190 14 246 190 14 246 190 14
57109-242 186 14 225 175 15 142 122 72 66 66 66
57110- 30 30 30 10 10 10 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 6 6 6
57114- 26 26 26 70 70 70 163 133 67 210 150 10
57115-236 178 12 246 190 14 246 190 14 246 190 14
57116-246 190 14 246 190 14 246 190 14 246 190 14
57117-246 190 14 246 190 14 246 190 14 246 190 14
57118-246 190 14 246 190 14 246 190 14 246 190 14
57119-232 195 16 121 92 8 34 34 34 106 106 106
57120-221 221 221 253 253 253 253 253 253 253 253 253
57121-253 253 253 253 253 253 253 253 253 253 253 253
57122-253 253 253 253 253 253 253 253 253 253 253 253
57123-253 253 253 253 253 253 253 253 253 253 253 253
57124-242 242 242 82 82 82 18 14 6 163 110 8
57125-216 158 10 236 178 12 242 186 14 246 190 14
57126-246 190 14 246 190 14 246 190 14 246 190 14
57127-246 190 14 246 190 14 246 190 14 246 190 14
57128-246 190 14 246 190 14 246 190 14 246 190 14
57129-246 190 14 246 190 14 242 186 14 163 133 67
57130- 46 46 46 18 18 18 6 6 6 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 10 10 10
57134- 30 30 30 78 78 78 163 133 67 210 150 10
57135-236 178 12 246 186 14 246 190 14 246 190 14
57136-246 190 14 246 190 14 246 190 14 246 190 14
57137-246 190 14 246 190 14 246 190 14 246 190 14
57138-246 190 14 246 190 14 246 190 14 246 190 14
57139-241 196 14 215 174 15 190 178 144 253 253 253
57140-253 253 253 253 253 253 253 253 253 253 253 253
57141-253 253 253 253 253 253 253 253 253 253 253 253
57142-253 253 253 253 253 253 253 253 253 253 253 253
57143-253 253 253 253 253 253 253 253 253 218 218 218
57144- 58 58 58 2 2 6 22 18 6 167 114 7
57145-216 158 10 236 178 12 246 186 14 246 190 14
57146-246 190 14 246 190 14 246 190 14 246 190 14
57147-246 190 14 246 190 14 246 190 14 246 190 14
57148-246 190 14 246 190 14 246 190 14 246 190 14
57149-246 190 14 246 186 14 242 186 14 190 150 46
57150- 54 54 54 22 22 22 6 6 6 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 14 14 14
57154- 38 38 38 86 86 86 180 133 36 213 154 11
57155-236 178 12 246 186 14 246 190 14 246 190 14
57156-246 190 14 246 190 14 246 190 14 246 190 14
57157-246 190 14 246 190 14 246 190 14 246 190 14
57158-246 190 14 246 190 14 246 190 14 246 190 14
57159-246 190 14 232 195 16 190 146 13 214 214 214
57160-253 253 253 253 253 253 253 253 253 253 253 253
57161-253 253 253 253 253 253 253 253 253 253 253 253
57162-253 253 253 253 253 253 253 253 253 253 253 253
57163-253 253 253 250 250 250 170 170 170 26 26 26
57164- 2 2 6 2 2 6 37 26 9 163 110 8
57165-219 162 10 239 182 13 246 186 14 246 190 14
57166-246 190 14 246 190 14 246 190 14 246 190 14
57167-246 190 14 246 190 14 246 190 14 246 190 14
57168-246 190 14 246 190 14 246 190 14 246 190 14
57169-246 186 14 236 178 12 224 166 10 142 122 72
57170- 46 46 46 18 18 18 6 6 6 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 6 6 6 18 18 18
57174- 50 50 50 109 106 95 192 133 9 224 166 10
57175-242 186 14 246 190 14 246 190 14 246 190 14
57176-246 190 14 246 190 14 246 190 14 246 190 14
57177-246 190 14 246 190 14 246 190 14 246 190 14
57178-246 190 14 246 190 14 246 190 14 246 190 14
57179-242 186 14 226 184 13 210 162 10 142 110 46
57180-226 226 226 253 253 253 253 253 253 253 253 253
57181-253 253 253 253 253 253 253 253 253 253 253 253
57182-253 253 253 253 253 253 253 253 253 253 253 253
57183-198 198 198 66 66 66 2 2 6 2 2 6
57184- 2 2 6 2 2 6 50 34 6 156 107 11
57185-219 162 10 239 182 13 246 186 14 246 190 14
57186-246 190 14 246 190 14 246 190 14 246 190 14
57187-246 190 14 246 190 14 246 190 14 246 190 14
57188-246 190 14 246 190 14 246 190 14 242 186 14
57189-234 174 13 213 154 11 154 122 46 66 66 66
57190- 30 30 30 10 10 10 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 6 6 6 22 22 22
57194- 58 58 58 154 121 60 206 145 10 234 174 13
57195-242 186 14 246 186 14 246 190 14 246 190 14
57196-246 190 14 246 190 14 246 190 14 246 190 14
57197-246 190 14 246 190 14 246 190 14 246 190 14
57198-246 190 14 246 190 14 246 190 14 246 190 14
57199-246 186 14 236 178 12 210 162 10 163 110 8
57200- 61 42 6 138 138 138 218 218 218 250 250 250
57201-253 253 253 253 253 253 253 253 253 250 250 250
57202-242 242 242 210 210 210 144 144 144 66 66 66
57203- 6 6 6 2 2 6 2 2 6 2 2 6
57204- 2 2 6 2 2 6 61 42 6 163 110 8
57205-216 158 10 236 178 12 246 190 14 246 190 14
57206-246 190 14 246 190 14 246 190 14 246 190 14
57207-246 190 14 246 190 14 246 190 14 246 190 14
57208-246 190 14 239 182 13 230 174 11 216 158 10
57209-190 142 34 124 112 88 70 70 70 38 38 38
57210- 18 18 18 6 6 6 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 6 6 6 22 22 22
57214- 62 62 62 168 124 44 206 145 10 224 166 10
57215-236 178 12 239 182 13 242 186 14 242 186 14
57216-246 186 14 246 190 14 246 190 14 246 190 14
57217-246 190 14 246 190 14 246 190 14 246 190 14
57218-246 190 14 246 190 14 246 190 14 246 190 14
57219-246 190 14 236 178 12 216 158 10 175 118 6
57220- 80 54 7 2 2 6 6 6 6 30 30 30
57221- 54 54 54 62 62 62 50 50 50 38 38 38
57222- 14 14 14 2 2 6 2 2 6 2 2 6
57223- 2 2 6 2 2 6 2 2 6 2 2 6
57224- 2 2 6 6 6 6 80 54 7 167 114 7
57225-213 154 11 236 178 12 246 190 14 246 190 14
57226-246 190 14 246 190 14 246 190 14 246 190 14
57227-246 190 14 242 186 14 239 182 13 239 182 13
57228-230 174 11 210 150 10 174 135 50 124 112 88
57229- 82 82 82 54 54 54 34 34 34 18 18 18
57230- 6 6 6 0 0 0 0 0 0 0 0 0
57231- 0 0 0 0 0 0 0 0 0 0 0 0
57232- 0 0 0 0 0 0 0 0 0 0 0 0
57233- 0 0 0 0 0 0 6 6 6 18 18 18
57234- 50 50 50 158 118 36 192 133 9 200 144 11
57235-216 158 10 219 162 10 224 166 10 226 170 11
57236-230 174 11 236 178 12 239 182 13 239 182 13
57237-242 186 14 246 186 14 246 190 14 246 190 14
57238-246 190 14 246 190 14 246 190 14 246 190 14
57239-246 186 14 230 174 11 210 150 10 163 110 8
57240-104 69 6 10 10 10 2 2 6 2 2 6
57241- 2 2 6 2 2 6 2 2 6 2 2 6
57242- 2 2 6 2 2 6 2 2 6 2 2 6
57243- 2 2 6 2 2 6 2 2 6 2 2 6
57244- 2 2 6 6 6 6 91 60 6 167 114 7
57245-206 145 10 230 174 11 242 186 14 246 190 14
57246-246 190 14 246 190 14 246 186 14 242 186 14
57247-239 182 13 230 174 11 224 166 10 213 154 11
57248-180 133 36 124 112 88 86 86 86 58 58 58
57249- 38 38 38 22 22 22 10 10 10 6 6 6
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 14 14 14
57254- 34 34 34 70 70 70 138 110 50 158 118 36
57255-167 114 7 180 123 7 192 133 9 197 138 11
57256-200 144 11 206 145 10 213 154 11 219 162 10
57257-224 166 10 230 174 11 239 182 13 242 186 14
57258-246 186 14 246 186 14 246 186 14 246 186 14
57259-239 182 13 216 158 10 185 133 11 152 99 6
57260-104 69 6 18 14 6 2 2 6 2 2 6
57261- 2 2 6 2 2 6 2 2 6 2 2 6
57262- 2 2 6 2 2 6 2 2 6 2 2 6
57263- 2 2 6 2 2 6 2 2 6 2 2 6
57264- 2 2 6 6 6 6 80 54 7 152 99 6
57265-192 133 9 219 162 10 236 178 12 239 182 13
57266-246 186 14 242 186 14 239 182 13 236 178 12
57267-224 166 10 206 145 10 192 133 9 154 121 60
57268- 94 94 94 62 62 62 42 42 42 22 22 22
57269- 14 14 14 6 6 6 0 0 0 0 0 0
57270- 0 0 0 0 0 0 0 0 0 0 0 0
57271- 0 0 0 0 0 0 0 0 0 0 0 0
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 6 6 6
57274- 18 18 18 34 34 34 58 58 58 78 78 78
57275-101 98 89 124 112 88 142 110 46 156 107 11
57276-163 110 8 167 114 7 175 118 6 180 123 7
57277-185 133 11 197 138 11 210 150 10 219 162 10
57278-226 170 11 236 178 12 236 178 12 234 174 13
57279-219 162 10 197 138 11 163 110 8 130 83 6
57280- 91 60 6 10 10 10 2 2 6 2 2 6
57281- 18 18 18 38 38 38 38 38 38 38 38 38
57282- 38 38 38 38 38 38 38 38 38 38 38 38
57283- 38 38 38 38 38 38 26 26 26 2 2 6
57284- 2 2 6 6 6 6 70 47 6 137 92 6
57285-175 118 6 200 144 11 219 162 10 230 174 11
57286-234 174 13 230 174 11 219 162 10 210 150 10
57287-192 133 9 163 110 8 124 112 88 82 82 82
57288- 50 50 50 30 30 30 14 14 14 6 6 6
57289- 0 0 0 0 0 0 0 0 0 0 0 0
57290- 0 0 0 0 0 0 0 0 0 0 0 0
57291- 0 0 0 0 0 0 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 0 0 0
57294- 6 6 6 14 14 14 22 22 22 34 34 34
57295- 42 42 42 58 58 58 74 74 74 86 86 86
57296-101 98 89 122 102 70 130 98 46 121 87 25
57297-137 92 6 152 99 6 163 110 8 180 123 7
57298-185 133 11 197 138 11 206 145 10 200 144 11
57299-180 123 7 156 107 11 130 83 6 104 69 6
57300- 50 34 6 54 54 54 110 110 110 101 98 89
57301- 86 86 86 82 82 82 78 78 78 78 78 78
57302- 78 78 78 78 78 78 78 78 78 78 78 78
57303- 78 78 78 82 82 82 86 86 86 94 94 94
57304-106 106 106 101 101 101 86 66 34 124 80 6
57305-156 107 11 180 123 7 192 133 9 200 144 11
57306-206 145 10 200 144 11 192 133 9 175 118 6
57307-139 102 15 109 106 95 70 70 70 42 42 42
57308- 22 22 22 10 10 10 0 0 0 0 0 0
57309- 0 0 0 0 0 0 0 0 0 0 0 0
57310- 0 0 0 0 0 0 0 0 0 0 0 0
57311- 0 0 0 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 0 0 0
57314- 0 0 0 0 0 0 6 6 6 10 10 10
57315- 14 14 14 22 22 22 30 30 30 38 38 38
57316- 50 50 50 62 62 62 74 74 74 90 90 90
57317-101 98 89 112 100 78 121 87 25 124 80 6
57318-137 92 6 152 99 6 152 99 6 152 99 6
57319-138 86 6 124 80 6 98 70 6 86 66 30
57320-101 98 89 82 82 82 58 58 58 46 46 46
57321- 38 38 38 34 34 34 34 34 34 34 34 34
57322- 34 34 34 34 34 34 34 34 34 34 34 34
57323- 34 34 34 34 34 34 38 38 38 42 42 42
57324- 54 54 54 82 82 82 94 86 76 91 60 6
57325-134 86 6 156 107 11 167 114 7 175 118 6
57326-175 118 6 167 114 7 152 99 6 121 87 25
57327-101 98 89 62 62 62 34 34 34 18 18 18
57328- 6 6 6 0 0 0 0 0 0 0 0 0
57329- 0 0 0 0 0 0 0 0 0 0 0 0
57330- 0 0 0 0 0 0 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 6 6 6 6 6 6 10 10 10
57336- 18 18 18 22 22 22 30 30 30 42 42 42
57337- 50 50 50 66 66 66 86 86 86 101 98 89
57338-106 86 58 98 70 6 104 69 6 104 69 6
57339-104 69 6 91 60 6 82 62 34 90 90 90
57340- 62 62 62 38 38 38 22 22 22 14 14 14
57341- 10 10 10 10 10 10 10 10 10 10 10 10
57342- 10 10 10 10 10 10 6 6 6 10 10 10
57343- 10 10 10 10 10 10 10 10 10 14 14 14
57344- 22 22 22 42 42 42 70 70 70 89 81 66
57345- 80 54 7 104 69 6 124 80 6 137 92 6
57346-134 86 6 116 81 8 100 82 52 86 86 86
57347- 58 58 58 30 30 30 14 14 14 6 6 6
57348- 0 0 0 0 0 0 0 0 0 0 0 0
57349- 0 0 0 0 0 0 0 0 0 0 0 0
57350- 0 0 0 0 0 0 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 0 0 0 0 0 0
57354- 0 0 0 0 0 0 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 0 0 0
57356- 0 0 0 6 6 6 10 10 10 14 14 14
57357- 18 18 18 26 26 26 38 38 38 54 54 54
57358- 70 70 70 86 86 86 94 86 76 89 81 66
57359- 89 81 66 86 86 86 74 74 74 50 50 50
57360- 30 30 30 14 14 14 6 6 6 0 0 0
57361- 0 0 0 0 0 0 0 0 0 0 0 0
57362- 0 0 0 0 0 0 0 0 0 0 0 0
57363- 0 0 0 0 0 0 0 0 0 0 0 0
57364- 6 6 6 18 18 18 34 34 34 58 58 58
57365- 82 82 82 89 81 66 89 81 66 89 81 66
57366- 94 86 66 94 86 76 74 74 74 50 50 50
57367- 26 26 26 14 14 14 6 6 6 0 0 0
57368- 0 0 0 0 0 0 0 0 0 0 0 0
57369- 0 0 0 0 0 0 0 0 0 0 0 0
57370- 0 0 0 0 0 0 0 0 0 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 0 0 0 0 0 0 0 0 0
57374- 0 0 0 0 0 0 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 6 6 6 6 6 6 14 14 14 18 18 18
57378- 30 30 30 38 38 38 46 46 46 54 54 54
57379- 50 50 50 42 42 42 30 30 30 18 18 18
57380- 10 10 10 0 0 0 0 0 0 0 0 0
57381- 0 0 0 0 0 0 0 0 0 0 0 0
57382- 0 0 0 0 0 0 0 0 0 0 0 0
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 6 6 6 14 14 14 26 26 26
57385- 38 38 38 50 50 50 58 58 58 58 58 58
57386- 54 54 54 42 42 42 30 30 30 18 18 18
57387- 10 10 10 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 0 0 0
57389- 0 0 0 0 0 0 0 0 0 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 0 0 0 0 0 0 0 0 0 0 0 0
57394- 0 0 0 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 6 6 6
57398- 6 6 6 10 10 10 14 14 14 18 18 18
57399- 18 18 18 14 14 14 10 10 10 6 6 6
57400- 0 0 0 0 0 0 0 0 0 0 0 0
57401- 0 0 0 0 0 0 0 0 0 0 0 0
57402- 0 0 0 0 0 0 0 0 0 0 0 0
57403- 0 0 0 0 0 0 0 0 0 0 0 0
57404- 0 0 0 0 0 0 0 0 0 6 6 6
57405- 14 14 14 18 18 18 22 22 22 22 22 22
57406- 18 18 18 14 14 14 10 10 10 6 6 6
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 0 0 0
57409- 0 0 0 0 0 0 0 0 0 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 0 0 0 0 0 0 0 0 0
57412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57425+4 4 4 4 4 4
57426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57439+4 4 4 4 4 4
57440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57453+4 4 4 4 4 4
57454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57467+4 4 4 4 4 4
57468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57481+4 4 4 4 4 4
57482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57495+4 4 4 4 4 4
57496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57500+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
57501+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
57502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57505+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
57506+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57507+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
57508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57509+4 4 4 4 4 4
57510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57514+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
57515+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57516+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57519+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57520+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57521+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57522+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57523+4 4 4 4 4 4
57524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57528+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57529+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57530+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57533+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57534+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57535+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57536+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57537+4 4 4 4 4 4
57538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57541+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57542+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57543+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57544+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57546+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57547+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57548+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57549+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57550+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57551+4 4 4 4 4 4
57552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57555+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57556+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57557+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57558+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57559+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57560+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57561+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57562+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57563+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57564+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57565+4 4 4 4 4 4
57566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57569+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57570+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57571+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57572+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57573+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57574+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57575+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57576+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57577+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57578+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57579+4 4 4 4 4 4
57580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57582+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57583+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57584+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57585+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57586+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57587+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57588+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57589+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57590+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57591+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57592+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57593+4 4 4 4 4 4
57594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57596+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57597+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57598+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57599+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57600+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57601+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57602+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57603+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57604+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57605+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57606+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57607+4 4 4 4 4 4
57608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57610+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57611+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57612+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57613+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57614+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57615+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57616+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57617+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57618+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57619+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57620+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57621+4 4 4 4 4 4
57622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57624+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57625+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57626+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57627+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57628+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57629+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57630+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57631+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57632+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57633+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57634+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57635+4 4 4 4 4 4
57636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57637+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
57638+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57639+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57640+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57641+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57642+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57643+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57644+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57645+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57646+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57647+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57648+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57649+4 4 4 4 4 4
57650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57651+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57652+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57653+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57654+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57655+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57656+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57657+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57658+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57659+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57660+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57661+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57662+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57663+0 0 0 4 4 4
57664+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57665+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57666+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57667+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57668+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57669+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57670+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57671+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57672+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57673+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57674+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57675+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57676+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57677+2 0 0 0 0 0
57678+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57679+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57680+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57681+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57682+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57683+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57684+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57685+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57686+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57687+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57688+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57689+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57690+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57691+37 38 37 0 0 0
57692+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57693+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57694+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57695+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57696+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57697+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57698+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57699+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57700+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57701+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57702+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57703+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57704+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57705+85 115 134 4 0 0
57706+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57707+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57708+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57709+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57710+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57711+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57712+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57713+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57714+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57715+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57716+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57717+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57718+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57719+60 73 81 4 0 0
57720+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57721+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57722+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57723+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57724+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57725+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57726+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57727+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57728+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57729+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57730+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57731+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57732+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57733+16 19 21 4 0 0
57734+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57735+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57736+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57737+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57738+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57739+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57740+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57741+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57742+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57743+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57744+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57745+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57746+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57747+4 0 0 4 3 3
57748+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57749+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57750+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57752+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57753+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57754+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57755+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57756+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57757+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57758+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57759+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57760+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57761+3 2 2 4 4 4
57762+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57763+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57764+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57765+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57766+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57767+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57768+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57769+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57770+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57771+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57772+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57773+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57774+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57775+4 4 4 4 4 4
57776+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57777+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57778+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57779+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57780+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57781+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57782+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57783+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57784+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57785+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57786+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57787+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57788+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57789+4 4 4 4 4 4
57790+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57791+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57792+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57793+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57794+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57795+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57796+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57797+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57798+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57799+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57800+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57801+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57802+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57803+5 5 5 5 5 5
57804+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57805+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57806+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57807+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57808+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57809+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57810+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57811+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57812+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57813+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57814+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57815+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57816+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57817+5 5 5 4 4 4
57818+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57819+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57820+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57821+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57822+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57823+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57824+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57825+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57826+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57827+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57828+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57829+4 0 0 4 0 0 5 5 5 5 5 5 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
57832+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57833+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57834+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57835+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57836+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57837+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57838+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57839+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57840+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57841+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57842+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57843+3 3 3 5 5 5 6 6 6 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
57846+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57847+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57848+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57849+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57850+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57851+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57852+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57853+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57854+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57855+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57856+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 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
57860+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57861+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57862+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57863+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57864+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57865+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57866+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57867+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57868+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57869+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57870+6 6 6 4 0 0 4 0 0 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
57874+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57875+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57876+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57877+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57878+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57879+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57880+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57881+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57882+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57883+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57884+4 0 0 4 3 3 5 5 5 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
57888+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57889+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57890+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57891+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57892+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57893+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57894+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57895+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57896+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57897+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57898+6 6 6 4 0 0 6 6 6 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
57902+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57903+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57904+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57905+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57906+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57907+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57908+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57909+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57910+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57911+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57912+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 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 4 4 4 4 4 4
57915+4 4 4 4 4 4
57916+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57917+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57918+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57919+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57920+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57921+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57922+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57923+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57924+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57925+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57926+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57927+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57928+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57929+4 4 4 4 4 4
57930+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57931+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57932+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57933+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57934+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57935+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57936+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57937+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57938+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57939+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57940+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57941+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57943+4 4 4 4 4 4
57944+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57945+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57946+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57947+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57948+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57949+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57950+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57951+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57952+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57953+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57954+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57955+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57956+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57957+4 4 4 4 4 4
57958+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57959+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57960+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57961+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57962+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57963+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57964+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57965+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57966+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57967+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57968+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57969+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57970+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57971+4 4 4 4 4 4
57972+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57973+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57974+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57975+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57976+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57977+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57978+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57979+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57980+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57981+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57982+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57983+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57984+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57985+4 4 4 4 4 4
57986+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57987+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57988+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57989+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57990+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57991+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57992+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57993+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57994+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57995+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57996+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57997+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57998+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57999+4 4 4 4 4 4
58000+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58001+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58002+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58003+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58004+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58005+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58006+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58007+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58008+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58009+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58010+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58011+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58013+4 4 4 4 4 4
58014+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58015+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58016+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58017+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58018+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58019+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58020+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58021+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58022+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58023+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58024+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58027+4 4 4 4 4 4
58028+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58029+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58030+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58031+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58032+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58033+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58034+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58035+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58036+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58037+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58038+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58041+4 4 4 4 4 4
58042+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58043+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58044+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58045+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
58046+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
58047+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
58048+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
58049+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
58050+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
58051+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58052+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58055+4 4 4 4 4 4
58056+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58057+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
58058+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
58059+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
58060+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
58061+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
58062+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
58063+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
58064+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58065+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58066+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58068+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58069+4 4 4 4 4 4
58070+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58071+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
58072+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58073+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
58074+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
58075+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
58076+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
58077+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
58078+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58079+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58080+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58083+4 4 4 4 4 4
58084+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58085+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
58086+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
58087+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
58088+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
58089+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
58090+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58091+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
58092+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58093+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58094+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58097+4 4 4 4 4 4
58098+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58099+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
58100+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
58101+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58102+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
58103+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
58104+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58105+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
58106+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58107+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58108+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58111+4 4 4 4 4 4
58112+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58113+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
58114+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
58115+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
58116+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
58117+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
58118+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
58119+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
58120+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
58121+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58122+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58124+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58125+4 4 4 4 4 4
58126+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58127+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
58128+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
58129+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
58130+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
58131+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
58132+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
58133+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
58134+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
58135+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58136+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58138+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58139+4 4 4 4 4 4
58140+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
58141+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
58142+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
58143+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
58144+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58145+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
58146+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
58147+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
58148+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
58149+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58150+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58151+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58152+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58153+4 4 4 4 4 4
58154+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58155+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
58156+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
58157+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
58158+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
58159+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
58160+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
58161+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
58162+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
58163+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58164+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58165+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58166+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58167+4 4 4 4 4 4
58168+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
58169+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
58170+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
58171+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
58172+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
58173+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
58174+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
58175+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
58176+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
58177+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
58178+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58179+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58180+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58181+4 4 4 4 4 4
58182+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
58183+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58184+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
58185+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
58186+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
58187+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
58188+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
58189+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
58190+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
58191+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
58192+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58193+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58194+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58195+4 4 4 4 4 4
58196+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
58197+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58198+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
58199+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
58200+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
58201+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
58202+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58203+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
58204+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
58205+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
58206+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58207+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58208+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58209+4 4 4 4 4 4
58210+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
58211+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
58212+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
58213+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
58214+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
58215+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
58216+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
58217+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
58218+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
58219+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
58220+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58221+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58222+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58223+4 4 4 4 4 4
58224+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
58225+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
58226+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58227+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
58228+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
58229+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
58230+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
58231+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
58232+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
58233+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
58234+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58235+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58236+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58237+4 4 4 4 4 4
58238+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58239+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
58240+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
58241+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
58242+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
58243+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
58244+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
58245+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
58246+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
58247+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58248+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58249+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58250+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58251+4 4 4 4 4 4
58252+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
58253+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
58254+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
58255+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
58256+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
58257+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
58258+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
58259+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
58260+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
58261+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58262+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58263+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58264+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58265+4 4 4 4 4 4
58266+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
58267+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
58268+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
58269+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
58270+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
58271+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
58272+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
58273+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
58274+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58275+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58277+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58278+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58279+4 4 4 4 4 4
58280+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
58281+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58282+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
58283+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58284+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
58285+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
58286+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
58287+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
58288+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
58289+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58293+4 4 4 4 4 4
58294+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
58295+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
58296+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
58297+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
58298+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
58299+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
58300+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
58301+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
58302+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
58303+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58307+4 4 4 4 4 4
58308+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58309+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
58310+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
58311+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
58312+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
58313+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
58314+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
58315+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
58316+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58321+4 4 4 4 4 4
58322+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
58323+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
58324+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58325+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
58326+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
58327+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
58328+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
58329+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
58330+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58335+4 4 4 4 4 4
58336+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58337+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
58338+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
58339+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
58340+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
58341+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
58342+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
58343+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58344+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58349+4 4 4 4 4 4
58350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58351+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
58352+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58353+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
58354+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
58355+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
58356+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
58357+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
58358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58363+4 4 4 4 4 4
58364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58365+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
58366+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
58367+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
58368+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
58369+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
58370+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
58371+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
58372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58377+4 4 4 4 4 4
58378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58379+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58380+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
58381+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58382+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
58383+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
58384+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
58385+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+4 4 4 4 4 4
58392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58395+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
58396+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
58397+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
58398+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
58399+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58405+4 4 4 4 4 4
58406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58409+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58410+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
58411+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
58412+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
58413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58419+4 4 4 4 4 4
58420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58423+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58424+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58425+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
58426+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
58427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58433+4 4 4 4 4 4
58434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58437+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58438+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58439+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58440+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
58441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58451+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
58452+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
58453+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
58454+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
58455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58461+4 4 4 4 4 4
58462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58466+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
58467+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58468+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58475+4 4 4 4 4 4
58476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
58481+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
58482+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58489+4 4 4 4 4 4
58490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58495+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58496+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58503+4 4 4 4 4 4
58504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
58509+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58517+4 4 4 4 4 4
58518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58523+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58531+4 4 4 4 4 4
58532diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
58533index 70fba97..8ec7f86 100644
58534--- a/drivers/xen/events/events_base.c
58535+++ b/drivers/xen/events/events_base.c
58536@@ -1563,7 +1563,7 @@ void xen_irq_resume(void)
58537 restore_pirqs();
58538 }
58539
58540-static struct irq_chip xen_dynamic_chip __read_mostly = {
58541+static struct irq_chip xen_dynamic_chip = {
58542 .name = "xen-dyn",
58543
58544 .irq_disable = disable_dynirq,
58545@@ -1577,7 +1577,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
58546 .irq_retrigger = retrigger_dynirq,
58547 };
58548
58549-static struct irq_chip xen_pirq_chip __read_mostly = {
58550+static struct irq_chip xen_pirq_chip = {
58551 .name = "xen-pirq",
58552
58553 .irq_startup = startup_pirq,
58554@@ -1597,7 +1597,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
58555 .irq_retrigger = retrigger_dynirq,
58556 };
58557
58558-static struct irq_chip xen_percpu_chip __read_mostly = {
58559+static struct irq_chip xen_percpu_chip = {
58560 .name = "xen-percpu",
58561
58562 .irq_disable = disable_dynirq,
58563diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58564index fef20db..d28b1ab 100644
58565--- a/drivers/xen/xenfs/xenstored.c
58566+++ b/drivers/xen/xenfs/xenstored.c
58567@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58568 static int xsd_kva_open(struct inode *inode, struct file *file)
58569 {
58570 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58571+#ifdef CONFIG_GRKERNSEC_HIDESYM
58572+ NULL);
58573+#else
58574 xen_store_interface);
58575+#endif
58576+
58577 if (!file->private_data)
58578 return -ENOMEM;
58579 return 0;
58580diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58581index eb14e05..5156de7 100644
58582--- a/fs/9p/vfs_addr.c
58583+++ b/fs/9p/vfs_addr.c
58584@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58585
58586 retval = v9fs_file_write_internal(inode,
58587 v9inode->writeback_fid,
58588- (__force const char __user *)buffer,
58589+ (const char __force_user *)buffer,
58590 len, &offset, 0);
58591 if (retval > 0)
58592 retval = 0;
58593diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58594index 9ee5343..5165e3c 100644
58595--- a/fs/9p/vfs_inode.c
58596+++ b/fs/9p/vfs_inode.c
58597@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58598 void
58599 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58600 {
58601- char *s = nd_get_link(nd);
58602+ const char *s = nd_get_link(nd);
58603
58604 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58605 dentry, IS_ERR(s) ? "<error>" : s);
58606diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58607index c055d56e..a46f4f5 100644
58608--- a/fs/Kconfig.binfmt
58609+++ b/fs/Kconfig.binfmt
58610@@ -106,7 +106,7 @@ config HAVE_AOUT
58611
58612 config BINFMT_AOUT
58613 tristate "Kernel support for a.out and ECOFF binaries"
58614- depends on HAVE_AOUT
58615+ depends on HAVE_AOUT && BROKEN
58616 ---help---
58617 A.out (Assembler.OUTput) is a set of formats for libraries and
58618 executables used in the earliest versions of UNIX. Linux used
58619diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58620index 8a1d38e..300a14e 100644
58621--- a/fs/afs/inode.c
58622+++ b/fs/afs/inode.c
58623@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58624 struct afs_vnode *vnode;
58625 struct super_block *sb;
58626 struct inode *inode;
58627- static atomic_t afs_autocell_ino;
58628+ static atomic_unchecked_t afs_autocell_ino;
58629
58630 _enter("{%x:%u},%*.*s,",
58631 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58632@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58633 data.fid.unique = 0;
58634 data.fid.vnode = 0;
58635
58636- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58637+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58638 afs_iget5_autocell_test, afs_iget5_set,
58639 &data);
58640 if (!inode) {
58641diff --git a/fs/aio.c b/fs/aio.c
58642index ebd0e9b..c577c91 100644
58643--- a/fs/aio.c
58644+++ b/fs/aio.c
58645@@ -413,7 +413,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58646 size += sizeof(struct io_event) * nr_events;
58647
58648 nr_pages = PFN_UP(size);
58649- if (nr_pages < 0)
58650+ if (nr_pages <= 0)
58651 return -EINVAL;
58652
58653 file = aio_private_file(ctx, nr_pages);
58654diff --git a/fs/attr.c b/fs/attr.c
58655index 6530ced..4a827e2 100644
58656--- a/fs/attr.c
58657+++ b/fs/attr.c
58658@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58659 unsigned long limit;
58660
58661 limit = rlimit(RLIMIT_FSIZE);
58662+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58663 if (limit != RLIM_INFINITY && offset > limit)
58664 goto out_sig;
58665 if (offset > inode->i_sb->s_maxbytes)
58666diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58667index 116fd38..c04182da 100644
58668--- a/fs/autofs4/waitq.c
58669+++ b/fs/autofs4/waitq.c
58670@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58671 {
58672 unsigned long sigpipe, flags;
58673 mm_segment_t fs;
58674- const char *data = (const char *)addr;
58675+ const char __user *data = (const char __force_user *)addr;
58676 ssize_t wr = 0;
58677
58678 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58679@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58680 return 1;
58681 }
58682
58683+#ifdef CONFIG_GRKERNSEC_HIDESYM
58684+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58685+#endif
58686+
58687 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58688 enum autofs_notify notify)
58689 {
58690@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58691
58692 /* If this is a direct mount request create a dummy name */
58693 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58694+#ifdef CONFIG_GRKERNSEC_HIDESYM
58695+ /* this name does get written to userland via autofs4_write() */
58696+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58697+#else
58698 qstr.len = sprintf(name, "%p", dentry);
58699+#endif
58700 else {
58701 qstr.len = autofs4_getpath(sbi, dentry, &name);
58702 if (!qstr.len) {
58703diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58704index 2722387..56059b5 100644
58705--- a/fs/befs/endian.h
58706+++ b/fs/befs/endian.h
58707@@ -11,7 +11,7 @@
58708
58709 #include <asm/byteorder.h>
58710
58711-static inline u64
58712+static inline u64 __intentional_overflow(-1)
58713 fs64_to_cpu(const struct super_block *sb, fs64 n)
58714 {
58715 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58716@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58717 return (__force fs64)cpu_to_be64(n);
58718 }
58719
58720-static inline u32
58721+static inline u32 __intentional_overflow(-1)
58722 fs32_to_cpu(const struct super_block *sb, fs32 n)
58723 {
58724 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58725@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58726 return (__force fs32)cpu_to_be32(n);
58727 }
58728
58729-static inline u16
58730+static inline u16 __intentional_overflow(-1)
58731 fs16_to_cpu(const struct super_block *sb, fs16 n)
58732 {
58733 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58734diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58735index 4c55668..eeae150 100644
58736--- a/fs/binfmt_aout.c
58737+++ b/fs/binfmt_aout.c
58738@@ -16,6 +16,7 @@
58739 #include <linux/string.h>
58740 #include <linux/fs.h>
58741 #include <linux/file.h>
58742+#include <linux/security.h>
58743 #include <linux/stat.h>
58744 #include <linux/fcntl.h>
58745 #include <linux/ptrace.h>
58746@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58747 #endif
58748 # define START_STACK(u) ((void __user *)u.start_stack)
58749
58750+ memset(&dump, 0, sizeof(dump));
58751+
58752 fs = get_fs();
58753 set_fs(KERNEL_DS);
58754 has_dumped = 1;
58755@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58756
58757 /* If the size of the dump file exceeds the rlimit, then see what would happen
58758 if we wrote the stack, but not the data area. */
58759+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58760 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58761 dump.u_dsize = 0;
58762
58763 /* Make sure we have enough room to write the stack and data areas. */
58764+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58765 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58766 dump.u_ssize = 0;
58767
58768@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58769 rlim = rlimit(RLIMIT_DATA);
58770 if (rlim >= RLIM_INFINITY)
58771 rlim = ~0;
58772+
58773+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58774 if (ex.a_data + ex.a_bss > rlim)
58775 return -ENOMEM;
58776
58777@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58778
58779 install_exec_creds(bprm);
58780
58781+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58782+ current->mm->pax_flags = 0UL;
58783+#endif
58784+
58785+#ifdef CONFIG_PAX_PAGEEXEC
58786+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58787+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58788+
58789+#ifdef CONFIG_PAX_EMUTRAMP
58790+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58791+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58792+#endif
58793+
58794+#ifdef CONFIG_PAX_MPROTECT
58795+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58796+ current->mm->pax_flags |= MF_PAX_MPROTECT;
58797+#endif
58798+
58799+ }
58800+#endif
58801+
58802 if (N_MAGIC(ex) == OMAGIC) {
58803 unsigned long text_addr, map_size;
58804 loff_t pos;
58805@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58806 return error;
58807
58808 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58809- PROT_READ | PROT_WRITE | PROT_EXEC,
58810+ PROT_READ | PROT_WRITE,
58811 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58812 fd_offset + ex.a_text);
58813 if (error != N_DATADDR(ex))
58814diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58815index 995986b..dcc4ef2 100644
58816--- a/fs/binfmt_elf.c
58817+++ b/fs/binfmt_elf.c
58818@@ -34,6 +34,7 @@
58819 #include <linux/utsname.h>
58820 #include <linux/coredump.h>
58821 #include <linux/sched.h>
58822+#include <linux/xattr.h>
58823 #include <asm/uaccess.h>
58824 #include <asm/param.h>
58825 #include <asm/page.h>
58826@@ -47,7 +48,7 @@
58827
58828 static int load_elf_binary(struct linux_binprm *bprm);
58829 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58830- int, int, unsigned long);
58831+ int, int, unsigned long) __intentional_overflow(-1);
58832
58833 #ifdef CONFIG_USELIB
58834 static int load_elf_library(struct file *);
58835@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58836 #define elf_core_dump NULL
58837 #endif
58838
58839+#ifdef CONFIG_PAX_MPROTECT
58840+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58841+#endif
58842+
58843+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58844+static void elf_handle_mmap(struct file *file);
58845+#endif
58846+
58847 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58848 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58849 #else
58850@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58851 .load_binary = load_elf_binary,
58852 .load_shlib = load_elf_library,
58853 .core_dump = elf_core_dump,
58854+
58855+#ifdef CONFIG_PAX_MPROTECT
58856+ .handle_mprotect= elf_handle_mprotect,
58857+#endif
58858+
58859+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58860+ .handle_mmap = elf_handle_mmap,
58861+#endif
58862+
58863 .min_coredump = ELF_EXEC_PAGESIZE,
58864 };
58865
58866@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58867
58868 static int set_brk(unsigned long start, unsigned long end)
58869 {
58870+ unsigned long e = end;
58871+
58872 start = ELF_PAGEALIGN(start);
58873 end = ELF_PAGEALIGN(end);
58874 if (end > start) {
58875@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58876 if (BAD_ADDR(addr))
58877 return addr;
58878 }
58879- current->mm->start_brk = current->mm->brk = end;
58880+ current->mm->start_brk = current->mm->brk = e;
58881 return 0;
58882 }
58883
58884@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58885 elf_addr_t __user *u_rand_bytes;
58886 const char *k_platform = ELF_PLATFORM;
58887 const char *k_base_platform = ELF_BASE_PLATFORM;
58888- unsigned char k_rand_bytes[16];
58889+ u32 k_rand_bytes[4];
58890 int items;
58891 elf_addr_t *elf_info;
58892 int ei_index = 0;
58893 const struct cred *cred = current_cred();
58894 struct vm_area_struct *vma;
58895+ unsigned long saved_auxv[AT_VECTOR_SIZE];
58896
58897 /*
58898 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58899@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58900 * Generate 16 random bytes for userspace PRNG seeding.
58901 */
58902 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58903- u_rand_bytes = (elf_addr_t __user *)
58904- STACK_ALLOC(p, sizeof(k_rand_bytes));
58905+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58906+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58907+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58908+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58909+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
58910+ u_rand_bytes = (elf_addr_t __user *) p;
58911 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58912 return -EFAULT;
58913
58914@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58915 return -EFAULT;
58916 current->mm->env_end = p;
58917
58918+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58919+
58920 /* Put the elf_info on the stack in the right place. */
58921 sp = (elf_addr_t __user *)envp + 1;
58922- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58923+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58924 return -EFAULT;
58925 return 0;
58926 }
58927@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
58928 an ELF header */
58929
58930 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58931- struct file *interpreter, unsigned long *interp_map_addr,
58932+ struct file *interpreter,
58933 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
58934 {
58935 struct elf_phdr *eppnt;
58936- unsigned long load_addr = 0;
58937+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58938 int load_addr_set = 0;
58939 unsigned long last_bss = 0, elf_bss = 0;
58940- unsigned long error = ~0UL;
58941+ unsigned long error = -EINVAL;
58942 unsigned long total_size;
58943 int i;
58944
58945@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58946 goto out;
58947 }
58948
58949+#ifdef CONFIG_PAX_SEGMEXEC
58950+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58951+ pax_task_size = SEGMEXEC_TASK_SIZE;
58952+#endif
58953+
58954 eppnt = interp_elf_phdata;
58955 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58956 if (eppnt->p_type == PT_LOAD) {
58957@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58958 map_addr = elf_map(interpreter, load_addr + vaddr,
58959 eppnt, elf_prot, elf_type, total_size);
58960 total_size = 0;
58961- if (!*interp_map_addr)
58962- *interp_map_addr = map_addr;
58963 error = map_addr;
58964 if (BAD_ADDR(map_addr))
58965 goto out;
58966@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58967 k = load_addr + eppnt->p_vaddr;
58968 if (BAD_ADDR(k) ||
58969 eppnt->p_filesz > eppnt->p_memsz ||
58970- eppnt->p_memsz > TASK_SIZE ||
58971- TASK_SIZE - eppnt->p_memsz < k) {
58972+ eppnt->p_memsz > pax_task_size ||
58973+ pax_task_size - eppnt->p_memsz < k) {
58974 error = -ENOMEM;
58975 goto out;
58976 }
58977@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58978 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58979
58980 /* Map the last of the bss segment */
58981- error = vm_brk(elf_bss, last_bss - elf_bss);
58982- if (BAD_ADDR(error))
58983- goto out;
58984+ if (last_bss > elf_bss) {
58985+ error = vm_brk(elf_bss, last_bss - elf_bss);
58986+ if (BAD_ADDR(error))
58987+ goto out;
58988+ }
58989 }
58990
58991 error = load_addr;
58992@@ -634,6 +666,336 @@ out:
58993 return error;
58994 }
58995
58996+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58997+#ifdef CONFIG_PAX_SOFTMODE
58998+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58999+{
59000+ unsigned long pax_flags = 0UL;
59001+
59002+#ifdef CONFIG_PAX_PAGEEXEC
59003+ if (elf_phdata->p_flags & PF_PAGEEXEC)
59004+ pax_flags |= MF_PAX_PAGEEXEC;
59005+#endif
59006+
59007+#ifdef CONFIG_PAX_SEGMEXEC
59008+ if (elf_phdata->p_flags & PF_SEGMEXEC)
59009+ pax_flags |= MF_PAX_SEGMEXEC;
59010+#endif
59011+
59012+#ifdef CONFIG_PAX_EMUTRAMP
59013+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
59014+ pax_flags |= MF_PAX_EMUTRAMP;
59015+#endif
59016+
59017+#ifdef CONFIG_PAX_MPROTECT
59018+ if (elf_phdata->p_flags & PF_MPROTECT)
59019+ pax_flags |= MF_PAX_MPROTECT;
59020+#endif
59021+
59022+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59023+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
59024+ pax_flags |= MF_PAX_RANDMMAP;
59025+#endif
59026+
59027+ return pax_flags;
59028+}
59029+#endif
59030+
59031+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
59032+{
59033+ unsigned long pax_flags = 0UL;
59034+
59035+#ifdef CONFIG_PAX_PAGEEXEC
59036+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
59037+ pax_flags |= MF_PAX_PAGEEXEC;
59038+#endif
59039+
59040+#ifdef CONFIG_PAX_SEGMEXEC
59041+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
59042+ pax_flags |= MF_PAX_SEGMEXEC;
59043+#endif
59044+
59045+#ifdef CONFIG_PAX_EMUTRAMP
59046+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
59047+ pax_flags |= MF_PAX_EMUTRAMP;
59048+#endif
59049+
59050+#ifdef CONFIG_PAX_MPROTECT
59051+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
59052+ pax_flags |= MF_PAX_MPROTECT;
59053+#endif
59054+
59055+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59056+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
59057+ pax_flags |= MF_PAX_RANDMMAP;
59058+#endif
59059+
59060+ return pax_flags;
59061+}
59062+#endif
59063+
59064+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59065+#ifdef CONFIG_PAX_SOFTMODE
59066+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
59067+{
59068+ unsigned long pax_flags = 0UL;
59069+
59070+#ifdef CONFIG_PAX_PAGEEXEC
59071+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
59072+ pax_flags |= MF_PAX_PAGEEXEC;
59073+#endif
59074+
59075+#ifdef CONFIG_PAX_SEGMEXEC
59076+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
59077+ pax_flags |= MF_PAX_SEGMEXEC;
59078+#endif
59079+
59080+#ifdef CONFIG_PAX_EMUTRAMP
59081+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
59082+ pax_flags |= MF_PAX_EMUTRAMP;
59083+#endif
59084+
59085+#ifdef CONFIG_PAX_MPROTECT
59086+ if (pax_flags_softmode & MF_PAX_MPROTECT)
59087+ pax_flags |= MF_PAX_MPROTECT;
59088+#endif
59089+
59090+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59091+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
59092+ pax_flags |= MF_PAX_RANDMMAP;
59093+#endif
59094+
59095+ return pax_flags;
59096+}
59097+#endif
59098+
59099+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
59100+{
59101+ unsigned long pax_flags = 0UL;
59102+
59103+#ifdef CONFIG_PAX_PAGEEXEC
59104+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
59105+ pax_flags |= MF_PAX_PAGEEXEC;
59106+#endif
59107+
59108+#ifdef CONFIG_PAX_SEGMEXEC
59109+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
59110+ pax_flags |= MF_PAX_SEGMEXEC;
59111+#endif
59112+
59113+#ifdef CONFIG_PAX_EMUTRAMP
59114+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
59115+ pax_flags |= MF_PAX_EMUTRAMP;
59116+#endif
59117+
59118+#ifdef CONFIG_PAX_MPROTECT
59119+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
59120+ pax_flags |= MF_PAX_MPROTECT;
59121+#endif
59122+
59123+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59124+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
59125+ pax_flags |= MF_PAX_RANDMMAP;
59126+#endif
59127+
59128+ return pax_flags;
59129+}
59130+#endif
59131+
59132+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59133+static unsigned long pax_parse_defaults(void)
59134+{
59135+ unsigned long pax_flags = 0UL;
59136+
59137+#ifdef CONFIG_PAX_SOFTMODE
59138+ if (pax_softmode)
59139+ return pax_flags;
59140+#endif
59141+
59142+#ifdef CONFIG_PAX_PAGEEXEC
59143+ pax_flags |= MF_PAX_PAGEEXEC;
59144+#endif
59145+
59146+#ifdef CONFIG_PAX_SEGMEXEC
59147+ pax_flags |= MF_PAX_SEGMEXEC;
59148+#endif
59149+
59150+#ifdef CONFIG_PAX_MPROTECT
59151+ pax_flags |= MF_PAX_MPROTECT;
59152+#endif
59153+
59154+#ifdef CONFIG_PAX_RANDMMAP
59155+ if (randomize_va_space)
59156+ pax_flags |= MF_PAX_RANDMMAP;
59157+#endif
59158+
59159+ return pax_flags;
59160+}
59161+
59162+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
59163+{
59164+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
59165+
59166+#ifdef CONFIG_PAX_EI_PAX
59167+
59168+#ifdef CONFIG_PAX_SOFTMODE
59169+ if (pax_softmode)
59170+ return pax_flags;
59171+#endif
59172+
59173+ pax_flags = 0UL;
59174+
59175+#ifdef CONFIG_PAX_PAGEEXEC
59176+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
59177+ pax_flags |= MF_PAX_PAGEEXEC;
59178+#endif
59179+
59180+#ifdef CONFIG_PAX_SEGMEXEC
59181+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
59182+ pax_flags |= MF_PAX_SEGMEXEC;
59183+#endif
59184+
59185+#ifdef CONFIG_PAX_EMUTRAMP
59186+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
59187+ pax_flags |= MF_PAX_EMUTRAMP;
59188+#endif
59189+
59190+#ifdef CONFIG_PAX_MPROTECT
59191+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
59192+ pax_flags |= MF_PAX_MPROTECT;
59193+#endif
59194+
59195+#ifdef CONFIG_PAX_ASLR
59196+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
59197+ pax_flags |= MF_PAX_RANDMMAP;
59198+#endif
59199+
59200+#endif
59201+
59202+ return pax_flags;
59203+
59204+}
59205+
59206+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
59207+{
59208+
59209+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59210+ unsigned long i;
59211+
59212+ for (i = 0UL; i < elf_ex->e_phnum; i++)
59213+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
59214+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
59215+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
59216+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
59217+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
59218+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
59219+ return PAX_PARSE_FLAGS_FALLBACK;
59220+
59221+#ifdef CONFIG_PAX_SOFTMODE
59222+ if (pax_softmode)
59223+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
59224+ else
59225+#endif
59226+
59227+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
59228+ break;
59229+ }
59230+#endif
59231+
59232+ return PAX_PARSE_FLAGS_FALLBACK;
59233+}
59234+
59235+static unsigned long pax_parse_xattr_pax(struct file * const file)
59236+{
59237+
59238+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59239+ ssize_t xattr_size, i;
59240+ unsigned char xattr_value[sizeof("pemrs") - 1];
59241+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
59242+
59243+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
59244+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
59245+ return PAX_PARSE_FLAGS_FALLBACK;
59246+
59247+ for (i = 0; i < xattr_size; i++)
59248+ switch (xattr_value[i]) {
59249+ default:
59250+ return PAX_PARSE_FLAGS_FALLBACK;
59251+
59252+#define parse_flag(option1, option2, flag) \
59253+ case option1: \
59254+ if (pax_flags_hardmode & MF_PAX_##flag) \
59255+ return PAX_PARSE_FLAGS_FALLBACK;\
59256+ pax_flags_hardmode |= MF_PAX_##flag; \
59257+ break; \
59258+ case option2: \
59259+ if (pax_flags_softmode & MF_PAX_##flag) \
59260+ return PAX_PARSE_FLAGS_FALLBACK;\
59261+ pax_flags_softmode |= MF_PAX_##flag; \
59262+ break;
59263+
59264+ parse_flag('p', 'P', PAGEEXEC);
59265+ parse_flag('e', 'E', EMUTRAMP);
59266+ parse_flag('m', 'M', MPROTECT);
59267+ parse_flag('r', 'R', RANDMMAP);
59268+ parse_flag('s', 'S', SEGMEXEC);
59269+
59270+#undef parse_flag
59271+ }
59272+
59273+ if (pax_flags_hardmode & pax_flags_softmode)
59274+ return PAX_PARSE_FLAGS_FALLBACK;
59275+
59276+#ifdef CONFIG_PAX_SOFTMODE
59277+ if (pax_softmode)
59278+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
59279+ else
59280+#endif
59281+
59282+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
59283+#else
59284+ return PAX_PARSE_FLAGS_FALLBACK;
59285+#endif
59286+
59287+}
59288+
59289+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
59290+{
59291+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
59292+
59293+ pax_flags = pax_parse_defaults();
59294+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
59295+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
59296+ xattr_pax_flags = pax_parse_xattr_pax(file);
59297+
59298+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59299+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59300+ pt_pax_flags != xattr_pax_flags)
59301+ return -EINVAL;
59302+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59303+ pax_flags = xattr_pax_flags;
59304+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59305+ pax_flags = pt_pax_flags;
59306+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59307+ pax_flags = ei_pax_flags;
59308+
59309+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
59310+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59311+ if ((__supported_pte_mask & _PAGE_NX))
59312+ pax_flags &= ~MF_PAX_SEGMEXEC;
59313+ else
59314+ pax_flags &= ~MF_PAX_PAGEEXEC;
59315+ }
59316+#endif
59317+
59318+ if (0 > pax_check_flags(&pax_flags))
59319+ return -EINVAL;
59320+
59321+ current->mm->pax_flags = pax_flags;
59322+ return 0;
59323+}
59324+#endif
59325+
59326 /*
59327 * These are the functions used to load ELF style executables and shared
59328 * libraries. There is no binary dependent code anywhere else.
59329@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
59330 {
59331 unsigned long random_variable = 0;
59332
59333+#ifdef CONFIG_PAX_RANDUSTACK
59334+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
59335+ return stack_top - current->mm->delta_stack;
59336+#endif
59337+
59338 if ((current->flags & PF_RANDOMIZE) &&
59339 !(current->personality & ADDR_NO_RANDOMIZE)) {
59340 random_variable = (unsigned long) get_random_int();
59341@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59342 unsigned long load_addr = 0, load_bias = 0;
59343 int load_addr_set = 0;
59344 char * elf_interpreter = NULL;
59345- unsigned long error;
59346+ unsigned long error = 0;
59347 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
59348 unsigned long elf_bss, elf_brk;
59349 int retval, i;
59350@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59351 struct elfhdr interp_elf_ex;
59352 } *loc;
59353 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
59354+ unsigned long pax_task_size;
59355
59356 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
59357 if (!loc) {
59358@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
59359 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
59360 may depend on the personality. */
59361 SET_PERSONALITY2(loc->elf_ex, &arch_state);
59362+
59363+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59364+ current->mm->pax_flags = 0UL;
59365+#endif
59366+
59367+#ifdef CONFIG_PAX_DLRESOLVE
59368+ current->mm->call_dl_resolve = 0UL;
59369+#endif
59370+
59371+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
59372+ current->mm->call_syscall = 0UL;
59373+#endif
59374+
59375+#ifdef CONFIG_PAX_ASLR
59376+ current->mm->delta_mmap = 0UL;
59377+ current->mm->delta_stack = 0UL;
59378+#endif
59379+
59380+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59381+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
59382+ send_sig(SIGKILL, current, 0);
59383+ goto out_free_dentry;
59384+ }
59385+#endif
59386+
59387+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
59388+ pax_set_initial_flags(bprm);
59389+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
59390+ if (pax_set_initial_flags_func)
59391+ (pax_set_initial_flags_func)(bprm);
59392+#endif
59393+
59394+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59395+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
59396+ current->mm->context.user_cs_limit = PAGE_SIZE;
59397+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
59398+ }
59399+#endif
59400+
59401+#ifdef CONFIG_PAX_SEGMEXEC
59402+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
59403+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
59404+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
59405+ pax_task_size = SEGMEXEC_TASK_SIZE;
59406+ current->mm->def_flags |= VM_NOHUGEPAGE;
59407+ } else
59408+#endif
59409+
59410+ pax_task_size = TASK_SIZE;
59411+
59412+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
59413+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59414+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
59415+ put_cpu();
59416+ }
59417+#endif
59418+
59419+#ifdef CONFIG_PAX_ASLR
59420+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59421+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
59422+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
59423+ }
59424+#endif
59425+
59426+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
59427+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59428+ executable_stack = EXSTACK_DISABLE_X;
59429+ current->personality &= ~READ_IMPLIES_EXEC;
59430+ } else
59431+#endif
59432+
59433 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
59434 current->personality |= READ_IMPLIES_EXEC;
59435
59436@@ -924,6 +1363,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
59437 #else
59438 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
59439 #endif
59440+
59441+#ifdef CONFIG_PAX_RANDMMAP
59442+ /* PaX: randomize base address at the default exe base if requested */
59443+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
59444+#ifdef CONFIG_SPARC64
59445+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
59446+#else
59447+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
59448+#endif
59449+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
59450+ elf_flags |= MAP_FIXED;
59451+ }
59452+#endif
59453+
59454 }
59455
59456 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
59457@@ -955,9 +1408,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
59458 * allowed task size. Note that p_filesz must always be
59459 * <= p_memsz so it is only necessary to check p_memsz.
59460 */
59461- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59462- elf_ppnt->p_memsz > TASK_SIZE ||
59463- TASK_SIZE - elf_ppnt->p_memsz < k) {
59464+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59465+ elf_ppnt->p_memsz > pax_task_size ||
59466+ pax_task_size - elf_ppnt->p_memsz < k) {
59467 /* set_brk can never work. Avoid overflows. */
59468 retval = -EINVAL;
59469 goto out_free_dentry;
59470@@ -993,16 +1446,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
59471 if (retval)
59472 goto out_free_dentry;
59473 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
59474- retval = -EFAULT; /* Nobody gets to see this, but.. */
59475- goto out_free_dentry;
59476+ /*
59477+ * This bss-zeroing can fail if the ELF
59478+ * file specifies odd protections. So
59479+ * we don't check the return value
59480+ */
59481 }
59482
59483+#ifdef CONFIG_PAX_RANDMMAP
59484+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59485+ unsigned long start, size, flags;
59486+ vm_flags_t vm_flags;
59487+
59488+ start = ELF_PAGEALIGN(elf_brk);
59489+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
59490+ flags = MAP_FIXED | MAP_PRIVATE;
59491+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
59492+
59493+ down_write(&current->mm->mmap_sem);
59494+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
59495+ retval = -ENOMEM;
59496+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
59497+// if (current->personality & ADDR_NO_RANDOMIZE)
59498+// vm_flags |= VM_READ | VM_MAYREAD;
59499+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
59500+ retval = IS_ERR_VALUE(start) ? start : 0;
59501+ }
59502+ up_write(&current->mm->mmap_sem);
59503+ if (retval == 0)
59504+ retval = set_brk(start + size, start + size + PAGE_SIZE);
59505+ if (retval < 0)
59506+ goto out_free_dentry;
59507+ }
59508+#endif
59509+
59510 if (elf_interpreter) {
59511- unsigned long interp_map_addr = 0;
59512-
59513 elf_entry = load_elf_interp(&loc->interp_elf_ex,
59514 interpreter,
59515- &interp_map_addr,
59516 load_bias, interp_elf_phdata);
59517 if (!IS_ERR((void *)elf_entry)) {
59518 /*
59519@@ -1230,7 +1710,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59520 * Decide what to dump of a segment, part, all or none.
59521 */
59522 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59523- unsigned long mm_flags)
59524+ unsigned long mm_flags, long signr)
59525 {
59526 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59527
59528@@ -1268,7 +1748,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59529 if (vma->vm_file == NULL)
59530 return 0;
59531
59532- if (FILTER(MAPPED_PRIVATE))
59533+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59534 goto whole;
59535
59536 /*
59537@@ -1475,9 +1955,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59538 {
59539 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59540 int i = 0;
59541- do
59542+ do {
59543 i += 2;
59544- while (auxv[i - 2] != AT_NULL);
59545+ } while (auxv[i - 2] != AT_NULL);
59546 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59547 }
59548
59549@@ -1486,7 +1966,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59550 {
59551 mm_segment_t old_fs = get_fs();
59552 set_fs(KERNEL_DS);
59553- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59554+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59555 set_fs(old_fs);
59556 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59557 }
59558@@ -2206,7 +2686,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59559 vma = next_vma(vma, gate_vma)) {
59560 unsigned long dump_size;
59561
59562- dump_size = vma_dump_size(vma, cprm->mm_flags);
59563+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59564 vma_filesz[i++] = dump_size;
59565 vma_data_size += dump_size;
59566 }
59567@@ -2314,6 +2794,167 @@ out:
59568
59569 #endif /* CONFIG_ELF_CORE */
59570
59571+#ifdef CONFIG_PAX_MPROTECT
59572+/* PaX: non-PIC ELF libraries need relocations on their executable segments
59573+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59574+ * we'll remove VM_MAYWRITE for good on RELRO segments.
59575+ *
59576+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59577+ * basis because we want to allow the common case and not the special ones.
59578+ */
59579+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59580+{
59581+ struct elfhdr elf_h;
59582+ struct elf_phdr elf_p;
59583+ unsigned long i;
59584+ unsigned long oldflags;
59585+ bool is_textrel_rw, is_textrel_rx, is_relro;
59586+
59587+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59588+ return;
59589+
59590+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59591+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59592+
59593+#ifdef CONFIG_PAX_ELFRELOCS
59594+ /* possible TEXTREL */
59595+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59596+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59597+#else
59598+ is_textrel_rw = false;
59599+ is_textrel_rx = false;
59600+#endif
59601+
59602+ /* possible RELRO */
59603+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59604+
59605+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59606+ return;
59607+
59608+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59609+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59610+
59611+#ifdef CONFIG_PAX_ETEXECRELOCS
59612+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59613+#else
59614+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59615+#endif
59616+
59617+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59618+ !elf_check_arch(&elf_h) ||
59619+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59620+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59621+ return;
59622+
59623+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59624+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59625+ return;
59626+ switch (elf_p.p_type) {
59627+ case PT_DYNAMIC:
59628+ if (!is_textrel_rw && !is_textrel_rx)
59629+ continue;
59630+ i = 0UL;
59631+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59632+ elf_dyn dyn;
59633+
59634+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59635+ break;
59636+ if (dyn.d_tag == DT_NULL)
59637+ break;
59638+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59639+ gr_log_textrel(vma);
59640+ if (is_textrel_rw)
59641+ vma->vm_flags |= VM_MAYWRITE;
59642+ else
59643+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59644+ vma->vm_flags &= ~VM_MAYWRITE;
59645+ break;
59646+ }
59647+ i++;
59648+ }
59649+ is_textrel_rw = false;
59650+ is_textrel_rx = false;
59651+ continue;
59652+
59653+ case PT_GNU_RELRO:
59654+ if (!is_relro)
59655+ continue;
59656+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59657+ vma->vm_flags &= ~VM_MAYWRITE;
59658+ is_relro = false;
59659+ continue;
59660+
59661+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59662+ case PT_PAX_FLAGS: {
59663+ const char *msg_mprotect = "", *msg_emutramp = "";
59664+ char *buffer_lib, *buffer_exe;
59665+
59666+ if (elf_p.p_flags & PF_NOMPROTECT)
59667+ msg_mprotect = "MPROTECT disabled";
59668+
59669+#ifdef CONFIG_PAX_EMUTRAMP
59670+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59671+ msg_emutramp = "EMUTRAMP enabled";
59672+#endif
59673+
59674+ if (!msg_mprotect[0] && !msg_emutramp[0])
59675+ continue;
59676+
59677+ if (!printk_ratelimit())
59678+ continue;
59679+
59680+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59681+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59682+ if (buffer_lib && buffer_exe) {
59683+ char *path_lib, *path_exe;
59684+
59685+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59686+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59687+
59688+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59689+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59690+
59691+ }
59692+ free_page((unsigned long)buffer_exe);
59693+ free_page((unsigned long)buffer_lib);
59694+ continue;
59695+ }
59696+#endif
59697+
59698+ }
59699+ }
59700+}
59701+#endif
59702+
59703+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59704+
59705+extern int grsec_enable_log_rwxmaps;
59706+
59707+static void elf_handle_mmap(struct file *file)
59708+{
59709+ struct elfhdr elf_h;
59710+ struct elf_phdr elf_p;
59711+ unsigned long i;
59712+
59713+ if (!grsec_enable_log_rwxmaps)
59714+ return;
59715+
59716+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59717+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59718+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59719+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59720+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59721+ return;
59722+
59723+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59724+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59725+ return;
59726+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59727+ gr_log_ptgnustack(file);
59728+ }
59729+}
59730+#endif
59731+
59732 static int __init init_elf_binfmt(void)
59733 {
59734 register_binfmt(&elf_format);
59735diff --git a/fs/block_dev.c b/fs/block_dev.c
59736index b48c41b..e070416 100644
59737--- a/fs/block_dev.c
59738+++ b/fs/block_dev.c
59739@@ -703,7 +703,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59740 else if (bdev->bd_contains == bdev)
59741 return true; /* is a whole device which isn't held */
59742
59743- else if (whole->bd_holder == bd_may_claim)
59744+ else if (whole->bd_holder == (void *)bd_may_claim)
59745 return true; /* is a partition of a device that is being partitioned */
59746 else if (whole->bd_holder != NULL)
59747 return false; /* is a partition of a held device */
59748diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59749index f54511d..58acdec 100644
59750--- a/fs/btrfs/ctree.c
59751+++ b/fs/btrfs/ctree.c
59752@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59753 free_extent_buffer(buf);
59754 add_root_to_dirty_list(root);
59755 } else {
59756- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59757- parent_start = parent->start;
59758- else
59759+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59760+ if (parent)
59761+ parent_start = parent->start;
59762+ else
59763+ parent_start = 0;
59764+ } else
59765 parent_start = 0;
59766
59767 WARN_ON(trans->transid != btrfs_header_generation(parent));
59768diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59769index de4e70f..b41dc45 100644
59770--- a/fs/btrfs/delayed-inode.c
59771+++ b/fs/btrfs/delayed-inode.c
59772@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59773
59774 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59775 {
59776- int seq = atomic_inc_return(&delayed_root->items_seq);
59777+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59778 if ((atomic_dec_return(&delayed_root->items) <
59779 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59780 waitqueue_active(&delayed_root->wait))
59781@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59782
59783 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59784 {
59785- int val = atomic_read(&delayed_root->items_seq);
59786+ int val = atomic_read_unchecked(&delayed_root->items_seq);
59787
59788 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59789 return 1;
59790@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59791 int seq;
59792 int ret;
59793
59794- seq = atomic_read(&delayed_root->items_seq);
59795+ seq = atomic_read_unchecked(&delayed_root->items_seq);
59796
59797 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59798 if (ret)
59799diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59800index f70119f..ab5894d 100644
59801--- a/fs/btrfs/delayed-inode.h
59802+++ b/fs/btrfs/delayed-inode.h
59803@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59804 */
59805 struct list_head prepare_list;
59806 atomic_t items; /* for delayed items */
59807- atomic_t items_seq; /* for delayed items */
59808+ atomic_unchecked_t items_seq; /* for delayed items */
59809 int nodes; /* for delayed nodes */
59810 wait_queue_head_t wait;
59811 };
59812@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59813 struct btrfs_delayed_root *delayed_root)
59814 {
59815 atomic_set(&delayed_root->items, 0);
59816- atomic_set(&delayed_root->items_seq, 0);
59817+ atomic_set_unchecked(&delayed_root->items_seq, 0);
59818 delayed_root->nodes = 0;
59819 spin_lock_init(&delayed_root->lock);
59820 init_waitqueue_head(&delayed_root->wait);
59821diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59822index 6f49b28..483410f 100644
59823--- a/fs/btrfs/super.c
59824+++ b/fs/btrfs/super.c
59825@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59826 function, line, errstr);
59827 return;
59828 }
59829- ACCESS_ONCE(trans->transaction->aborted) = errno;
59830+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59831 /* Wake up anybody who may be waiting on this transaction */
59832 wake_up(&root->fs_info->transaction_wait);
59833 wake_up(&root->fs_info->transaction_blocked_wait);
59834diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59835index 92db3f6..898a561 100644
59836--- a/fs/btrfs/sysfs.c
59837+++ b/fs/btrfs/sysfs.c
59838@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59839 for (set = 0; set < FEAT_MAX; set++) {
59840 int i;
59841 struct attribute *attrs[2];
59842- struct attribute_group agroup = {
59843+ attribute_group_no_const agroup = {
59844 .name = "features",
59845 .attrs = attrs,
59846 };
59847diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59848index 2299bfd..4098e72 100644
59849--- a/fs/btrfs/tests/free-space-tests.c
59850+++ b/fs/btrfs/tests/free-space-tests.c
59851@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59852 * extent entry.
59853 */
59854 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59855- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59856+ pax_open_kernel();
59857+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59858+ pax_close_kernel();
59859
59860 /*
59861 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59862@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59863 if (ret)
59864 return ret;
59865
59866- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59867+ pax_open_kernel();
59868+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59869+ pax_close_kernel();
59870 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59871
59872 return 0;
59873diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59874index 154990c..d0cf699 100644
59875--- a/fs/btrfs/tree-log.h
59876+++ b/fs/btrfs/tree-log.h
59877@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59878 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59879 struct btrfs_trans_handle *trans)
59880 {
59881- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59882+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59883 }
59884
59885 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59886diff --git a/fs/buffer.c b/fs/buffer.c
59887index 20805db..2e8fc69 100644
59888--- a/fs/buffer.c
59889+++ b/fs/buffer.c
59890@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59891 bh_cachep = kmem_cache_create("buffer_head",
59892 sizeof(struct buffer_head), 0,
59893 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59894- SLAB_MEM_SPREAD),
59895+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59896 NULL);
59897
59898 /*
59899diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59900index fbb08e9..0fda764 100644
59901--- a/fs/cachefiles/bind.c
59902+++ b/fs/cachefiles/bind.c
59903@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59904 args);
59905
59906 /* start by checking things over */
59907- ASSERT(cache->fstop_percent >= 0 &&
59908- cache->fstop_percent < cache->fcull_percent &&
59909+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
59910 cache->fcull_percent < cache->frun_percent &&
59911 cache->frun_percent < 100);
59912
59913- ASSERT(cache->bstop_percent >= 0 &&
59914- cache->bstop_percent < cache->bcull_percent &&
59915+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
59916 cache->bcull_percent < cache->brun_percent &&
59917 cache->brun_percent < 100);
59918
59919diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59920index ce1b115..4a6852c 100644
59921--- a/fs/cachefiles/daemon.c
59922+++ b/fs/cachefiles/daemon.c
59923@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59924 if (n > buflen)
59925 return -EMSGSIZE;
59926
59927- if (copy_to_user(_buffer, buffer, n) != 0)
59928+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59929 return -EFAULT;
59930
59931 return n;
59932@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59933 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59934 return -EIO;
59935
59936- if (datalen < 0 || datalen > PAGE_SIZE - 1)
59937+ if (datalen > PAGE_SIZE - 1)
59938 return -EOPNOTSUPP;
59939
59940 /* drag the command string into the kernel so we can parse it */
59941@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59942 if (args[0] != '%' || args[1] != '\0')
59943 return -EINVAL;
59944
59945- if (fstop < 0 || fstop >= cache->fcull_percent)
59946+ if (fstop >= cache->fcull_percent)
59947 return cachefiles_daemon_range_error(cache, args);
59948
59949 cache->fstop_percent = fstop;
59950@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59951 if (args[0] != '%' || args[1] != '\0')
59952 return -EINVAL;
59953
59954- if (bstop < 0 || bstop >= cache->bcull_percent)
59955+ if (bstop >= cache->bcull_percent)
59956 return cachefiles_daemon_range_error(cache, args);
59957
59958 cache->bstop_percent = bstop;
59959diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59960index 8c52472..c4e3a69 100644
59961--- a/fs/cachefiles/internal.h
59962+++ b/fs/cachefiles/internal.h
59963@@ -66,7 +66,7 @@ struct cachefiles_cache {
59964 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59965 struct rb_root active_nodes; /* active nodes (can't be culled) */
59966 rwlock_t active_lock; /* lock for active_nodes */
59967- atomic_t gravecounter; /* graveyard uniquifier */
59968+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59969 unsigned frun_percent; /* when to stop culling (% files) */
59970 unsigned fcull_percent; /* when to start culling (% files) */
59971 unsigned fstop_percent; /* when to stop allocating (% files) */
59972@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59973 * proc.c
59974 */
59975 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59976-extern atomic_t cachefiles_lookup_histogram[HZ];
59977-extern atomic_t cachefiles_mkdir_histogram[HZ];
59978-extern atomic_t cachefiles_create_histogram[HZ];
59979+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59980+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59981+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59982
59983 extern int __init cachefiles_proc_init(void);
59984 extern void cachefiles_proc_cleanup(void);
59985 static inline
59986-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59987+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59988 {
59989 unsigned long jif = jiffies - start_jif;
59990 if (jif >= HZ)
59991 jif = HZ - 1;
59992- atomic_inc(&histogram[jif]);
59993+ atomic_inc_unchecked(&histogram[jif]);
59994 }
59995
59996 #else
59997diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59998index 7f8e83f..8951aa4 100644
59999--- a/fs/cachefiles/namei.c
60000+++ b/fs/cachefiles/namei.c
60001@@ -309,7 +309,7 @@ try_again:
60002 /* first step is to make up a grave dentry in the graveyard */
60003 sprintf(nbuffer, "%08x%08x",
60004 (uint32_t) get_seconds(),
60005- (uint32_t) atomic_inc_return(&cache->gravecounter));
60006+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
60007
60008 /* do the multiway lock magic */
60009 trap = lock_rename(cache->graveyard, dir);
60010diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
60011index eccd339..4c1d995 100644
60012--- a/fs/cachefiles/proc.c
60013+++ b/fs/cachefiles/proc.c
60014@@ -14,9 +14,9 @@
60015 #include <linux/seq_file.h>
60016 #include "internal.h"
60017
60018-atomic_t cachefiles_lookup_histogram[HZ];
60019-atomic_t cachefiles_mkdir_histogram[HZ];
60020-atomic_t cachefiles_create_histogram[HZ];
60021+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
60022+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
60023+atomic_unchecked_t cachefiles_create_histogram[HZ];
60024
60025 /*
60026 * display the latency histogram
60027@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
60028 return 0;
60029 default:
60030 index = (unsigned long) v - 3;
60031- x = atomic_read(&cachefiles_lookup_histogram[index]);
60032- y = atomic_read(&cachefiles_mkdir_histogram[index]);
60033- z = atomic_read(&cachefiles_create_histogram[index]);
60034+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
60035+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
60036+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
60037 if (x == 0 && y == 0 && z == 0)
60038 return 0;
60039
60040diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
60041index c241603..56bae60 100644
60042--- a/fs/ceph/dir.c
60043+++ b/fs/ceph/dir.c
60044@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
60045 struct dentry *dentry, *last;
60046 struct ceph_dentry_info *di;
60047 int err = 0;
60048+ char d_name[DNAME_INLINE_LEN];
60049+ const unsigned char *name;
60050
60051 /* claim ref on last dentry we returned */
60052 last = fi->dentry;
60053@@ -192,7 +194,12 @@ more:
60054
60055 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
60056 dentry, dentry, dentry->d_inode);
60057- if (!dir_emit(ctx, dentry->d_name.name,
60058+ name = dentry->d_name.name;
60059+ if (name == dentry->d_iname) {
60060+ memcpy(d_name, name, dentry->d_name.len);
60061+ name = d_name;
60062+ }
60063+ if (!dir_emit(ctx, name,
60064 dentry->d_name.len,
60065 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
60066 dentry->d_inode->i_mode >> 12)) {
60067@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
60068 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
60069 struct ceph_mds_client *mdsc = fsc->mdsc;
60070 unsigned frag = fpos_frag(ctx->pos);
60071- int off = fpos_off(ctx->pos);
60072+ unsigned int off = fpos_off(ctx->pos);
60073 int err;
60074 u32 ftype;
60075 struct ceph_mds_reply_info_parsed *rinfo;
60076diff --git a/fs/ceph/super.c b/fs/ceph/super.c
60077index 50f06cd..c7eba3e 100644
60078--- a/fs/ceph/super.c
60079+++ b/fs/ceph/super.c
60080@@ -896,7 +896,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
60081 /*
60082 * construct our own bdi so we can control readahead, etc.
60083 */
60084-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
60085+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
60086
60087 static int ceph_register_bdi(struct super_block *sb,
60088 struct ceph_fs_client *fsc)
60089@@ -913,7 +913,7 @@ static int ceph_register_bdi(struct super_block *sb,
60090 default_backing_dev_info.ra_pages;
60091
60092 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
60093- atomic_long_inc_return(&bdi_seq));
60094+ atomic_long_inc_return_unchecked(&bdi_seq));
60095 if (!err)
60096 sb->s_bdi = &fsc->backing_dev_info;
60097 return err;
60098diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
60099index 7febcf2..62a5721 100644
60100--- a/fs/cifs/cifs_debug.c
60101+++ b/fs/cifs/cifs_debug.c
60102@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60103
60104 if (strtobool(&c, &bv) == 0) {
60105 #ifdef CONFIG_CIFS_STATS2
60106- atomic_set(&totBufAllocCount, 0);
60107- atomic_set(&totSmBufAllocCount, 0);
60108+ atomic_set_unchecked(&totBufAllocCount, 0);
60109+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60110 #endif /* CONFIG_CIFS_STATS2 */
60111 spin_lock(&cifs_tcp_ses_lock);
60112 list_for_each(tmp1, &cifs_tcp_ses_list) {
60113@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60114 tcon = list_entry(tmp3,
60115 struct cifs_tcon,
60116 tcon_list);
60117- atomic_set(&tcon->num_smbs_sent, 0);
60118+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
60119 if (server->ops->clear_stats)
60120 server->ops->clear_stats(tcon);
60121 }
60122@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60123 smBufAllocCount.counter, cifs_min_small);
60124 #ifdef CONFIG_CIFS_STATS2
60125 seq_printf(m, "Total Large %d Small %d Allocations\n",
60126- atomic_read(&totBufAllocCount),
60127- atomic_read(&totSmBufAllocCount));
60128+ atomic_read_unchecked(&totBufAllocCount),
60129+ atomic_read_unchecked(&totSmBufAllocCount));
60130 #endif /* CONFIG_CIFS_STATS2 */
60131
60132 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
60133@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60134 if (tcon->need_reconnect)
60135 seq_puts(m, "\tDISCONNECTED ");
60136 seq_printf(m, "\nSMBs: %d",
60137- atomic_read(&tcon->num_smbs_sent));
60138+ atomic_read_unchecked(&tcon->num_smbs_sent));
60139 if (server->ops->print_stats)
60140 server->ops->print_stats(m, tcon);
60141 }
60142diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
60143index d72fe37..ded5511 100644
60144--- a/fs/cifs/cifsfs.c
60145+++ b/fs/cifs/cifsfs.c
60146@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
60147 */
60148 cifs_req_cachep = kmem_cache_create("cifs_request",
60149 CIFSMaxBufSize + max_hdr_size, 0,
60150- SLAB_HWCACHE_ALIGN, NULL);
60151+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
60152 if (cifs_req_cachep == NULL)
60153 return -ENOMEM;
60154
60155@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
60156 efficient to alloc 1 per page off the slab compared to 17K (5page)
60157 alloc of large cifs buffers even when page debugging is on */
60158 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
60159- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
60160+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
60161 NULL);
60162 if (cifs_sm_req_cachep == NULL) {
60163 mempool_destroy(cifs_req_poolp);
60164@@ -1204,8 +1204,8 @@ init_cifs(void)
60165 atomic_set(&bufAllocCount, 0);
60166 atomic_set(&smBufAllocCount, 0);
60167 #ifdef CONFIG_CIFS_STATS2
60168- atomic_set(&totBufAllocCount, 0);
60169- atomic_set(&totSmBufAllocCount, 0);
60170+ atomic_set_unchecked(&totBufAllocCount, 0);
60171+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60172 #endif /* CONFIG_CIFS_STATS2 */
60173
60174 atomic_set(&midCount, 0);
60175diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
60176index 22b289a..bbbba08 100644
60177--- a/fs/cifs/cifsglob.h
60178+++ b/fs/cifs/cifsglob.h
60179@@ -823,35 +823,35 @@ struct cifs_tcon {
60180 __u16 Flags; /* optional support bits */
60181 enum statusEnum tidStatus;
60182 #ifdef CONFIG_CIFS_STATS
60183- atomic_t num_smbs_sent;
60184+ atomic_unchecked_t num_smbs_sent;
60185 union {
60186 struct {
60187- atomic_t num_writes;
60188- atomic_t num_reads;
60189- atomic_t num_flushes;
60190- atomic_t num_oplock_brks;
60191- atomic_t num_opens;
60192- atomic_t num_closes;
60193- atomic_t num_deletes;
60194- atomic_t num_mkdirs;
60195- atomic_t num_posixopens;
60196- atomic_t num_posixmkdirs;
60197- atomic_t num_rmdirs;
60198- atomic_t num_renames;
60199- atomic_t num_t2renames;
60200- atomic_t num_ffirst;
60201- atomic_t num_fnext;
60202- atomic_t num_fclose;
60203- atomic_t num_hardlinks;
60204- atomic_t num_symlinks;
60205- atomic_t num_locks;
60206- atomic_t num_acl_get;
60207- atomic_t num_acl_set;
60208+ atomic_unchecked_t num_writes;
60209+ atomic_unchecked_t num_reads;
60210+ atomic_unchecked_t num_flushes;
60211+ atomic_unchecked_t num_oplock_brks;
60212+ atomic_unchecked_t num_opens;
60213+ atomic_unchecked_t num_closes;
60214+ atomic_unchecked_t num_deletes;
60215+ atomic_unchecked_t num_mkdirs;
60216+ atomic_unchecked_t num_posixopens;
60217+ atomic_unchecked_t num_posixmkdirs;
60218+ atomic_unchecked_t num_rmdirs;
60219+ atomic_unchecked_t num_renames;
60220+ atomic_unchecked_t num_t2renames;
60221+ atomic_unchecked_t num_ffirst;
60222+ atomic_unchecked_t num_fnext;
60223+ atomic_unchecked_t num_fclose;
60224+ atomic_unchecked_t num_hardlinks;
60225+ atomic_unchecked_t num_symlinks;
60226+ atomic_unchecked_t num_locks;
60227+ atomic_unchecked_t num_acl_get;
60228+ atomic_unchecked_t num_acl_set;
60229 } cifs_stats;
60230 #ifdef CONFIG_CIFS_SMB2
60231 struct {
60232- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60233- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60234+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60235+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60236 } smb2_stats;
60237 #endif /* CONFIG_CIFS_SMB2 */
60238 } stats;
60239@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
60240 }
60241
60242 #ifdef CONFIG_CIFS_STATS
60243-#define cifs_stats_inc atomic_inc
60244+#define cifs_stats_inc atomic_inc_unchecked
60245
60246 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
60247 unsigned int bytes)
60248@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
60249 /* Various Debug counters */
60250 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
60251 #ifdef CONFIG_CIFS_STATS2
60252-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
60253-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
60254+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
60255+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
60256 #endif
60257 GLOBAL_EXTERN atomic_t smBufAllocCount;
60258 GLOBAL_EXTERN atomic_t midCount;
60259diff --git a/fs/cifs/file.c b/fs/cifs/file.c
60260index 3e30d92..2c9f066 100644
60261--- a/fs/cifs/file.c
60262+++ b/fs/cifs/file.c
60263@@ -2061,10 +2061,14 @@ static int cifs_writepages(struct address_space *mapping,
60264 index = mapping->writeback_index; /* Start from prev offset */
60265 end = -1;
60266 } else {
60267- index = wbc->range_start >> PAGE_CACHE_SHIFT;
60268- end = wbc->range_end >> PAGE_CACHE_SHIFT;
60269- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
60270+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
60271 range_whole = true;
60272+ index = 0;
60273+ end = ULONG_MAX;
60274+ } else {
60275+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
60276+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
60277+ }
60278 scanned = true;
60279 }
60280 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
60281diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
60282index 3379463..3af418a 100644
60283--- a/fs/cifs/misc.c
60284+++ b/fs/cifs/misc.c
60285@@ -170,7 +170,7 @@ cifs_buf_get(void)
60286 memset(ret_buf, 0, buf_size + 3);
60287 atomic_inc(&bufAllocCount);
60288 #ifdef CONFIG_CIFS_STATS2
60289- atomic_inc(&totBufAllocCount);
60290+ atomic_inc_unchecked(&totBufAllocCount);
60291 #endif /* CONFIG_CIFS_STATS2 */
60292 }
60293
60294@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
60295 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
60296 atomic_inc(&smBufAllocCount);
60297 #ifdef CONFIG_CIFS_STATS2
60298- atomic_inc(&totSmBufAllocCount);
60299+ atomic_inc_unchecked(&totSmBufAllocCount);
60300 #endif /* CONFIG_CIFS_STATS2 */
60301
60302 }
60303diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
60304index d297903..1cb7516 100644
60305--- a/fs/cifs/smb1ops.c
60306+++ b/fs/cifs/smb1ops.c
60307@@ -622,27 +622,27 @@ static void
60308 cifs_clear_stats(struct cifs_tcon *tcon)
60309 {
60310 #ifdef CONFIG_CIFS_STATS
60311- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
60312- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
60313- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
60314- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60315- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
60316- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
60317- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60318- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
60319- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
60320- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
60321- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
60322- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
60323- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
60324- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
60325- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
60326- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
60327- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
60328- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
60329- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
60330- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
60331- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
60332+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
60333+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
60334+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
60335+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60336+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
60337+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
60338+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60339+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
60340+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
60341+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
60342+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
60343+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
60344+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
60345+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
60346+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
60347+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
60348+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
60349+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
60350+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
60351+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
60352+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
60353 #endif
60354 }
60355
60356@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60357 {
60358 #ifdef CONFIG_CIFS_STATS
60359 seq_printf(m, " Oplocks breaks: %d",
60360- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
60361+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
60362 seq_printf(m, "\nReads: %d Bytes: %llu",
60363- atomic_read(&tcon->stats.cifs_stats.num_reads),
60364+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
60365 (long long)(tcon->bytes_read));
60366 seq_printf(m, "\nWrites: %d Bytes: %llu",
60367- atomic_read(&tcon->stats.cifs_stats.num_writes),
60368+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
60369 (long long)(tcon->bytes_written));
60370 seq_printf(m, "\nFlushes: %d",
60371- atomic_read(&tcon->stats.cifs_stats.num_flushes));
60372+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
60373 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
60374- atomic_read(&tcon->stats.cifs_stats.num_locks),
60375- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
60376- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
60377+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
60378+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
60379+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
60380 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
60381- atomic_read(&tcon->stats.cifs_stats.num_opens),
60382- atomic_read(&tcon->stats.cifs_stats.num_closes),
60383- atomic_read(&tcon->stats.cifs_stats.num_deletes));
60384+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
60385+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
60386+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
60387 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
60388- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
60389- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
60390+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
60391+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
60392 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
60393- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
60394- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
60395+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
60396+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
60397 seq_printf(m, "\nRenames: %d T2 Renames %d",
60398- atomic_read(&tcon->stats.cifs_stats.num_renames),
60399- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
60400+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
60401+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
60402 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
60403- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
60404- atomic_read(&tcon->stats.cifs_stats.num_fnext),
60405- atomic_read(&tcon->stats.cifs_stats.num_fclose));
60406+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
60407+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
60408+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
60409 #endif
60410 }
60411
60412diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
60413index eab05e1..ffe5ea4 100644
60414--- a/fs/cifs/smb2ops.c
60415+++ b/fs/cifs/smb2ops.c
60416@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
60417 #ifdef CONFIG_CIFS_STATS
60418 int i;
60419 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
60420- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60421- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60422+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60423+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60424 }
60425 #endif
60426 }
60427@@ -459,65 +459,65 @@ static void
60428 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60429 {
60430 #ifdef CONFIG_CIFS_STATS
60431- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60432- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60433+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60434+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60435 seq_printf(m, "\nNegotiates: %d sent %d failed",
60436- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
60437- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
60438+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
60439+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
60440 seq_printf(m, "\nSessionSetups: %d sent %d failed",
60441- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
60442- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
60443+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
60444+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
60445 seq_printf(m, "\nLogoffs: %d sent %d failed",
60446- atomic_read(&sent[SMB2_LOGOFF_HE]),
60447- atomic_read(&failed[SMB2_LOGOFF_HE]));
60448+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
60449+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
60450 seq_printf(m, "\nTreeConnects: %d sent %d failed",
60451- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60452- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60453+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60454+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60455 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60456- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60457- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60458+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60459+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60460 seq_printf(m, "\nCreates: %d sent %d failed",
60461- atomic_read(&sent[SMB2_CREATE_HE]),
60462- atomic_read(&failed[SMB2_CREATE_HE]));
60463+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60464+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60465 seq_printf(m, "\nCloses: %d sent %d failed",
60466- atomic_read(&sent[SMB2_CLOSE_HE]),
60467- atomic_read(&failed[SMB2_CLOSE_HE]));
60468+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60469+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60470 seq_printf(m, "\nFlushes: %d sent %d failed",
60471- atomic_read(&sent[SMB2_FLUSH_HE]),
60472- atomic_read(&failed[SMB2_FLUSH_HE]));
60473+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60474+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60475 seq_printf(m, "\nReads: %d sent %d failed",
60476- atomic_read(&sent[SMB2_READ_HE]),
60477- atomic_read(&failed[SMB2_READ_HE]));
60478+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
60479+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
60480 seq_printf(m, "\nWrites: %d sent %d failed",
60481- atomic_read(&sent[SMB2_WRITE_HE]),
60482- atomic_read(&failed[SMB2_WRITE_HE]));
60483+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60484+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60485 seq_printf(m, "\nLocks: %d sent %d failed",
60486- atomic_read(&sent[SMB2_LOCK_HE]),
60487- atomic_read(&failed[SMB2_LOCK_HE]));
60488+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60489+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60490 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60491- atomic_read(&sent[SMB2_IOCTL_HE]),
60492- atomic_read(&failed[SMB2_IOCTL_HE]));
60493+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60494+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60495 seq_printf(m, "\nCancels: %d sent %d failed",
60496- atomic_read(&sent[SMB2_CANCEL_HE]),
60497- atomic_read(&failed[SMB2_CANCEL_HE]));
60498+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60499+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60500 seq_printf(m, "\nEchos: %d sent %d failed",
60501- atomic_read(&sent[SMB2_ECHO_HE]),
60502- atomic_read(&failed[SMB2_ECHO_HE]));
60503+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60504+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60505 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60506- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60507- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60508+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60509+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60510 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60511- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60512- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60513+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60514+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60515 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60516- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60517- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60518+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60519+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60520 seq_printf(m, "\nSetInfos: %d sent %d failed",
60521- atomic_read(&sent[SMB2_SET_INFO_HE]),
60522- atomic_read(&failed[SMB2_SET_INFO_HE]));
60523+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60524+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60525 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60526- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60527- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60528+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60529+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60530 #endif
60531 }
60532
60533diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60534index 3417340..b942390 100644
60535--- a/fs/cifs/smb2pdu.c
60536+++ b/fs/cifs/smb2pdu.c
60537@@ -2144,8 +2144,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60538 default:
60539 cifs_dbg(VFS, "info level %u isn't supported\n",
60540 srch_inf->info_level);
60541- rc = -EINVAL;
60542- goto qdir_exit;
60543+ return -EINVAL;
60544 }
60545
60546 req->FileIndex = cpu_to_le32(index);
60547diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60548index 46ee6f2..89a9e7f 100644
60549--- a/fs/coda/cache.c
60550+++ b/fs/coda/cache.c
60551@@ -24,7 +24,7 @@
60552 #include "coda_linux.h"
60553 #include "coda_cache.h"
60554
60555-static atomic_t permission_epoch = ATOMIC_INIT(0);
60556+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60557
60558 /* replace or extend an acl cache hit */
60559 void coda_cache_enter(struct inode *inode, int mask)
60560@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60561 struct coda_inode_info *cii = ITOC(inode);
60562
60563 spin_lock(&cii->c_lock);
60564- cii->c_cached_epoch = atomic_read(&permission_epoch);
60565+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60566 if (!uid_eq(cii->c_uid, current_fsuid())) {
60567 cii->c_uid = current_fsuid();
60568 cii->c_cached_perm = mask;
60569@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60570 {
60571 struct coda_inode_info *cii = ITOC(inode);
60572 spin_lock(&cii->c_lock);
60573- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60574+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60575 spin_unlock(&cii->c_lock);
60576 }
60577
60578 /* remove all acl caches */
60579 void coda_cache_clear_all(struct super_block *sb)
60580 {
60581- atomic_inc(&permission_epoch);
60582+ atomic_inc_unchecked(&permission_epoch);
60583 }
60584
60585
60586@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60587 spin_lock(&cii->c_lock);
60588 hit = (mask & cii->c_cached_perm) == mask &&
60589 uid_eq(cii->c_uid, current_fsuid()) &&
60590- cii->c_cached_epoch == atomic_read(&permission_epoch);
60591+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60592 spin_unlock(&cii->c_lock);
60593
60594 return hit;
60595diff --git a/fs/compat.c b/fs/compat.c
60596index 6fd272d..dd34ba2 100644
60597--- a/fs/compat.c
60598+++ b/fs/compat.c
60599@@ -54,7 +54,7 @@
60600 #include <asm/ioctls.h>
60601 #include "internal.h"
60602
60603-int compat_log = 1;
60604+int compat_log = 0;
60605
60606 int compat_printk(const char *fmt, ...)
60607 {
60608@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60609
60610 set_fs(KERNEL_DS);
60611 /* The __user pointer cast is valid because of the set_fs() */
60612- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60613+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60614 set_fs(oldfs);
60615 /* truncating is ok because it's a user address */
60616 if (!ret)
60617@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60618 goto out;
60619
60620 ret = -EINVAL;
60621- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60622+ if (nr_segs > UIO_MAXIOV)
60623 goto out;
60624 if (nr_segs > fast_segs) {
60625 ret = -ENOMEM;
60626@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60627 struct compat_readdir_callback {
60628 struct dir_context ctx;
60629 struct compat_old_linux_dirent __user *dirent;
60630+ struct file * file;
60631 int result;
60632 };
60633
60634@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
60635 buf->result = -EOVERFLOW;
60636 return -EOVERFLOW;
60637 }
60638+
60639+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60640+ return 0;
60641+
60642 buf->result++;
60643 dirent = buf->dirent;
60644 if (!access_ok(VERIFY_WRITE, dirent,
60645@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60646 if (!f.file)
60647 return -EBADF;
60648
60649+ buf.file = f.file;
60650 error = iterate_dir(f.file, &buf.ctx);
60651 if (buf.result)
60652 error = buf.result;
60653@@ -913,6 +919,7 @@ struct compat_getdents_callback {
60654 struct dir_context ctx;
60655 struct compat_linux_dirent __user *current_dir;
60656 struct compat_linux_dirent __user *previous;
60657+ struct file * file;
60658 int count;
60659 int error;
60660 };
60661@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
60662 buf->error = -EOVERFLOW;
60663 return -EOVERFLOW;
60664 }
60665+
60666+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60667+ return 0;
60668+
60669 dirent = buf->previous;
60670 if (dirent) {
60671 if (__put_user(offset, &dirent->d_off))
60672@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60673 if (!f.file)
60674 return -EBADF;
60675
60676+ buf.file = f.file;
60677 error = iterate_dir(f.file, &buf.ctx);
60678 if (error >= 0)
60679 error = buf.error;
60680@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
60681 struct dir_context ctx;
60682 struct linux_dirent64 __user *current_dir;
60683 struct linux_dirent64 __user *previous;
60684+ struct file * file;
60685 int count;
60686 int error;
60687 };
60688@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
60689 buf->error = -EINVAL; /* only used if we fail.. */
60690 if (reclen > buf->count)
60691 return -EINVAL;
60692+
60693+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60694+ return 0;
60695+
60696 dirent = buf->previous;
60697
60698 if (dirent) {
60699@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60700 if (!f.file)
60701 return -EBADF;
60702
60703+ buf.file = f.file;
60704 error = iterate_dir(f.file, &buf.ctx);
60705 if (error >= 0)
60706 error = buf.error;
60707diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60708index 4d24d17..4f8c09e 100644
60709--- a/fs/compat_binfmt_elf.c
60710+++ b/fs/compat_binfmt_elf.c
60711@@ -30,11 +30,13 @@
60712 #undef elf_phdr
60713 #undef elf_shdr
60714 #undef elf_note
60715+#undef elf_dyn
60716 #undef elf_addr_t
60717 #define elfhdr elf32_hdr
60718 #define elf_phdr elf32_phdr
60719 #define elf_shdr elf32_shdr
60720 #define elf_note elf32_note
60721+#define elf_dyn Elf32_Dyn
60722 #define elf_addr_t Elf32_Addr
60723
60724 /*
60725diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60726index afec645..9c65620 100644
60727--- a/fs/compat_ioctl.c
60728+++ b/fs/compat_ioctl.c
60729@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60730 return -EFAULT;
60731 if (__get_user(udata, &ss32->iomem_base))
60732 return -EFAULT;
60733- ss.iomem_base = compat_ptr(udata);
60734+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60735 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60736 __get_user(ss.port_high, &ss32->port_high))
60737 return -EFAULT;
60738@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60739 for (i = 0; i < nmsgs; i++) {
60740 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60741 return -EFAULT;
60742- if (get_user(datap, &umsgs[i].buf) ||
60743- put_user(compat_ptr(datap), &tmsgs[i].buf))
60744+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60745+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60746 return -EFAULT;
60747 }
60748 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60749@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60750 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60751 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60752 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60753- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60754+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60755 return -EFAULT;
60756
60757 return ioctl_preallocate(file, p);
60758@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60759 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60760 {
60761 unsigned int a, b;
60762- a = *(unsigned int *)p;
60763- b = *(unsigned int *)q;
60764+ a = *(const unsigned int *)p;
60765+ b = *(const unsigned int *)q;
60766 if (a > b)
60767 return 1;
60768 if (a < b)
60769diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60770index c9c298b..544d100 100644
60771--- a/fs/configfs/dir.c
60772+++ b/fs/configfs/dir.c
60773@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60774 }
60775 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60776 struct configfs_dirent *next;
60777- const char *name;
60778+ const unsigned char * name;
60779+ char d_name[sizeof(next->s_dentry->d_iname)];
60780 int len;
60781 struct inode *inode = NULL;
60782
60783@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60784 continue;
60785
60786 name = configfs_get_name(next);
60787- len = strlen(name);
60788+ if (next->s_dentry && name == next->s_dentry->d_iname) {
60789+ len = next->s_dentry->d_name.len;
60790+ memcpy(d_name, name, len);
60791+ name = d_name;
60792+ } else
60793+ len = strlen(name);
60794
60795 /*
60796 * We'll have a dentry and an inode for
60797diff --git a/fs/coredump.c b/fs/coredump.c
60798index b5c86ff..0dac262 100644
60799--- a/fs/coredump.c
60800+++ b/fs/coredump.c
60801@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60802 struct pipe_inode_info *pipe = file->private_data;
60803
60804 pipe_lock(pipe);
60805- pipe->readers++;
60806- pipe->writers--;
60807+ atomic_inc(&pipe->readers);
60808+ atomic_dec(&pipe->writers);
60809 wake_up_interruptible_sync(&pipe->wait);
60810 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60811 pipe_unlock(pipe);
60812@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60813 * We actually want wait_event_freezable() but then we need
60814 * to clear TIF_SIGPENDING and improve dump_interrupted().
60815 */
60816- wait_event_interruptible(pipe->wait, pipe->readers == 1);
60817+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60818
60819 pipe_lock(pipe);
60820- pipe->readers--;
60821- pipe->writers++;
60822+ atomic_dec(&pipe->readers);
60823+ atomic_inc(&pipe->writers);
60824 pipe_unlock(pipe);
60825 }
60826
60827@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60828 struct files_struct *displaced;
60829 bool need_nonrelative = false;
60830 bool core_dumped = false;
60831- static atomic_t core_dump_count = ATOMIC_INIT(0);
60832+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60833+ long signr = siginfo->si_signo;
60834+ int dumpable;
60835 struct coredump_params cprm = {
60836 .siginfo = siginfo,
60837 .regs = signal_pt_regs(),
60838@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60839 .mm_flags = mm->flags,
60840 };
60841
60842- audit_core_dumps(siginfo->si_signo);
60843+ audit_core_dumps(signr);
60844+
60845+ dumpable = __get_dumpable(cprm.mm_flags);
60846+
60847+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60848+ gr_handle_brute_attach(dumpable);
60849
60850 binfmt = mm->binfmt;
60851 if (!binfmt || !binfmt->core_dump)
60852 goto fail;
60853- if (!__get_dumpable(cprm.mm_flags))
60854+ if (!dumpable)
60855 goto fail;
60856
60857 cred = prepare_creds();
60858@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60859 need_nonrelative = true;
60860 }
60861
60862- retval = coredump_wait(siginfo->si_signo, &core_state);
60863+ retval = coredump_wait(signr, &core_state);
60864 if (retval < 0)
60865 goto fail_creds;
60866
60867@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60868 }
60869 cprm.limit = RLIM_INFINITY;
60870
60871- dump_count = atomic_inc_return(&core_dump_count);
60872+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
60873 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60874 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60875 task_tgid_vnr(current), current->comm);
60876@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60877 } else {
60878 struct inode *inode;
60879
60880+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60881+
60882 if (cprm.limit < binfmt->min_coredump)
60883 goto fail_unlock;
60884
60885@@ -681,7 +690,7 @@ close_fail:
60886 filp_close(cprm.file, NULL);
60887 fail_dropcount:
60888 if (ispipe)
60889- atomic_dec(&core_dump_count);
60890+ atomic_dec_unchecked(&core_dump_count);
60891 fail_unlock:
60892 kfree(cn.corename);
60893 coredump_finish(mm, core_dumped);
60894@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60895 struct file *file = cprm->file;
60896 loff_t pos = file->f_pos;
60897 ssize_t n;
60898+
60899+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60900 if (cprm->written + nr > cprm->limit)
60901 return 0;
60902 while (nr) {
60903diff --git a/fs/dcache.c b/fs/dcache.c
60904index e368d4f..b40ba59 100644
60905--- a/fs/dcache.c
60906+++ b/fs/dcache.c
60907@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60908 * dentry_iput drops the locks, at which point nobody (except
60909 * transient RCU lookups) can reach this dentry.
60910 */
60911- BUG_ON((int)dentry->d_lockref.count > 0);
60912+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60913 this_cpu_dec(nr_dentry);
60914 if (dentry->d_op && dentry->d_op->d_release)
60915 dentry->d_op->d_release(dentry);
60916@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60917 struct dentry *parent = dentry->d_parent;
60918 if (IS_ROOT(dentry))
60919 return NULL;
60920- if (unlikely((int)dentry->d_lockref.count < 0))
60921+ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60922 return NULL;
60923 if (likely(spin_trylock(&parent->d_lock)))
60924 return parent;
60925@@ -638,7 +638,7 @@ repeat:
60926 dentry->d_flags |= DCACHE_REFERENCED;
60927 dentry_lru_add(dentry);
60928
60929- dentry->d_lockref.count--;
60930+ __lockref_dec(&dentry->d_lockref);
60931 spin_unlock(&dentry->d_lock);
60932 return;
60933
60934@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60935 /* This must be called with d_lock held */
60936 static inline void __dget_dlock(struct dentry *dentry)
60937 {
60938- dentry->d_lockref.count++;
60939+ __lockref_inc(&dentry->d_lockref);
60940 }
60941
60942 static inline void __dget(struct dentry *dentry)
60943@@ -694,8 +694,8 @@ repeat:
60944 goto repeat;
60945 }
60946 rcu_read_unlock();
60947- BUG_ON(!ret->d_lockref.count);
60948- ret->d_lockref.count++;
60949+ BUG_ON(!__lockref_read(&ret->d_lockref));
60950+ __lockref_inc(&ret->d_lockref);
60951 spin_unlock(&ret->d_lock);
60952 return ret;
60953 }
60954@@ -773,9 +773,9 @@ restart:
60955 spin_lock(&inode->i_lock);
60956 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60957 spin_lock(&dentry->d_lock);
60958- if (!dentry->d_lockref.count) {
60959+ if (!__lockref_read(&dentry->d_lockref)) {
60960 struct dentry *parent = lock_parent(dentry);
60961- if (likely(!dentry->d_lockref.count)) {
60962+ if (likely(!__lockref_read(&dentry->d_lockref))) {
60963 __dentry_kill(dentry);
60964 dput(parent);
60965 goto restart;
60966@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60967 * We found an inuse dentry which was not removed from
60968 * the LRU because of laziness during lookup. Do not free it.
60969 */
60970- if ((int)dentry->d_lockref.count > 0) {
60971+ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60972 spin_unlock(&dentry->d_lock);
60973 if (parent)
60974 spin_unlock(&parent->d_lock);
60975@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60976 dentry = parent;
60977 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60978 parent = lock_parent(dentry);
60979- if (dentry->d_lockref.count != 1) {
60980- dentry->d_lockref.count--;
60981+ if (__lockref_read(&dentry->d_lockref) != 1) {
60982+ __lockref_inc(&dentry->d_lockref);
60983 spin_unlock(&dentry->d_lock);
60984 if (parent)
60985 spin_unlock(&parent->d_lock);
60986@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60987 * counts, just remove them from the LRU. Otherwise give them
60988 * another pass through the LRU.
60989 */
60990- if (dentry->d_lockref.count) {
60991+ if (__lockref_read(&dentry->d_lockref) > 0) {
60992 d_lru_isolate(dentry);
60993 spin_unlock(&dentry->d_lock);
60994 return LRU_REMOVED;
60995@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60996 } else {
60997 if (dentry->d_flags & DCACHE_LRU_LIST)
60998 d_lru_del(dentry);
60999- if (!dentry->d_lockref.count) {
61000+ if (!__lockref_read(&dentry->d_lockref)) {
61001 d_shrink_add(dentry, &data->dispose);
61002 data->found++;
61003 }
61004@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
61005 return D_WALK_CONTINUE;
61006
61007 /* root with refcount 1 is fine */
61008- if (dentry == _data && dentry->d_lockref.count == 1)
61009+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
61010 return D_WALK_CONTINUE;
61011
61012 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
61013@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
61014 dentry->d_inode ?
61015 dentry->d_inode->i_ino : 0UL,
61016 dentry,
61017- dentry->d_lockref.count,
61018+ __lockref_read(&dentry->d_lockref),
61019 dentry->d_sb->s_type->name,
61020 dentry->d_sb->s_id);
61021 WARN_ON(1);
61022@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61023 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
61024 if (name->len > DNAME_INLINE_LEN-1) {
61025 size_t size = offsetof(struct external_name, name[1]);
61026- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
61027+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
61028 if (!p) {
61029 kmem_cache_free(dentry_cache, dentry);
61030 return NULL;
61031@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61032 smp_wmb();
61033 dentry->d_name.name = dname;
61034
61035- dentry->d_lockref.count = 1;
61036+ __lockref_set(&dentry->d_lockref, 1);
61037 dentry->d_flags = 0;
61038 spin_lock_init(&dentry->d_lock);
61039 seqcount_init(&dentry->d_seq);
61040@@ -1452,6 +1452,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61041 dentry->d_sb = sb;
61042 dentry->d_op = NULL;
61043 dentry->d_fsdata = NULL;
61044+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
61045+ atomic_set(&dentry->chroot_refcnt, 0);
61046+#endif
61047 INIT_HLIST_BL_NODE(&dentry->d_hash);
61048 INIT_LIST_HEAD(&dentry->d_lru);
61049 INIT_LIST_HEAD(&dentry->d_subdirs);
61050@@ -2151,7 +2154,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
61051 goto next;
61052 }
61053
61054- dentry->d_lockref.count++;
61055+ __lockref_inc(&dentry->d_lockref);
61056 found = dentry;
61057 spin_unlock(&dentry->d_lock);
61058 break;
61059@@ -2250,7 +2253,7 @@ again:
61060 spin_lock(&dentry->d_lock);
61061 inode = dentry->d_inode;
61062 isdir = S_ISDIR(inode->i_mode);
61063- if (dentry->d_lockref.count == 1) {
61064+ if (__lockref_read(&dentry->d_lockref) == 1) {
61065 if (!spin_trylock(&inode->i_lock)) {
61066 spin_unlock(&dentry->d_lock);
61067 cpu_relax();
61068@@ -3203,7 +3206,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
61069
61070 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
61071 dentry->d_flags |= DCACHE_GENOCIDE;
61072- dentry->d_lockref.count--;
61073+ __lockref_dec(&dentry->d_lockref);
61074 }
61075 }
61076 return D_WALK_CONTINUE;
61077@@ -3319,7 +3322,8 @@ void __init vfs_caches_init(unsigned long mempages)
61078 mempages -= reserve;
61079
61080 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
61081- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
61082+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
61083+ SLAB_NO_SANITIZE, NULL);
61084
61085 dcache_init();
61086 inode_init();
61087diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
61088index 6f0ce53..92bba36 100644
61089--- a/fs/debugfs/inode.c
61090+++ b/fs/debugfs/inode.c
61091@@ -423,10 +423,20 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
61092 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
61093 * returned.
61094 */
61095+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61096+extern int grsec_enable_sysfs_restrict;
61097+#endif
61098+
61099 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
61100 {
61101- return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
61102- parent, NULL, NULL);
61103+ umode_t mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
61104+
61105+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61106+ if (grsec_enable_sysfs_restrict)
61107+ mode = S_IFDIR | S_IRWXU;
61108+#endif
61109+
61110+ return __create_file(name, mode, parent, NULL, NULL);
61111 }
61112 EXPORT_SYMBOL_GPL(debugfs_create_dir);
61113
61114diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
61115index 1686dc2..9611c50 100644
61116--- a/fs/ecryptfs/inode.c
61117+++ b/fs/ecryptfs/inode.c
61118@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
61119 old_fs = get_fs();
61120 set_fs(get_ds());
61121 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
61122- (char __user *)lower_buf,
61123+ (char __force_user *)lower_buf,
61124 PATH_MAX);
61125 set_fs(old_fs);
61126 if (rc < 0)
61127diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
61128index e4141f2..d8263e8 100644
61129--- a/fs/ecryptfs/miscdev.c
61130+++ b/fs/ecryptfs/miscdev.c
61131@@ -304,7 +304,7 @@ check_list:
61132 goto out_unlock_msg_ctx;
61133 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
61134 if (msg_ctx->msg) {
61135- if (copy_to_user(&buf[i], packet_length, packet_length_size))
61136+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
61137 goto out_unlock_msg_ctx;
61138 i += packet_length_size;
61139 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
61140diff --git a/fs/exec.c b/fs/exec.c
61141index 4617a4e..e3f50ec 100644
61142--- a/fs/exec.c
61143+++ b/fs/exec.c
61144@@ -56,8 +56,20 @@
61145 #include <linux/pipe_fs_i.h>
61146 #include <linux/oom.h>
61147 #include <linux/compat.h>
61148+#include <linux/random.h>
61149+#include <linux/seq_file.h>
61150+#include <linux/coredump.h>
61151+#include <linux/mman.h>
61152+
61153+#ifdef CONFIG_PAX_REFCOUNT
61154+#include <linux/kallsyms.h>
61155+#include <linux/kdebug.h>
61156+#endif
61157+
61158+#include <trace/events/fs.h>
61159
61160 #include <asm/uaccess.h>
61161+#include <asm/sections.h>
61162 #include <asm/mmu_context.h>
61163 #include <asm/tlb.h>
61164
61165@@ -66,19 +78,34 @@
61166
61167 #include <trace/events/sched.h>
61168
61169+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
61170+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
61171+{
61172+ 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");
61173+}
61174+#endif
61175+
61176+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
61177+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
61178+EXPORT_SYMBOL(pax_set_initial_flags_func);
61179+#endif
61180+
61181 int suid_dumpable = 0;
61182
61183 static LIST_HEAD(formats);
61184 static DEFINE_RWLOCK(binfmt_lock);
61185
61186+extern int gr_process_kernel_exec_ban(void);
61187+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
61188+
61189 void __register_binfmt(struct linux_binfmt * fmt, int insert)
61190 {
61191 BUG_ON(!fmt);
61192 if (WARN_ON(!fmt->load_binary))
61193 return;
61194 write_lock(&binfmt_lock);
61195- insert ? list_add(&fmt->lh, &formats) :
61196- list_add_tail(&fmt->lh, &formats);
61197+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
61198+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
61199 write_unlock(&binfmt_lock);
61200 }
61201
61202@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
61203 void unregister_binfmt(struct linux_binfmt * fmt)
61204 {
61205 write_lock(&binfmt_lock);
61206- list_del(&fmt->lh);
61207+ pax_list_del((struct list_head *)&fmt->lh);
61208 write_unlock(&binfmt_lock);
61209 }
61210
61211@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61212 int write)
61213 {
61214 struct page *page;
61215- int ret;
61216
61217-#ifdef CONFIG_STACK_GROWSUP
61218- if (write) {
61219- ret = expand_downwards(bprm->vma, pos);
61220- if (ret < 0)
61221- return NULL;
61222- }
61223-#endif
61224- ret = get_user_pages(current, bprm->mm, pos,
61225- 1, write, 1, &page, NULL);
61226- if (ret <= 0)
61227+ if (0 > expand_downwards(bprm->vma, pos))
61228+ return NULL;
61229+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
61230 return NULL;
61231
61232 if (write) {
61233@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61234 if (size <= ARG_MAX)
61235 return page;
61236
61237+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61238+ // only allow 512KB for argv+env on suid/sgid binaries
61239+ // to prevent easy ASLR exhaustion
61240+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
61241+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
61242+ (size > (512 * 1024))) {
61243+ put_page(page);
61244+ return NULL;
61245+ }
61246+#endif
61247+
61248 /*
61249 * Limit to 1/4-th the stack size for the argv+env strings.
61250 * This ensures that:
61251@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61252 vma->vm_end = STACK_TOP_MAX;
61253 vma->vm_start = vma->vm_end - PAGE_SIZE;
61254 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
61255+
61256+#ifdef CONFIG_PAX_SEGMEXEC
61257+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
61258+#endif
61259+
61260 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
61261 INIT_LIST_HEAD(&vma->anon_vma_chain);
61262
61263@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61264 arch_bprm_mm_init(mm, vma);
61265 up_write(&mm->mmap_sem);
61266 bprm->p = vma->vm_end - sizeof(void *);
61267+
61268+#ifdef CONFIG_PAX_RANDUSTACK
61269+ if (randomize_va_space)
61270+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
61271+#endif
61272+
61273 return 0;
61274 err:
61275 up_write(&mm->mmap_sem);
61276@@ -396,7 +437,7 @@ struct user_arg_ptr {
61277 } ptr;
61278 };
61279
61280-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61281+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61282 {
61283 const char __user *native;
61284
61285@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61286 compat_uptr_t compat;
61287
61288 if (get_user(compat, argv.ptr.compat + nr))
61289- return ERR_PTR(-EFAULT);
61290+ return (const char __force_user *)ERR_PTR(-EFAULT);
61291
61292 return compat_ptr(compat);
61293 }
61294 #endif
61295
61296 if (get_user(native, argv.ptr.native + nr))
61297- return ERR_PTR(-EFAULT);
61298+ return (const char __force_user *)ERR_PTR(-EFAULT);
61299
61300 return native;
61301 }
61302@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
61303 if (!p)
61304 break;
61305
61306- if (IS_ERR(p))
61307+ if (IS_ERR((const char __force_kernel *)p))
61308 return -EFAULT;
61309
61310 if (i >= max)
61311@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
61312
61313 ret = -EFAULT;
61314 str = get_user_arg_ptr(argv, argc);
61315- if (IS_ERR(str))
61316+ if (IS_ERR((const char __force_kernel *)str))
61317 goto out;
61318
61319 len = strnlen_user(str, MAX_ARG_STRLEN);
61320@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
61321 int r;
61322 mm_segment_t oldfs = get_fs();
61323 struct user_arg_ptr argv = {
61324- .ptr.native = (const char __user *const __user *)__argv,
61325+ .ptr.native = (const char __user * const __force_user *)__argv,
61326 };
61327
61328 set_fs(KERNEL_DS);
61329@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61330 unsigned long new_end = old_end - shift;
61331 struct mmu_gather tlb;
61332
61333- BUG_ON(new_start > new_end);
61334+ if (new_start >= new_end || new_start < mmap_min_addr)
61335+ return -ENOMEM;
61336
61337 /*
61338 * ensure there are no vmas between where we want to go
61339@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61340 if (vma != find_vma(mm, new_start))
61341 return -EFAULT;
61342
61343+#ifdef CONFIG_PAX_SEGMEXEC
61344+ BUG_ON(pax_find_mirror_vma(vma));
61345+#endif
61346+
61347 /*
61348 * cover the whole range: [new_start, old_end)
61349 */
61350@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61351 stack_top = arch_align_stack(stack_top);
61352 stack_top = PAGE_ALIGN(stack_top);
61353
61354- if (unlikely(stack_top < mmap_min_addr) ||
61355- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
61356- return -ENOMEM;
61357-
61358 stack_shift = vma->vm_end - stack_top;
61359
61360 bprm->p -= stack_shift;
61361@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
61362 bprm->exec -= stack_shift;
61363
61364 down_write(&mm->mmap_sem);
61365+
61366+ /* Move stack pages down in memory. */
61367+ if (stack_shift) {
61368+ ret = shift_arg_pages(vma, stack_shift);
61369+ if (ret)
61370+ goto out_unlock;
61371+ }
61372+
61373 vm_flags = VM_STACK_FLAGS;
61374
61375+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61376+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
61377+ vm_flags &= ~VM_EXEC;
61378+
61379+#ifdef CONFIG_PAX_MPROTECT
61380+ if (mm->pax_flags & MF_PAX_MPROTECT)
61381+ vm_flags &= ~VM_MAYEXEC;
61382+#endif
61383+
61384+ }
61385+#endif
61386+
61387 /*
61388 * Adjust stack execute permissions; explicitly enable for
61389 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
61390@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61391 goto out_unlock;
61392 BUG_ON(prev != vma);
61393
61394- /* Move stack pages down in memory. */
61395- if (stack_shift) {
61396- ret = shift_arg_pages(vma, stack_shift);
61397- if (ret)
61398- goto out_unlock;
61399- }
61400-
61401 /* mprotect_fixup is overkill to remove the temporary stack flags */
61402 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
61403
61404@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
61405 #endif
61406 current->mm->start_stack = bprm->p;
61407 ret = expand_stack(vma, stack_base);
61408+
61409+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
61410+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
61411+ unsigned long size;
61412+ vm_flags_t vm_flags;
61413+
61414+ size = STACK_TOP - vma->vm_end;
61415+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
61416+
61417+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
61418+
61419+#ifdef CONFIG_X86
61420+ if (!ret) {
61421+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
61422+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
61423+ }
61424+#endif
61425+
61426+ }
61427+#endif
61428+
61429 if (ret)
61430 ret = -EFAULT;
61431
61432@@ -781,8 +857,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
61433 if (err)
61434 goto exit;
61435
61436- if (name->name[0] != '\0')
61437+ if (name->name[0] != '\0') {
61438 fsnotify_open(file);
61439+ trace_open_exec(name->name);
61440+ }
61441
61442 out:
61443 return file;
61444@@ -809,7 +887,7 @@ int kernel_read(struct file *file, loff_t offset,
61445 old_fs = get_fs();
61446 set_fs(get_ds());
61447 /* The cast to a user pointer is valid due to the set_fs() */
61448- result = vfs_read(file, (void __user *)addr, count, &pos);
61449+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
61450 set_fs(old_fs);
61451 return result;
61452 }
61453@@ -854,6 +932,7 @@ static int exec_mmap(struct mm_struct *mm)
61454 tsk->mm = mm;
61455 tsk->active_mm = mm;
61456 activate_mm(active_mm, mm);
61457+ populate_stack();
61458 tsk->mm->vmacache_seqnum = 0;
61459 vmacache_flush(tsk);
61460 task_unlock(tsk);
61461@@ -920,10 +999,14 @@ static int de_thread(struct task_struct *tsk)
61462 if (!thread_group_leader(tsk)) {
61463 struct task_struct *leader = tsk->group_leader;
61464
61465- sig->notify_count = -1; /* for exit_notify() */
61466 for (;;) {
61467 threadgroup_change_begin(tsk);
61468 write_lock_irq(&tasklist_lock);
61469+ /*
61470+ * Do this under tasklist_lock to ensure that
61471+ * exit_notify() can't miss ->group_exit_task
61472+ */
61473+ sig->notify_count = -1;
61474 if (likely(leader->exit_state))
61475 break;
61476 __set_current_state(TASK_KILLABLE);
61477@@ -1252,7 +1335,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
61478 }
61479 rcu_read_unlock();
61480
61481- if (p->fs->users > n_fs)
61482+ if (atomic_read(&p->fs->users) > n_fs)
61483 bprm->unsafe |= LSM_UNSAFE_SHARE;
61484 else
61485 p->fs->in_exec = 1;
61486@@ -1453,6 +1536,31 @@ static int exec_binprm(struct linux_binprm *bprm)
61487 return ret;
61488 }
61489
61490+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61491+static DEFINE_PER_CPU(u64, exec_counter);
61492+static int __init init_exec_counters(void)
61493+{
61494+ unsigned int cpu;
61495+
61496+ for_each_possible_cpu(cpu) {
61497+ per_cpu(exec_counter, cpu) = (u64)cpu;
61498+ }
61499+
61500+ return 0;
61501+}
61502+early_initcall(init_exec_counters);
61503+static inline void increment_exec_counter(void)
61504+{
61505+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
61506+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61507+}
61508+#else
61509+static inline void increment_exec_counter(void) {}
61510+#endif
61511+
61512+extern void gr_handle_exec_args(struct linux_binprm *bprm,
61513+ struct user_arg_ptr argv);
61514+
61515 /*
61516 * sys_execve() executes a new program.
61517 */
61518@@ -1461,6 +1569,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61519 struct user_arg_ptr envp,
61520 int flags)
61521 {
61522+#ifdef CONFIG_GRKERNSEC
61523+ struct file *old_exec_file;
61524+ struct acl_subject_label *old_acl;
61525+ struct rlimit old_rlim[RLIM_NLIMITS];
61526+#endif
61527 char *pathbuf = NULL;
61528 struct linux_binprm *bprm;
61529 struct file *file;
61530@@ -1470,6 +1583,8 @@ static int do_execveat_common(int fd, struct filename *filename,
61531 if (IS_ERR(filename))
61532 return PTR_ERR(filename);
61533
61534+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61535+
61536 /*
61537 * We move the actual failure in case of RLIMIT_NPROC excess from
61538 * set*uid() to execve() because too many poorly written programs
61539@@ -1507,6 +1622,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61540 if (IS_ERR(file))
61541 goto out_unmark;
61542
61543+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
61544+ retval = -EPERM;
61545+ goto out_unmark;
61546+ }
61547+
61548 sched_exec();
61549
61550 bprm->file = file;
61551@@ -1533,6 +1653,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61552 }
61553 bprm->interp = bprm->filename;
61554
61555+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61556+ retval = -EACCES;
61557+ goto out_unmark;
61558+ }
61559+
61560 retval = bprm_mm_init(bprm);
61561 if (retval)
61562 goto out_unmark;
61563@@ -1549,24 +1674,70 @@ static int do_execveat_common(int fd, struct filename *filename,
61564 if (retval < 0)
61565 goto out;
61566
61567+#ifdef CONFIG_GRKERNSEC
61568+ old_acl = current->acl;
61569+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61570+ old_exec_file = current->exec_file;
61571+ get_file(file);
61572+ current->exec_file = file;
61573+#endif
61574+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61575+ /* limit suid stack to 8MB
61576+ * we saved the old limits above and will restore them if this exec fails
61577+ */
61578+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61579+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61580+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61581+#endif
61582+
61583+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61584+ retval = -EPERM;
61585+ goto out_fail;
61586+ }
61587+
61588+ if (!gr_tpe_allow(file)) {
61589+ retval = -EACCES;
61590+ goto out_fail;
61591+ }
61592+
61593+ if (gr_check_crash_exec(file)) {
61594+ retval = -EACCES;
61595+ goto out_fail;
61596+ }
61597+
61598+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61599+ bprm->unsafe);
61600+ if (retval < 0)
61601+ goto out_fail;
61602+
61603 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61604 if (retval < 0)
61605- goto out;
61606+ goto out_fail;
61607
61608 bprm->exec = bprm->p;
61609 retval = copy_strings(bprm->envc, envp, bprm);
61610 if (retval < 0)
61611- goto out;
61612+ goto out_fail;
61613
61614 retval = copy_strings(bprm->argc, argv, bprm);
61615 if (retval < 0)
61616- goto out;
61617+ goto out_fail;
61618+
61619+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61620+
61621+ gr_handle_exec_args(bprm, argv);
61622
61623 retval = exec_binprm(bprm);
61624 if (retval < 0)
61625- goto out;
61626+ goto out_fail;
61627+#ifdef CONFIG_GRKERNSEC
61628+ if (old_exec_file)
61629+ fput(old_exec_file);
61630+#endif
61631
61632 /* execve succeeded */
61633+
61634+ increment_exec_counter();
61635 current->fs->in_exec = 0;
61636 current->in_execve = 0;
61637 acct_update_integrals(current);
61638@@ -1578,6 +1749,14 @@ static int do_execveat_common(int fd, struct filename *filename,
61639 put_files_struct(displaced);
61640 return retval;
61641
61642+out_fail:
61643+#ifdef CONFIG_GRKERNSEC
61644+ current->acl = old_acl;
61645+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61646+ fput(current->exec_file);
61647+ current->exec_file = old_exec_file;
61648+#endif
61649+
61650 out:
61651 if (bprm->mm) {
61652 acct_arg_size(bprm, 0);
61653@@ -1724,3 +1903,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
61654 argv, envp, flags);
61655 }
61656 #endif
61657+
61658+int pax_check_flags(unsigned long *flags)
61659+{
61660+ int retval = 0;
61661+
61662+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61663+ if (*flags & MF_PAX_SEGMEXEC)
61664+ {
61665+ *flags &= ~MF_PAX_SEGMEXEC;
61666+ retval = -EINVAL;
61667+ }
61668+#endif
61669+
61670+ if ((*flags & MF_PAX_PAGEEXEC)
61671+
61672+#ifdef CONFIG_PAX_PAGEEXEC
61673+ && (*flags & MF_PAX_SEGMEXEC)
61674+#endif
61675+
61676+ )
61677+ {
61678+ *flags &= ~MF_PAX_PAGEEXEC;
61679+ retval = -EINVAL;
61680+ }
61681+
61682+ if ((*flags & MF_PAX_MPROTECT)
61683+
61684+#ifdef CONFIG_PAX_MPROTECT
61685+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61686+#endif
61687+
61688+ )
61689+ {
61690+ *flags &= ~MF_PAX_MPROTECT;
61691+ retval = -EINVAL;
61692+ }
61693+
61694+ if ((*flags & MF_PAX_EMUTRAMP)
61695+
61696+#ifdef CONFIG_PAX_EMUTRAMP
61697+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61698+#endif
61699+
61700+ )
61701+ {
61702+ *flags &= ~MF_PAX_EMUTRAMP;
61703+ retval = -EINVAL;
61704+ }
61705+
61706+ return retval;
61707+}
61708+
61709+EXPORT_SYMBOL(pax_check_flags);
61710+
61711+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61712+char *pax_get_path(const struct path *path, char *buf, int buflen)
61713+{
61714+ char *pathname = d_path(path, buf, buflen);
61715+
61716+ if (IS_ERR(pathname))
61717+ goto toolong;
61718+
61719+ pathname = mangle_path(buf, pathname, "\t\n\\");
61720+ if (!pathname)
61721+ goto toolong;
61722+
61723+ *pathname = 0;
61724+ return buf;
61725+
61726+toolong:
61727+ return "<path too long>";
61728+}
61729+EXPORT_SYMBOL(pax_get_path);
61730+
61731+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61732+{
61733+ struct task_struct *tsk = current;
61734+ struct mm_struct *mm = current->mm;
61735+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61736+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61737+ char *path_exec = NULL;
61738+ char *path_fault = NULL;
61739+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
61740+ siginfo_t info = { };
61741+
61742+ if (buffer_exec && buffer_fault) {
61743+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61744+
61745+ down_read(&mm->mmap_sem);
61746+ vma = mm->mmap;
61747+ while (vma && (!vma_exec || !vma_fault)) {
61748+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61749+ vma_exec = vma;
61750+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61751+ vma_fault = vma;
61752+ vma = vma->vm_next;
61753+ }
61754+ if (vma_exec)
61755+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61756+ if (vma_fault) {
61757+ start = vma_fault->vm_start;
61758+ end = vma_fault->vm_end;
61759+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61760+ if (vma_fault->vm_file)
61761+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61762+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61763+ path_fault = "<heap>";
61764+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61765+ path_fault = "<stack>";
61766+ else
61767+ path_fault = "<anonymous mapping>";
61768+ }
61769+ up_read(&mm->mmap_sem);
61770+ }
61771+ if (tsk->signal->curr_ip)
61772+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61773+ else
61774+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61775+ 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),
61776+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61777+ free_page((unsigned long)buffer_exec);
61778+ free_page((unsigned long)buffer_fault);
61779+ pax_report_insns(regs, pc, sp);
61780+ info.si_signo = SIGKILL;
61781+ info.si_errno = 0;
61782+ info.si_code = SI_KERNEL;
61783+ info.si_pid = 0;
61784+ info.si_uid = 0;
61785+ do_coredump(&info);
61786+}
61787+#endif
61788+
61789+#ifdef CONFIG_PAX_REFCOUNT
61790+void pax_report_refcount_overflow(struct pt_regs *regs)
61791+{
61792+ if (current->signal->curr_ip)
61793+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61794+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
61795+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61796+ else
61797+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61798+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61799+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61800+ preempt_disable();
61801+ show_regs(regs);
61802+ preempt_enable();
61803+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61804+}
61805+#endif
61806+
61807+#ifdef CONFIG_PAX_USERCOPY
61808+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61809+static noinline int check_stack_object(const void *obj, unsigned long len)
61810+{
61811+ const void * const stack = task_stack_page(current);
61812+ const void * const stackend = stack + THREAD_SIZE;
61813+
61814+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61815+ const void *frame = NULL;
61816+ const void *oldframe;
61817+#endif
61818+
61819+ if (obj + len < obj)
61820+ return -1;
61821+
61822+ if (obj + len <= stack || stackend <= obj)
61823+ return 0;
61824+
61825+ if (obj < stack || stackend < obj + len)
61826+ return -1;
61827+
61828+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61829+ oldframe = __builtin_frame_address(1);
61830+ if (oldframe)
61831+ frame = __builtin_frame_address(2);
61832+ /*
61833+ low ----------------------------------------------> high
61834+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
61835+ ^----------------^
61836+ allow copies only within here
61837+ */
61838+ while (stack <= frame && frame < stackend) {
61839+ /* if obj + len extends past the last frame, this
61840+ check won't pass and the next frame will be 0,
61841+ causing us to bail out and correctly report
61842+ the copy as invalid
61843+ */
61844+ if (obj + len <= frame)
61845+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61846+ oldframe = frame;
61847+ frame = *(const void * const *)frame;
61848+ }
61849+ return -1;
61850+#else
61851+ return 1;
61852+#endif
61853+}
61854+
61855+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61856+{
61857+ if (current->signal->curr_ip)
61858+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61859+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61860+ else
61861+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61862+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61863+ dump_stack();
61864+ gr_handle_kernel_exploit();
61865+ do_group_exit(SIGKILL);
61866+}
61867+#endif
61868+
61869+#ifdef CONFIG_PAX_USERCOPY
61870+
61871+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61872+{
61873+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61874+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
61875+#ifdef CONFIG_MODULES
61876+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61877+#else
61878+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61879+#endif
61880+
61881+#else
61882+ unsigned long textlow = (unsigned long)_stext;
61883+ unsigned long texthigh = (unsigned long)_etext;
61884+
61885+#ifdef CONFIG_X86_64
61886+ /* check against linear mapping as well */
61887+ if (high > (unsigned long)__va(__pa(textlow)) &&
61888+ low < (unsigned long)__va(__pa(texthigh)))
61889+ return true;
61890+#endif
61891+
61892+#endif
61893+
61894+ if (high <= textlow || low >= texthigh)
61895+ return false;
61896+ else
61897+ return true;
61898+}
61899+#endif
61900+
61901+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61902+{
61903+#ifdef CONFIG_PAX_USERCOPY
61904+ const char *type;
61905+#endif
61906+
61907+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
61908+ unsigned long stackstart = (unsigned long)task_stack_page(current);
61909+ unsigned long currentsp = (unsigned long)&stackstart;
61910+ if (unlikely((currentsp < stackstart + 512 ||
61911+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61912+ BUG();
61913+#endif
61914+
61915+#ifndef CONFIG_PAX_USERCOPY_DEBUG
61916+ if (const_size)
61917+ return;
61918+#endif
61919+
61920+#ifdef CONFIG_PAX_USERCOPY
61921+ if (!n)
61922+ return;
61923+
61924+ type = check_heap_object(ptr, n);
61925+ if (!type) {
61926+ int ret = check_stack_object(ptr, n);
61927+ if (ret == 1 || ret == 2)
61928+ return;
61929+ if (ret == 0) {
61930+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61931+ type = "<kernel text>";
61932+ else
61933+ return;
61934+ } else
61935+ type = "<process stack>";
61936+ }
61937+
61938+ pax_report_usercopy(ptr, n, to_user, type);
61939+#endif
61940+
61941+}
61942+EXPORT_SYMBOL(__check_object_size);
61943+
61944+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61945+void pax_track_stack(void)
61946+{
61947+ unsigned long sp = (unsigned long)&sp;
61948+ if (sp < current_thread_info()->lowest_stack &&
61949+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
61950+ current_thread_info()->lowest_stack = sp;
61951+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61952+ BUG();
61953+}
61954+EXPORT_SYMBOL(pax_track_stack);
61955+#endif
61956+
61957+#ifdef CONFIG_PAX_SIZE_OVERFLOW
61958+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61959+{
61960+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61961+ dump_stack();
61962+ do_group_exit(SIGKILL);
61963+}
61964+EXPORT_SYMBOL(report_size_overflow);
61965+#endif
61966diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61967index 9f9992b..8b59411 100644
61968--- a/fs/ext2/balloc.c
61969+++ b/fs/ext2/balloc.c
61970@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61971
61972 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61973 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61974- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61975+ if (free_blocks < root_blocks + 1 &&
61976 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61977 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61978- !in_group_p (sbi->s_resgid))) {
61979+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61980 return 0;
61981 }
61982 return 1;
61983diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61984index ae55fdd..5e64c27 100644
61985--- a/fs/ext2/super.c
61986+++ b/fs/ext2/super.c
61987@@ -268,10 +268,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61988 #ifdef CONFIG_EXT2_FS_XATTR
61989 if (test_opt(sb, XATTR_USER))
61990 seq_puts(seq, ",user_xattr");
61991- if (!test_opt(sb, XATTR_USER) &&
61992- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61993+ if (!test_opt(sb, XATTR_USER))
61994 seq_puts(seq, ",nouser_xattr");
61995- }
61996 #endif
61997
61998 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61999@@ -850,8 +848,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
62000 if (def_mount_opts & EXT2_DEFM_UID16)
62001 set_opt(sbi->s_mount_opt, NO_UID32);
62002 #ifdef CONFIG_EXT2_FS_XATTR
62003- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
62004- set_opt(sbi->s_mount_opt, XATTR_USER);
62005+ /* always enable user xattrs */
62006+ set_opt(sbi->s_mount_opt, XATTR_USER);
62007 #endif
62008 #ifdef CONFIG_EXT2_FS_POSIX_ACL
62009 if (def_mount_opts & EXT2_DEFM_ACL)
62010diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
62011index 9142614..97484fa 100644
62012--- a/fs/ext2/xattr.c
62013+++ b/fs/ext2/xattr.c
62014@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
62015 struct buffer_head *bh = NULL;
62016 struct ext2_xattr_entry *entry;
62017 char *end;
62018- size_t rest = buffer_size;
62019+ size_t rest = buffer_size, total_size = 0;
62020 int error;
62021
62022 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
62023@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
62024 buffer += size;
62025 }
62026 rest -= size;
62027+ total_size += size;
62028 }
62029 }
62030- error = buffer_size - rest; /* total size */
62031+ error = total_size;
62032
62033 cleanup:
62034 brelse(bh);
62035diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
62036index 158b5d4..2432610 100644
62037--- a/fs/ext3/balloc.c
62038+++ b/fs/ext3/balloc.c
62039@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
62040
62041 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
62042 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
62043- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
62044+ if (free_blocks < root_blocks + 1 &&
62045 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
62046 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
62047- !in_group_p (sbi->s_resgid))) {
62048+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
62049 return 0;
62050 }
62051 return 1;
62052diff --git a/fs/ext3/super.c b/fs/ext3/super.c
62053index 9b4e7d7..048d025 100644
62054--- a/fs/ext3/super.c
62055+++ b/fs/ext3/super.c
62056@@ -653,10 +653,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
62057 #ifdef CONFIG_EXT3_FS_XATTR
62058 if (test_opt(sb, XATTR_USER))
62059 seq_puts(seq, ",user_xattr");
62060- if (!test_opt(sb, XATTR_USER) &&
62061- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
62062+ if (!test_opt(sb, XATTR_USER))
62063 seq_puts(seq, ",nouser_xattr");
62064- }
62065 #endif
62066 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62067 if (test_opt(sb, POSIX_ACL))
62068@@ -1758,8 +1756,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
62069 if (def_mount_opts & EXT3_DEFM_UID16)
62070 set_opt(sbi->s_mount_opt, NO_UID32);
62071 #ifdef CONFIG_EXT3_FS_XATTR
62072- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
62073- set_opt(sbi->s_mount_opt, XATTR_USER);
62074+ /* always enable user xattrs */
62075+ set_opt(sbi->s_mount_opt, XATTR_USER);
62076 #endif
62077 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62078 if (def_mount_opts & EXT3_DEFM_ACL)
62079diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
62080index c6874be..f8a6ae8 100644
62081--- a/fs/ext3/xattr.c
62082+++ b/fs/ext3/xattr.c
62083@@ -330,7 +330,7 @@ static int
62084 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62085 char *buffer, size_t buffer_size)
62086 {
62087- size_t rest = buffer_size;
62088+ size_t rest = buffer_size, total_size = 0;
62089
62090 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
62091 const struct xattr_handler *handler =
62092@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62093 buffer += size;
62094 }
62095 rest -= size;
62096+ total_size += size;
62097 }
62098 }
62099- return buffer_size - rest;
62100+ return total_size;
62101 }
62102
62103 static int
62104diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
62105index 83a6f49..d4e4d03 100644
62106--- a/fs/ext4/balloc.c
62107+++ b/fs/ext4/balloc.c
62108@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
62109 /* Hm, nope. Are (enough) root reserved clusters available? */
62110 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
62111 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
62112- capable(CAP_SYS_RESOURCE) ||
62113- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
62114+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
62115+ capable_nolog(CAP_SYS_RESOURCE)) {
62116
62117 if (free_clusters >= (nclusters + dirty_clusters +
62118 resv_clusters))
62119diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
62120index a75fba6..8235fca 100644
62121--- a/fs/ext4/ext4.h
62122+++ b/fs/ext4/ext4.h
62123@@ -1274,19 +1274,19 @@ struct ext4_sb_info {
62124 unsigned long s_mb_last_start;
62125
62126 /* stats for buddy allocator */
62127- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
62128- atomic_t s_bal_success; /* we found long enough chunks */
62129- atomic_t s_bal_allocated; /* in blocks */
62130- atomic_t s_bal_ex_scanned; /* total extents scanned */
62131- atomic_t s_bal_goals; /* goal hits */
62132- atomic_t s_bal_breaks; /* too long searches */
62133- atomic_t s_bal_2orders; /* 2^order hits */
62134+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
62135+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
62136+ atomic_unchecked_t s_bal_allocated; /* in blocks */
62137+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
62138+ atomic_unchecked_t s_bal_goals; /* goal hits */
62139+ atomic_unchecked_t s_bal_breaks; /* too long searches */
62140+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
62141 spinlock_t s_bal_lock;
62142 unsigned long s_mb_buddies_generated;
62143 unsigned long long s_mb_generation_time;
62144- atomic_t s_mb_lost_chunks;
62145- atomic_t s_mb_preallocated;
62146- atomic_t s_mb_discarded;
62147+ atomic_unchecked_t s_mb_lost_chunks;
62148+ atomic_unchecked_t s_mb_preallocated;
62149+ atomic_unchecked_t s_mb_discarded;
62150 atomic_t s_lock_busy;
62151
62152 /* locality groups */
62153diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
62154index 8d1e602..abf497b 100644
62155--- a/fs/ext4/mballoc.c
62156+++ b/fs/ext4/mballoc.c
62157@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
62158 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
62159
62160 if (EXT4_SB(sb)->s_mb_stats)
62161- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
62162+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
62163
62164 break;
62165 }
62166@@ -2211,7 +2211,7 @@ repeat:
62167 ac->ac_status = AC_STATUS_CONTINUE;
62168 ac->ac_flags |= EXT4_MB_HINT_FIRST;
62169 cr = 3;
62170- atomic_inc(&sbi->s_mb_lost_chunks);
62171+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
62172 goto repeat;
62173 }
62174 }
62175@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
62176 if (sbi->s_mb_stats) {
62177 ext4_msg(sb, KERN_INFO,
62178 "mballoc: %u blocks %u reqs (%u success)",
62179- atomic_read(&sbi->s_bal_allocated),
62180- atomic_read(&sbi->s_bal_reqs),
62181- atomic_read(&sbi->s_bal_success));
62182+ atomic_read_unchecked(&sbi->s_bal_allocated),
62183+ atomic_read_unchecked(&sbi->s_bal_reqs),
62184+ atomic_read_unchecked(&sbi->s_bal_success));
62185 ext4_msg(sb, KERN_INFO,
62186 "mballoc: %u extents scanned, %u goal hits, "
62187 "%u 2^N hits, %u breaks, %u lost",
62188- atomic_read(&sbi->s_bal_ex_scanned),
62189- atomic_read(&sbi->s_bal_goals),
62190- atomic_read(&sbi->s_bal_2orders),
62191- atomic_read(&sbi->s_bal_breaks),
62192- atomic_read(&sbi->s_mb_lost_chunks));
62193+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
62194+ atomic_read_unchecked(&sbi->s_bal_goals),
62195+ atomic_read_unchecked(&sbi->s_bal_2orders),
62196+ atomic_read_unchecked(&sbi->s_bal_breaks),
62197+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
62198 ext4_msg(sb, KERN_INFO,
62199 "mballoc: %lu generated and it took %Lu",
62200 sbi->s_mb_buddies_generated,
62201 sbi->s_mb_generation_time);
62202 ext4_msg(sb, KERN_INFO,
62203 "mballoc: %u preallocated, %u discarded",
62204- atomic_read(&sbi->s_mb_preallocated),
62205- atomic_read(&sbi->s_mb_discarded));
62206+ atomic_read_unchecked(&sbi->s_mb_preallocated),
62207+ atomic_read_unchecked(&sbi->s_mb_discarded));
62208 }
62209
62210 free_percpu(sbi->s_locality_groups);
62211@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
62212 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
62213
62214 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
62215- atomic_inc(&sbi->s_bal_reqs);
62216- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62217+ atomic_inc_unchecked(&sbi->s_bal_reqs);
62218+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62219 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
62220- atomic_inc(&sbi->s_bal_success);
62221- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
62222+ atomic_inc_unchecked(&sbi->s_bal_success);
62223+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
62224 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
62225 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
62226- atomic_inc(&sbi->s_bal_goals);
62227+ atomic_inc_unchecked(&sbi->s_bal_goals);
62228 if (ac->ac_found > sbi->s_mb_max_to_scan)
62229- atomic_inc(&sbi->s_bal_breaks);
62230+ atomic_inc_unchecked(&sbi->s_bal_breaks);
62231 }
62232
62233 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
62234@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
62235 trace_ext4_mb_new_inode_pa(ac, pa);
62236
62237 ext4_mb_use_inode_pa(ac, pa);
62238- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
62239+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
62240
62241 ei = EXT4_I(ac->ac_inode);
62242 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62243@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
62244 trace_ext4_mb_new_group_pa(ac, pa);
62245
62246 ext4_mb_use_group_pa(ac, pa);
62247- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62248+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62249
62250 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62251 lg = ac->ac_lg;
62252@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
62253 * from the bitmap and continue.
62254 */
62255 }
62256- atomic_add(free, &sbi->s_mb_discarded);
62257+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
62258
62259 return err;
62260 }
62261@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
62262 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
62263 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
62264 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
62265- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62266+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62267 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
62268
62269 return 0;
62270diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
62271index 8313ca3..8a37d08 100644
62272--- a/fs/ext4/mmp.c
62273+++ b/fs/ext4/mmp.c
62274@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
62275 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
62276 const char *function, unsigned int line, const char *msg)
62277 {
62278- __ext4_warning(sb, function, line, msg);
62279+ __ext4_warning(sb, function, line, "%s", msg);
62280 __ext4_warning(sb, function, line,
62281 "MMP failure info: last update time: %llu, last update "
62282 "node: %s, last update device: %s\n",
62283diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
62284index 8a8ec62..1b02de5 100644
62285--- a/fs/ext4/resize.c
62286+++ b/fs/ext4/resize.c
62287@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62288
62289 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
62290 for (count2 = count; count > 0; count -= count2, block += count2) {
62291- ext4_fsblk_t start;
62292+ ext4_fsblk_t start, diff;
62293 struct buffer_head *bh;
62294 ext4_group_t group;
62295 int err;
62296@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62297 start = ext4_group_first_block_no(sb, group);
62298 group -= flex_gd->groups[0].group;
62299
62300- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
62301- if (count2 > count)
62302- count2 = count;
62303-
62304 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
62305 BUG_ON(flex_gd->count > 1);
62306 continue;
62307@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62308 err = ext4_journal_get_write_access(handle, bh);
62309 if (err)
62310 return err;
62311+
62312+ diff = block - start;
62313+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
62314+ if (count2 > count)
62315+ count2 = count;
62316+
62317 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
62318- block - start, count2);
62319- ext4_set_bits(bh->b_data, block - start, count2);
62320+ diff, count2);
62321+ ext4_set_bits(bh->b_data, diff, count2);
62322
62323 err = ext4_handle_dirty_metadata(handle, NULL, bh);
62324 if (unlikely(err))
62325diff --git a/fs/ext4/super.c b/fs/ext4/super.c
62326index fc29b2c..6c8b255 100644
62327--- a/fs/ext4/super.c
62328+++ b/fs/ext4/super.c
62329@@ -1252,7 +1252,7 @@ static ext4_fsblk_t get_sb_block(void **data)
62330 }
62331
62332 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
62333-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62334+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62335 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
62336
62337 #ifdef CONFIG_QUOTA
62338@@ -2440,7 +2440,7 @@ struct ext4_attr {
62339 int offset;
62340 int deprecated_val;
62341 } u;
62342-};
62343+} __do_const;
62344
62345 static int parse_strtoull(const char *buf,
62346 unsigned long long max, unsigned long long *value)
62347diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
62348index 1e09fc7..0400dd4 100644
62349--- a/fs/ext4/xattr.c
62350+++ b/fs/ext4/xattr.c
62351@@ -399,7 +399,7 @@ static int
62352 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62353 char *buffer, size_t buffer_size)
62354 {
62355- size_t rest = buffer_size;
62356+ size_t rest = buffer_size, total_size = 0;
62357
62358 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
62359 const struct xattr_handler *handler =
62360@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62361 buffer += size;
62362 }
62363 rest -= size;
62364+ total_size += size;
62365 }
62366 }
62367- return buffer_size - rest;
62368+ return total_size;
62369 }
62370
62371 static int
62372diff --git a/fs/fcntl.c b/fs/fcntl.c
62373index ee85cd4..9dd0d20 100644
62374--- a/fs/fcntl.c
62375+++ b/fs/fcntl.c
62376@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
62377 int force)
62378 {
62379 security_file_set_fowner(filp);
62380+ if (gr_handle_chroot_fowner(pid, type))
62381+ return;
62382+ if (gr_check_protected_task_fowner(pid, type))
62383+ return;
62384 f_modown(filp, pid, type, force);
62385 }
62386 EXPORT_SYMBOL(__f_setown);
62387diff --git a/fs/fhandle.c b/fs/fhandle.c
62388index 999ff5c..2281df9 100644
62389--- a/fs/fhandle.c
62390+++ b/fs/fhandle.c
62391@@ -8,6 +8,7 @@
62392 #include <linux/fs_struct.h>
62393 #include <linux/fsnotify.h>
62394 #include <linux/personality.h>
62395+#include <linux/grsecurity.h>
62396 #include <asm/uaccess.h>
62397 #include "internal.h"
62398 #include "mount.h"
62399@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
62400 } else
62401 retval = 0;
62402 /* copy the mount id */
62403- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
62404- sizeof(*mnt_id)) ||
62405+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
62406 copy_to_user(ufh, handle,
62407 sizeof(struct file_handle) + handle_bytes))
62408 retval = -EFAULT;
62409@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62410 * the directory. Ideally we would like CAP_DAC_SEARCH.
62411 * But we don't have that
62412 */
62413- if (!capable(CAP_DAC_READ_SEARCH)) {
62414+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
62415 retval = -EPERM;
62416 goto out_err;
62417 }
62418@@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62419 goto out_err;
62420 }
62421 /* copy the full handle */
62422- if (copy_from_user(handle, ufh,
62423- sizeof(struct file_handle) +
62424+ *handle = f_handle;
62425+ if (copy_from_user(&handle->f_handle,
62426+ &ufh->f_handle,
62427 f_handle.handle_bytes)) {
62428 retval = -EFAULT;
62429 goto out_handle;
62430diff --git a/fs/file.c b/fs/file.c
62431index ee738ea..f6c15629 100644
62432--- a/fs/file.c
62433+++ b/fs/file.c
62434@@ -16,6 +16,7 @@
62435 #include <linux/slab.h>
62436 #include <linux/vmalloc.h>
62437 #include <linux/file.h>
62438+#include <linux/security.h>
62439 #include <linux/fdtable.h>
62440 #include <linux/bitops.h>
62441 #include <linux/interrupt.h>
62442@@ -139,7 +140,7 @@ out:
62443 * Return <0 error code on error; 1 on successful completion.
62444 * The files->file_lock should be held on entry, and will be held on exit.
62445 */
62446-static int expand_fdtable(struct files_struct *files, int nr)
62447+static int expand_fdtable(struct files_struct *files, unsigned int nr)
62448 __releases(files->file_lock)
62449 __acquires(files->file_lock)
62450 {
62451@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
62452 * expanded and execution may have blocked.
62453 * The files->file_lock should be held on entry, and will be held on exit.
62454 */
62455-static int expand_files(struct files_struct *files, int nr)
62456+static int expand_files(struct files_struct *files, unsigned int nr)
62457 {
62458 struct fdtable *fdt;
62459
62460@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
62461 if (!file)
62462 return __close_fd(files, fd);
62463
62464+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
62465 if (fd >= rlimit(RLIMIT_NOFILE))
62466 return -EBADF;
62467
62468@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
62469 if (unlikely(oldfd == newfd))
62470 return -EINVAL;
62471
62472+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
62473 if (newfd >= rlimit(RLIMIT_NOFILE))
62474 return -EBADF;
62475
62476@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
62477 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
62478 {
62479 int err;
62480+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
62481 if (from >= rlimit(RLIMIT_NOFILE))
62482 return -EINVAL;
62483 err = alloc_fd(from, flags);
62484diff --git a/fs/filesystems.c b/fs/filesystems.c
62485index 5797d45..7d7d79a 100644
62486--- a/fs/filesystems.c
62487+++ b/fs/filesystems.c
62488@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
62489 int len = dot ? dot - name : strlen(name);
62490
62491 fs = __get_fs_type(name, len);
62492+#ifdef CONFIG_GRKERNSEC_MODHARDEN
62493+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
62494+#else
62495 if (!fs && (request_module("fs-%.*s", len, name) == 0))
62496+#endif
62497 fs = __get_fs_type(name, len);
62498
62499 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
62500diff --git a/fs/fs_struct.c b/fs/fs_struct.c
62501index 7dca743..1ff87ae 100644
62502--- a/fs/fs_struct.c
62503+++ b/fs/fs_struct.c
62504@@ -4,6 +4,7 @@
62505 #include <linux/path.h>
62506 #include <linux/slab.h>
62507 #include <linux/fs_struct.h>
62508+#include <linux/grsecurity.h>
62509 #include "internal.h"
62510
62511 /*
62512@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
62513 struct path old_root;
62514
62515 path_get(path);
62516+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
62517 spin_lock(&fs->lock);
62518 write_seqcount_begin(&fs->seq);
62519 old_root = fs->root;
62520 fs->root = *path;
62521+ gr_set_chroot_entries(current, path);
62522 write_seqcount_end(&fs->seq);
62523 spin_unlock(&fs->lock);
62524- if (old_root.dentry)
62525+ if (old_root.dentry) {
62526+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
62527 path_put(&old_root);
62528+ }
62529 }
62530
62531 /*
62532@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62533 int hits = 0;
62534 spin_lock(&fs->lock);
62535 write_seqcount_begin(&fs->seq);
62536+ /* this root replacement is only done by pivot_root,
62537+ leave grsec's chroot tagging alone for this task
62538+ so that a pivoted root isn't treated as a chroot
62539+ */
62540 hits += replace_path(&fs->root, old_root, new_root);
62541 hits += replace_path(&fs->pwd, old_root, new_root);
62542 write_seqcount_end(&fs->seq);
62543@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62544
62545 void free_fs_struct(struct fs_struct *fs)
62546 {
62547+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62548 path_put(&fs->root);
62549 path_put(&fs->pwd);
62550 kmem_cache_free(fs_cachep, fs);
62551@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
62552 task_lock(tsk);
62553 spin_lock(&fs->lock);
62554 tsk->fs = NULL;
62555- kill = !--fs->users;
62556+ gr_clear_chroot_entries(tsk);
62557+ kill = !atomic_dec_return(&fs->users);
62558 spin_unlock(&fs->lock);
62559 task_unlock(tsk);
62560 if (kill)
62561@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62562 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
62563 /* We don't need to lock fs - think why ;-) */
62564 if (fs) {
62565- fs->users = 1;
62566+ atomic_set(&fs->users, 1);
62567 fs->in_exec = 0;
62568 spin_lock_init(&fs->lock);
62569 seqcount_init(&fs->seq);
62570@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62571 spin_lock(&old->lock);
62572 fs->root = old->root;
62573 path_get(&fs->root);
62574+ /* instead of calling gr_set_chroot_entries here,
62575+ we call it from every caller of this function
62576+ */
62577 fs->pwd = old->pwd;
62578 path_get(&fs->pwd);
62579 spin_unlock(&old->lock);
62580+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62581 }
62582 return fs;
62583 }
62584@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
62585
62586 task_lock(current);
62587 spin_lock(&fs->lock);
62588- kill = !--fs->users;
62589+ kill = !atomic_dec_return(&fs->users);
62590 current->fs = new_fs;
62591+ gr_set_chroot_entries(current, &new_fs->root);
62592 spin_unlock(&fs->lock);
62593 task_unlock(current);
62594
62595@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
62596
62597 int current_umask(void)
62598 {
62599- return current->fs->umask;
62600+ return current->fs->umask | gr_acl_umask();
62601 }
62602 EXPORT_SYMBOL(current_umask);
62603
62604 /* to be mentioned only in INIT_TASK */
62605 struct fs_struct init_fs = {
62606- .users = 1,
62607+ .users = ATOMIC_INIT(1),
62608 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
62609 .seq = SEQCNT_ZERO(init_fs.seq),
62610 .umask = 0022,
62611diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
62612index 89acec7..a575262 100644
62613--- a/fs/fscache/cookie.c
62614+++ b/fs/fscache/cookie.c
62615@@ -19,7 +19,7 @@
62616
62617 struct kmem_cache *fscache_cookie_jar;
62618
62619-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
62620+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
62621
62622 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
62623 static int fscache_alloc_object(struct fscache_cache *cache,
62624@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62625 parent ? (char *) parent->def->name : "<no-parent>",
62626 def->name, netfs_data, enable);
62627
62628- fscache_stat(&fscache_n_acquires);
62629+ fscache_stat_unchecked(&fscache_n_acquires);
62630
62631 /* if there's no parent cookie, then we don't create one here either */
62632 if (!parent) {
62633- fscache_stat(&fscache_n_acquires_null);
62634+ fscache_stat_unchecked(&fscache_n_acquires_null);
62635 _leave(" [no parent]");
62636 return NULL;
62637 }
62638@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62639 /* allocate and initialise a cookie */
62640 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62641 if (!cookie) {
62642- fscache_stat(&fscache_n_acquires_oom);
62643+ fscache_stat_unchecked(&fscache_n_acquires_oom);
62644 _leave(" [ENOMEM]");
62645 return NULL;
62646 }
62647@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62648
62649 switch (cookie->def->type) {
62650 case FSCACHE_COOKIE_TYPE_INDEX:
62651- fscache_stat(&fscache_n_cookie_index);
62652+ fscache_stat_unchecked(&fscache_n_cookie_index);
62653 break;
62654 case FSCACHE_COOKIE_TYPE_DATAFILE:
62655- fscache_stat(&fscache_n_cookie_data);
62656+ fscache_stat_unchecked(&fscache_n_cookie_data);
62657 break;
62658 default:
62659- fscache_stat(&fscache_n_cookie_special);
62660+ fscache_stat_unchecked(&fscache_n_cookie_special);
62661 break;
62662 }
62663
62664@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62665 } else {
62666 atomic_dec(&parent->n_children);
62667 __fscache_cookie_put(cookie);
62668- fscache_stat(&fscache_n_acquires_nobufs);
62669+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62670 _leave(" = NULL");
62671 return NULL;
62672 }
62673@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62674 }
62675 }
62676
62677- fscache_stat(&fscache_n_acquires_ok);
62678+ fscache_stat_unchecked(&fscache_n_acquires_ok);
62679 _leave(" = %p", cookie);
62680 return cookie;
62681 }
62682@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62683 cache = fscache_select_cache_for_object(cookie->parent);
62684 if (!cache) {
62685 up_read(&fscache_addremove_sem);
62686- fscache_stat(&fscache_n_acquires_no_cache);
62687+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62688 _leave(" = -ENOMEDIUM [no cache]");
62689 return -ENOMEDIUM;
62690 }
62691@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62692 object = cache->ops->alloc_object(cache, cookie);
62693 fscache_stat_d(&fscache_n_cop_alloc_object);
62694 if (IS_ERR(object)) {
62695- fscache_stat(&fscache_n_object_no_alloc);
62696+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
62697 ret = PTR_ERR(object);
62698 goto error;
62699 }
62700
62701- fscache_stat(&fscache_n_object_alloc);
62702+ fscache_stat_unchecked(&fscache_n_object_alloc);
62703
62704- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62705+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62706
62707 _debug("ALLOC OBJ%x: %s {%lx}",
62708 object->debug_id, cookie->def->name, object->events);
62709@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62710
62711 _enter("{%s}", cookie->def->name);
62712
62713- fscache_stat(&fscache_n_invalidates);
62714+ fscache_stat_unchecked(&fscache_n_invalidates);
62715
62716 /* Only permit invalidation of data files. Invalidating an index will
62717 * require the caller to release all its attachments to the tree rooted
62718@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62719 {
62720 struct fscache_object *object;
62721
62722- fscache_stat(&fscache_n_updates);
62723+ fscache_stat_unchecked(&fscache_n_updates);
62724
62725 if (!cookie) {
62726- fscache_stat(&fscache_n_updates_null);
62727+ fscache_stat_unchecked(&fscache_n_updates_null);
62728 _leave(" [no cookie]");
62729 return;
62730 }
62731@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62732 */
62733 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62734 {
62735- fscache_stat(&fscache_n_relinquishes);
62736+ fscache_stat_unchecked(&fscache_n_relinquishes);
62737 if (retire)
62738- fscache_stat(&fscache_n_relinquishes_retire);
62739+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62740
62741 if (!cookie) {
62742- fscache_stat(&fscache_n_relinquishes_null);
62743+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
62744 _leave(" [no cookie]");
62745 return;
62746 }
62747@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62748 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62749 goto inconsistent;
62750
62751- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62752+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62753
62754 __fscache_use_cookie(cookie);
62755 if (fscache_submit_op(object, op) < 0)
62756diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62757index 7872a62..d91b19f 100644
62758--- a/fs/fscache/internal.h
62759+++ b/fs/fscache/internal.h
62760@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62761 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62762 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62763 struct fscache_operation *,
62764- atomic_t *,
62765- atomic_t *,
62766+ atomic_unchecked_t *,
62767+ atomic_unchecked_t *,
62768 void (*)(struct fscache_operation *));
62769 extern void fscache_invalidate_writes(struct fscache_cookie *);
62770
62771@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62772 * stats.c
62773 */
62774 #ifdef CONFIG_FSCACHE_STATS
62775-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62776-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62777+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62778+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62779
62780-extern atomic_t fscache_n_op_pend;
62781-extern atomic_t fscache_n_op_run;
62782-extern atomic_t fscache_n_op_enqueue;
62783-extern atomic_t fscache_n_op_deferred_release;
62784-extern atomic_t fscache_n_op_release;
62785-extern atomic_t fscache_n_op_gc;
62786-extern atomic_t fscache_n_op_cancelled;
62787-extern atomic_t fscache_n_op_rejected;
62788+extern atomic_unchecked_t fscache_n_op_pend;
62789+extern atomic_unchecked_t fscache_n_op_run;
62790+extern atomic_unchecked_t fscache_n_op_enqueue;
62791+extern atomic_unchecked_t fscache_n_op_deferred_release;
62792+extern atomic_unchecked_t fscache_n_op_release;
62793+extern atomic_unchecked_t fscache_n_op_gc;
62794+extern atomic_unchecked_t fscache_n_op_cancelled;
62795+extern atomic_unchecked_t fscache_n_op_rejected;
62796
62797-extern atomic_t fscache_n_attr_changed;
62798-extern atomic_t fscache_n_attr_changed_ok;
62799-extern atomic_t fscache_n_attr_changed_nobufs;
62800-extern atomic_t fscache_n_attr_changed_nomem;
62801-extern atomic_t fscache_n_attr_changed_calls;
62802+extern atomic_unchecked_t fscache_n_attr_changed;
62803+extern atomic_unchecked_t fscache_n_attr_changed_ok;
62804+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62805+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62806+extern atomic_unchecked_t fscache_n_attr_changed_calls;
62807
62808-extern atomic_t fscache_n_allocs;
62809-extern atomic_t fscache_n_allocs_ok;
62810-extern atomic_t fscache_n_allocs_wait;
62811-extern atomic_t fscache_n_allocs_nobufs;
62812-extern atomic_t fscache_n_allocs_intr;
62813-extern atomic_t fscache_n_allocs_object_dead;
62814-extern atomic_t fscache_n_alloc_ops;
62815-extern atomic_t fscache_n_alloc_op_waits;
62816+extern atomic_unchecked_t fscache_n_allocs;
62817+extern atomic_unchecked_t fscache_n_allocs_ok;
62818+extern atomic_unchecked_t fscache_n_allocs_wait;
62819+extern atomic_unchecked_t fscache_n_allocs_nobufs;
62820+extern atomic_unchecked_t fscache_n_allocs_intr;
62821+extern atomic_unchecked_t fscache_n_allocs_object_dead;
62822+extern atomic_unchecked_t fscache_n_alloc_ops;
62823+extern atomic_unchecked_t fscache_n_alloc_op_waits;
62824
62825-extern atomic_t fscache_n_retrievals;
62826-extern atomic_t fscache_n_retrievals_ok;
62827-extern atomic_t fscache_n_retrievals_wait;
62828-extern atomic_t fscache_n_retrievals_nodata;
62829-extern atomic_t fscache_n_retrievals_nobufs;
62830-extern atomic_t fscache_n_retrievals_intr;
62831-extern atomic_t fscache_n_retrievals_nomem;
62832-extern atomic_t fscache_n_retrievals_object_dead;
62833-extern atomic_t fscache_n_retrieval_ops;
62834-extern atomic_t fscache_n_retrieval_op_waits;
62835+extern atomic_unchecked_t fscache_n_retrievals;
62836+extern atomic_unchecked_t fscache_n_retrievals_ok;
62837+extern atomic_unchecked_t fscache_n_retrievals_wait;
62838+extern atomic_unchecked_t fscache_n_retrievals_nodata;
62839+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62840+extern atomic_unchecked_t fscache_n_retrievals_intr;
62841+extern atomic_unchecked_t fscache_n_retrievals_nomem;
62842+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62843+extern atomic_unchecked_t fscache_n_retrieval_ops;
62844+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62845
62846-extern atomic_t fscache_n_stores;
62847-extern atomic_t fscache_n_stores_ok;
62848-extern atomic_t fscache_n_stores_again;
62849-extern atomic_t fscache_n_stores_nobufs;
62850-extern atomic_t fscache_n_stores_oom;
62851-extern atomic_t fscache_n_store_ops;
62852-extern atomic_t fscache_n_store_calls;
62853-extern atomic_t fscache_n_store_pages;
62854-extern atomic_t fscache_n_store_radix_deletes;
62855-extern atomic_t fscache_n_store_pages_over_limit;
62856+extern atomic_unchecked_t fscache_n_stores;
62857+extern atomic_unchecked_t fscache_n_stores_ok;
62858+extern atomic_unchecked_t fscache_n_stores_again;
62859+extern atomic_unchecked_t fscache_n_stores_nobufs;
62860+extern atomic_unchecked_t fscache_n_stores_oom;
62861+extern atomic_unchecked_t fscache_n_store_ops;
62862+extern atomic_unchecked_t fscache_n_store_calls;
62863+extern atomic_unchecked_t fscache_n_store_pages;
62864+extern atomic_unchecked_t fscache_n_store_radix_deletes;
62865+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62866
62867-extern atomic_t fscache_n_store_vmscan_not_storing;
62868-extern atomic_t fscache_n_store_vmscan_gone;
62869-extern atomic_t fscache_n_store_vmscan_busy;
62870-extern atomic_t fscache_n_store_vmscan_cancelled;
62871-extern atomic_t fscache_n_store_vmscan_wait;
62872+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62873+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62874+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62875+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62876+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62877
62878-extern atomic_t fscache_n_marks;
62879-extern atomic_t fscache_n_uncaches;
62880+extern atomic_unchecked_t fscache_n_marks;
62881+extern atomic_unchecked_t fscache_n_uncaches;
62882
62883-extern atomic_t fscache_n_acquires;
62884-extern atomic_t fscache_n_acquires_null;
62885-extern atomic_t fscache_n_acquires_no_cache;
62886-extern atomic_t fscache_n_acquires_ok;
62887-extern atomic_t fscache_n_acquires_nobufs;
62888-extern atomic_t fscache_n_acquires_oom;
62889+extern atomic_unchecked_t fscache_n_acquires;
62890+extern atomic_unchecked_t fscache_n_acquires_null;
62891+extern atomic_unchecked_t fscache_n_acquires_no_cache;
62892+extern atomic_unchecked_t fscache_n_acquires_ok;
62893+extern atomic_unchecked_t fscache_n_acquires_nobufs;
62894+extern atomic_unchecked_t fscache_n_acquires_oom;
62895
62896-extern atomic_t fscache_n_invalidates;
62897-extern atomic_t fscache_n_invalidates_run;
62898+extern atomic_unchecked_t fscache_n_invalidates;
62899+extern atomic_unchecked_t fscache_n_invalidates_run;
62900
62901-extern atomic_t fscache_n_updates;
62902-extern atomic_t fscache_n_updates_null;
62903-extern atomic_t fscache_n_updates_run;
62904+extern atomic_unchecked_t fscache_n_updates;
62905+extern atomic_unchecked_t fscache_n_updates_null;
62906+extern atomic_unchecked_t fscache_n_updates_run;
62907
62908-extern atomic_t fscache_n_relinquishes;
62909-extern atomic_t fscache_n_relinquishes_null;
62910-extern atomic_t fscache_n_relinquishes_waitcrt;
62911-extern atomic_t fscache_n_relinquishes_retire;
62912+extern atomic_unchecked_t fscache_n_relinquishes;
62913+extern atomic_unchecked_t fscache_n_relinquishes_null;
62914+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62915+extern atomic_unchecked_t fscache_n_relinquishes_retire;
62916
62917-extern atomic_t fscache_n_cookie_index;
62918-extern atomic_t fscache_n_cookie_data;
62919-extern atomic_t fscache_n_cookie_special;
62920+extern atomic_unchecked_t fscache_n_cookie_index;
62921+extern atomic_unchecked_t fscache_n_cookie_data;
62922+extern atomic_unchecked_t fscache_n_cookie_special;
62923
62924-extern atomic_t fscache_n_object_alloc;
62925-extern atomic_t fscache_n_object_no_alloc;
62926-extern atomic_t fscache_n_object_lookups;
62927-extern atomic_t fscache_n_object_lookups_negative;
62928-extern atomic_t fscache_n_object_lookups_positive;
62929-extern atomic_t fscache_n_object_lookups_timed_out;
62930-extern atomic_t fscache_n_object_created;
62931-extern atomic_t fscache_n_object_avail;
62932-extern atomic_t fscache_n_object_dead;
62933+extern atomic_unchecked_t fscache_n_object_alloc;
62934+extern atomic_unchecked_t fscache_n_object_no_alloc;
62935+extern atomic_unchecked_t fscache_n_object_lookups;
62936+extern atomic_unchecked_t fscache_n_object_lookups_negative;
62937+extern atomic_unchecked_t fscache_n_object_lookups_positive;
62938+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62939+extern atomic_unchecked_t fscache_n_object_created;
62940+extern atomic_unchecked_t fscache_n_object_avail;
62941+extern atomic_unchecked_t fscache_n_object_dead;
62942
62943-extern atomic_t fscache_n_checkaux_none;
62944-extern atomic_t fscache_n_checkaux_okay;
62945-extern atomic_t fscache_n_checkaux_update;
62946-extern atomic_t fscache_n_checkaux_obsolete;
62947+extern atomic_unchecked_t fscache_n_checkaux_none;
62948+extern atomic_unchecked_t fscache_n_checkaux_okay;
62949+extern atomic_unchecked_t fscache_n_checkaux_update;
62950+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62951
62952 extern atomic_t fscache_n_cop_alloc_object;
62953 extern atomic_t fscache_n_cop_lookup_object;
62954@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62955 atomic_inc(stat);
62956 }
62957
62958+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62959+{
62960+ atomic_inc_unchecked(stat);
62961+}
62962+
62963 static inline void fscache_stat_d(atomic_t *stat)
62964 {
62965 atomic_dec(stat);
62966@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62967
62968 #define __fscache_stat(stat) (NULL)
62969 #define fscache_stat(stat) do {} while (0)
62970+#define fscache_stat_unchecked(stat) do {} while (0)
62971 #define fscache_stat_d(stat) do {} while (0)
62972 #endif
62973
62974diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62975index da032da..0076ce7 100644
62976--- a/fs/fscache/object.c
62977+++ b/fs/fscache/object.c
62978@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62979 _debug("LOOKUP \"%s\" in \"%s\"",
62980 cookie->def->name, object->cache->tag->name);
62981
62982- fscache_stat(&fscache_n_object_lookups);
62983+ fscache_stat_unchecked(&fscache_n_object_lookups);
62984 fscache_stat(&fscache_n_cop_lookup_object);
62985 ret = object->cache->ops->lookup_object(object);
62986 fscache_stat_d(&fscache_n_cop_lookup_object);
62987@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62988 if (ret == -ETIMEDOUT) {
62989 /* probably stuck behind another object, so move this one to
62990 * the back of the queue */
62991- fscache_stat(&fscache_n_object_lookups_timed_out);
62992+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62993 _leave(" [timeout]");
62994 return NO_TRANSIT;
62995 }
62996@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62997 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62998
62999 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
63000- fscache_stat(&fscache_n_object_lookups_negative);
63001+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
63002
63003 /* Allow write requests to begin stacking up and read requests to begin
63004 * returning ENODATA.
63005@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
63006 /* if we were still looking up, then we must have a positive lookup
63007 * result, in which case there may be data available */
63008 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
63009- fscache_stat(&fscache_n_object_lookups_positive);
63010+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
63011
63012 /* We do (presumably) have data */
63013 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
63014@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
63015 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
63016 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
63017 } else {
63018- fscache_stat(&fscache_n_object_created);
63019+ fscache_stat_unchecked(&fscache_n_object_created);
63020 }
63021
63022 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
63023@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
63024 fscache_stat_d(&fscache_n_cop_lookup_complete);
63025
63026 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
63027- fscache_stat(&fscache_n_object_avail);
63028+ fscache_stat_unchecked(&fscache_n_object_avail);
63029
63030 _leave("");
63031 return transit_to(JUMPSTART_DEPS);
63032@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
63033
63034 /* this just shifts the object release to the work processor */
63035 fscache_put_object(object);
63036- fscache_stat(&fscache_n_object_dead);
63037+ fscache_stat_unchecked(&fscache_n_object_dead);
63038
63039 _leave("");
63040 return transit_to(OBJECT_DEAD);
63041@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63042 enum fscache_checkaux result;
63043
63044 if (!object->cookie->def->check_aux) {
63045- fscache_stat(&fscache_n_checkaux_none);
63046+ fscache_stat_unchecked(&fscache_n_checkaux_none);
63047 return FSCACHE_CHECKAUX_OKAY;
63048 }
63049
63050@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63051 switch (result) {
63052 /* entry okay as is */
63053 case FSCACHE_CHECKAUX_OKAY:
63054- fscache_stat(&fscache_n_checkaux_okay);
63055+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
63056 break;
63057
63058 /* entry requires update */
63059 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
63060- fscache_stat(&fscache_n_checkaux_update);
63061+ fscache_stat_unchecked(&fscache_n_checkaux_update);
63062 break;
63063
63064 /* entry requires deletion */
63065 case FSCACHE_CHECKAUX_OBSOLETE:
63066- fscache_stat(&fscache_n_checkaux_obsolete);
63067+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
63068 break;
63069
63070 default:
63071@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
63072 {
63073 const struct fscache_state *s;
63074
63075- fscache_stat(&fscache_n_invalidates_run);
63076+ fscache_stat_unchecked(&fscache_n_invalidates_run);
63077 fscache_stat(&fscache_n_cop_invalidate_object);
63078 s = _fscache_invalidate_object(object, event);
63079 fscache_stat_d(&fscache_n_cop_invalidate_object);
63080@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
63081 {
63082 _enter("{OBJ%x},%d", object->debug_id, event);
63083
63084- fscache_stat(&fscache_n_updates_run);
63085+ fscache_stat_unchecked(&fscache_n_updates_run);
63086 fscache_stat(&fscache_n_cop_update_object);
63087 object->cache->ops->update_object(object);
63088 fscache_stat_d(&fscache_n_cop_update_object);
63089diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
63090index e7b87a0..a85d47a 100644
63091--- a/fs/fscache/operation.c
63092+++ b/fs/fscache/operation.c
63093@@ -17,7 +17,7 @@
63094 #include <linux/slab.h>
63095 #include "internal.h"
63096
63097-atomic_t fscache_op_debug_id;
63098+atomic_unchecked_t fscache_op_debug_id;
63099 EXPORT_SYMBOL(fscache_op_debug_id);
63100
63101 /**
63102@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
63103 ASSERTCMP(atomic_read(&op->usage), >, 0);
63104 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
63105
63106- fscache_stat(&fscache_n_op_enqueue);
63107+ fscache_stat_unchecked(&fscache_n_op_enqueue);
63108 switch (op->flags & FSCACHE_OP_TYPE) {
63109 case FSCACHE_OP_ASYNC:
63110 _debug("queue async");
63111@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
63112 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
63113 if (op->processor)
63114 fscache_enqueue_operation(op);
63115- fscache_stat(&fscache_n_op_run);
63116+ fscache_stat_unchecked(&fscache_n_op_run);
63117 }
63118
63119 /*
63120@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63121 if (object->n_in_progress > 0) {
63122 atomic_inc(&op->usage);
63123 list_add_tail(&op->pend_link, &object->pending_ops);
63124- fscache_stat(&fscache_n_op_pend);
63125+ fscache_stat_unchecked(&fscache_n_op_pend);
63126 } else if (!list_empty(&object->pending_ops)) {
63127 atomic_inc(&op->usage);
63128 list_add_tail(&op->pend_link, &object->pending_ops);
63129- fscache_stat(&fscache_n_op_pend);
63130+ fscache_stat_unchecked(&fscache_n_op_pend);
63131 fscache_start_operations(object);
63132 } else {
63133 ASSERTCMP(object->n_in_progress, ==, 0);
63134@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63135 object->n_exclusive++; /* reads and writes must wait */
63136 atomic_inc(&op->usage);
63137 list_add_tail(&op->pend_link, &object->pending_ops);
63138- fscache_stat(&fscache_n_op_pend);
63139+ fscache_stat_unchecked(&fscache_n_op_pend);
63140 ret = 0;
63141 } else {
63142 /* If we're in any other state, there must have been an I/O
63143@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
63144 if (object->n_exclusive > 0) {
63145 atomic_inc(&op->usage);
63146 list_add_tail(&op->pend_link, &object->pending_ops);
63147- fscache_stat(&fscache_n_op_pend);
63148+ fscache_stat_unchecked(&fscache_n_op_pend);
63149 } else if (!list_empty(&object->pending_ops)) {
63150 atomic_inc(&op->usage);
63151 list_add_tail(&op->pend_link, &object->pending_ops);
63152- fscache_stat(&fscache_n_op_pend);
63153+ fscache_stat_unchecked(&fscache_n_op_pend);
63154 fscache_start_operations(object);
63155 } else {
63156 ASSERTCMP(object->n_exclusive, ==, 0);
63157@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
63158 object->n_ops++;
63159 atomic_inc(&op->usage);
63160 list_add_tail(&op->pend_link, &object->pending_ops);
63161- fscache_stat(&fscache_n_op_pend);
63162+ fscache_stat_unchecked(&fscache_n_op_pend);
63163 ret = 0;
63164 } else if (fscache_object_is_dying(object)) {
63165- fscache_stat(&fscache_n_op_rejected);
63166+ fscache_stat_unchecked(&fscache_n_op_rejected);
63167 op->state = FSCACHE_OP_ST_CANCELLED;
63168 ret = -ENOBUFS;
63169 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
63170@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
63171 ret = -EBUSY;
63172 if (op->state == FSCACHE_OP_ST_PENDING) {
63173 ASSERT(!list_empty(&op->pend_link));
63174- fscache_stat(&fscache_n_op_cancelled);
63175+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63176 list_del_init(&op->pend_link);
63177 if (do_cancel)
63178 do_cancel(op);
63179@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
63180 while (!list_empty(&object->pending_ops)) {
63181 op = list_entry(object->pending_ops.next,
63182 struct fscache_operation, pend_link);
63183- fscache_stat(&fscache_n_op_cancelled);
63184+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63185 list_del_init(&op->pend_link);
63186
63187 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
63188@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
63189 op->state, ==, FSCACHE_OP_ST_CANCELLED);
63190 op->state = FSCACHE_OP_ST_DEAD;
63191
63192- fscache_stat(&fscache_n_op_release);
63193+ fscache_stat_unchecked(&fscache_n_op_release);
63194
63195 if (op->release) {
63196 op->release(op);
63197@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
63198 * lock, and defer it otherwise */
63199 if (!spin_trylock(&object->lock)) {
63200 _debug("defer put");
63201- fscache_stat(&fscache_n_op_deferred_release);
63202+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
63203
63204 cache = object->cache;
63205 spin_lock(&cache->op_gc_list_lock);
63206@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
63207
63208 _debug("GC DEFERRED REL OBJ%x OP%x",
63209 object->debug_id, op->debug_id);
63210- fscache_stat(&fscache_n_op_gc);
63211+ fscache_stat_unchecked(&fscache_n_op_gc);
63212
63213 ASSERTCMP(atomic_read(&op->usage), ==, 0);
63214 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
63215diff --git a/fs/fscache/page.c b/fs/fscache/page.c
63216index de33b3f..8be4d29 100644
63217--- a/fs/fscache/page.c
63218+++ b/fs/fscache/page.c
63219@@ -74,7 +74,7 @@ try_again:
63220 val = radix_tree_lookup(&cookie->stores, page->index);
63221 if (!val) {
63222 rcu_read_unlock();
63223- fscache_stat(&fscache_n_store_vmscan_not_storing);
63224+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
63225 __fscache_uncache_page(cookie, page);
63226 return true;
63227 }
63228@@ -104,11 +104,11 @@ try_again:
63229 spin_unlock(&cookie->stores_lock);
63230
63231 if (xpage) {
63232- fscache_stat(&fscache_n_store_vmscan_cancelled);
63233- fscache_stat(&fscache_n_store_radix_deletes);
63234+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
63235+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63236 ASSERTCMP(xpage, ==, page);
63237 } else {
63238- fscache_stat(&fscache_n_store_vmscan_gone);
63239+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
63240 }
63241
63242 wake_up_bit(&cookie->flags, 0);
63243@@ -123,11 +123,11 @@ page_busy:
63244 * sleeping on memory allocation, so we may need to impose a timeout
63245 * too. */
63246 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
63247- fscache_stat(&fscache_n_store_vmscan_busy);
63248+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
63249 return false;
63250 }
63251
63252- fscache_stat(&fscache_n_store_vmscan_wait);
63253+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
63254 if (!release_page_wait_timeout(cookie, page))
63255 _debug("fscache writeout timeout page: %p{%lx}",
63256 page, page->index);
63257@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
63258 FSCACHE_COOKIE_STORING_TAG);
63259 if (!radix_tree_tag_get(&cookie->stores, page->index,
63260 FSCACHE_COOKIE_PENDING_TAG)) {
63261- fscache_stat(&fscache_n_store_radix_deletes);
63262+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63263 xpage = radix_tree_delete(&cookie->stores, page->index);
63264 }
63265 spin_unlock(&cookie->stores_lock);
63266@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
63267
63268 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
63269
63270- fscache_stat(&fscache_n_attr_changed_calls);
63271+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
63272
63273 if (fscache_object_is_active(object)) {
63274 fscache_stat(&fscache_n_cop_attr_changed);
63275@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63276
63277 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63278
63279- fscache_stat(&fscache_n_attr_changed);
63280+ fscache_stat_unchecked(&fscache_n_attr_changed);
63281
63282 op = kzalloc(sizeof(*op), GFP_KERNEL);
63283 if (!op) {
63284- fscache_stat(&fscache_n_attr_changed_nomem);
63285+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
63286 _leave(" = -ENOMEM");
63287 return -ENOMEM;
63288 }
63289@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63290 if (fscache_submit_exclusive_op(object, op) < 0)
63291 goto nobufs_dec;
63292 spin_unlock(&cookie->lock);
63293- fscache_stat(&fscache_n_attr_changed_ok);
63294+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
63295 fscache_put_operation(op);
63296 _leave(" = 0");
63297 return 0;
63298@@ -242,7 +242,7 @@ nobufs:
63299 kfree(op);
63300 if (wake_cookie)
63301 __fscache_wake_unused_cookie(cookie);
63302- fscache_stat(&fscache_n_attr_changed_nobufs);
63303+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
63304 _leave(" = %d", -ENOBUFS);
63305 return -ENOBUFS;
63306 }
63307@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
63308 /* allocate a retrieval operation and attempt to submit it */
63309 op = kzalloc(sizeof(*op), GFP_NOIO);
63310 if (!op) {
63311- fscache_stat(&fscache_n_retrievals_nomem);
63312+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63313 return NULL;
63314 }
63315
63316@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
63317 return 0;
63318 }
63319
63320- fscache_stat(&fscache_n_retrievals_wait);
63321+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
63322
63323 jif = jiffies;
63324 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
63325 TASK_INTERRUPTIBLE) != 0) {
63326- fscache_stat(&fscache_n_retrievals_intr);
63327+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63328 _leave(" = -ERESTARTSYS");
63329 return -ERESTARTSYS;
63330 }
63331@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
63332 */
63333 int fscache_wait_for_operation_activation(struct fscache_object *object,
63334 struct fscache_operation *op,
63335- atomic_t *stat_op_waits,
63336- atomic_t *stat_object_dead,
63337+ atomic_unchecked_t *stat_op_waits,
63338+ atomic_unchecked_t *stat_object_dead,
63339 void (*do_cancel)(struct fscache_operation *))
63340 {
63341 int ret;
63342@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63343
63344 _debug(">>> WT");
63345 if (stat_op_waits)
63346- fscache_stat(stat_op_waits);
63347+ fscache_stat_unchecked(stat_op_waits);
63348 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
63349 TASK_INTERRUPTIBLE) != 0) {
63350 ret = fscache_cancel_op(op, do_cancel);
63351@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63352 check_if_dead:
63353 if (op->state == FSCACHE_OP_ST_CANCELLED) {
63354 if (stat_object_dead)
63355- fscache_stat(stat_object_dead);
63356+ fscache_stat_unchecked(stat_object_dead);
63357 _leave(" = -ENOBUFS [cancelled]");
63358 return -ENOBUFS;
63359 }
63360@@ -381,7 +381,7 @@ check_if_dead:
63361 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
63362 fscache_cancel_op(op, do_cancel);
63363 if (stat_object_dead)
63364- fscache_stat(stat_object_dead);
63365+ fscache_stat_unchecked(stat_object_dead);
63366 return -ENOBUFS;
63367 }
63368 return 0;
63369@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63370
63371 _enter("%p,%p,,,", cookie, page);
63372
63373- fscache_stat(&fscache_n_retrievals);
63374+ fscache_stat_unchecked(&fscache_n_retrievals);
63375
63376 if (hlist_empty(&cookie->backing_objects))
63377 goto nobufs;
63378@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63379 goto nobufs_unlock_dec;
63380 spin_unlock(&cookie->lock);
63381
63382- fscache_stat(&fscache_n_retrieval_ops);
63383+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63384
63385 /* pin the netfs read context in case we need to do the actual netfs
63386 * read because we've encountered a cache read failure */
63387@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63388
63389 error:
63390 if (ret == -ENOMEM)
63391- fscache_stat(&fscache_n_retrievals_nomem);
63392+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63393 else if (ret == -ERESTARTSYS)
63394- fscache_stat(&fscache_n_retrievals_intr);
63395+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63396 else if (ret == -ENODATA)
63397- fscache_stat(&fscache_n_retrievals_nodata);
63398+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63399 else if (ret < 0)
63400- fscache_stat(&fscache_n_retrievals_nobufs);
63401+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63402 else
63403- fscache_stat(&fscache_n_retrievals_ok);
63404+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63405
63406 fscache_put_retrieval(op);
63407 _leave(" = %d", ret);
63408@@ -505,7 +505,7 @@ nobufs_unlock:
63409 __fscache_wake_unused_cookie(cookie);
63410 kfree(op);
63411 nobufs:
63412- fscache_stat(&fscache_n_retrievals_nobufs);
63413+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63414 _leave(" = -ENOBUFS");
63415 return -ENOBUFS;
63416 }
63417@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63418
63419 _enter("%p,,%d,,,", cookie, *nr_pages);
63420
63421- fscache_stat(&fscache_n_retrievals);
63422+ fscache_stat_unchecked(&fscache_n_retrievals);
63423
63424 if (hlist_empty(&cookie->backing_objects))
63425 goto nobufs;
63426@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63427 goto nobufs_unlock_dec;
63428 spin_unlock(&cookie->lock);
63429
63430- fscache_stat(&fscache_n_retrieval_ops);
63431+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63432
63433 /* pin the netfs read context in case we need to do the actual netfs
63434 * read because we've encountered a cache read failure */
63435@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63436
63437 error:
63438 if (ret == -ENOMEM)
63439- fscache_stat(&fscache_n_retrievals_nomem);
63440+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63441 else if (ret == -ERESTARTSYS)
63442- fscache_stat(&fscache_n_retrievals_intr);
63443+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63444 else if (ret == -ENODATA)
63445- fscache_stat(&fscache_n_retrievals_nodata);
63446+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63447 else if (ret < 0)
63448- fscache_stat(&fscache_n_retrievals_nobufs);
63449+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63450 else
63451- fscache_stat(&fscache_n_retrievals_ok);
63452+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63453
63454 fscache_put_retrieval(op);
63455 _leave(" = %d", ret);
63456@@ -636,7 +636,7 @@ nobufs_unlock:
63457 if (wake_cookie)
63458 __fscache_wake_unused_cookie(cookie);
63459 nobufs:
63460- fscache_stat(&fscache_n_retrievals_nobufs);
63461+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63462 _leave(" = -ENOBUFS");
63463 return -ENOBUFS;
63464 }
63465@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63466
63467 _enter("%p,%p,,,", cookie, page);
63468
63469- fscache_stat(&fscache_n_allocs);
63470+ fscache_stat_unchecked(&fscache_n_allocs);
63471
63472 if (hlist_empty(&cookie->backing_objects))
63473 goto nobufs;
63474@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63475 goto nobufs_unlock_dec;
63476 spin_unlock(&cookie->lock);
63477
63478- fscache_stat(&fscache_n_alloc_ops);
63479+ fscache_stat_unchecked(&fscache_n_alloc_ops);
63480
63481 ret = fscache_wait_for_operation_activation(
63482 object, &op->op,
63483@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63484
63485 error:
63486 if (ret == -ERESTARTSYS)
63487- fscache_stat(&fscache_n_allocs_intr);
63488+ fscache_stat_unchecked(&fscache_n_allocs_intr);
63489 else if (ret < 0)
63490- fscache_stat(&fscache_n_allocs_nobufs);
63491+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63492 else
63493- fscache_stat(&fscache_n_allocs_ok);
63494+ fscache_stat_unchecked(&fscache_n_allocs_ok);
63495
63496 fscache_put_retrieval(op);
63497 _leave(" = %d", ret);
63498@@ -730,7 +730,7 @@ nobufs_unlock:
63499 if (wake_cookie)
63500 __fscache_wake_unused_cookie(cookie);
63501 nobufs:
63502- fscache_stat(&fscache_n_allocs_nobufs);
63503+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63504 _leave(" = -ENOBUFS");
63505 return -ENOBUFS;
63506 }
63507@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63508
63509 spin_lock(&cookie->stores_lock);
63510
63511- fscache_stat(&fscache_n_store_calls);
63512+ fscache_stat_unchecked(&fscache_n_store_calls);
63513
63514 /* find a page to store */
63515 page = NULL;
63516@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63517 page = results[0];
63518 _debug("gang %d [%lx]", n, page->index);
63519 if (page->index > op->store_limit) {
63520- fscache_stat(&fscache_n_store_pages_over_limit);
63521+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
63522 goto superseded;
63523 }
63524
63525@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63526 spin_unlock(&cookie->stores_lock);
63527 spin_unlock(&object->lock);
63528
63529- fscache_stat(&fscache_n_store_pages);
63530+ fscache_stat_unchecked(&fscache_n_store_pages);
63531 fscache_stat(&fscache_n_cop_write_page);
63532 ret = object->cache->ops->write_page(op, page);
63533 fscache_stat_d(&fscache_n_cop_write_page);
63534@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63535 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63536 ASSERT(PageFsCache(page));
63537
63538- fscache_stat(&fscache_n_stores);
63539+ fscache_stat_unchecked(&fscache_n_stores);
63540
63541 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
63542 _leave(" = -ENOBUFS [invalidating]");
63543@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63544 spin_unlock(&cookie->stores_lock);
63545 spin_unlock(&object->lock);
63546
63547- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
63548+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63549 op->store_limit = object->store_limit;
63550
63551 __fscache_use_cookie(cookie);
63552@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63553
63554 spin_unlock(&cookie->lock);
63555 radix_tree_preload_end();
63556- fscache_stat(&fscache_n_store_ops);
63557- fscache_stat(&fscache_n_stores_ok);
63558+ fscache_stat_unchecked(&fscache_n_store_ops);
63559+ fscache_stat_unchecked(&fscache_n_stores_ok);
63560
63561 /* the work queue now carries its own ref on the object */
63562 fscache_put_operation(&op->op);
63563@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63564 return 0;
63565
63566 already_queued:
63567- fscache_stat(&fscache_n_stores_again);
63568+ fscache_stat_unchecked(&fscache_n_stores_again);
63569 already_pending:
63570 spin_unlock(&cookie->stores_lock);
63571 spin_unlock(&object->lock);
63572 spin_unlock(&cookie->lock);
63573 radix_tree_preload_end();
63574 kfree(op);
63575- fscache_stat(&fscache_n_stores_ok);
63576+ fscache_stat_unchecked(&fscache_n_stores_ok);
63577 _leave(" = 0");
63578 return 0;
63579
63580@@ -1039,14 +1039,14 @@ nobufs:
63581 kfree(op);
63582 if (wake_cookie)
63583 __fscache_wake_unused_cookie(cookie);
63584- fscache_stat(&fscache_n_stores_nobufs);
63585+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
63586 _leave(" = -ENOBUFS");
63587 return -ENOBUFS;
63588
63589 nomem_free:
63590 kfree(op);
63591 nomem:
63592- fscache_stat(&fscache_n_stores_oom);
63593+ fscache_stat_unchecked(&fscache_n_stores_oom);
63594 _leave(" = -ENOMEM");
63595 return -ENOMEM;
63596 }
63597@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
63598 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63599 ASSERTCMP(page, !=, NULL);
63600
63601- fscache_stat(&fscache_n_uncaches);
63602+ fscache_stat_unchecked(&fscache_n_uncaches);
63603
63604 /* cache withdrawal may beat us to it */
63605 if (!PageFsCache(page))
63606@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
63607 struct fscache_cookie *cookie = op->op.object->cookie;
63608
63609 #ifdef CONFIG_FSCACHE_STATS
63610- atomic_inc(&fscache_n_marks);
63611+ atomic_inc_unchecked(&fscache_n_marks);
63612 #endif
63613
63614 _debug("- mark %p{%lx}", page, page->index);
63615diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
63616index 40d13c7..ddf52b9 100644
63617--- a/fs/fscache/stats.c
63618+++ b/fs/fscache/stats.c
63619@@ -18,99 +18,99 @@
63620 /*
63621 * operation counters
63622 */
63623-atomic_t fscache_n_op_pend;
63624-atomic_t fscache_n_op_run;
63625-atomic_t fscache_n_op_enqueue;
63626-atomic_t fscache_n_op_requeue;
63627-atomic_t fscache_n_op_deferred_release;
63628-atomic_t fscache_n_op_release;
63629-atomic_t fscache_n_op_gc;
63630-atomic_t fscache_n_op_cancelled;
63631-atomic_t fscache_n_op_rejected;
63632+atomic_unchecked_t fscache_n_op_pend;
63633+atomic_unchecked_t fscache_n_op_run;
63634+atomic_unchecked_t fscache_n_op_enqueue;
63635+atomic_unchecked_t fscache_n_op_requeue;
63636+atomic_unchecked_t fscache_n_op_deferred_release;
63637+atomic_unchecked_t fscache_n_op_release;
63638+atomic_unchecked_t fscache_n_op_gc;
63639+atomic_unchecked_t fscache_n_op_cancelled;
63640+atomic_unchecked_t fscache_n_op_rejected;
63641
63642-atomic_t fscache_n_attr_changed;
63643-atomic_t fscache_n_attr_changed_ok;
63644-atomic_t fscache_n_attr_changed_nobufs;
63645-atomic_t fscache_n_attr_changed_nomem;
63646-atomic_t fscache_n_attr_changed_calls;
63647+atomic_unchecked_t fscache_n_attr_changed;
63648+atomic_unchecked_t fscache_n_attr_changed_ok;
63649+atomic_unchecked_t fscache_n_attr_changed_nobufs;
63650+atomic_unchecked_t fscache_n_attr_changed_nomem;
63651+atomic_unchecked_t fscache_n_attr_changed_calls;
63652
63653-atomic_t fscache_n_allocs;
63654-atomic_t fscache_n_allocs_ok;
63655-atomic_t fscache_n_allocs_wait;
63656-atomic_t fscache_n_allocs_nobufs;
63657-atomic_t fscache_n_allocs_intr;
63658-atomic_t fscache_n_allocs_object_dead;
63659-atomic_t fscache_n_alloc_ops;
63660-atomic_t fscache_n_alloc_op_waits;
63661+atomic_unchecked_t fscache_n_allocs;
63662+atomic_unchecked_t fscache_n_allocs_ok;
63663+atomic_unchecked_t fscache_n_allocs_wait;
63664+atomic_unchecked_t fscache_n_allocs_nobufs;
63665+atomic_unchecked_t fscache_n_allocs_intr;
63666+atomic_unchecked_t fscache_n_allocs_object_dead;
63667+atomic_unchecked_t fscache_n_alloc_ops;
63668+atomic_unchecked_t fscache_n_alloc_op_waits;
63669
63670-atomic_t fscache_n_retrievals;
63671-atomic_t fscache_n_retrievals_ok;
63672-atomic_t fscache_n_retrievals_wait;
63673-atomic_t fscache_n_retrievals_nodata;
63674-atomic_t fscache_n_retrievals_nobufs;
63675-atomic_t fscache_n_retrievals_intr;
63676-atomic_t fscache_n_retrievals_nomem;
63677-atomic_t fscache_n_retrievals_object_dead;
63678-atomic_t fscache_n_retrieval_ops;
63679-atomic_t fscache_n_retrieval_op_waits;
63680+atomic_unchecked_t fscache_n_retrievals;
63681+atomic_unchecked_t fscache_n_retrievals_ok;
63682+atomic_unchecked_t fscache_n_retrievals_wait;
63683+atomic_unchecked_t fscache_n_retrievals_nodata;
63684+atomic_unchecked_t fscache_n_retrievals_nobufs;
63685+atomic_unchecked_t fscache_n_retrievals_intr;
63686+atomic_unchecked_t fscache_n_retrievals_nomem;
63687+atomic_unchecked_t fscache_n_retrievals_object_dead;
63688+atomic_unchecked_t fscache_n_retrieval_ops;
63689+atomic_unchecked_t fscache_n_retrieval_op_waits;
63690
63691-atomic_t fscache_n_stores;
63692-atomic_t fscache_n_stores_ok;
63693-atomic_t fscache_n_stores_again;
63694-atomic_t fscache_n_stores_nobufs;
63695-atomic_t fscache_n_stores_oom;
63696-atomic_t fscache_n_store_ops;
63697-atomic_t fscache_n_store_calls;
63698-atomic_t fscache_n_store_pages;
63699-atomic_t fscache_n_store_radix_deletes;
63700-atomic_t fscache_n_store_pages_over_limit;
63701+atomic_unchecked_t fscache_n_stores;
63702+atomic_unchecked_t fscache_n_stores_ok;
63703+atomic_unchecked_t fscache_n_stores_again;
63704+atomic_unchecked_t fscache_n_stores_nobufs;
63705+atomic_unchecked_t fscache_n_stores_oom;
63706+atomic_unchecked_t fscache_n_store_ops;
63707+atomic_unchecked_t fscache_n_store_calls;
63708+atomic_unchecked_t fscache_n_store_pages;
63709+atomic_unchecked_t fscache_n_store_radix_deletes;
63710+atomic_unchecked_t fscache_n_store_pages_over_limit;
63711
63712-atomic_t fscache_n_store_vmscan_not_storing;
63713-atomic_t fscache_n_store_vmscan_gone;
63714-atomic_t fscache_n_store_vmscan_busy;
63715-atomic_t fscache_n_store_vmscan_cancelled;
63716-atomic_t fscache_n_store_vmscan_wait;
63717+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63718+atomic_unchecked_t fscache_n_store_vmscan_gone;
63719+atomic_unchecked_t fscache_n_store_vmscan_busy;
63720+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63721+atomic_unchecked_t fscache_n_store_vmscan_wait;
63722
63723-atomic_t fscache_n_marks;
63724-atomic_t fscache_n_uncaches;
63725+atomic_unchecked_t fscache_n_marks;
63726+atomic_unchecked_t fscache_n_uncaches;
63727
63728-atomic_t fscache_n_acquires;
63729-atomic_t fscache_n_acquires_null;
63730-atomic_t fscache_n_acquires_no_cache;
63731-atomic_t fscache_n_acquires_ok;
63732-atomic_t fscache_n_acquires_nobufs;
63733-atomic_t fscache_n_acquires_oom;
63734+atomic_unchecked_t fscache_n_acquires;
63735+atomic_unchecked_t fscache_n_acquires_null;
63736+atomic_unchecked_t fscache_n_acquires_no_cache;
63737+atomic_unchecked_t fscache_n_acquires_ok;
63738+atomic_unchecked_t fscache_n_acquires_nobufs;
63739+atomic_unchecked_t fscache_n_acquires_oom;
63740
63741-atomic_t fscache_n_invalidates;
63742-atomic_t fscache_n_invalidates_run;
63743+atomic_unchecked_t fscache_n_invalidates;
63744+atomic_unchecked_t fscache_n_invalidates_run;
63745
63746-atomic_t fscache_n_updates;
63747-atomic_t fscache_n_updates_null;
63748-atomic_t fscache_n_updates_run;
63749+atomic_unchecked_t fscache_n_updates;
63750+atomic_unchecked_t fscache_n_updates_null;
63751+atomic_unchecked_t fscache_n_updates_run;
63752
63753-atomic_t fscache_n_relinquishes;
63754-atomic_t fscache_n_relinquishes_null;
63755-atomic_t fscache_n_relinquishes_waitcrt;
63756-atomic_t fscache_n_relinquishes_retire;
63757+atomic_unchecked_t fscache_n_relinquishes;
63758+atomic_unchecked_t fscache_n_relinquishes_null;
63759+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63760+atomic_unchecked_t fscache_n_relinquishes_retire;
63761
63762-atomic_t fscache_n_cookie_index;
63763-atomic_t fscache_n_cookie_data;
63764-atomic_t fscache_n_cookie_special;
63765+atomic_unchecked_t fscache_n_cookie_index;
63766+atomic_unchecked_t fscache_n_cookie_data;
63767+atomic_unchecked_t fscache_n_cookie_special;
63768
63769-atomic_t fscache_n_object_alloc;
63770-atomic_t fscache_n_object_no_alloc;
63771-atomic_t fscache_n_object_lookups;
63772-atomic_t fscache_n_object_lookups_negative;
63773-atomic_t fscache_n_object_lookups_positive;
63774-atomic_t fscache_n_object_lookups_timed_out;
63775-atomic_t fscache_n_object_created;
63776-atomic_t fscache_n_object_avail;
63777-atomic_t fscache_n_object_dead;
63778+atomic_unchecked_t fscache_n_object_alloc;
63779+atomic_unchecked_t fscache_n_object_no_alloc;
63780+atomic_unchecked_t fscache_n_object_lookups;
63781+atomic_unchecked_t fscache_n_object_lookups_negative;
63782+atomic_unchecked_t fscache_n_object_lookups_positive;
63783+atomic_unchecked_t fscache_n_object_lookups_timed_out;
63784+atomic_unchecked_t fscache_n_object_created;
63785+atomic_unchecked_t fscache_n_object_avail;
63786+atomic_unchecked_t fscache_n_object_dead;
63787
63788-atomic_t fscache_n_checkaux_none;
63789-atomic_t fscache_n_checkaux_okay;
63790-atomic_t fscache_n_checkaux_update;
63791-atomic_t fscache_n_checkaux_obsolete;
63792+atomic_unchecked_t fscache_n_checkaux_none;
63793+atomic_unchecked_t fscache_n_checkaux_okay;
63794+atomic_unchecked_t fscache_n_checkaux_update;
63795+atomic_unchecked_t fscache_n_checkaux_obsolete;
63796
63797 atomic_t fscache_n_cop_alloc_object;
63798 atomic_t fscache_n_cop_lookup_object;
63799@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63800 seq_puts(m, "FS-Cache statistics\n");
63801
63802 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63803- atomic_read(&fscache_n_cookie_index),
63804- atomic_read(&fscache_n_cookie_data),
63805- atomic_read(&fscache_n_cookie_special));
63806+ atomic_read_unchecked(&fscache_n_cookie_index),
63807+ atomic_read_unchecked(&fscache_n_cookie_data),
63808+ atomic_read_unchecked(&fscache_n_cookie_special));
63809
63810 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63811- atomic_read(&fscache_n_object_alloc),
63812- atomic_read(&fscache_n_object_no_alloc),
63813- atomic_read(&fscache_n_object_avail),
63814- atomic_read(&fscache_n_object_dead));
63815+ atomic_read_unchecked(&fscache_n_object_alloc),
63816+ atomic_read_unchecked(&fscache_n_object_no_alloc),
63817+ atomic_read_unchecked(&fscache_n_object_avail),
63818+ atomic_read_unchecked(&fscache_n_object_dead));
63819 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63820- atomic_read(&fscache_n_checkaux_none),
63821- atomic_read(&fscache_n_checkaux_okay),
63822- atomic_read(&fscache_n_checkaux_update),
63823- atomic_read(&fscache_n_checkaux_obsolete));
63824+ atomic_read_unchecked(&fscache_n_checkaux_none),
63825+ atomic_read_unchecked(&fscache_n_checkaux_okay),
63826+ atomic_read_unchecked(&fscache_n_checkaux_update),
63827+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63828
63829 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63830- atomic_read(&fscache_n_marks),
63831- atomic_read(&fscache_n_uncaches));
63832+ atomic_read_unchecked(&fscache_n_marks),
63833+ atomic_read_unchecked(&fscache_n_uncaches));
63834
63835 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63836 " oom=%u\n",
63837- atomic_read(&fscache_n_acquires),
63838- atomic_read(&fscache_n_acquires_null),
63839- atomic_read(&fscache_n_acquires_no_cache),
63840- atomic_read(&fscache_n_acquires_ok),
63841- atomic_read(&fscache_n_acquires_nobufs),
63842- atomic_read(&fscache_n_acquires_oom));
63843+ atomic_read_unchecked(&fscache_n_acquires),
63844+ atomic_read_unchecked(&fscache_n_acquires_null),
63845+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
63846+ atomic_read_unchecked(&fscache_n_acquires_ok),
63847+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
63848+ atomic_read_unchecked(&fscache_n_acquires_oom));
63849
63850 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63851- atomic_read(&fscache_n_object_lookups),
63852- atomic_read(&fscache_n_object_lookups_negative),
63853- atomic_read(&fscache_n_object_lookups_positive),
63854- atomic_read(&fscache_n_object_created),
63855- atomic_read(&fscache_n_object_lookups_timed_out));
63856+ atomic_read_unchecked(&fscache_n_object_lookups),
63857+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
63858+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
63859+ atomic_read_unchecked(&fscache_n_object_created),
63860+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63861
63862 seq_printf(m, "Invals : n=%u run=%u\n",
63863- atomic_read(&fscache_n_invalidates),
63864- atomic_read(&fscache_n_invalidates_run));
63865+ atomic_read_unchecked(&fscache_n_invalidates),
63866+ atomic_read_unchecked(&fscache_n_invalidates_run));
63867
63868 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63869- atomic_read(&fscache_n_updates),
63870- atomic_read(&fscache_n_updates_null),
63871- atomic_read(&fscache_n_updates_run));
63872+ atomic_read_unchecked(&fscache_n_updates),
63873+ atomic_read_unchecked(&fscache_n_updates_null),
63874+ atomic_read_unchecked(&fscache_n_updates_run));
63875
63876 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63877- atomic_read(&fscache_n_relinquishes),
63878- atomic_read(&fscache_n_relinquishes_null),
63879- atomic_read(&fscache_n_relinquishes_waitcrt),
63880- atomic_read(&fscache_n_relinquishes_retire));
63881+ atomic_read_unchecked(&fscache_n_relinquishes),
63882+ atomic_read_unchecked(&fscache_n_relinquishes_null),
63883+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63884+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
63885
63886 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63887- atomic_read(&fscache_n_attr_changed),
63888- atomic_read(&fscache_n_attr_changed_ok),
63889- atomic_read(&fscache_n_attr_changed_nobufs),
63890- atomic_read(&fscache_n_attr_changed_nomem),
63891- atomic_read(&fscache_n_attr_changed_calls));
63892+ atomic_read_unchecked(&fscache_n_attr_changed),
63893+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
63894+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63895+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63896+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
63897
63898 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63899- atomic_read(&fscache_n_allocs),
63900- atomic_read(&fscache_n_allocs_ok),
63901- atomic_read(&fscache_n_allocs_wait),
63902- atomic_read(&fscache_n_allocs_nobufs),
63903- atomic_read(&fscache_n_allocs_intr));
63904+ atomic_read_unchecked(&fscache_n_allocs),
63905+ atomic_read_unchecked(&fscache_n_allocs_ok),
63906+ atomic_read_unchecked(&fscache_n_allocs_wait),
63907+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
63908+ atomic_read_unchecked(&fscache_n_allocs_intr));
63909 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63910- atomic_read(&fscache_n_alloc_ops),
63911- atomic_read(&fscache_n_alloc_op_waits),
63912- atomic_read(&fscache_n_allocs_object_dead));
63913+ atomic_read_unchecked(&fscache_n_alloc_ops),
63914+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
63915+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
63916
63917 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63918 " int=%u oom=%u\n",
63919- atomic_read(&fscache_n_retrievals),
63920- atomic_read(&fscache_n_retrievals_ok),
63921- atomic_read(&fscache_n_retrievals_wait),
63922- atomic_read(&fscache_n_retrievals_nodata),
63923- atomic_read(&fscache_n_retrievals_nobufs),
63924- atomic_read(&fscache_n_retrievals_intr),
63925- atomic_read(&fscache_n_retrievals_nomem));
63926+ atomic_read_unchecked(&fscache_n_retrievals),
63927+ atomic_read_unchecked(&fscache_n_retrievals_ok),
63928+ atomic_read_unchecked(&fscache_n_retrievals_wait),
63929+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
63930+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63931+ atomic_read_unchecked(&fscache_n_retrievals_intr),
63932+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
63933 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63934- atomic_read(&fscache_n_retrieval_ops),
63935- atomic_read(&fscache_n_retrieval_op_waits),
63936- atomic_read(&fscache_n_retrievals_object_dead));
63937+ atomic_read_unchecked(&fscache_n_retrieval_ops),
63938+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63939+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63940
63941 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63942- atomic_read(&fscache_n_stores),
63943- atomic_read(&fscache_n_stores_ok),
63944- atomic_read(&fscache_n_stores_again),
63945- atomic_read(&fscache_n_stores_nobufs),
63946- atomic_read(&fscache_n_stores_oom));
63947+ atomic_read_unchecked(&fscache_n_stores),
63948+ atomic_read_unchecked(&fscache_n_stores_ok),
63949+ atomic_read_unchecked(&fscache_n_stores_again),
63950+ atomic_read_unchecked(&fscache_n_stores_nobufs),
63951+ atomic_read_unchecked(&fscache_n_stores_oom));
63952 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63953- atomic_read(&fscache_n_store_ops),
63954- atomic_read(&fscache_n_store_calls),
63955- atomic_read(&fscache_n_store_pages),
63956- atomic_read(&fscache_n_store_radix_deletes),
63957- atomic_read(&fscache_n_store_pages_over_limit));
63958+ atomic_read_unchecked(&fscache_n_store_ops),
63959+ atomic_read_unchecked(&fscache_n_store_calls),
63960+ atomic_read_unchecked(&fscache_n_store_pages),
63961+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
63962+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63963
63964 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63965- atomic_read(&fscache_n_store_vmscan_not_storing),
63966- atomic_read(&fscache_n_store_vmscan_gone),
63967- atomic_read(&fscache_n_store_vmscan_busy),
63968- atomic_read(&fscache_n_store_vmscan_cancelled),
63969- atomic_read(&fscache_n_store_vmscan_wait));
63970+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63971+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63972+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63973+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63974+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63975
63976 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63977- atomic_read(&fscache_n_op_pend),
63978- atomic_read(&fscache_n_op_run),
63979- atomic_read(&fscache_n_op_enqueue),
63980- atomic_read(&fscache_n_op_cancelled),
63981- atomic_read(&fscache_n_op_rejected));
63982+ atomic_read_unchecked(&fscache_n_op_pend),
63983+ atomic_read_unchecked(&fscache_n_op_run),
63984+ atomic_read_unchecked(&fscache_n_op_enqueue),
63985+ atomic_read_unchecked(&fscache_n_op_cancelled),
63986+ atomic_read_unchecked(&fscache_n_op_rejected));
63987 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63988- atomic_read(&fscache_n_op_deferred_release),
63989- atomic_read(&fscache_n_op_release),
63990- atomic_read(&fscache_n_op_gc));
63991+ atomic_read_unchecked(&fscache_n_op_deferred_release),
63992+ atomic_read_unchecked(&fscache_n_op_release),
63993+ atomic_read_unchecked(&fscache_n_op_gc));
63994
63995 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63996 atomic_read(&fscache_n_cop_alloc_object),
63997diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63998index 28d0c7a..04816b7 100644
63999--- a/fs/fuse/cuse.c
64000+++ b/fs/fuse/cuse.c
64001@@ -611,10 +611,12 @@ static int __init cuse_init(void)
64002 INIT_LIST_HEAD(&cuse_conntbl[i]);
64003
64004 /* inherit and extend fuse_dev_operations */
64005- cuse_channel_fops = fuse_dev_operations;
64006- cuse_channel_fops.owner = THIS_MODULE;
64007- cuse_channel_fops.open = cuse_channel_open;
64008- cuse_channel_fops.release = cuse_channel_release;
64009+ pax_open_kernel();
64010+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
64011+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
64012+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
64013+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
64014+ pax_close_kernel();
64015
64016 cuse_class = class_create(THIS_MODULE, "cuse");
64017 if (IS_ERR(cuse_class))
64018diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
64019index 71c4619..6a9f6d4 100644
64020--- a/fs/fuse/dev.c
64021+++ b/fs/fuse/dev.c
64022@@ -1394,7 +1394,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64023 ret = 0;
64024 pipe_lock(pipe);
64025
64026- if (!pipe->readers) {
64027+ if (!atomic_read(&pipe->readers)) {
64028 send_sig(SIGPIPE, current, 0);
64029 if (!ret)
64030 ret = -EPIPE;
64031@@ -1423,7 +1423,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64032 page_nr++;
64033 ret += buf->len;
64034
64035- if (pipe->files)
64036+ if (atomic_read(&pipe->files))
64037 do_wakeup = 1;
64038 }
64039
64040diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
64041index 08e7b1a..d91c6ee 100644
64042--- a/fs/fuse/dir.c
64043+++ b/fs/fuse/dir.c
64044@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
64045 return link;
64046 }
64047
64048-static void free_link(char *link)
64049+static void free_link(const char *link)
64050 {
64051 if (!IS_ERR(link))
64052 free_page((unsigned long) link);
64053diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
64054index fd62cae..3494dfa 100644
64055--- a/fs/hostfs/hostfs_kern.c
64056+++ b/fs/hostfs/hostfs_kern.c
64057@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
64058
64059 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
64060 {
64061- char *s = nd_get_link(nd);
64062+ const char *s = nd_get_link(nd);
64063 if (!IS_ERR(s))
64064 __putname(s);
64065 }
64066diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
64067index 5eba47f..d353c22 100644
64068--- a/fs/hugetlbfs/inode.c
64069+++ b/fs/hugetlbfs/inode.c
64070@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64071 struct mm_struct *mm = current->mm;
64072 struct vm_area_struct *vma;
64073 struct hstate *h = hstate_file(file);
64074+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
64075 struct vm_unmapped_area_info info;
64076
64077 if (len & ~huge_page_mask(h))
64078@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64079 return addr;
64080 }
64081
64082+#ifdef CONFIG_PAX_RANDMMAP
64083+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
64084+#endif
64085+
64086 if (addr) {
64087 addr = ALIGN(addr, huge_page_size(h));
64088 vma = find_vma(mm, addr);
64089- if (TASK_SIZE - len >= addr &&
64090- (!vma || addr + len <= vma->vm_start))
64091+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
64092 return addr;
64093 }
64094
64095 info.flags = 0;
64096 info.length = len;
64097 info.low_limit = TASK_UNMAPPED_BASE;
64098+
64099+#ifdef CONFIG_PAX_RANDMMAP
64100+ if (mm->pax_flags & MF_PAX_RANDMMAP)
64101+ info.low_limit += mm->delta_mmap;
64102+#endif
64103+
64104 info.high_limit = TASK_SIZE;
64105 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
64106 info.align_offset = 0;
64107@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
64108 };
64109 MODULE_ALIAS_FS("hugetlbfs");
64110
64111-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64112+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64113
64114 static int can_do_hugetlb_shm(void)
64115 {
64116diff --git a/fs/inode.c b/fs/inode.c
64117index aa149e7..46f1f65 100644
64118--- a/fs/inode.c
64119+++ b/fs/inode.c
64120@@ -842,16 +842,20 @@ unsigned int get_next_ino(void)
64121 unsigned int *p = &get_cpu_var(last_ino);
64122 unsigned int res = *p;
64123
64124+start:
64125+
64126 #ifdef CONFIG_SMP
64127 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
64128- static atomic_t shared_last_ino;
64129- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
64130+ static atomic_unchecked_t shared_last_ino;
64131+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
64132
64133 res = next - LAST_INO_BATCH;
64134 }
64135 #endif
64136
64137- *p = ++res;
64138+ if (unlikely(!++res))
64139+ goto start; /* never zero */
64140+ *p = res;
64141 put_cpu_var(last_ino);
64142 return res;
64143 }
64144diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
64145index 4a6cf28..d3a29d3 100644
64146--- a/fs/jffs2/erase.c
64147+++ b/fs/jffs2/erase.c
64148@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
64149 struct jffs2_unknown_node marker = {
64150 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
64151 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64152- .totlen = cpu_to_je32(c->cleanmarker_size)
64153+ .totlen = cpu_to_je32(c->cleanmarker_size),
64154+ .hdr_crc = cpu_to_je32(0)
64155 };
64156
64157 jffs2_prealloc_raw_node_refs(c, jeb, 1);
64158diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
64159index 09ed551..45684f8 100644
64160--- a/fs/jffs2/wbuf.c
64161+++ b/fs/jffs2/wbuf.c
64162@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
64163 {
64164 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
64165 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64166- .totlen = constant_cpu_to_je32(8)
64167+ .totlen = constant_cpu_to_je32(8),
64168+ .hdr_crc = constant_cpu_to_je32(0)
64169 };
64170
64171 /*
64172diff --git a/fs/jfs/super.c b/fs/jfs/super.c
64173index 16c3a95..e9cb75d 100644
64174--- a/fs/jfs/super.c
64175+++ b/fs/jfs/super.c
64176@@ -902,7 +902,7 @@ static int __init init_jfs_fs(void)
64177
64178 jfs_inode_cachep =
64179 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
64180- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
64181+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
64182 init_once);
64183 if (jfs_inode_cachep == NULL)
64184 return -ENOMEM;
64185diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
64186index 2d881b3..fe1ac77 100644
64187--- a/fs/kernfs/dir.c
64188+++ b/fs/kernfs/dir.c
64189@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
64190 *
64191 * Returns 31 bit hash of ns + name (so it fits in an off_t )
64192 */
64193-static unsigned int kernfs_name_hash(const char *name, const void *ns)
64194+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
64195 {
64196 unsigned long hash = init_name_hash();
64197 unsigned int len = strlen(name);
64198@@ -833,6 +833,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
64199 ret = scops->mkdir(parent, dentry->d_name.name, mode);
64200
64201 kernfs_put_active(parent);
64202+
64203+ if (!ret) {
64204+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
64205+ ret = PTR_ERR_OR_ZERO(dentry_ret);
64206+ }
64207+
64208 return ret;
64209 }
64210
64211diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
64212index ddc9f96..4e450ad 100644
64213--- a/fs/kernfs/file.c
64214+++ b/fs/kernfs/file.c
64215@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
64216
64217 struct kernfs_open_node {
64218 atomic_t refcnt;
64219- atomic_t event;
64220+ atomic_unchecked_t event;
64221 wait_queue_head_t poll;
64222 struct list_head files; /* goes through kernfs_open_file.list */
64223 };
64224@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
64225 {
64226 struct kernfs_open_file *of = sf->private;
64227
64228- of->event = atomic_read(&of->kn->attr.open->event);
64229+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
64230
64231 return of->kn->attr.ops->seq_show(sf, v);
64232 }
64233@@ -271,7 +271,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
64234 {
64235 struct kernfs_open_file *of = kernfs_of(file);
64236 const struct kernfs_ops *ops;
64237- size_t len;
64238+ ssize_t len;
64239 char *buf;
64240
64241 if (of->atomic_write_len) {
64242@@ -384,12 +384,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
64243 return ret;
64244 }
64245
64246-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64247- void *buf, int len, int write)
64248+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64249+ void *buf, size_t len, int write)
64250 {
64251 struct file *file = vma->vm_file;
64252 struct kernfs_open_file *of = kernfs_of(file);
64253- int ret;
64254+ ssize_t ret;
64255
64256 if (!of->vm_ops)
64257 return -EINVAL;
64258@@ -568,7 +568,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
64259 return -ENOMEM;
64260
64261 atomic_set(&new_on->refcnt, 0);
64262- atomic_set(&new_on->event, 1);
64263+ atomic_set_unchecked(&new_on->event, 1);
64264 init_waitqueue_head(&new_on->poll);
64265 INIT_LIST_HEAD(&new_on->files);
64266 goto retry;
64267@@ -792,7 +792,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
64268
64269 kernfs_put_active(kn);
64270
64271- if (of->event != atomic_read(&on->event))
64272+ if (of->event != atomic_read_unchecked(&on->event))
64273 goto trigger;
64274
64275 return DEFAULT_POLLMASK;
64276@@ -823,7 +823,7 @@ repeat:
64277
64278 on = kn->attr.open;
64279 if (on) {
64280- atomic_inc(&on->event);
64281+ atomic_inc_unchecked(&on->event);
64282 wake_up_interruptible(&on->poll);
64283 }
64284
64285diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
64286index 8a19889..4c3069a 100644
64287--- a/fs/kernfs/symlink.c
64288+++ b/fs/kernfs/symlink.c
64289@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
64290 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
64291 void *cookie)
64292 {
64293- char *page = nd_get_link(nd);
64294+ const char *page = nd_get_link(nd);
64295 if (!IS_ERR(page))
64296 free_page((unsigned long)page);
64297 }
64298diff --git a/fs/libfs.c b/fs/libfs.c
64299index 005843c..06c4191 100644
64300--- a/fs/libfs.c
64301+++ b/fs/libfs.c
64302@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64303
64304 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
64305 struct dentry *next = list_entry(p, struct dentry, d_child);
64306+ char d_name[sizeof(next->d_iname)];
64307+ const unsigned char *name;
64308+
64309 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
64310 if (!simple_positive(next)) {
64311 spin_unlock(&next->d_lock);
64312@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64313
64314 spin_unlock(&next->d_lock);
64315 spin_unlock(&dentry->d_lock);
64316- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
64317+ name = next->d_name.name;
64318+ if (name == next->d_iname) {
64319+ memcpy(d_name, name, next->d_name.len);
64320+ name = d_name;
64321+ }
64322+ if (!dir_emit(ctx, name, next->d_name.len,
64323 next->d_inode->i_ino, dt_type(next->d_inode)))
64324 return 0;
64325 spin_lock(&dentry->d_lock);
64326@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
64327 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
64328 void *cookie)
64329 {
64330- char *s = nd_get_link(nd);
64331+ const char *s = nd_get_link(nd);
64332 if (!IS_ERR(s))
64333 kfree(s);
64334 }
64335diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
64336index acd3947..1f896e2 100644
64337--- a/fs/lockd/clntproc.c
64338+++ b/fs/lockd/clntproc.c
64339@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
64340 /*
64341 * Cookie counter for NLM requests
64342 */
64343-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
64344+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
64345
64346 void nlmclnt_next_cookie(struct nlm_cookie *c)
64347 {
64348- u32 cookie = atomic_inc_return(&nlm_cookie);
64349+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
64350
64351 memcpy(c->data, &cookie, 4);
64352 c->len=4;
64353diff --git a/fs/locks.c b/fs/locks.c
64354index 59e2f90..bd69071 100644
64355--- a/fs/locks.c
64356+++ b/fs/locks.c
64357@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
64358 locks_remove_posix(filp, filp);
64359
64360 if (filp->f_op->flock) {
64361- struct file_lock fl = {
64362+ struct file_lock flock = {
64363 .fl_owner = filp,
64364 .fl_pid = current->tgid,
64365 .fl_file = filp,
64366@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
64367 .fl_type = F_UNLCK,
64368 .fl_end = OFFSET_MAX,
64369 };
64370- filp->f_op->flock(filp, F_SETLKW, &fl);
64371- if (fl.fl_ops && fl.fl_ops->fl_release_private)
64372- fl.fl_ops->fl_release_private(&fl);
64373+ filp->f_op->flock(filp, F_SETLKW, &flock);
64374+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
64375+ flock.fl_ops->fl_release_private(&flock);
64376 }
64377
64378 spin_lock(&inode->i_lock);
64379diff --git a/fs/mount.h b/fs/mount.h
64380index 0ad6f76..a04c146 100644
64381--- a/fs/mount.h
64382+++ b/fs/mount.h
64383@@ -12,7 +12,7 @@ struct mnt_namespace {
64384 u64 seq; /* Sequence number to prevent loops */
64385 wait_queue_head_t poll;
64386 u64 event;
64387-};
64388+} __randomize_layout;
64389
64390 struct mnt_pcp {
64391 int mnt_count;
64392@@ -63,7 +63,7 @@ struct mount {
64393 int mnt_expiry_mark; /* true if marked for expiry */
64394 struct hlist_head mnt_pins;
64395 struct path mnt_ex_mountpoint;
64396-};
64397+} __randomize_layout;
64398
64399 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
64400
64401diff --git a/fs/namei.c b/fs/namei.c
64402index bc35b02..7ed1f1d 100644
64403--- a/fs/namei.c
64404+++ b/fs/namei.c
64405@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
64406 if (ret != -EACCES)
64407 return ret;
64408
64409+#ifdef CONFIG_GRKERNSEC
64410+ /* we'll block if we have to log due to a denied capability use */
64411+ if (mask & MAY_NOT_BLOCK)
64412+ return -ECHILD;
64413+#endif
64414+
64415 if (S_ISDIR(inode->i_mode)) {
64416 /* DACs are overridable for directories */
64417- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64418- return 0;
64419 if (!(mask & MAY_WRITE))
64420- if (capable_wrt_inode_uidgid(inode,
64421- CAP_DAC_READ_SEARCH))
64422+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64423+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64424 return 0;
64425+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64426+ return 0;
64427 return -EACCES;
64428 }
64429 /*
64430+ * Searching includes executable on directories, else just read.
64431+ */
64432+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64433+ if (mask == MAY_READ)
64434+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64435+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64436+ return 0;
64437+
64438+ /*
64439 * Read/write DACs are always overridable.
64440 * Executable DACs are overridable when there is
64441 * at least one exec bit set.
64442@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
64443 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64444 return 0;
64445
64446- /*
64447- * Searching includes executable on directories, else just read.
64448- */
64449- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64450- if (mask == MAY_READ)
64451- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64452- return 0;
64453-
64454 return -EACCES;
64455 }
64456 EXPORT_SYMBOL(generic_permission);
64457@@ -497,7 +504,7 @@ struct nameidata {
64458 int last_type;
64459 unsigned depth;
64460 struct file *base;
64461- char *saved_names[MAX_NESTED_LINKS + 1];
64462+ const char *saved_names[MAX_NESTED_LINKS + 1];
64463 };
64464
64465 /*
64466@@ -708,13 +715,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
64467 nd->flags |= LOOKUP_JUMPED;
64468 }
64469
64470-void nd_set_link(struct nameidata *nd, char *path)
64471+void nd_set_link(struct nameidata *nd, const char *path)
64472 {
64473 nd->saved_names[nd->depth] = path;
64474 }
64475 EXPORT_SYMBOL(nd_set_link);
64476
64477-char *nd_get_link(struct nameidata *nd)
64478+const char *nd_get_link(const struct nameidata *nd)
64479 {
64480 return nd->saved_names[nd->depth];
64481 }
64482@@ -849,7 +856,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64483 {
64484 struct dentry *dentry = link->dentry;
64485 int error;
64486- char *s;
64487+ const char *s;
64488
64489 BUG_ON(nd->flags & LOOKUP_RCU);
64490
64491@@ -870,6 +877,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64492 if (error)
64493 goto out_put_nd_path;
64494
64495+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
64496+ dentry->d_inode, dentry, nd->path.mnt)) {
64497+ error = -EACCES;
64498+ goto out_put_nd_path;
64499+ }
64500+
64501 nd->last_type = LAST_BIND;
64502 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
64503 error = PTR_ERR(*p);
64504@@ -1633,6 +1646,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
64505 if (res)
64506 break;
64507 res = walk_component(nd, path, LOOKUP_FOLLOW);
64508+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
64509+ res = -EACCES;
64510 put_link(nd, &link, cookie);
64511 } while (res > 0);
64512
64513@@ -1705,7 +1720,7 @@ EXPORT_SYMBOL(full_name_hash);
64514 static inline u64 hash_name(const char *name)
64515 {
64516 unsigned long a, b, adata, bdata, mask, hash, len;
64517- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64518+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64519
64520 hash = a = 0;
64521 len = -sizeof(unsigned long);
64522@@ -2000,6 +2015,8 @@ static int path_lookupat(int dfd, const char *name,
64523 if (err)
64524 break;
64525 err = lookup_last(nd, &path);
64526+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
64527+ err = -EACCES;
64528 put_link(nd, &link, cookie);
64529 }
64530 }
64531@@ -2007,6 +2024,13 @@ static int path_lookupat(int dfd, const char *name,
64532 if (!err)
64533 err = complete_walk(nd);
64534
64535+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
64536+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64537+ path_put(&nd->path);
64538+ err = -ENOENT;
64539+ }
64540+ }
64541+
64542 if (!err && nd->flags & LOOKUP_DIRECTORY) {
64543 if (!d_can_lookup(nd->path.dentry)) {
64544 path_put(&nd->path);
64545@@ -2028,8 +2052,15 @@ static int filename_lookup(int dfd, struct filename *name,
64546 retval = path_lookupat(dfd, name->name,
64547 flags | LOOKUP_REVAL, nd);
64548
64549- if (likely(!retval))
64550+ if (likely(!retval)) {
64551 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
64552+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
64553+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
64554+ path_put(&nd->path);
64555+ return -ENOENT;
64556+ }
64557+ }
64558+ }
64559 return retval;
64560 }
64561
64562@@ -2595,6 +2626,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
64563 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
64564 return -EPERM;
64565
64566+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
64567+ return -EPERM;
64568+ if (gr_handle_rawio(inode))
64569+ return -EPERM;
64570+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
64571+ return -EACCES;
64572+
64573 return 0;
64574 }
64575
64576@@ -2826,7 +2864,7 @@ looked_up:
64577 * cleared otherwise prior to returning.
64578 */
64579 static int lookup_open(struct nameidata *nd, struct path *path,
64580- struct file *file,
64581+ struct path *link, struct file *file,
64582 const struct open_flags *op,
64583 bool got_write, int *opened)
64584 {
64585@@ -2861,6 +2899,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64586 /* Negative dentry, just create the file */
64587 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
64588 umode_t mode = op->mode;
64589+
64590+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
64591+ error = -EACCES;
64592+ goto out_dput;
64593+ }
64594+
64595+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
64596+ error = -EACCES;
64597+ goto out_dput;
64598+ }
64599+
64600 if (!IS_POSIXACL(dir->d_inode))
64601 mode &= ~current_umask();
64602 /*
64603@@ -2882,6 +2931,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64604 nd->flags & LOOKUP_EXCL);
64605 if (error)
64606 goto out_dput;
64607+ else
64608+ gr_handle_create(dentry, nd->path.mnt);
64609 }
64610 out_no_open:
64611 path->dentry = dentry;
64612@@ -2896,7 +2947,7 @@ out_dput:
64613 /*
64614 * Handle the last step of open()
64615 */
64616-static int do_last(struct nameidata *nd, struct path *path,
64617+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
64618 struct file *file, const struct open_flags *op,
64619 int *opened, struct filename *name)
64620 {
64621@@ -2946,6 +2997,15 @@ static int do_last(struct nameidata *nd, struct path *path,
64622 if (error)
64623 return error;
64624
64625+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
64626+ error = -ENOENT;
64627+ goto out;
64628+ }
64629+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64630+ error = -EACCES;
64631+ goto out;
64632+ }
64633+
64634 audit_inode(name, dir, LOOKUP_PARENT);
64635 error = -EISDIR;
64636 /* trailing slashes? */
64637@@ -2965,7 +3025,7 @@ retry_lookup:
64638 */
64639 }
64640 mutex_lock(&dir->d_inode->i_mutex);
64641- error = lookup_open(nd, path, file, op, got_write, opened);
64642+ error = lookup_open(nd, path, link, file, op, got_write, opened);
64643 mutex_unlock(&dir->d_inode->i_mutex);
64644
64645 if (error <= 0) {
64646@@ -2989,11 +3049,28 @@ retry_lookup:
64647 goto finish_open_created;
64648 }
64649
64650+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64651+ error = -ENOENT;
64652+ goto exit_dput;
64653+ }
64654+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64655+ error = -EACCES;
64656+ goto exit_dput;
64657+ }
64658+
64659 /*
64660 * create/update audit record if it already exists.
64661 */
64662- if (d_is_positive(path->dentry))
64663+ if (d_is_positive(path->dentry)) {
64664+ /* only check if O_CREAT is specified, all other checks need to go
64665+ into may_open */
64666+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64667+ error = -EACCES;
64668+ goto exit_dput;
64669+ }
64670+
64671 audit_inode(name, path->dentry, 0);
64672+ }
64673
64674 /*
64675 * If atomic_open() acquired write access it is dropped now due to
64676@@ -3034,6 +3111,11 @@ finish_lookup:
64677 }
64678 }
64679 BUG_ON(inode != path->dentry->d_inode);
64680+ /* if we're resolving a symlink to another symlink */
64681+ if (link && gr_handle_symlink_owner(link, inode)) {
64682+ error = -EACCES;
64683+ goto out;
64684+ }
64685 return 1;
64686 }
64687
64688@@ -3053,7 +3135,18 @@ finish_open:
64689 path_put(&save_parent);
64690 return error;
64691 }
64692+
64693+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64694+ error = -ENOENT;
64695+ goto out;
64696+ }
64697+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64698+ error = -EACCES;
64699+ goto out;
64700+ }
64701+
64702 audit_inode(name, nd->path.dentry, 0);
64703+
64704 error = -EISDIR;
64705 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64706 goto out;
64707@@ -3214,7 +3307,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64708 if (unlikely(error))
64709 goto out;
64710
64711- error = do_last(nd, &path, file, op, &opened, pathname);
64712+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64713 while (unlikely(error > 0)) { /* trailing symlink */
64714 struct path link = path;
64715 void *cookie;
64716@@ -3232,7 +3325,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64717 error = follow_link(&link, nd, &cookie);
64718 if (unlikely(error))
64719 break;
64720- error = do_last(nd, &path, file, op, &opened, pathname);
64721+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
64722 put_link(nd, &link, cookie);
64723 }
64724 out:
64725@@ -3329,9 +3422,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64726 goto unlock;
64727
64728 error = -EEXIST;
64729- if (d_is_positive(dentry))
64730+ if (d_is_positive(dentry)) {
64731+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64732+ error = -ENOENT;
64733 goto fail;
64734-
64735+ }
64736 /*
64737 * Special case - lookup gave negative, but... we had foo/bar/
64738 * From the vfs_mknod() POV we just have a negative dentry -
64739@@ -3383,6 +3478,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64740 }
64741 EXPORT_SYMBOL(user_path_create);
64742
64743+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64744+{
64745+ struct filename *tmp = getname(pathname);
64746+ struct dentry *res;
64747+ if (IS_ERR(tmp))
64748+ return ERR_CAST(tmp);
64749+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64750+ if (IS_ERR(res))
64751+ putname(tmp);
64752+ else
64753+ *to = tmp;
64754+ return res;
64755+}
64756+
64757 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64758 {
64759 int error = may_create(dir, dentry);
64760@@ -3446,6 +3555,17 @@ retry:
64761
64762 if (!IS_POSIXACL(path.dentry->d_inode))
64763 mode &= ~current_umask();
64764+
64765+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64766+ error = -EPERM;
64767+ goto out;
64768+ }
64769+
64770+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64771+ error = -EACCES;
64772+ goto out;
64773+ }
64774+
64775 error = security_path_mknod(&path, dentry, mode, dev);
64776 if (error)
64777 goto out;
64778@@ -3461,6 +3581,8 @@ retry:
64779 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64780 break;
64781 }
64782+ if (!error)
64783+ gr_handle_create(dentry, path.mnt);
64784 out:
64785 done_path_create(&path, dentry);
64786 if (retry_estale(error, lookup_flags)) {
64787@@ -3515,9 +3637,16 @@ retry:
64788
64789 if (!IS_POSIXACL(path.dentry->d_inode))
64790 mode &= ~current_umask();
64791+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64792+ error = -EACCES;
64793+ goto out;
64794+ }
64795 error = security_path_mkdir(&path, dentry, mode);
64796 if (!error)
64797 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64798+ if (!error)
64799+ gr_handle_create(dentry, path.mnt);
64800+out:
64801 done_path_create(&path, dentry);
64802 if (retry_estale(error, lookup_flags)) {
64803 lookup_flags |= LOOKUP_REVAL;
64804@@ -3601,6 +3730,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64805 struct filename *name;
64806 struct dentry *dentry;
64807 struct nameidata nd;
64808+ u64 saved_ino = 0;
64809+ dev_t saved_dev = 0;
64810 unsigned int lookup_flags = 0;
64811 retry:
64812 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64813@@ -3633,10 +3764,21 @@ retry:
64814 error = -ENOENT;
64815 goto exit3;
64816 }
64817+
64818+ saved_ino = gr_get_ino_from_dentry(dentry);
64819+ saved_dev = gr_get_dev_from_dentry(dentry);
64820+
64821+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64822+ error = -EACCES;
64823+ goto exit3;
64824+ }
64825+
64826 error = security_path_rmdir(&nd.path, dentry);
64827 if (error)
64828 goto exit3;
64829 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64830+ if (!error && (saved_dev || saved_ino))
64831+ gr_handle_delete(saved_ino, saved_dev);
64832 exit3:
64833 dput(dentry);
64834 exit2:
64835@@ -3729,6 +3871,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64836 struct nameidata nd;
64837 struct inode *inode = NULL;
64838 struct inode *delegated_inode = NULL;
64839+ u64 saved_ino = 0;
64840+ dev_t saved_dev = 0;
64841 unsigned int lookup_flags = 0;
64842 retry:
64843 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64844@@ -3755,10 +3899,22 @@ retry_deleg:
64845 if (d_is_negative(dentry))
64846 goto slashes;
64847 ihold(inode);
64848+
64849+ if (inode->i_nlink <= 1) {
64850+ saved_ino = gr_get_ino_from_dentry(dentry);
64851+ saved_dev = gr_get_dev_from_dentry(dentry);
64852+ }
64853+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64854+ error = -EACCES;
64855+ goto exit2;
64856+ }
64857+
64858 error = security_path_unlink(&nd.path, dentry);
64859 if (error)
64860 goto exit2;
64861 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64862+ if (!error && (saved_ino || saved_dev))
64863+ gr_handle_delete(saved_ino, saved_dev);
64864 exit2:
64865 dput(dentry);
64866 }
64867@@ -3847,9 +4003,17 @@ retry:
64868 if (IS_ERR(dentry))
64869 goto out_putname;
64870
64871+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64872+ error = -EACCES;
64873+ goto out;
64874+ }
64875+
64876 error = security_path_symlink(&path, dentry, from->name);
64877 if (!error)
64878 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64879+ if (!error)
64880+ gr_handle_create(dentry, path.mnt);
64881+out:
64882 done_path_create(&path, dentry);
64883 if (retry_estale(error, lookup_flags)) {
64884 lookup_flags |= LOOKUP_REVAL;
64885@@ -3953,6 +4117,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64886 struct dentry *new_dentry;
64887 struct path old_path, new_path;
64888 struct inode *delegated_inode = NULL;
64889+ struct filename *to = NULL;
64890 int how = 0;
64891 int error;
64892
64893@@ -3976,7 +4141,7 @@ retry:
64894 if (error)
64895 return error;
64896
64897- new_dentry = user_path_create(newdfd, newname, &new_path,
64898+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64899 (how & LOOKUP_REVAL));
64900 error = PTR_ERR(new_dentry);
64901 if (IS_ERR(new_dentry))
64902@@ -3988,11 +4153,28 @@ retry:
64903 error = may_linkat(&old_path);
64904 if (unlikely(error))
64905 goto out_dput;
64906+
64907+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64908+ old_path.dentry->d_inode,
64909+ old_path.dentry->d_inode->i_mode, to)) {
64910+ error = -EACCES;
64911+ goto out_dput;
64912+ }
64913+
64914+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64915+ old_path.dentry, old_path.mnt, to)) {
64916+ error = -EACCES;
64917+ goto out_dput;
64918+ }
64919+
64920 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64921 if (error)
64922 goto out_dput;
64923 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64924+ if (!error)
64925+ gr_handle_create(new_dentry, new_path.mnt);
64926 out_dput:
64927+ putname(to);
64928 done_path_create(&new_path, new_dentry);
64929 if (delegated_inode) {
64930 error = break_deleg_wait(&delegated_inode);
64931@@ -4308,6 +4490,20 @@ retry_deleg:
64932 if (new_dentry == trap)
64933 goto exit5;
64934
64935+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
64936+ /* use EXDEV error to cause 'mv' to switch to an alternative
64937+ * method for usability
64938+ */
64939+ error = -EXDEV;
64940+ goto exit5;
64941+ }
64942+
64943+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64944+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
64945+ to, flags);
64946+ if (error)
64947+ goto exit5;
64948+
64949 error = security_path_rename(&oldnd.path, old_dentry,
64950 &newnd.path, new_dentry, flags);
64951 if (error)
64952@@ -4315,6 +4511,9 @@ retry_deleg:
64953 error = vfs_rename(old_dir->d_inode, old_dentry,
64954 new_dir->d_inode, new_dentry,
64955 &delegated_inode, flags);
64956+ if (!error)
64957+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64958+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64959 exit5:
64960 dput(new_dentry);
64961 exit4:
64962@@ -4371,14 +4570,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64963
64964 int readlink_copy(char __user *buffer, int buflen, const char *link)
64965 {
64966+ char tmpbuf[64];
64967+ const char *newlink;
64968 int len = PTR_ERR(link);
64969+
64970 if (IS_ERR(link))
64971 goto out;
64972
64973 len = strlen(link);
64974 if (len > (unsigned) buflen)
64975 len = buflen;
64976- if (copy_to_user(buffer, link, len))
64977+
64978+ if (len < sizeof(tmpbuf)) {
64979+ memcpy(tmpbuf, link, len);
64980+ newlink = tmpbuf;
64981+ } else
64982+ newlink = link;
64983+
64984+ if (copy_to_user(buffer, newlink, len))
64985 len = -EFAULT;
64986 out:
64987 return len;
64988diff --git a/fs/namespace.c b/fs/namespace.c
64989index cd1e968..e64ff16 100644
64990--- a/fs/namespace.c
64991+++ b/fs/namespace.c
64992@@ -1448,6 +1448,9 @@ static int do_umount(struct mount *mnt, int flags)
64993 if (!(sb->s_flags & MS_RDONLY))
64994 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64995 up_write(&sb->s_umount);
64996+
64997+ gr_log_remount(mnt->mnt_devname, retval);
64998+
64999 return retval;
65000 }
65001
65002@@ -1470,6 +1473,9 @@ static int do_umount(struct mount *mnt, int flags)
65003 }
65004 unlock_mount_hash();
65005 namespace_unlock();
65006+
65007+ gr_log_unmount(mnt->mnt_devname, retval);
65008+
65009 return retval;
65010 }
65011
65012@@ -1520,7 +1526,7 @@ static inline bool may_mount(void)
65013 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
65014 */
65015
65016-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
65017+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
65018 {
65019 struct path path;
65020 struct mount *mnt;
65021@@ -1565,7 +1571,7 @@ out:
65022 /*
65023 * The 2.0 compatible umount. No flags.
65024 */
65025-SYSCALL_DEFINE1(oldumount, char __user *, name)
65026+SYSCALL_DEFINE1(oldumount, const char __user *, name)
65027 {
65028 return sys_umount(name, 0);
65029 }
65030@@ -2631,6 +2637,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65031 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
65032 MS_STRICTATIME);
65033
65034+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
65035+ retval = -EPERM;
65036+ goto dput_out;
65037+ }
65038+
65039+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
65040+ retval = -EPERM;
65041+ goto dput_out;
65042+ }
65043+
65044 if (flags & MS_REMOUNT)
65045 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
65046 data_page);
65047@@ -2644,7 +2660,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65048 retval = do_new_mount(&path, type_page, flags, mnt_flags,
65049 dev_name, data_page);
65050 dput_out:
65051+ gr_log_mount(dev_name, &path, retval);
65052+
65053 path_put(&path);
65054+
65055 return retval;
65056 }
65057
65058@@ -2662,7 +2681,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
65059 * number incrementing at 10Ghz will take 12,427 years to wrap which
65060 * is effectively never, so we can ignore the possibility.
65061 */
65062-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
65063+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
65064
65065 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65066 {
65067@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65068 return ERR_PTR(ret);
65069 }
65070 new_ns->ns.ops = &mntns_operations;
65071- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
65072+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
65073 atomic_set(&new_ns->count, 1);
65074 new_ns->root = NULL;
65075 INIT_LIST_HEAD(&new_ns->list);
65076@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65077 return new_ns;
65078 }
65079
65080-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65081+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65082 struct user_namespace *user_ns, struct fs_struct *new_fs)
65083 {
65084 struct mnt_namespace *new_ns;
65085@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
65086 }
65087 EXPORT_SYMBOL(mount_subtree);
65088
65089-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
65090- char __user *, type, unsigned long, flags, void __user *, data)
65091+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
65092+ const char __user *, type, unsigned long, flags, void __user *, data)
65093 {
65094 int ret;
65095 char *kernel_type;
65096@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
65097 if (error)
65098 goto out2;
65099
65100+ if (gr_handle_chroot_pivot()) {
65101+ error = -EPERM;
65102+ goto out2;
65103+ }
65104+
65105 get_fs_root(current->fs, &root);
65106 old_mp = lock_mount(&old);
65107 error = PTR_ERR(old_mp);
65108@@ -3190,7 +3214,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
65109 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
65110 return -EPERM;
65111
65112- if (fs->users != 1)
65113+ if (atomic_read(&fs->users) != 1)
65114 return -EINVAL;
65115
65116 get_mnt_ns(mnt_ns);
65117diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
65118index 02f8d09..a5c25d1 100644
65119--- a/fs/nfs/callback_xdr.c
65120+++ b/fs/nfs/callback_xdr.c
65121@@ -51,7 +51,7 @@ struct callback_op {
65122 callback_decode_arg_t decode_args;
65123 callback_encode_res_t encode_res;
65124 long res_maxsize;
65125-};
65126+} __do_const;
65127
65128 static struct callback_op callback_ops[];
65129
65130diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
65131index 2211f6b..30d0950 100644
65132--- a/fs/nfs/inode.c
65133+++ b/fs/nfs/inode.c
65134@@ -1234,16 +1234,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
65135 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
65136 }
65137
65138-static atomic_long_t nfs_attr_generation_counter;
65139+static atomic_long_unchecked_t nfs_attr_generation_counter;
65140
65141 static unsigned long nfs_read_attr_generation_counter(void)
65142 {
65143- return atomic_long_read(&nfs_attr_generation_counter);
65144+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
65145 }
65146
65147 unsigned long nfs_inc_attr_generation_counter(void)
65148 {
65149- return atomic_long_inc_return(&nfs_attr_generation_counter);
65150+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
65151 }
65152
65153 void nfs_fattr_init(struct nfs_fattr *fattr)
65154diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
65155index ac71d13..a2e590a 100644
65156--- a/fs/nfsd/nfs4proc.c
65157+++ b/fs/nfsd/nfs4proc.c
65158@@ -1237,7 +1237,7 @@ struct nfsd4_operation {
65159 nfsd4op_rsize op_rsize_bop;
65160 stateid_getter op_get_currentstateid;
65161 stateid_setter op_set_currentstateid;
65162-};
65163+} __do_const;
65164
65165 static struct nfsd4_operation nfsd4_ops[];
65166
65167diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
65168index 15f7b73..00e230b 100644
65169--- a/fs/nfsd/nfs4xdr.c
65170+++ b/fs/nfsd/nfs4xdr.c
65171@@ -1560,7 +1560,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
65172
65173 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
65174
65175-static nfsd4_dec nfsd4_dec_ops[] = {
65176+static const nfsd4_dec nfsd4_dec_ops[] = {
65177 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
65178 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
65179 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
65180diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
65181index 83a9694..6b7f928 100644
65182--- a/fs/nfsd/nfscache.c
65183+++ b/fs/nfsd/nfscache.c
65184@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65185 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
65186 u32 hash;
65187 struct nfsd_drc_bucket *b;
65188- int len;
65189+ long len;
65190 size_t bufsize = 0;
65191
65192 if (!rp)
65193@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65194 hash = nfsd_cache_hash(rp->c_xid);
65195 b = &drc_hashtbl[hash];
65196
65197- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
65198- len >>= 2;
65199+ if (statp) {
65200+ len = (char*)statp - (char*)resv->iov_base;
65201+ len = resv->iov_len - len;
65202+ len >>= 2;
65203+ }
65204
65205 /* Don't cache excessive amounts of data and XDR failures */
65206- if (!statp || len > (256 >> 2)) {
65207+ if (!statp || len > (256 >> 2) || len < 0) {
65208 nfsd_reply_cache_free(b, rp);
65209 return;
65210 }
65211@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65212 switch (cachetype) {
65213 case RC_REPLSTAT:
65214 if (len != 1)
65215- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
65216+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
65217 rp->c_replstat = *statp;
65218 break;
65219 case RC_REPLBUFF:
65220diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
65221index 5685c67..73029ef 100644
65222--- a/fs/nfsd/vfs.c
65223+++ b/fs/nfsd/vfs.c
65224@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
65225
65226 oldfs = get_fs();
65227 set_fs(KERNEL_DS);
65228- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
65229+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
65230 set_fs(oldfs);
65231 return nfsd_finish_read(file, count, host_err);
65232 }
65233@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
65234
65235 /* Write the data. */
65236 oldfs = get_fs(); set_fs(KERNEL_DS);
65237- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
65238+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
65239 set_fs(oldfs);
65240 if (host_err < 0)
65241 goto out_nfserr;
65242@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
65243 */
65244
65245 oldfs = get_fs(); set_fs(KERNEL_DS);
65246- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
65247+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
65248 set_fs(oldfs);
65249
65250 if (host_err < 0)
65251diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
65252index 52ccd34..7a6b202 100644
65253--- a/fs/nls/nls_base.c
65254+++ b/fs/nls/nls_base.c
65255@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
65256
65257 int __register_nls(struct nls_table *nls, struct module *owner)
65258 {
65259- struct nls_table ** tmp = &tables;
65260+ struct nls_table *tmp = tables;
65261
65262 if (nls->next)
65263 return -EBUSY;
65264
65265- nls->owner = owner;
65266+ pax_open_kernel();
65267+ *(void **)&nls->owner = owner;
65268+ pax_close_kernel();
65269 spin_lock(&nls_lock);
65270- while (*tmp) {
65271- if (nls == *tmp) {
65272+ while (tmp) {
65273+ if (nls == tmp) {
65274 spin_unlock(&nls_lock);
65275 return -EBUSY;
65276 }
65277- tmp = &(*tmp)->next;
65278+ tmp = tmp->next;
65279 }
65280- nls->next = tables;
65281+ pax_open_kernel();
65282+ *(struct nls_table **)&nls->next = tables;
65283+ pax_close_kernel();
65284 tables = nls;
65285 spin_unlock(&nls_lock);
65286 return 0;
65287@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
65288
65289 int unregister_nls(struct nls_table * nls)
65290 {
65291- struct nls_table ** tmp = &tables;
65292+ struct nls_table * const * tmp = &tables;
65293
65294 spin_lock(&nls_lock);
65295 while (*tmp) {
65296 if (nls == *tmp) {
65297- *tmp = nls->next;
65298+ pax_open_kernel();
65299+ *(struct nls_table **)tmp = nls->next;
65300+ pax_close_kernel();
65301 spin_unlock(&nls_lock);
65302 return 0;
65303 }
65304@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
65305 return -EINVAL;
65306 }
65307
65308-static struct nls_table *find_nls(char *charset)
65309+static struct nls_table *find_nls(const char *charset)
65310 {
65311 struct nls_table *nls;
65312 spin_lock(&nls_lock);
65313@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
65314 return nls;
65315 }
65316
65317-struct nls_table *load_nls(char *charset)
65318+struct nls_table *load_nls(const char *charset)
65319 {
65320 return try_then_request_module(find_nls(charset), "nls_%s", charset);
65321 }
65322diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
65323index 162b3f1..6076a7c 100644
65324--- a/fs/nls/nls_euc-jp.c
65325+++ b/fs/nls/nls_euc-jp.c
65326@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
65327 p_nls = load_nls("cp932");
65328
65329 if (p_nls) {
65330- table.charset2upper = p_nls->charset2upper;
65331- table.charset2lower = p_nls->charset2lower;
65332+ pax_open_kernel();
65333+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
65334+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
65335+ pax_close_kernel();
65336 return register_nls(&table);
65337 }
65338
65339diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
65340index a80a741..7b96e1b 100644
65341--- a/fs/nls/nls_koi8-ru.c
65342+++ b/fs/nls/nls_koi8-ru.c
65343@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
65344 p_nls = load_nls("koi8-u");
65345
65346 if (p_nls) {
65347- table.charset2upper = p_nls->charset2upper;
65348- table.charset2lower = p_nls->charset2lower;
65349+ pax_open_kernel();
65350+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
65351+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
65352+ pax_close_kernel();
65353 return register_nls(&table);
65354 }
65355
65356diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
65357index bff8567..83281c6 100644
65358--- a/fs/notify/fanotify/fanotify_user.c
65359+++ b/fs/notify/fanotify/fanotify_user.c
65360@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
65361
65362 fd = fanotify_event_metadata.fd;
65363 ret = -EFAULT;
65364- if (copy_to_user(buf, &fanotify_event_metadata,
65365- fanotify_event_metadata.event_len))
65366+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
65367+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
65368 goto out_close_fd;
65369
65370 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
65371diff --git a/fs/notify/notification.c b/fs/notify/notification.c
65372index a95d8e0..a91a5fd 100644
65373--- a/fs/notify/notification.c
65374+++ b/fs/notify/notification.c
65375@@ -48,7 +48,7 @@
65376 #include <linux/fsnotify_backend.h>
65377 #include "fsnotify.h"
65378
65379-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65380+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65381
65382 /**
65383 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
65384@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65385 */
65386 u32 fsnotify_get_cookie(void)
65387 {
65388- return atomic_inc_return(&fsnotify_sync_cookie);
65389+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
65390 }
65391 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
65392
65393diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
65394index 9e38daf..5727cae 100644
65395--- a/fs/ntfs/dir.c
65396+++ b/fs/ntfs/dir.c
65397@@ -1310,7 +1310,7 @@ find_next_index_buffer:
65398 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
65399 ~(s64)(ndir->itype.index.block_size - 1)));
65400 /* Bounds checks. */
65401- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65402+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65403 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
65404 "inode 0x%lx or driver bug.", vdir->i_ino);
65405 goto err_out;
65406diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
65407index 643faa4..ef9027e 100644
65408--- a/fs/ntfs/file.c
65409+++ b/fs/ntfs/file.c
65410@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
65411 char *addr;
65412 size_t total = 0;
65413 unsigned len;
65414- int left;
65415+ unsigned left;
65416
65417 do {
65418 len = PAGE_CACHE_SIZE - ofs;
65419diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
65420index 9e1e112..241a52a 100644
65421--- a/fs/ntfs/super.c
65422+++ b/fs/ntfs/super.c
65423@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65424 if (!silent)
65425 ntfs_error(sb, "Primary boot sector is invalid.");
65426 } else if (!silent)
65427- ntfs_error(sb, read_err_str, "primary");
65428+ ntfs_error(sb, read_err_str, "%s", "primary");
65429 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
65430 if (bh_primary)
65431 brelse(bh_primary);
65432@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65433 goto hotfix_primary_boot_sector;
65434 brelse(bh_backup);
65435 } else if (!silent)
65436- ntfs_error(sb, read_err_str, "backup");
65437+ ntfs_error(sb, read_err_str, "%s", "backup");
65438 /* Try to read NT3.51- backup boot sector. */
65439 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
65440 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
65441@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65442 "sector.");
65443 brelse(bh_backup);
65444 } else if (!silent)
65445- ntfs_error(sb, read_err_str, "backup");
65446+ ntfs_error(sb, read_err_str, "%s", "backup");
65447 /* We failed. Cleanup and return. */
65448 if (bh_primary)
65449 brelse(bh_primary);
65450diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
65451index 0440134..d52c93a 100644
65452--- a/fs/ocfs2/localalloc.c
65453+++ b/fs/ocfs2/localalloc.c
65454@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
65455 goto bail;
65456 }
65457
65458- atomic_inc(&osb->alloc_stats.moves);
65459+ atomic_inc_unchecked(&osb->alloc_stats.moves);
65460
65461 bail:
65462 if (handle)
65463diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
65464index 7d6b7d0..5fb529a 100644
65465--- a/fs/ocfs2/ocfs2.h
65466+++ b/fs/ocfs2/ocfs2.h
65467@@ -242,11 +242,11 @@ enum ocfs2_vol_state
65468
65469 struct ocfs2_alloc_stats
65470 {
65471- atomic_t moves;
65472- atomic_t local_data;
65473- atomic_t bitmap_data;
65474- atomic_t bg_allocs;
65475- atomic_t bg_extends;
65476+ atomic_unchecked_t moves;
65477+ atomic_unchecked_t local_data;
65478+ atomic_unchecked_t bitmap_data;
65479+ atomic_unchecked_t bg_allocs;
65480+ atomic_unchecked_t bg_extends;
65481 };
65482
65483 enum ocfs2_local_alloc_state
65484diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
65485index d81f6e2..e794c38 100644
65486--- a/fs/ocfs2/refcounttree.c
65487+++ b/fs/ocfs2/refcounttree.c
65488@@ -4278,7 +4278,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
65489 error = posix_acl_create(dir, &mode, &default_acl, &acl);
65490 if (error) {
65491 mlog_errno(error);
65492- goto out;
65493+ return error;
65494 }
65495
65496 error = ocfs2_create_inode_in_orphan(dir, mode,
65497diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
65498index 0cb889a..6a26b24 100644
65499--- a/fs/ocfs2/suballoc.c
65500+++ b/fs/ocfs2/suballoc.c
65501@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
65502 mlog_errno(status);
65503 goto bail;
65504 }
65505- atomic_inc(&osb->alloc_stats.bg_extends);
65506+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
65507
65508 /* You should never ask for this much metadata */
65509 BUG_ON(bits_wanted >
65510@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
65511 mlog_errno(status);
65512 goto bail;
65513 }
65514- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65515+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65516
65517 *suballoc_loc = res.sr_bg_blkno;
65518 *suballoc_bit_start = res.sr_bit_offset;
65519@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
65520 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
65521 res->sr_bits);
65522
65523- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65524+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65525
65526 BUG_ON(res->sr_bits != 1);
65527
65528@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
65529 mlog_errno(status);
65530 goto bail;
65531 }
65532- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65533+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65534
65535 BUG_ON(res.sr_bits != 1);
65536
65537@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65538 cluster_start,
65539 num_clusters);
65540 if (!status)
65541- atomic_inc(&osb->alloc_stats.local_data);
65542+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
65543 } else {
65544 if (min_clusters > (osb->bitmap_cpg - 1)) {
65545 /* The only paths asking for contiguousness
65546@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65547 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
65548 res.sr_bg_blkno,
65549 res.sr_bit_offset);
65550- atomic_inc(&osb->alloc_stats.bitmap_data);
65551+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
65552 *num_clusters = res.sr_bits;
65553 }
65554 }
65555diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
65556index 8372317..ec86e79 100644
65557--- a/fs/ocfs2/super.c
65558+++ b/fs/ocfs2/super.c
65559@@ -306,11 +306,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
65560 "%10s => GlobalAllocs: %d LocalAllocs: %d "
65561 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
65562 "Stats",
65563- atomic_read(&osb->alloc_stats.bitmap_data),
65564- atomic_read(&osb->alloc_stats.local_data),
65565- atomic_read(&osb->alloc_stats.bg_allocs),
65566- atomic_read(&osb->alloc_stats.moves),
65567- atomic_read(&osb->alloc_stats.bg_extends));
65568+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
65569+ atomic_read_unchecked(&osb->alloc_stats.local_data),
65570+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
65571+ atomic_read_unchecked(&osb->alloc_stats.moves),
65572+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
65573
65574 out += snprintf(buf + out, len - out,
65575 "%10s => State: %u Descriptor: %llu Size: %u bits "
65576@@ -2113,11 +2113,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
65577
65578 mutex_init(&osb->system_file_mutex);
65579
65580- atomic_set(&osb->alloc_stats.moves, 0);
65581- atomic_set(&osb->alloc_stats.local_data, 0);
65582- atomic_set(&osb->alloc_stats.bitmap_data, 0);
65583- atomic_set(&osb->alloc_stats.bg_allocs, 0);
65584- atomic_set(&osb->alloc_stats.bg_extends, 0);
65585+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
65586+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
65587+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
65588+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
65589+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
65590
65591 /* Copy the blockcheck stats from the superblock probe */
65592 osb->osb_ecc_stats = *stats;
65593diff --git a/fs/open.c b/fs/open.c
65594index 813be03..781941d 100644
65595--- a/fs/open.c
65596+++ b/fs/open.c
65597@@ -32,6 +32,8 @@
65598 #include <linux/dnotify.h>
65599 #include <linux/compat.h>
65600
65601+#define CREATE_TRACE_POINTS
65602+#include <trace/events/fs.h>
65603 #include "internal.h"
65604
65605 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
65606@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
65607 error = locks_verify_truncate(inode, NULL, length);
65608 if (!error)
65609 error = security_path_truncate(path);
65610+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
65611+ error = -EACCES;
65612 if (!error)
65613 error = do_truncate(path->dentry, length, 0, NULL);
65614
65615@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
65616 error = locks_verify_truncate(inode, f.file, length);
65617 if (!error)
65618 error = security_path_truncate(&f.file->f_path);
65619+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
65620+ error = -EACCES;
65621 if (!error)
65622 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
65623 sb_end_write(inode->i_sb);
65624@@ -392,6 +398,9 @@ retry:
65625 if (__mnt_is_readonly(path.mnt))
65626 res = -EROFS;
65627
65628+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
65629+ res = -EACCES;
65630+
65631 out_path_release:
65632 path_put(&path);
65633 if (retry_estale(res, lookup_flags)) {
65634@@ -423,6 +432,8 @@ retry:
65635 if (error)
65636 goto dput_and_out;
65637
65638+ gr_log_chdir(path.dentry, path.mnt);
65639+
65640 set_fs_pwd(current->fs, &path);
65641
65642 dput_and_out:
65643@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65644 goto out_putf;
65645
65646 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65647+
65648+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65649+ error = -EPERM;
65650+
65651+ if (!error)
65652+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65653+
65654 if (!error)
65655 set_fs_pwd(current->fs, &f.file->f_path);
65656 out_putf:
65657@@ -481,7 +499,13 @@ retry:
65658 if (error)
65659 goto dput_and_out;
65660
65661+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65662+ goto dput_and_out;
65663+
65664 set_fs_root(current->fs, &path);
65665+
65666+ gr_handle_chroot_chdir(&path);
65667+
65668 error = 0;
65669 dput_and_out:
65670 path_put(&path);
65671@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
65672 return error;
65673 retry_deleg:
65674 mutex_lock(&inode->i_mutex);
65675+
65676+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65677+ error = -EACCES;
65678+ goto out_unlock;
65679+ }
65680+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65681+ error = -EACCES;
65682+ goto out_unlock;
65683+ }
65684+
65685 error = security_path_chmod(path, mode);
65686 if (error)
65687 goto out_unlock;
65688@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65689 uid = make_kuid(current_user_ns(), user);
65690 gid = make_kgid(current_user_ns(), group);
65691
65692+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
65693+ return -EACCES;
65694+
65695 newattrs.ia_valid = ATTR_CTIME;
65696 if (user != (uid_t) -1) {
65697 if (!uid_valid(uid))
65698@@ -1014,6 +1051,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65699 } else {
65700 fsnotify_open(f);
65701 fd_install(fd, f);
65702+ trace_do_sys_open(tmp->name, flags, mode);
65703 }
65704 }
65705 putname(tmp);
65706diff --git a/fs/pipe.c b/fs/pipe.c
65707index 21981e5..3d5f55c 100644
65708--- a/fs/pipe.c
65709+++ b/fs/pipe.c
65710@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65711
65712 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65713 {
65714- if (pipe->files)
65715+ if (atomic_read(&pipe->files))
65716 mutex_lock_nested(&pipe->mutex, subclass);
65717 }
65718
65719@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65720
65721 void pipe_unlock(struct pipe_inode_info *pipe)
65722 {
65723- if (pipe->files)
65724+ if (atomic_read(&pipe->files))
65725 mutex_unlock(&pipe->mutex);
65726 }
65727 EXPORT_SYMBOL(pipe_unlock);
65728@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65729 }
65730 if (bufs) /* More to do? */
65731 continue;
65732- if (!pipe->writers)
65733+ if (!atomic_read(&pipe->writers))
65734 break;
65735- if (!pipe->waiting_writers) {
65736+ if (!atomic_read(&pipe->waiting_writers)) {
65737 /* syscall merging: Usually we must not sleep
65738 * if O_NONBLOCK is set, or if we got some data.
65739 * But if a writer sleeps in kernel space, then
65740@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65741
65742 __pipe_lock(pipe);
65743
65744- if (!pipe->readers) {
65745+ if (!atomic_read(&pipe->readers)) {
65746 send_sig(SIGPIPE, current, 0);
65747 ret = -EPIPE;
65748 goto out;
65749@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65750 for (;;) {
65751 int bufs;
65752
65753- if (!pipe->readers) {
65754+ if (!atomic_read(&pipe->readers)) {
65755 send_sig(SIGPIPE, current, 0);
65756 if (!ret)
65757 ret = -EPIPE;
65758@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65759 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65760 do_wakeup = 0;
65761 }
65762- pipe->waiting_writers++;
65763+ atomic_inc(&pipe->waiting_writers);
65764 pipe_wait(pipe);
65765- pipe->waiting_writers--;
65766+ atomic_dec(&pipe->waiting_writers);
65767 }
65768 out:
65769 __pipe_unlock(pipe);
65770@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65771 mask = 0;
65772 if (filp->f_mode & FMODE_READ) {
65773 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65774- if (!pipe->writers && filp->f_version != pipe->w_counter)
65775+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65776 mask |= POLLHUP;
65777 }
65778
65779@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65780 * Most Unices do not set POLLERR for FIFOs but on Linux they
65781 * behave exactly like pipes for poll().
65782 */
65783- if (!pipe->readers)
65784+ if (!atomic_read(&pipe->readers))
65785 mask |= POLLERR;
65786 }
65787
65788@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65789 int kill = 0;
65790
65791 spin_lock(&inode->i_lock);
65792- if (!--pipe->files) {
65793+ if (atomic_dec_and_test(&pipe->files)) {
65794 inode->i_pipe = NULL;
65795 kill = 1;
65796 }
65797@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65798
65799 __pipe_lock(pipe);
65800 if (file->f_mode & FMODE_READ)
65801- pipe->readers--;
65802+ atomic_dec(&pipe->readers);
65803 if (file->f_mode & FMODE_WRITE)
65804- pipe->writers--;
65805+ atomic_dec(&pipe->writers);
65806
65807- if (pipe->readers || pipe->writers) {
65808+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65809 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65810 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65811 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65812@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65813 kfree(pipe);
65814 }
65815
65816-static struct vfsmount *pipe_mnt __read_mostly;
65817+struct vfsmount *pipe_mnt __read_mostly;
65818
65819 /*
65820 * pipefs_dname() is called from d_path().
65821@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65822 goto fail_iput;
65823
65824 inode->i_pipe = pipe;
65825- pipe->files = 2;
65826- pipe->readers = pipe->writers = 1;
65827+ atomic_set(&pipe->files, 2);
65828+ atomic_set(&pipe->readers, 1);
65829+ atomic_set(&pipe->writers, 1);
65830 inode->i_fop = &pipefifo_fops;
65831
65832 /*
65833@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65834 spin_lock(&inode->i_lock);
65835 if (inode->i_pipe) {
65836 pipe = inode->i_pipe;
65837- pipe->files++;
65838+ atomic_inc(&pipe->files);
65839 spin_unlock(&inode->i_lock);
65840 } else {
65841 spin_unlock(&inode->i_lock);
65842 pipe = alloc_pipe_info();
65843 if (!pipe)
65844 return -ENOMEM;
65845- pipe->files = 1;
65846+ atomic_set(&pipe->files, 1);
65847 spin_lock(&inode->i_lock);
65848 if (unlikely(inode->i_pipe)) {
65849- inode->i_pipe->files++;
65850+ atomic_inc(&inode->i_pipe->files);
65851 spin_unlock(&inode->i_lock);
65852 free_pipe_info(pipe);
65853 pipe = inode->i_pipe;
65854@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65855 * opened, even when there is no process writing the FIFO.
65856 */
65857 pipe->r_counter++;
65858- if (pipe->readers++ == 0)
65859+ if (atomic_inc_return(&pipe->readers) == 1)
65860 wake_up_partner(pipe);
65861
65862- if (!is_pipe && !pipe->writers) {
65863+ if (!is_pipe && !atomic_read(&pipe->writers)) {
65864 if ((filp->f_flags & O_NONBLOCK)) {
65865 /* suppress POLLHUP until we have
65866 * seen a writer */
65867@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65868 * errno=ENXIO when there is no process reading the FIFO.
65869 */
65870 ret = -ENXIO;
65871- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65872+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65873 goto err;
65874
65875 pipe->w_counter++;
65876- if (!pipe->writers++)
65877+ if (atomic_inc_return(&pipe->writers) == 1)
65878 wake_up_partner(pipe);
65879
65880- if (!is_pipe && !pipe->readers) {
65881+ if (!is_pipe && !atomic_read(&pipe->readers)) {
65882 if (wait_for_partner(pipe, &pipe->r_counter))
65883 goto err_wr;
65884 }
65885@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65886 * the process can at least talk to itself.
65887 */
65888
65889- pipe->readers++;
65890- pipe->writers++;
65891+ atomic_inc(&pipe->readers);
65892+ atomic_inc(&pipe->writers);
65893 pipe->r_counter++;
65894 pipe->w_counter++;
65895- if (pipe->readers == 1 || pipe->writers == 1)
65896+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65897 wake_up_partner(pipe);
65898 break;
65899
65900@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65901 return 0;
65902
65903 err_rd:
65904- if (!--pipe->readers)
65905+ if (atomic_dec_and_test(&pipe->readers))
65906 wake_up_interruptible(&pipe->wait);
65907 ret = -ERESTARTSYS;
65908 goto err;
65909
65910 err_wr:
65911- if (!--pipe->writers)
65912+ if (atomic_dec_and_test(&pipe->writers))
65913 wake_up_interruptible(&pipe->wait);
65914 ret = -ERESTARTSYS;
65915 goto err;
65916diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65917index 0855f77..6787d50 100644
65918--- a/fs/posix_acl.c
65919+++ b/fs/posix_acl.c
65920@@ -20,6 +20,7 @@
65921 #include <linux/xattr.h>
65922 #include <linux/export.h>
65923 #include <linux/user_namespace.h>
65924+#include <linux/grsecurity.h>
65925
65926 struct posix_acl **acl_by_type(struct inode *inode, int type)
65927 {
65928@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65929 }
65930 }
65931 if (mode_p)
65932- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65933+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65934 return not_equiv;
65935 }
65936 EXPORT_SYMBOL(posix_acl_equiv_mode);
65937@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65938 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65939 }
65940
65941- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65942+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65943 return not_equiv;
65944 }
65945
65946@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65947 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65948 int err = -ENOMEM;
65949 if (clone) {
65950+ *mode_p &= ~gr_acl_umask();
65951+
65952 err = posix_acl_create_masq(clone, mode_p);
65953 if (err < 0) {
65954 posix_acl_release(clone);
65955@@ -659,11 +662,12 @@ struct posix_acl *
65956 posix_acl_from_xattr(struct user_namespace *user_ns,
65957 const void *value, size_t size)
65958 {
65959- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65960- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65961+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65962+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65963 int count;
65964 struct posix_acl *acl;
65965 struct posix_acl_entry *acl_e;
65966+ umode_t umask = gr_acl_umask();
65967
65968 if (!value)
65969 return NULL;
65970@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65971
65972 switch(acl_e->e_tag) {
65973 case ACL_USER_OBJ:
65974+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65975+ break;
65976 case ACL_GROUP_OBJ:
65977 case ACL_MASK:
65978+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65979+ break;
65980 case ACL_OTHER:
65981+ acl_e->e_perm &= ~(umask & S_IRWXO);
65982 break;
65983
65984 case ACL_USER:
65985+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65986 acl_e->e_uid =
65987 make_kuid(user_ns,
65988 le32_to_cpu(entry->e_id));
65989@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65990 goto fail;
65991 break;
65992 case ACL_GROUP:
65993+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65994 acl_e->e_gid =
65995 make_kgid(user_ns,
65996 le32_to_cpu(entry->e_id));
65997diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65998index 2183fcf..3c32a98 100644
65999--- a/fs/proc/Kconfig
66000+++ b/fs/proc/Kconfig
66001@@ -30,7 +30,7 @@ config PROC_FS
66002
66003 config PROC_KCORE
66004 bool "/proc/kcore support" if !ARM
66005- depends on PROC_FS && MMU
66006+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
66007 help
66008 Provides a virtual ELF core file of the live kernel. This can
66009 be read with gdb and other ELF tools. No modifications can be
66010@@ -38,8 +38,8 @@ config PROC_KCORE
66011
66012 config PROC_VMCORE
66013 bool "/proc/vmcore support"
66014- depends on PROC_FS && CRASH_DUMP
66015- default y
66016+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
66017+ default n
66018 help
66019 Exports the dump image of crashed kernel in ELF format.
66020
66021@@ -63,8 +63,8 @@ config PROC_SYSCTL
66022 limited in memory.
66023
66024 config PROC_PAGE_MONITOR
66025- default y
66026- depends on PROC_FS && MMU
66027+ default n
66028+ depends on PROC_FS && MMU && !GRKERNSEC
66029 bool "Enable /proc page monitoring" if EXPERT
66030 help
66031 Various /proc files exist to monitor process memory utilization:
66032diff --git a/fs/proc/array.c b/fs/proc/array.c
66033index bd117d0..e6872d7 100644
66034--- a/fs/proc/array.c
66035+++ b/fs/proc/array.c
66036@@ -60,6 +60,7 @@
66037 #include <linux/tty.h>
66038 #include <linux/string.h>
66039 #include <linux/mman.h>
66040+#include <linux/grsecurity.h>
66041 #include <linux/proc_fs.h>
66042 #include <linux/ioport.h>
66043 #include <linux/uaccess.h>
66044@@ -344,6 +345,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
66045 seq_putc(m, '\n');
66046 }
66047
66048+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66049+static inline void task_pax(struct seq_file *m, struct task_struct *p)
66050+{
66051+ if (p->mm)
66052+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
66053+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
66054+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
66055+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
66056+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
66057+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
66058+ else
66059+ seq_printf(m, "PaX:\t-----\n");
66060+}
66061+#endif
66062+
66063 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66064 struct pid *pid, struct task_struct *task)
66065 {
66066@@ -362,9 +378,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66067 task_cpus_allowed(m, task);
66068 cpuset_task_status_allowed(m, task);
66069 task_context_switch_counts(m, task);
66070+
66071+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66072+ task_pax(m, task);
66073+#endif
66074+
66075+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
66076+ task_grsec_rbac(m, task);
66077+#endif
66078+
66079 return 0;
66080 }
66081
66082+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66083+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66084+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66085+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66086+#endif
66087+
66088 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66089 struct pid *pid, struct task_struct *task, int whole)
66090 {
66091@@ -386,6 +417,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66092 char tcomm[sizeof(task->comm)];
66093 unsigned long flags;
66094
66095+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66096+ if (current->exec_id != m->exec_id) {
66097+ gr_log_badprocpid("stat");
66098+ return 0;
66099+ }
66100+#endif
66101+
66102 state = *get_task_state(task);
66103 vsize = eip = esp = 0;
66104 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66105@@ -456,6 +494,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66106 gtime = task_gtime(task);
66107 }
66108
66109+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66110+ if (PAX_RAND_FLAGS(mm)) {
66111+ eip = 0;
66112+ esp = 0;
66113+ wchan = 0;
66114+ }
66115+#endif
66116+#ifdef CONFIG_GRKERNSEC_HIDESYM
66117+ wchan = 0;
66118+ eip =0;
66119+ esp =0;
66120+#endif
66121+
66122 /* scale priority and nice values from timeslices to -20..20 */
66123 /* to make it look like a "normal" Unix priority/nice value */
66124 priority = task_prio(task);
66125@@ -487,9 +538,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66126 seq_put_decimal_ull(m, ' ', vsize);
66127 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
66128 seq_put_decimal_ull(m, ' ', rsslim);
66129+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66130+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
66131+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
66132+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
66133+#else
66134 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
66135 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
66136 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
66137+#endif
66138 seq_put_decimal_ull(m, ' ', esp);
66139 seq_put_decimal_ull(m, ' ', eip);
66140 /* The signal information here is obsolete.
66141@@ -511,7 +568,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66142 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
66143 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
66144
66145- if (mm && permitted) {
66146+ if (mm && permitted
66147+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66148+ && !PAX_RAND_FLAGS(mm)
66149+#endif
66150+ ) {
66151 seq_put_decimal_ull(m, ' ', mm->start_data);
66152 seq_put_decimal_ull(m, ' ', mm->end_data);
66153 seq_put_decimal_ull(m, ' ', mm->start_brk);
66154@@ -549,8 +610,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66155 struct pid *pid, struct task_struct *task)
66156 {
66157 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
66158- struct mm_struct *mm = get_task_mm(task);
66159+ struct mm_struct *mm;
66160
66161+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66162+ if (current->exec_id != m->exec_id) {
66163+ gr_log_badprocpid("statm");
66164+ return 0;
66165+ }
66166+#endif
66167+ mm = get_task_mm(task);
66168 if (mm) {
66169 size = task_statm(mm, &shared, &text, &data, &resident);
66170 mmput(mm);
66171@@ -573,6 +641,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66172 return 0;
66173 }
66174
66175+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66176+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
66177+{
66178+ unsigned long flags;
66179+ u32 curr_ip = 0;
66180+
66181+ if (lock_task_sighand(task, &flags)) {
66182+ curr_ip = task->signal->curr_ip;
66183+ unlock_task_sighand(task, &flags);
66184+ }
66185+ return seq_printf(m, "%pI4\n", &curr_ip);
66186+}
66187+#endif
66188+
66189 #ifdef CONFIG_CHECKPOINT_RESTORE
66190 static struct pid *
66191 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
66192diff --git a/fs/proc/base.c b/fs/proc/base.c
66193index 3f3d7ae..68de109 100644
66194--- a/fs/proc/base.c
66195+++ b/fs/proc/base.c
66196@@ -113,6 +113,14 @@ struct pid_entry {
66197 union proc_op op;
66198 };
66199
66200+struct getdents_callback {
66201+ struct linux_dirent __user * current_dir;
66202+ struct linux_dirent __user * previous;
66203+ struct file * file;
66204+ int count;
66205+ int error;
66206+};
66207+
66208 #define NOD(NAME, MODE, IOP, FOP, OP) { \
66209 .name = (NAME), \
66210 .len = sizeof(NAME) - 1, \
66211@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
66212 return 0;
66213 }
66214
66215+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66216+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66217+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66218+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66219+#endif
66220+
66221 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66222 struct pid *pid, struct task_struct *task)
66223 {
66224 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
66225 if (mm && !IS_ERR(mm)) {
66226 unsigned int nwords = 0;
66227+
66228+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66229+ /* allow if we're currently ptracing this task */
66230+ if (PAX_RAND_FLAGS(mm) &&
66231+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
66232+ mmput(mm);
66233+ return 0;
66234+ }
66235+#endif
66236+
66237 do {
66238 nwords += 2;
66239 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
66240@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66241 }
66242
66243
66244-#ifdef CONFIG_KALLSYMS
66245+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66246 /*
66247 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
66248 * Returns the resolved symbol. If that fails, simply return the address.
66249@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
66250 mutex_unlock(&task->signal->cred_guard_mutex);
66251 }
66252
66253-#ifdef CONFIG_STACKTRACE
66254+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66255
66256 #define MAX_STACK_TRACE_DEPTH 64
66257
66258@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
66259 return 0;
66260 }
66261
66262-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66263+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66264 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66265 struct pid *pid, struct task_struct *task)
66266 {
66267@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66268 /************************************************************************/
66269
66270 /* permission checks */
66271-static int proc_fd_access_allowed(struct inode *inode)
66272+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
66273 {
66274 struct task_struct *task;
66275 int allowed = 0;
66276@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
66277 */
66278 task = get_proc_task(inode);
66279 if (task) {
66280- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66281+ if (log)
66282+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66283+ else
66284+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66285 put_task_struct(task);
66286 }
66287 return allowed;
66288@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
66289 struct task_struct *task,
66290 int hide_pid_min)
66291 {
66292+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66293+ return false;
66294+
66295+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66296+ rcu_read_lock();
66297+ {
66298+ const struct cred *tmpcred = current_cred();
66299+ const struct cred *cred = __task_cred(task);
66300+
66301+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
66302+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66303+ || in_group_p(grsec_proc_gid)
66304+#endif
66305+ ) {
66306+ rcu_read_unlock();
66307+ return true;
66308+ }
66309+ }
66310+ rcu_read_unlock();
66311+
66312+ if (!pid->hide_pid)
66313+ return false;
66314+#endif
66315+
66316 if (pid->hide_pid < hide_pid_min)
66317 return true;
66318 if (in_group_p(pid->pid_gid))
66319 return true;
66320+
66321 return ptrace_may_access(task, PTRACE_MODE_READ);
66322 }
66323
66324@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
66325 put_task_struct(task);
66326
66327 if (!has_perms) {
66328+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66329+ {
66330+#else
66331 if (pid->hide_pid == 2) {
66332+#endif
66333 /*
66334 * Let's make getdents(), stat(), and open()
66335 * consistent with each other. If a process
66336@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
66337
66338 if (task) {
66339 mm = mm_access(task, mode);
66340+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
66341+ mmput(mm);
66342+ mm = ERR_PTR(-EPERM);
66343+ }
66344 put_task_struct(task);
66345
66346 if (!IS_ERR_OR_NULL(mm)) {
66347@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
66348 return PTR_ERR(mm);
66349
66350 file->private_data = mm;
66351+
66352+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66353+ file->f_version = current->exec_id;
66354+#endif
66355+
66356 return 0;
66357 }
66358
66359@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66360 ssize_t copied;
66361 char *page;
66362
66363+#ifdef CONFIG_GRKERNSEC
66364+ if (write)
66365+ return -EPERM;
66366+#endif
66367+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66368+ if (file->f_version != current->exec_id) {
66369+ gr_log_badprocpid("mem");
66370+ return 0;
66371+ }
66372+#endif
66373+
66374 if (!mm)
66375 return 0;
66376
66377@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66378 goto free;
66379
66380 while (count > 0) {
66381- int this_len = min_t(int, count, PAGE_SIZE);
66382+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
66383
66384 if (write && copy_from_user(page, buf, this_len)) {
66385 copied = -EFAULT;
66386@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
66387 if (!mm)
66388 return 0;
66389
66390+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66391+ if (file->f_version != current->exec_id) {
66392+ gr_log_badprocpid("environ");
66393+ return 0;
66394+ }
66395+#endif
66396+
66397 page = (char *)__get_free_page(GFP_TEMPORARY);
66398 if (!page)
66399 return -ENOMEM;
66400@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
66401 goto free;
66402 while (count > 0) {
66403 size_t this_len, max_len;
66404- int retval;
66405+ ssize_t retval;
66406
66407 if (src >= (mm->env_end - mm->env_start))
66408 break;
66409@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
66410 int error = -EACCES;
66411
66412 /* Are we allowed to snoop on the tasks file descriptors? */
66413- if (!proc_fd_access_allowed(inode))
66414+ if (!proc_fd_access_allowed(inode, 0))
66415 goto out;
66416
66417 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
66418@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
66419 struct path path;
66420
66421 /* Are we allowed to snoop on the tasks file descriptors? */
66422- if (!proc_fd_access_allowed(inode))
66423- goto out;
66424+ /* logging this is needed for learning on chromium to work properly,
66425+ but we don't want to flood the logs from 'ps' which does a readlink
66426+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
66427+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
66428+ */
66429+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
66430+ if (!proc_fd_access_allowed(inode,0))
66431+ goto out;
66432+ } else {
66433+ if (!proc_fd_access_allowed(inode,1))
66434+ goto out;
66435+ }
66436
66437 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
66438 if (error)
66439@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
66440 rcu_read_lock();
66441 cred = __task_cred(task);
66442 inode->i_uid = cred->euid;
66443+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66444+ inode->i_gid = grsec_proc_gid;
66445+#else
66446 inode->i_gid = cred->egid;
66447+#endif
66448 rcu_read_unlock();
66449 }
66450 security_task_to_inode(task, inode);
66451@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
66452 return -ENOENT;
66453 }
66454 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66455+#ifdef CONFIG_GRKERNSEC_PROC_USER
66456+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66457+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66458+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66459+#endif
66460 task_dumpable(task)) {
66461 cred = __task_cred(task);
66462 stat->uid = cred->euid;
66463+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66464+ stat->gid = grsec_proc_gid;
66465+#else
66466 stat->gid = cred->egid;
66467+#endif
66468 }
66469 }
66470 rcu_read_unlock();
66471@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
66472
66473 if (task) {
66474 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66475+#ifdef CONFIG_GRKERNSEC_PROC_USER
66476+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66477+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66478+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66479+#endif
66480 task_dumpable(task)) {
66481 rcu_read_lock();
66482 cred = __task_cred(task);
66483 inode->i_uid = cred->euid;
66484+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66485+ inode->i_gid = grsec_proc_gid;
66486+#else
66487 inode->i_gid = cred->egid;
66488+#endif
66489 rcu_read_unlock();
66490 } else {
66491 inode->i_uid = GLOBAL_ROOT_UID;
66492@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
66493 if (!task)
66494 goto out_no_task;
66495
66496+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66497+ goto out;
66498+
66499 /*
66500 * Yes, it does not scale. And it should not. Don't add
66501 * new entries into /proc/<tgid>/ without very good reasons.
66502@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
66503 if (!task)
66504 return -ENOENT;
66505
66506+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66507+ goto out;
66508+
66509 if (!dir_emit_dots(file, ctx))
66510 goto out;
66511
66512@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
66513 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
66514 #endif
66515 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66516-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66517+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66518 ONE("syscall", S_IRUSR, proc_pid_syscall),
66519 #endif
66520 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66521@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
66522 #ifdef CONFIG_SECURITY
66523 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66524 #endif
66525-#ifdef CONFIG_KALLSYMS
66526+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66527 ONE("wchan", S_IRUGO, proc_pid_wchan),
66528 #endif
66529-#ifdef CONFIG_STACKTRACE
66530+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66531 ONE("stack", S_IRUSR, proc_pid_stack),
66532 #endif
66533 #ifdef CONFIG_SCHEDSTATS
66534@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
66535 #ifdef CONFIG_HARDWALL
66536 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
66537 #endif
66538+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66539+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
66540+#endif
66541 #ifdef CONFIG_USER_NS
66542 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
66543 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
66544@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
66545 if (!inode)
66546 goto out;
66547
66548+#ifdef CONFIG_GRKERNSEC_PROC_USER
66549+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
66550+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66551+ inode->i_gid = grsec_proc_gid;
66552+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
66553+#else
66554 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
66555+#endif
66556 inode->i_op = &proc_tgid_base_inode_operations;
66557 inode->i_fop = &proc_tgid_base_operations;
66558 inode->i_flags|=S_IMMUTABLE;
66559@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
66560 if (!task)
66561 goto out;
66562
66563+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66564+ goto out_put_task;
66565+
66566 result = proc_pid_instantiate(dir, dentry, task, NULL);
66567+out_put_task:
66568 put_task_struct(task);
66569 out:
66570 return ERR_PTR(result);
66571@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
66572 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
66573 #endif
66574 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66575-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66576+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66577 ONE("syscall", S_IRUSR, proc_pid_syscall),
66578 #endif
66579 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66580@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
66581 #ifdef CONFIG_SECURITY
66582 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66583 #endif
66584-#ifdef CONFIG_KALLSYMS
66585+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66586 ONE("wchan", S_IRUGO, proc_pid_wchan),
66587 #endif
66588-#ifdef CONFIG_STACKTRACE
66589+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66590 ONE("stack", S_IRUSR, proc_pid_stack),
66591 #endif
66592 #ifdef CONFIG_SCHEDSTATS
66593diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
66594index cbd82df..c0407d2 100644
66595--- a/fs/proc/cmdline.c
66596+++ b/fs/proc/cmdline.c
66597@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
66598
66599 static int __init proc_cmdline_init(void)
66600 {
66601+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66602+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
66603+#else
66604 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
66605+#endif
66606 return 0;
66607 }
66608 fs_initcall(proc_cmdline_init);
66609diff --git a/fs/proc/devices.c b/fs/proc/devices.c
66610index 50493ed..248166b 100644
66611--- a/fs/proc/devices.c
66612+++ b/fs/proc/devices.c
66613@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
66614
66615 static int __init proc_devices_init(void)
66616 {
66617+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66618+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
66619+#else
66620 proc_create("devices", 0, NULL, &proc_devinfo_operations);
66621+#endif
66622 return 0;
66623 }
66624 fs_initcall(proc_devices_init);
66625diff --git a/fs/proc/fd.c b/fs/proc/fd.c
66626index 8e5ad83..1f07a8c 100644
66627--- a/fs/proc/fd.c
66628+++ b/fs/proc/fd.c
66629@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
66630 if (!task)
66631 return -ENOENT;
66632
66633- files = get_files_struct(task);
66634+ if (!gr_acl_handle_procpidmem(task))
66635+ files = get_files_struct(task);
66636 put_task_struct(task);
66637
66638 if (files) {
66639@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
66640 */
66641 int proc_fd_permission(struct inode *inode, int mask)
66642 {
66643+ struct task_struct *task;
66644 int rv = generic_permission(inode, mask);
66645- if (rv == 0)
66646- return 0;
66647+
66648 if (task_tgid(current) == proc_pid(inode))
66649 rv = 0;
66650+
66651+ task = get_proc_task(inode);
66652+ if (task == NULL)
66653+ return rv;
66654+
66655+ if (gr_acl_handle_procpidmem(task))
66656+ rv = -EACCES;
66657+
66658+ put_task_struct(task);
66659+
66660 return rv;
66661 }
66662
66663diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66664index b502bba..849e216 100644
66665--- a/fs/proc/generic.c
66666+++ b/fs/proc/generic.c
66667@@ -22,6 +22,7 @@
66668 #include <linux/bitops.h>
66669 #include <linux/spinlock.h>
66670 #include <linux/completion.h>
66671+#include <linux/grsecurity.h>
66672 #include <asm/uaccess.h>
66673
66674 #include "internal.h"
66675@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66676 return proc_lookup_de(PDE(dir), dir, dentry);
66677 }
66678
66679+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66680+ unsigned int flags)
66681+{
66682+ if (gr_proc_is_restricted())
66683+ return ERR_PTR(-EACCES);
66684+
66685+ return proc_lookup_de(PDE(dir), dir, dentry);
66686+}
66687+
66688 /*
66689 * This returns non-zero if at EOF, so that the /proc
66690 * root directory can use this and check if it should
66691@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66692 return proc_readdir_de(PDE(inode), file, ctx);
66693 }
66694
66695+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66696+{
66697+ struct inode *inode = file_inode(file);
66698+
66699+ if (gr_proc_is_restricted())
66700+ return -EACCES;
66701+
66702+ return proc_readdir_de(PDE(inode), file, ctx);
66703+}
66704+
66705 /*
66706 * These are the generic /proc directory operations. They
66707 * use the in-memory "struct proc_dir_entry" tree to parse
66708@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
66709 .iterate = proc_readdir,
66710 };
66711
66712+static const struct file_operations proc_dir_restricted_operations = {
66713+ .llseek = generic_file_llseek,
66714+ .read = generic_read_dir,
66715+ .iterate = proc_readdir_restrict,
66716+};
66717+
66718 /*
66719 * proc directories can do almost nothing..
66720 */
66721@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66722 .setattr = proc_notify_change,
66723 };
66724
66725+static const struct inode_operations proc_dir_restricted_inode_operations = {
66726+ .lookup = proc_lookup_restrict,
66727+ .getattr = proc_getattr,
66728+ .setattr = proc_notify_change,
66729+};
66730+
66731 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66732 {
66733 int ret;
66734@@ -339,8 +371,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66735 return ret;
66736
66737 if (S_ISDIR(dp->mode)) {
66738- dp->proc_fops = &proc_dir_operations;
66739- dp->proc_iops = &proc_dir_inode_operations;
66740+ if (dp->restricted) {
66741+ dp->proc_fops = &proc_dir_restricted_operations;
66742+ dp->proc_iops = &proc_dir_restricted_inode_operations;
66743+ } else {
66744+ dp->proc_fops = &proc_dir_operations;
66745+ dp->proc_iops = &proc_dir_inode_operations;
66746+ }
66747 dir->nlink++;
66748 } else if (S_ISLNK(dp->mode)) {
66749 dp->proc_iops = &proc_link_inode_operations;
66750@@ -453,6 +490,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66751 }
66752 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66753
66754+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66755+ struct proc_dir_entry *parent, void *data)
66756+{
66757+ struct proc_dir_entry *ent;
66758+
66759+ if (mode == 0)
66760+ mode = S_IRUGO | S_IXUGO;
66761+
66762+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66763+ if (ent) {
66764+ ent->data = data;
66765+ ent->restricted = 1;
66766+ if (proc_register(parent, ent) < 0) {
66767+ kfree(ent);
66768+ ent = NULL;
66769+ }
66770+ }
66771+ return ent;
66772+}
66773+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66774+
66775 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66776 struct proc_dir_entry *parent)
66777 {
66778@@ -467,6 +525,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66779 }
66780 EXPORT_SYMBOL(proc_mkdir);
66781
66782+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66783+ struct proc_dir_entry *parent)
66784+{
66785+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
66786+}
66787+EXPORT_SYMBOL(proc_mkdir_restrict);
66788+
66789 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66790 struct proc_dir_entry *parent,
66791 const struct file_operations *proc_fops,
66792diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66793index 3b0f838..a0e0f63e 100644
66794--- a/fs/proc/inode.c
66795+++ b/fs/proc/inode.c
66796@@ -24,11 +24,17 @@
66797 #include <linux/mount.h>
66798 #include <linux/magic.h>
66799 #include <linux/namei.h>
66800+#include <linux/grsecurity.h>
66801
66802 #include <asm/uaccess.h>
66803
66804 #include "internal.h"
66805
66806+#ifdef CONFIG_PROC_SYSCTL
66807+extern const struct inode_operations proc_sys_inode_operations;
66808+extern const struct inode_operations proc_sys_dir_operations;
66809+#endif
66810+
66811 static void proc_evict_inode(struct inode *inode)
66812 {
66813 struct proc_dir_entry *de;
66814@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
66815 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
66816 sysctl_head_put(head);
66817 }
66818+
66819+#ifdef CONFIG_PROC_SYSCTL
66820+ if (inode->i_op == &proc_sys_inode_operations ||
66821+ inode->i_op == &proc_sys_dir_operations)
66822+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66823+#endif
66824+
66825 }
66826
66827 static struct kmem_cache * proc_inode_cachep;
66828@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66829 if (de->mode) {
66830 inode->i_mode = de->mode;
66831 inode->i_uid = de->uid;
66832+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66833+ inode->i_gid = grsec_proc_gid;
66834+#else
66835 inode->i_gid = de->gid;
66836+#endif
66837 }
66838 if (de->size)
66839 inode->i_size = de->size;
66840diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66841index c835b94..c9e01a3 100644
66842--- a/fs/proc/internal.h
66843+++ b/fs/proc/internal.h
66844@@ -47,9 +47,10 @@ struct proc_dir_entry {
66845 struct completion *pde_unload_completion;
66846 struct list_head pde_openers; /* who did ->open, but not ->release */
66847 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66848+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66849 u8 namelen;
66850 char name[];
66851-};
66852+} __randomize_layout;
66853
66854 union proc_op {
66855 int (*proc_get_link)(struct dentry *, struct path *);
66856@@ -67,7 +68,7 @@ struct proc_inode {
66857 struct ctl_table *sysctl_entry;
66858 const struct proc_ns_operations *ns_ops;
66859 struct inode vfs_inode;
66860-};
66861+} __randomize_layout;
66862
66863 /*
66864 * General functions
66865@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66866 struct pid *, struct task_struct *);
66867 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66868 struct pid *, struct task_struct *);
66869+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66870+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66871+ struct pid *, struct task_struct *);
66872+#endif
66873
66874 /*
66875 * base.c
66876@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66877 * generic.c
66878 */
66879 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66880+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66881 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66882 struct dentry *);
66883 extern int proc_readdir(struct file *, struct dir_context *);
66884+extern int proc_readdir_restrict(struct file *, struct dir_context *);
66885 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66886
66887 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66888diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66889index a352d57..cb94a5c 100644
66890--- a/fs/proc/interrupts.c
66891+++ b/fs/proc/interrupts.c
66892@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66893
66894 static int __init proc_interrupts_init(void)
66895 {
66896+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66897+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66898+#else
66899 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66900+#endif
66901 return 0;
66902 }
66903 fs_initcall(proc_interrupts_init);
66904diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66905index 91a4e64..cb007c0 100644
66906--- a/fs/proc/kcore.c
66907+++ b/fs/proc/kcore.c
66908@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66909 * the addresses in the elf_phdr on our list.
66910 */
66911 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66912- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66913+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66914+ if (tsz > buflen)
66915 tsz = buflen;
66916-
66917+
66918 while (buflen) {
66919 struct kcore_list *m;
66920
66921@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66922 kfree(elf_buf);
66923 } else {
66924 if (kern_addr_valid(start)) {
66925- unsigned long n;
66926+ char *elf_buf;
66927+ mm_segment_t oldfs;
66928
66929- n = copy_to_user(buffer, (char *)start, tsz);
66930- /*
66931- * We cannot distinguish between fault on source
66932- * and fault on destination. When this happens
66933- * we clear too and hope it will trigger the
66934- * EFAULT again.
66935- */
66936- if (n) {
66937- if (clear_user(buffer + tsz - n,
66938- n))
66939+ elf_buf = kmalloc(tsz, GFP_KERNEL);
66940+ if (!elf_buf)
66941+ return -ENOMEM;
66942+ oldfs = get_fs();
66943+ set_fs(KERNEL_DS);
66944+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66945+ set_fs(oldfs);
66946+ if (copy_to_user(buffer, elf_buf, tsz)) {
66947+ kfree(elf_buf);
66948 return -EFAULT;
66949+ }
66950 }
66951+ set_fs(oldfs);
66952+ kfree(elf_buf);
66953 } else {
66954 if (clear_user(buffer, tsz))
66955 return -EFAULT;
66956@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66957
66958 static int open_kcore(struct inode *inode, struct file *filp)
66959 {
66960+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66961+ return -EPERM;
66962+#endif
66963 if (!capable(CAP_SYS_RAWIO))
66964 return -EPERM;
66965 if (kcore_need_update)
66966diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66967index d3ebf2e..6ad42d1 100644
66968--- a/fs/proc/meminfo.c
66969+++ b/fs/proc/meminfo.c
66970@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66971 vmi.used >> 10,
66972 vmi.largest_chunk >> 10
66973 #ifdef CONFIG_MEMORY_FAILURE
66974- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66975+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66976 #endif
66977 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66978 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66979diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66980index d4a3574..b421ce9 100644
66981--- a/fs/proc/nommu.c
66982+++ b/fs/proc/nommu.c
66983@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66984
66985 if (file) {
66986 seq_pad(m, ' ');
66987- seq_path(m, &file->f_path, "");
66988+ seq_path(m, &file->f_path, "\n\\");
66989 }
66990
66991 seq_putc(m, '\n');
66992diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66993index 1bde894..22ac7eb 100644
66994--- a/fs/proc/proc_net.c
66995+++ b/fs/proc/proc_net.c
66996@@ -23,9 +23,27 @@
66997 #include <linux/nsproxy.h>
66998 #include <net/net_namespace.h>
66999 #include <linux/seq_file.h>
67000+#include <linux/grsecurity.h>
67001
67002 #include "internal.h"
67003
67004+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
67005+static struct seq_operations *ipv6_seq_ops_addr;
67006+
67007+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
67008+{
67009+ ipv6_seq_ops_addr = addr;
67010+}
67011+
67012+void unregister_ipv6_seq_ops_addr(void)
67013+{
67014+ ipv6_seq_ops_addr = NULL;
67015+}
67016+
67017+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
67018+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
67019+#endif
67020+
67021 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
67022 {
67023 return pde->parent->data;
67024@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
67025 return maybe_get_net(PDE_NET(PDE(inode)));
67026 }
67027
67028+extern const struct seq_operations dev_seq_ops;
67029+
67030 int seq_open_net(struct inode *ino, struct file *f,
67031 const struct seq_operations *ops, int size)
67032 {
67033@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
67034
67035 BUG_ON(size < sizeof(*p));
67036
67037+ /* only permit access to /proc/net/dev */
67038+ if (
67039+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
67040+ ops != ipv6_seq_ops_addr &&
67041+#endif
67042+ ops != &dev_seq_ops && gr_proc_is_restricted())
67043+ return -EACCES;
67044+
67045 net = get_proc_net(ino);
67046 if (net == NULL)
67047 return -ENXIO;
67048@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
67049 int err;
67050 struct net *net;
67051
67052+ if (gr_proc_is_restricted())
67053+ return -EACCES;
67054+
67055 err = -ENXIO;
67056 net = get_proc_net(inode);
67057 if (net == NULL)
67058diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
67059index f92d5dd..26398ac 100644
67060--- a/fs/proc/proc_sysctl.c
67061+++ b/fs/proc/proc_sysctl.c
67062@@ -11,13 +11,21 @@
67063 #include <linux/namei.h>
67064 #include <linux/mm.h>
67065 #include <linux/module.h>
67066+#include <linux/nsproxy.h>
67067+#ifdef CONFIG_GRKERNSEC
67068+#include <net/net_namespace.h>
67069+#endif
67070 #include "internal.h"
67071
67072+extern int gr_handle_chroot_sysctl(const int op);
67073+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
67074+ const int op);
67075+
67076 static const struct dentry_operations proc_sys_dentry_operations;
67077 static const struct file_operations proc_sys_file_operations;
67078-static const struct inode_operations proc_sys_inode_operations;
67079+const struct inode_operations proc_sys_inode_operations;
67080 static const struct file_operations proc_sys_dir_file_operations;
67081-static const struct inode_operations proc_sys_dir_operations;
67082+const struct inode_operations proc_sys_dir_operations;
67083
67084 void proc_sys_poll_notify(struct ctl_table_poll *poll)
67085 {
67086@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
67087
67088 err = NULL;
67089 d_set_d_op(dentry, &proc_sys_dentry_operations);
67090+
67091+ gr_handle_proc_create(dentry, inode);
67092+
67093 d_add(dentry, inode);
67094
67095 out:
67096@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67097 struct inode *inode = file_inode(filp);
67098 struct ctl_table_header *head = grab_header(inode);
67099 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
67100+ int op = write ? MAY_WRITE : MAY_READ;
67101 ssize_t error;
67102 size_t res;
67103
67104@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67105 * and won't be until we finish.
67106 */
67107 error = -EPERM;
67108- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
67109+ if (sysctl_perm(head, table, op))
67110 goto out;
67111
67112 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
67113@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67114 if (!table->proc_handler)
67115 goto out;
67116
67117+#ifdef CONFIG_GRKERNSEC
67118+ error = -EPERM;
67119+ if (gr_handle_chroot_sysctl(op))
67120+ goto out;
67121+ dget(filp->f_path.dentry);
67122+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
67123+ dput(filp->f_path.dentry);
67124+ goto out;
67125+ }
67126+ dput(filp->f_path.dentry);
67127+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
67128+ goto out;
67129+ if (write) {
67130+ if (current->nsproxy->net_ns != table->extra2) {
67131+ if (!capable(CAP_SYS_ADMIN))
67132+ goto out;
67133+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
67134+ goto out;
67135+ }
67136+#endif
67137+
67138 /* careful: calling conventions are nasty here */
67139 res = count;
67140 error = table->proc_handler(table, write, buf, &res, ppos);
67141@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
67142 return false;
67143 } else {
67144 d_set_d_op(child, &proc_sys_dentry_operations);
67145+
67146+ gr_handle_proc_create(child, inode);
67147+
67148 d_add(child, inode);
67149 }
67150 } else {
67151@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
67152 if ((*pos)++ < ctx->pos)
67153 return true;
67154
67155+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
67156+ return 0;
67157+
67158 if (unlikely(S_ISLNK(table->mode)))
67159 res = proc_sys_link_fill_cache(file, ctx, head, table);
67160 else
67161@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
67162 if (IS_ERR(head))
67163 return PTR_ERR(head);
67164
67165+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
67166+ return -ENOENT;
67167+
67168 generic_fillattr(inode, stat);
67169 if (table)
67170 stat->mode = (stat->mode & S_IFMT) | table->mode;
67171@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
67172 .llseek = generic_file_llseek,
67173 };
67174
67175-static const struct inode_operations proc_sys_inode_operations = {
67176+const struct inode_operations proc_sys_inode_operations = {
67177 .permission = proc_sys_permission,
67178 .setattr = proc_sys_setattr,
67179 .getattr = proc_sys_getattr,
67180 };
67181
67182-static const struct inode_operations proc_sys_dir_operations = {
67183+const struct inode_operations proc_sys_dir_operations = {
67184 .lookup = proc_sys_lookup,
67185 .permission = proc_sys_permission,
67186 .setattr = proc_sys_setattr,
67187@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
67188 static struct ctl_dir *new_dir(struct ctl_table_set *set,
67189 const char *name, int namelen)
67190 {
67191- struct ctl_table *table;
67192+ ctl_table_no_const *table;
67193 struct ctl_dir *new;
67194 struct ctl_node *node;
67195 char *new_name;
67196@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
67197 return NULL;
67198
67199 node = (struct ctl_node *)(new + 1);
67200- table = (struct ctl_table *)(node + 1);
67201+ table = (ctl_table_no_const *)(node + 1);
67202 new_name = (char *)(table + 2);
67203 memcpy(new_name, name, namelen);
67204 new_name[namelen] = '\0';
67205@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
67206 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
67207 struct ctl_table_root *link_root)
67208 {
67209- struct ctl_table *link_table, *entry, *link;
67210+ ctl_table_no_const *link_table, *link;
67211+ struct ctl_table *entry;
67212 struct ctl_table_header *links;
67213 struct ctl_node *node;
67214 char *link_name;
67215@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
67216 return NULL;
67217
67218 node = (struct ctl_node *)(links + 1);
67219- link_table = (struct ctl_table *)(node + nr_entries);
67220+ link_table = (ctl_table_no_const *)(node + nr_entries);
67221 link_name = (char *)&link_table[nr_entries + 1];
67222
67223 for (link = link_table, entry = table; entry->procname; link++, entry++) {
67224@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67225 struct ctl_table_header ***subheader, struct ctl_table_set *set,
67226 struct ctl_table *table)
67227 {
67228- struct ctl_table *ctl_table_arg = NULL;
67229- struct ctl_table *entry, *files;
67230+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
67231+ struct ctl_table *entry;
67232 int nr_files = 0;
67233 int nr_dirs = 0;
67234 int err = -ENOMEM;
67235@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67236 nr_files++;
67237 }
67238
67239- files = table;
67240 /* If there are mixed files and directories we need a new table */
67241 if (nr_dirs && nr_files) {
67242- struct ctl_table *new;
67243+ ctl_table_no_const *new;
67244 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
67245 GFP_KERNEL);
67246 if (!files)
67247@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67248 /* Register everything except a directory full of subdirectories */
67249 if (nr_files || !nr_dirs) {
67250 struct ctl_table_header *header;
67251- header = __register_sysctl_table(set, path, files);
67252+ header = __register_sysctl_table(set, path, files ? files : table);
67253 if (!header) {
67254 kfree(ctl_table_arg);
67255 goto out;
67256diff --git a/fs/proc/root.c b/fs/proc/root.c
67257index e74ac9f..35e89f4 100644
67258--- a/fs/proc/root.c
67259+++ b/fs/proc/root.c
67260@@ -188,7 +188,15 @@ void __init proc_root_init(void)
67261 proc_mkdir("openprom", NULL);
67262 #endif
67263 proc_tty_init();
67264+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67265+#ifdef CONFIG_GRKERNSEC_PROC_USER
67266+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
67267+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67268+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
67269+#endif
67270+#else
67271 proc_mkdir("bus", NULL);
67272+#endif
67273 proc_sys_init();
67274 }
67275
67276diff --git a/fs/proc/stat.c b/fs/proc/stat.c
67277index 510413eb..34d9a8c 100644
67278--- a/fs/proc/stat.c
67279+++ b/fs/proc/stat.c
67280@@ -11,6 +11,7 @@
67281 #include <linux/irqnr.h>
67282 #include <linux/cputime.h>
67283 #include <linux/tick.h>
67284+#include <linux/grsecurity.h>
67285
67286 #ifndef arch_irq_stat_cpu
67287 #define arch_irq_stat_cpu(cpu) 0
67288@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
67289 u64 sum_softirq = 0;
67290 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
67291 struct timespec boottime;
67292+ int unrestricted = 1;
67293+
67294+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67295+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67296+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
67297+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67298+ && !in_group_p(grsec_proc_gid)
67299+#endif
67300+ )
67301+ unrestricted = 0;
67302+#endif
67303+#endif
67304
67305 user = nice = system = idle = iowait =
67306 irq = softirq = steal = 0;
67307@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
67308 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67309 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67310 idle += get_idle_time(i);
67311- iowait += get_iowait_time(i);
67312- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67313- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67314- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67315- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67316- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67317- sum += kstat_cpu_irqs_sum(i);
67318- sum += arch_irq_stat_cpu(i);
67319+ if (unrestricted) {
67320+ iowait += get_iowait_time(i);
67321+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67322+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67323+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67324+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67325+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67326+ sum += kstat_cpu_irqs_sum(i);
67327+ sum += arch_irq_stat_cpu(i);
67328+ for (j = 0; j < NR_SOFTIRQS; j++) {
67329+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67330
67331- for (j = 0; j < NR_SOFTIRQS; j++) {
67332- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67333-
67334- per_softirq_sums[j] += softirq_stat;
67335- sum_softirq += softirq_stat;
67336+ per_softirq_sums[j] += softirq_stat;
67337+ sum_softirq += softirq_stat;
67338+ }
67339 }
67340 }
67341- sum += arch_irq_stat();
67342+ if (unrestricted)
67343+ sum += arch_irq_stat();
67344
67345 seq_puts(p, "cpu ");
67346 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67347@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
67348 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67349 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67350 idle = get_idle_time(i);
67351- iowait = get_iowait_time(i);
67352- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67353- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67354- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67355- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67356- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67357+ if (unrestricted) {
67358+ iowait = get_iowait_time(i);
67359+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67360+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67361+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67362+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67363+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67364+ }
67365 seq_printf(p, "cpu%d", i);
67366 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67367 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
67368@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
67369
67370 /* sum again ? it could be updated? */
67371 for_each_irq_nr(j)
67372- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
67373+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
67374
67375 seq_printf(p,
67376 "\nctxt %llu\n"
67377@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
67378 "processes %lu\n"
67379 "procs_running %lu\n"
67380 "procs_blocked %lu\n",
67381- nr_context_switches(),
67382+ unrestricted ? nr_context_switches() : 0ULL,
67383 (unsigned long)jif,
67384- total_forks,
67385- nr_running(),
67386- nr_iowait());
67387+ unrestricted ? total_forks : 0UL,
67388+ unrestricted ? nr_running() : 0UL,
67389+ unrestricted ? nr_iowait() : 0UL);
67390
67391 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
67392
67393diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
67394index f86e549..3a88fcd 100644
67395--- a/fs/proc/task_mmu.c
67396+++ b/fs/proc/task_mmu.c
67397@@ -13,12 +13,19 @@
67398 #include <linux/swap.h>
67399 #include <linux/swapops.h>
67400 #include <linux/mmu_notifier.h>
67401+#include <linux/grsecurity.h>
67402
67403 #include <asm/elf.h>
67404 #include <asm/uaccess.h>
67405 #include <asm/tlbflush.h>
67406 #include "internal.h"
67407
67408+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67409+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
67410+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
67411+ _mm->pax_flags & MF_PAX_SEGMEXEC))
67412+#endif
67413+
67414 void task_mem(struct seq_file *m, struct mm_struct *mm)
67415 {
67416 unsigned long data, text, lib, swap;
67417@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67418 "VmExe:\t%8lu kB\n"
67419 "VmLib:\t%8lu kB\n"
67420 "VmPTE:\t%8lu kB\n"
67421- "VmSwap:\t%8lu kB\n",
67422- hiwater_vm << (PAGE_SHIFT-10),
67423+ "VmSwap:\t%8lu kB\n"
67424+
67425+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
67426+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
67427+#endif
67428+
67429+ ,hiwater_vm << (PAGE_SHIFT-10),
67430 total_vm << (PAGE_SHIFT-10),
67431 mm->locked_vm << (PAGE_SHIFT-10),
67432 mm->pinned_vm << (PAGE_SHIFT-10),
67433@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67434 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
67435 (PTRS_PER_PTE * sizeof(pte_t) *
67436 atomic_long_read(&mm->nr_ptes)) >> 10,
67437- swap << (PAGE_SHIFT-10));
67438+ swap << (PAGE_SHIFT-10)
67439+
67440+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
67441+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67442+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
67443+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
67444+#else
67445+ , mm->context.user_cs_base
67446+ , mm->context.user_cs_limit
67447+#endif
67448+#endif
67449+
67450+ );
67451 }
67452
67453 unsigned long task_vsize(struct mm_struct *mm)
67454@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67455 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
67456 }
67457
67458- /* We don't show the stack guard page in /proc/maps */
67459+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67460+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
67461+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
67462+#else
67463 start = vma->vm_start;
67464- if (stack_guard_page_start(vma, start))
67465- start += PAGE_SIZE;
67466 end = vma->vm_end;
67467- if (stack_guard_page_end(vma, end))
67468- end -= PAGE_SIZE;
67469+#endif
67470
67471 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
67472 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
67473@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67474 flags & VM_WRITE ? 'w' : '-',
67475 flags & VM_EXEC ? 'x' : '-',
67476 flags & VM_MAYSHARE ? 's' : 'p',
67477+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67478+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
67479+#else
67480 pgoff,
67481+#endif
67482 MAJOR(dev), MINOR(dev), ino);
67483
67484 /*
67485@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67486 */
67487 if (file) {
67488 seq_pad(m, ' ');
67489- seq_path(m, &file->f_path, "\n");
67490+ seq_path(m, &file->f_path, "\n\\");
67491 goto done;
67492 }
67493
67494@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67495 * Thread stack in /proc/PID/task/TID/maps or
67496 * the main process stack.
67497 */
67498- if (!is_pid || (vma->vm_start <= mm->start_stack &&
67499- vma->vm_end >= mm->start_stack)) {
67500+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
67501+ (vma->vm_start <= mm->start_stack &&
67502+ vma->vm_end >= mm->start_stack)) {
67503 name = "[stack]";
67504 } else {
67505 /* Thread stack in /proc/PID/maps */
67506@@ -359,6 +388,12 @@ done:
67507
67508 static int show_map(struct seq_file *m, void *v, int is_pid)
67509 {
67510+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67511+ if (current->exec_id != m->exec_id) {
67512+ gr_log_badprocpid("maps");
67513+ return 0;
67514+ }
67515+#endif
67516 show_map_vma(m, v, is_pid);
67517 m_cache_vma(m, v);
67518 return 0;
67519@@ -629,12 +664,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67520 .private = &mss,
67521 };
67522
67523+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67524+ if (current->exec_id != m->exec_id) {
67525+ gr_log_badprocpid("smaps");
67526+ return 0;
67527+ }
67528+#endif
67529 memset(&mss, 0, sizeof mss);
67530- mss.vma = vma;
67531- /* mmap_sem is held in m_start */
67532- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67533- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67534-
67535+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67536+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
67537+#endif
67538+ mss.vma = vma;
67539+ /* mmap_sem is held in m_start */
67540+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67541+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67542+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67543+ }
67544+#endif
67545 show_map_vma(m, vma, is_pid);
67546
67547 seq_printf(m,
67548@@ -652,7 +698,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67549 "KernelPageSize: %8lu kB\n"
67550 "MMUPageSize: %8lu kB\n"
67551 "Locked: %8lu kB\n",
67552+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67553+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
67554+#else
67555 (vma->vm_end - vma->vm_start) >> 10,
67556+#endif
67557 mss.resident >> 10,
67558 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
67559 mss.shared_clean >> 10,
67560@@ -1489,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67561 char buffer[64];
67562 int nid;
67563
67564+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67565+ if (current->exec_id != m->exec_id) {
67566+ gr_log_badprocpid("numa_maps");
67567+ return 0;
67568+ }
67569+#endif
67570+
67571 if (!mm)
67572 return 0;
67573
67574@@ -1510,11 +1567,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67575 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
67576 }
67577
67578+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67579+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
67580+#else
67581 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
67582+#endif
67583
67584 if (file) {
67585 seq_puts(m, " file=");
67586- seq_path(m, &file->f_path, "\n\t= ");
67587+ seq_path(m, &file->f_path, "\n\t\\= ");
67588 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
67589 seq_puts(m, " heap");
67590 } else {
67591diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
67592index 599ec2e..f1413ae 100644
67593--- a/fs/proc/task_nommu.c
67594+++ b/fs/proc/task_nommu.c
67595@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67596 else
67597 bytes += kobjsize(mm);
67598
67599- if (current->fs && current->fs->users > 1)
67600+ if (current->fs && atomic_read(&current->fs->users) > 1)
67601 sbytes += kobjsize(current->fs);
67602 else
67603 bytes += kobjsize(current->fs);
67604@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
67605
67606 if (file) {
67607 seq_pad(m, ' ');
67608- seq_path(m, &file->f_path, "");
67609+ seq_path(m, &file->f_path, "\n\\");
67610 } else if (mm) {
67611 pid_t tid = pid_of_stack(priv, vma, is_pid);
67612
67613diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
67614index a90d6d35..d08047c 100644
67615--- a/fs/proc/vmcore.c
67616+++ b/fs/proc/vmcore.c
67617@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
67618 nr_bytes = count;
67619
67620 /* If pfn is not ram, return zeros for sparse dump files */
67621- if (pfn_is_ram(pfn) == 0)
67622- memset(buf, 0, nr_bytes);
67623- else {
67624+ if (pfn_is_ram(pfn) == 0) {
67625+ if (userbuf) {
67626+ if (clear_user((char __force_user *)buf, nr_bytes))
67627+ return -EFAULT;
67628+ } else
67629+ memset(buf, 0, nr_bytes);
67630+ } else {
67631 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
67632 offset, userbuf);
67633 if (tmp < 0)
67634@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
67635 static int copy_to(void *target, void *src, size_t size, int userbuf)
67636 {
67637 if (userbuf) {
67638- if (copy_to_user((char __user *) target, src, size))
67639+ if (copy_to_user((char __force_user *) target, src, size))
67640 return -EFAULT;
67641 } else {
67642 memcpy(target, src, size);
67643@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67644 if (*fpos < m->offset + m->size) {
67645 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67646 start = m->paddr + *fpos - m->offset;
67647- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67648+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67649 if (tmp < 0)
67650 return tmp;
67651 buflen -= tsz;
67652@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67653 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67654 size_t buflen, loff_t *fpos)
67655 {
67656- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67657+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67658 }
67659
67660 /*
67661diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67662index d3fb2b6..43a8140 100644
67663--- a/fs/qnx6/qnx6.h
67664+++ b/fs/qnx6/qnx6.h
67665@@ -74,7 +74,7 @@ enum {
67666 BYTESEX_BE,
67667 };
67668
67669-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67670+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67671 {
67672 if (sbi->s_bytesex == BYTESEX_LE)
67673 return le64_to_cpu((__force __le64)n);
67674@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67675 return (__force __fs64)cpu_to_be64(n);
67676 }
67677
67678-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67679+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67680 {
67681 if (sbi->s_bytesex == BYTESEX_LE)
67682 return le32_to_cpu((__force __le32)n);
67683diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67684index bb2869f..d34ada8 100644
67685--- a/fs/quota/netlink.c
67686+++ b/fs/quota/netlink.c
67687@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67688 void quota_send_warning(struct kqid qid, dev_t dev,
67689 const char warntype)
67690 {
67691- static atomic_t seq;
67692+ static atomic_unchecked_t seq;
67693 struct sk_buff *skb;
67694 void *msg_head;
67695 int ret;
67696@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67697 "VFS: Not enough memory to send quota warning.\n");
67698 return;
67699 }
67700- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67701+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67702 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67703 if (!msg_head) {
67704 printk(KERN_ERR
67705diff --git a/fs/read_write.c b/fs/read_write.c
67706index c0805c93..d39f2eb 100644
67707--- a/fs/read_write.c
67708+++ b/fs/read_write.c
67709@@ -507,7 +507,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67710
67711 old_fs = get_fs();
67712 set_fs(get_ds());
67713- p = (__force const char __user *)buf;
67714+ p = (const char __force_user *)buf;
67715 if (count > MAX_RW_COUNT)
67716 count = MAX_RW_COUNT;
67717 if (file->f_op->write)
67718diff --git a/fs/readdir.c b/fs/readdir.c
67719index ced6791..936687b 100644
67720--- a/fs/readdir.c
67721+++ b/fs/readdir.c
67722@@ -18,6 +18,7 @@
67723 #include <linux/security.h>
67724 #include <linux/syscalls.h>
67725 #include <linux/unistd.h>
67726+#include <linux/namei.h>
67727
67728 #include <asm/uaccess.h>
67729
67730@@ -71,6 +72,7 @@ struct old_linux_dirent {
67731 struct readdir_callback {
67732 struct dir_context ctx;
67733 struct old_linux_dirent __user * dirent;
67734+ struct file * file;
67735 int result;
67736 };
67737
67738@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
67739 buf->result = -EOVERFLOW;
67740 return -EOVERFLOW;
67741 }
67742+
67743+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67744+ return 0;
67745+
67746 buf->result++;
67747 dirent = buf->dirent;
67748 if (!access_ok(VERIFY_WRITE, dirent,
67749@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67750 if (!f.file)
67751 return -EBADF;
67752
67753+ buf.file = f.file;
67754 error = iterate_dir(f.file, &buf.ctx);
67755 if (buf.result)
67756 error = buf.result;
67757@@ -145,6 +152,7 @@ struct getdents_callback {
67758 struct dir_context ctx;
67759 struct linux_dirent __user * current_dir;
67760 struct linux_dirent __user * previous;
67761+ struct file * file;
67762 int count;
67763 int error;
67764 };
67765@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
67766 buf->error = -EOVERFLOW;
67767 return -EOVERFLOW;
67768 }
67769+
67770+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67771+ return 0;
67772+
67773 dirent = buf->previous;
67774 if (dirent) {
67775 if (__put_user(offset, &dirent->d_off))
67776@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67777 if (!f.file)
67778 return -EBADF;
67779
67780+ buf.file = f.file;
67781 error = iterate_dir(f.file, &buf.ctx);
67782 if (error >= 0)
67783 error = buf.error;
67784@@ -230,6 +243,7 @@ struct getdents_callback64 {
67785 struct dir_context ctx;
67786 struct linux_dirent64 __user * current_dir;
67787 struct linux_dirent64 __user * previous;
67788+ struct file *file;
67789 int count;
67790 int error;
67791 };
67792@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
67793 buf->error = -EINVAL; /* only used if we fail.. */
67794 if (reclen > buf->count)
67795 return -EINVAL;
67796+
67797+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67798+ return 0;
67799+
67800 dirent = buf->previous;
67801 if (dirent) {
67802 if (__put_user(offset, &dirent->d_off))
67803@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67804 if (!f.file)
67805 return -EBADF;
67806
67807+ buf.file = f.file;
67808 error = iterate_dir(f.file, &buf.ctx);
67809 if (error >= 0)
67810 error = buf.error;
67811diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67812index 9c02d96..6562c10 100644
67813--- a/fs/reiserfs/do_balan.c
67814+++ b/fs/reiserfs/do_balan.c
67815@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67816 return;
67817 }
67818
67819- atomic_inc(&fs_generation(tb->tb_sb));
67820+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67821 do_balance_starts(tb);
67822
67823 /*
67824diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67825index aca73dd..e3c558d 100644
67826--- a/fs/reiserfs/item_ops.c
67827+++ b/fs/reiserfs/item_ops.c
67828@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67829 }
67830
67831 static struct item_operations errcatch_ops = {
67832- errcatch_bytes_number,
67833- errcatch_decrement_key,
67834- errcatch_is_left_mergeable,
67835- errcatch_print_item,
67836- errcatch_check_item,
67837+ .bytes_number = errcatch_bytes_number,
67838+ .decrement_key = errcatch_decrement_key,
67839+ .is_left_mergeable = errcatch_is_left_mergeable,
67840+ .print_item = errcatch_print_item,
67841+ .check_item = errcatch_check_item,
67842
67843- errcatch_create_vi,
67844- errcatch_check_left,
67845- errcatch_check_right,
67846- errcatch_part_size,
67847- errcatch_unit_num,
67848- errcatch_print_vi
67849+ .create_vi = errcatch_create_vi,
67850+ .check_left = errcatch_check_left,
67851+ .check_right = errcatch_check_right,
67852+ .part_size = errcatch_part_size,
67853+ .unit_num = errcatch_unit_num,
67854+ .print_vi = errcatch_print_vi
67855 };
67856
67857 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67858diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67859index 621b9f3..af527fd 100644
67860--- a/fs/reiserfs/procfs.c
67861+++ b/fs/reiserfs/procfs.c
67862@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67863 "SMALL_TAILS " : "NO_TAILS ",
67864 replay_only(sb) ? "REPLAY_ONLY " : "",
67865 convert_reiserfs(sb) ? "CONV " : "",
67866- atomic_read(&r->s_generation_counter),
67867+ atomic_read_unchecked(&r->s_generation_counter),
67868 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67869 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67870 SF(s_good_search_by_key_reada), SF(s_bmaps),
67871diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67872index bb79cdd..fcf49ef 100644
67873--- a/fs/reiserfs/reiserfs.h
67874+++ b/fs/reiserfs/reiserfs.h
67875@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
67876 /* Comment? -Hans */
67877 wait_queue_head_t s_wait;
67878 /* increased by one every time the tree gets re-balanced */
67879- atomic_t s_generation_counter;
67880+ atomic_unchecked_t s_generation_counter;
67881
67882 /* File system properties. Currently holds on-disk FS format */
67883 unsigned long s_properties;
67884@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67885 #define REISERFS_USER_MEM 1 /* user memory mode */
67886
67887 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67888-#define get_generation(s) atomic_read (&fs_generation(s))
67889+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67890 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67891 #define __fs_changed(gen,s) (gen != get_generation (s))
67892 #define fs_changed(gen,s) \
67893diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67894index 71fbbe3..eff29ba 100644
67895--- a/fs/reiserfs/super.c
67896+++ b/fs/reiserfs/super.c
67897@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67898 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67899 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67900 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67901+#ifdef CONFIG_REISERFS_FS_XATTR
67902+ /* turn on user xattrs by default */
67903+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67904+#endif
67905 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67906 sbi->s_alloc_options.preallocmin = 0;
67907 /* Preallocate by 16 blocks (17-1) at once */
67908diff --git a/fs/select.c b/fs/select.c
67909index 467bb1c..cf9d65a 100644
67910--- a/fs/select.c
67911+++ b/fs/select.c
67912@@ -20,6 +20,7 @@
67913 #include <linux/export.h>
67914 #include <linux/slab.h>
67915 #include <linux/poll.h>
67916+#include <linux/security.h>
67917 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67918 #include <linux/file.h>
67919 #include <linux/fdtable.h>
67920@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67921 struct poll_list *walk = head;
67922 unsigned long todo = nfds;
67923
67924+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67925 if (nfds > rlimit(RLIMIT_NOFILE))
67926 return -EINVAL;
67927
67928diff --git a/fs/seq_file.c b/fs/seq_file.c
67929index dbf3a59..daf023f 100644
67930--- a/fs/seq_file.c
67931+++ b/fs/seq_file.c
67932@@ -12,6 +12,8 @@
67933 #include <linux/slab.h>
67934 #include <linux/cred.h>
67935 #include <linux/mm.h>
67936+#include <linux/sched.h>
67937+#include <linux/grsecurity.h>
67938
67939 #include <asm/uaccess.h>
67940 #include <asm/page.h>
67941@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
67942
67943 static void *seq_buf_alloc(unsigned long size)
67944 {
67945- void *buf;
67946-
67947- /*
67948- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
67949- * it's better to fall back to vmalloc() than to kill things.
67950- */
67951- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
67952- if (!buf && size > PAGE_SIZE)
67953- buf = vmalloc(size);
67954- return buf;
67955+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67956 }
67957
67958 /**
67959@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67960 #ifdef CONFIG_USER_NS
67961 p->user_ns = file->f_cred->user_ns;
67962 #endif
67963+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67964+ p->exec_id = current->exec_id;
67965+#endif
67966
67967 /*
67968 * Wrappers around seq_open(e.g. swaps_open) need to be
67969@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67970 }
67971 EXPORT_SYMBOL(seq_open);
67972
67973+
67974+int seq_open_restrict(struct file *file, const struct seq_operations *op)
67975+{
67976+ if (gr_proc_is_restricted())
67977+ return -EACCES;
67978+
67979+ return seq_open(file, op);
67980+}
67981+EXPORT_SYMBOL(seq_open_restrict);
67982+
67983 static int traverse(struct seq_file *m, loff_t offset)
67984 {
67985 loff_t pos = 0, index;
67986@@ -158,7 +164,7 @@ Eoverflow:
67987 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67988 {
67989 struct seq_file *m = file->private_data;
67990- size_t copied = 0;
67991+ ssize_t copied = 0;
67992 loff_t pos;
67993 size_t n;
67994 void *p;
67995@@ -589,7 +595,7 @@ static void single_stop(struct seq_file *p, void *v)
67996 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67997 void *data)
67998 {
67999- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
68000+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
68001 int res = -ENOMEM;
68002
68003 if (op) {
68004@@ -625,6 +631,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
68005 }
68006 EXPORT_SYMBOL(single_open_size);
68007
68008+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
68009+ void *data)
68010+{
68011+ if (gr_proc_is_restricted())
68012+ return -EACCES;
68013+
68014+ return single_open(file, show, data);
68015+}
68016+EXPORT_SYMBOL(single_open_restrict);
68017+
68018+
68019 int single_release(struct inode *inode, struct file *file)
68020 {
68021 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
68022diff --git a/fs/splice.c b/fs/splice.c
68023index 75c6058..770d40c 100644
68024--- a/fs/splice.c
68025+++ b/fs/splice.c
68026@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68027 pipe_lock(pipe);
68028
68029 for (;;) {
68030- if (!pipe->readers) {
68031+ if (!atomic_read(&pipe->readers)) {
68032 send_sig(SIGPIPE, current, 0);
68033 if (!ret)
68034 ret = -EPIPE;
68035@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68036 page_nr++;
68037 ret += buf->len;
68038
68039- if (pipe->files)
68040+ if (atomic_read(&pipe->files))
68041 do_wakeup = 1;
68042
68043 if (!--spd->nr_pages)
68044@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68045 do_wakeup = 0;
68046 }
68047
68048- pipe->waiting_writers++;
68049+ atomic_inc(&pipe->waiting_writers);
68050 pipe_wait(pipe);
68051- pipe->waiting_writers--;
68052+ atomic_dec(&pipe->waiting_writers);
68053 }
68054
68055 pipe_unlock(pipe);
68056@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
68057 old_fs = get_fs();
68058 set_fs(get_ds());
68059 /* The cast to a user pointer is valid due to the set_fs() */
68060- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
68061+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
68062 set_fs(old_fs);
68063
68064 return res;
68065@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
68066 old_fs = get_fs();
68067 set_fs(get_ds());
68068 /* The cast to a user pointer is valid due to the set_fs() */
68069- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
68070+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
68071 set_fs(old_fs);
68072
68073 return res;
68074@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
68075 goto err;
68076
68077 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
68078- vec[i].iov_base = (void __user *) page_address(page);
68079+ vec[i].iov_base = (void __force_user *) page_address(page);
68080 vec[i].iov_len = this_len;
68081 spd.pages[i] = page;
68082 spd.nr_pages++;
68083@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68084 ops->release(pipe, buf);
68085 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68086 pipe->nrbufs--;
68087- if (pipe->files)
68088+ if (atomic_read(&pipe->files))
68089 sd->need_wakeup = true;
68090 }
68091
68092@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68093 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
68094 {
68095 while (!pipe->nrbufs) {
68096- if (!pipe->writers)
68097+ if (!atomic_read(&pipe->writers))
68098 return 0;
68099
68100- if (!pipe->waiting_writers && sd->num_spliced)
68101+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
68102 return 0;
68103
68104 if (sd->flags & SPLICE_F_NONBLOCK)
68105@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
68106 ops->release(pipe, buf);
68107 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68108 pipe->nrbufs--;
68109- if (pipe->files)
68110+ if (atomic_read(&pipe->files))
68111 sd.need_wakeup = true;
68112 } else {
68113 buf->offset += ret;
68114@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
68115 * out of the pipe right after the splice_to_pipe(). So set
68116 * PIPE_READERS appropriately.
68117 */
68118- pipe->readers = 1;
68119+ atomic_set(&pipe->readers, 1);
68120
68121 current->splice_pipe = pipe;
68122 }
68123@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
68124
68125 partial[buffers].offset = off;
68126 partial[buffers].len = plen;
68127+ partial[buffers].private = 0;
68128
68129 off = 0;
68130 len -= plen;
68131@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68132 ret = -ERESTARTSYS;
68133 break;
68134 }
68135- if (!pipe->writers)
68136+ if (!atomic_read(&pipe->writers))
68137 break;
68138- if (!pipe->waiting_writers) {
68139+ if (!atomic_read(&pipe->waiting_writers)) {
68140 if (flags & SPLICE_F_NONBLOCK) {
68141 ret = -EAGAIN;
68142 break;
68143@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68144 pipe_lock(pipe);
68145
68146 while (pipe->nrbufs >= pipe->buffers) {
68147- if (!pipe->readers) {
68148+ if (!atomic_read(&pipe->readers)) {
68149 send_sig(SIGPIPE, current, 0);
68150 ret = -EPIPE;
68151 break;
68152@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68153 ret = -ERESTARTSYS;
68154 break;
68155 }
68156- pipe->waiting_writers++;
68157+ atomic_inc(&pipe->waiting_writers);
68158 pipe_wait(pipe);
68159- pipe->waiting_writers--;
68160+ atomic_dec(&pipe->waiting_writers);
68161 }
68162
68163 pipe_unlock(pipe);
68164@@ -1818,14 +1819,14 @@ retry:
68165 pipe_double_lock(ipipe, opipe);
68166
68167 do {
68168- if (!opipe->readers) {
68169+ if (!atomic_read(&opipe->readers)) {
68170 send_sig(SIGPIPE, current, 0);
68171 if (!ret)
68172 ret = -EPIPE;
68173 break;
68174 }
68175
68176- if (!ipipe->nrbufs && !ipipe->writers)
68177+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
68178 break;
68179
68180 /*
68181@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
68182 pipe_double_lock(ipipe, opipe);
68183
68184 do {
68185- if (!opipe->readers) {
68186+ if (!atomic_read(&opipe->readers)) {
68187 send_sig(SIGPIPE, current, 0);
68188 if (!ret)
68189 ret = -EPIPE;
68190@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
68191 * return EAGAIN if we have the potential of some data in the
68192 * future, otherwise just return 0
68193 */
68194- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
68195+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
68196 ret = -EAGAIN;
68197
68198 pipe_unlock(ipipe);
68199diff --git a/fs/stat.c b/fs/stat.c
68200index ae0c3ce..9ee641c 100644
68201--- a/fs/stat.c
68202+++ b/fs/stat.c
68203@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
68204 stat->gid = inode->i_gid;
68205 stat->rdev = inode->i_rdev;
68206 stat->size = i_size_read(inode);
68207- stat->atime = inode->i_atime;
68208- stat->mtime = inode->i_mtime;
68209+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68210+ stat->atime = inode->i_ctime;
68211+ stat->mtime = inode->i_ctime;
68212+ } else {
68213+ stat->atime = inode->i_atime;
68214+ stat->mtime = inode->i_mtime;
68215+ }
68216 stat->ctime = inode->i_ctime;
68217 stat->blksize = (1 << inode->i_blkbits);
68218 stat->blocks = inode->i_blocks;
68219@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
68220 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
68221 {
68222 struct inode *inode = path->dentry->d_inode;
68223+ int retval;
68224
68225- if (inode->i_op->getattr)
68226- return inode->i_op->getattr(path->mnt, path->dentry, stat);
68227+ if (inode->i_op->getattr) {
68228+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
68229+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68230+ stat->atime = stat->ctime;
68231+ stat->mtime = stat->ctime;
68232+ }
68233+ return retval;
68234+ }
68235
68236 generic_fillattr(inode, stat);
68237 return 0;
68238diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
68239index 0b45ff4..edf9d3a 100644
68240--- a/fs/sysfs/dir.c
68241+++ b/fs/sysfs/dir.c
68242@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68243 kfree(buf);
68244 }
68245
68246+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68247+extern int grsec_enable_sysfs_restrict;
68248+#endif
68249+
68250 /**
68251 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
68252 * @kobj: object we're creating directory for
68253@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68254 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68255 {
68256 struct kernfs_node *parent, *kn;
68257+ const char *name;
68258+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
68259+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68260+ const char *parent_name;
68261+#endif
68262
68263 BUG_ON(!kobj);
68264
68265+ name = kobject_name(kobj);
68266+
68267 if (kobj->parent)
68268 parent = kobj->parent->sd;
68269 else
68270@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68271 if (!parent)
68272 return -ENOENT;
68273
68274- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
68275- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
68276+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68277+ parent_name = parent->name;
68278+ mode = S_IRWXU;
68279+
68280+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
68281+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
68282+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
68283+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
68284+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68285+ if (!grsec_enable_sysfs_restrict)
68286+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68287+#endif
68288+
68289+ kn = kernfs_create_dir_ns(parent, name,
68290+ mode, kobj, ns);
68291 if (IS_ERR(kn)) {
68292 if (PTR_ERR(kn) == -EEXIST)
68293- sysfs_warn_dup(parent, kobject_name(kobj));
68294+ sysfs_warn_dup(parent, name);
68295 return PTR_ERR(kn);
68296 }
68297
68298diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
68299index 69d4889..a810bd4 100644
68300--- a/fs/sysv/sysv.h
68301+++ b/fs/sysv/sysv.h
68302@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
68303 #endif
68304 }
68305
68306-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68307+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68308 {
68309 if (sbi->s_bytesex == BYTESEX_PDP)
68310 return PDP_swab((__force __u32)n);
68311diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
68312index fb08b0c..65fcc7e 100644
68313--- a/fs/ubifs/io.c
68314+++ b/fs/ubifs/io.c
68315@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
68316 return err;
68317 }
68318
68319-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68320+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68321 {
68322 int err;
68323
68324diff --git a/fs/udf/misc.c b/fs/udf/misc.c
68325index c175b4d..8f36a16 100644
68326--- a/fs/udf/misc.c
68327+++ b/fs/udf/misc.c
68328@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
68329
68330 u8 udf_tag_checksum(const struct tag *t)
68331 {
68332- u8 *data = (u8 *)t;
68333+ const u8 *data = (const u8 *)t;
68334 u8 checksum = 0;
68335 int i;
68336 for (i = 0; i < sizeof(struct tag); ++i)
68337diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
68338index 8d974c4..b82f6ec 100644
68339--- a/fs/ufs/swab.h
68340+++ b/fs/ufs/swab.h
68341@@ -22,7 +22,7 @@ enum {
68342 BYTESEX_BE
68343 };
68344
68345-static inline u64
68346+static inline u64 __intentional_overflow(-1)
68347 fs64_to_cpu(struct super_block *sbp, __fs64 n)
68348 {
68349 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68350@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
68351 return (__force __fs64)cpu_to_be64(n);
68352 }
68353
68354-static inline u32
68355+static inline u32 __intentional_overflow(-1)
68356 fs32_to_cpu(struct super_block *sbp, __fs32 n)
68357 {
68358 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68359diff --git a/fs/utimes.c b/fs/utimes.c
68360index aa138d6..5f3a811 100644
68361--- a/fs/utimes.c
68362+++ b/fs/utimes.c
68363@@ -1,6 +1,7 @@
68364 #include <linux/compiler.h>
68365 #include <linux/file.h>
68366 #include <linux/fs.h>
68367+#include <linux/security.h>
68368 #include <linux/linkage.h>
68369 #include <linux/mount.h>
68370 #include <linux/namei.h>
68371@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
68372 }
68373 }
68374 retry_deleg:
68375+
68376+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
68377+ error = -EACCES;
68378+ goto mnt_drop_write_and_out;
68379+ }
68380+
68381 mutex_lock(&inode->i_mutex);
68382 error = notify_change(path->dentry, &newattrs, &delegated_inode);
68383 mutex_unlock(&inode->i_mutex);
68384diff --git a/fs/xattr.c b/fs/xattr.c
68385index 4ef6985..a6cd6567 100644
68386--- a/fs/xattr.c
68387+++ b/fs/xattr.c
68388@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
68389 return rc;
68390 }
68391
68392+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
68393+ssize_t
68394+pax_getxattr(struct dentry *dentry, void *value, size_t size)
68395+{
68396+ struct inode *inode = dentry->d_inode;
68397+ ssize_t error;
68398+
68399+ error = inode_permission(inode, MAY_EXEC);
68400+ if (error)
68401+ return error;
68402+
68403+ if (inode->i_op->getxattr)
68404+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
68405+ else
68406+ error = -EOPNOTSUPP;
68407+
68408+ return error;
68409+}
68410+EXPORT_SYMBOL(pax_getxattr);
68411+#endif
68412+
68413 ssize_t
68414 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
68415 {
68416@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
68417 * Extended attribute SET operations
68418 */
68419 static long
68420-setxattr(struct dentry *d, const char __user *name, const void __user *value,
68421+setxattr(struct path *path, const char __user *name, const void __user *value,
68422 size_t size, int flags)
68423 {
68424 int error;
68425@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
68426 posix_acl_fix_xattr_from_user(kvalue, size);
68427 }
68428
68429- error = vfs_setxattr(d, kname, kvalue, size, flags);
68430+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
68431+ error = -EACCES;
68432+ goto out;
68433+ }
68434+
68435+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
68436 out:
68437 if (vvalue)
68438 vfree(vvalue);
68439@@ -376,7 +402,7 @@ retry:
68440 return error;
68441 error = mnt_want_write(path.mnt);
68442 if (!error) {
68443- error = setxattr(path.dentry, name, value, size, flags);
68444+ error = setxattr(&path, name, value, size, flags);
68445 mnt_drop_write(path.mnt);
68446 }
68447 path_put(&path);
68448@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
68449 audit_file(f.file);
68450 error = mnt_want_write_file(f.file);
68451 if (!error) {
68452- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
68453+ error = setxattr(&f.file->f_path, name, value, size, flags);
68454 mnt_drop_write_file(f.file);
68455 }
68456 fdput(f);
68457@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
68458 * Extended attribute REMOVE operations
68459 */
68460 static long
68461-removexattr(struct dentry *d, const char __user *name)
68462+removexattr(struct path *path, const char __user *name)
68463 {
68464 int error;
68465 char kname[XATTR_NAME_MAX + 1];
68466@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
68467 if (error < 0)
68468 return error;
68469
68470- return vfs_removexattr(d, kname);
68471+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
68472+ return -EACCES;
68473+
68474+ return vfs_removexattr(path->dentry, kname);
68475 }
68476
68477 static int path_removexattr(const char __user *pathname,
68478@@ -623,7 +652,7 @@ retry:
68479 return error;
68480 error = mnt_want_write(path.mnt);
68481 if (!error) {
68482- error = removexattr(path.dentry, name);
68483+ error = removexattr(&path, name);
68484 mnt_drop_write(path.mnt);
68485 }
68486 path_put(&path);
68487@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
68488 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
68489 {
68490 struct fd f = fdget(fd);
68491+ struct path *path;
68492 int error = -EBADF;
68493
68494 if (!f.file)
68495 return error;
68496+ path = &f.file->f_path;
68497 audit_file(f.file);
68498 error = mnt_want_write_file(f.file);
68499 if (!error) {
68500- error = removexattr(f.file->f_path.dentry, name);
68501+ error = removexattr(path, name);
68502 mnt_drop_write_file(f.file);
68503 }
68504 fdput(f);
68505diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
68506index 4e20fe7..6d1a55a 100644
68507--- a/fs/xfs/libxfs/xfs_bmap.c
68508+++ b/fs/xfs/libxfs/xfs_bmap.c
68509@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
68510
68511 #else
68512 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
68513-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
68514+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
68515 #endif /* DEBUG */
68516
68517 /*
68518diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
68519index 098cd78..724d3f8 100644
68520--- a/fs/xfs/xfs_dir2_readdir.c
68521+++ b/fs/xfs/xfs_dir2_readdir.c
68522@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
68523 ino = dp->d_ops->sf_get_ino(sfp, sfep);
68524 filetype = dp->d_ops->sf_get_ftype(sfep);
68525 ctx->pos = off & 0x7fffffff;
68526- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68527+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
68528+ char name[sfep->namelen];
68529+ memcpy(name, sfep->name, sfep->namelen);
68530+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
68531+ return 0;
68532+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68533 xfs_dir3_get_dtype(dp->i_mount, filetype)))
68534 return 0;
68535 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
68536diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
68537index a183198..6b52f52 100644
68538--- a/fs/xfs/xfs_ioctl.c
68539+++ b/fs/xfs/xfs_ioctl.c
68540@@ -119,7 +119,7 @@ xfs_find_handle(
68541 }
68542
68543 error = -EFAULT;
68544- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
68545+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
68546 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
68547 goto out_put;
68548
68549diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
68550index c31d2c2..6ec8f62 100644
68551--- a/fs/xfs/xfs_linux.h
68552+++ b/fs/xfs/xfs_linux.h
68553@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
68554 * of the compiler which do not like us using do_div in the middle
68555 * of large functions.
68556 */
68557-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68558+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68559 {
68560 __u32 mod;
68561
68562@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
68563 return 0;
68564 }
68565 #else
68566-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68567+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68568 {
68569 __u32 mod;
68570
68571diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
68572new file mode 100644
68573index 0000000..31f8fe4
68574--- /dev/null
68575+++ b/grsecurity/Kconfig
68576@@ -0,0 +1,1182 @@
68577+#
68578+# grecurity configuration
68579+#
68580+menu "Memory Protections"
68581+depends on GRKERNSEC
68582+
68583+config GRKERNSEC_KMEM
68584+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
68585+ default y if GRKERNSEC_CONFIG_AUTO
68586+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
68587+ help
68588+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
68589+ be written to or read from to modify or leak the contents of the running
68590+ kernel. /dev/port will also not be allowed to be opened, writing to
68591+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
68592+ If you have module support disabled, enabling this will close up several
68593+ ways that are currently used to insert malicious code into the running
68594+ kernel.
68595+
68596+ Even with this feature enabled, we still highly recommend that
68597+ you use the RBAC system, as it is still possible for an attacker to
68598+ modify the running kernel through other more obscure methods.
68599+
68600+ It is highly recommended that you say Y here if you meet all the
68601+ conditions above.
68602+
68603+config GRKERNSEC_VM86
68604+ bool "Restrict VM86 mode"
68605+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68606+ depends on X86_32
68607+
68608+ help
68609+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
68610+ make use of a special execution mode on 32bit x86 processors called
68611+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
68612+ video cards and will still work with this option enabled. The purpose
68613+ of the option is to prevent exploitation of emulation errors in
68614+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
68615+ Nearly all users should be able to enable this option.
68616+
68617+config GRKERNSEC_IO
68618+ bool "Disable privileged I/O"
68619+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68620+ depends on X86
68621+ select RTC_CLASS
68622+ select RTC_INTF_DEV
68623+ select RTC_DRV_CMOS
68624+
68625+ help
68626+ If you say Y here, all ioperm and iopl calls will return an error.
68627+ Ioperm and iopl can be used to modify the running kernel.
68628+ Unfortunately, some programs need this access to operate properly,
68629+ the most notable of which are XFree86 and hwclock. hwclock can be
68630+ remedied by having RTC support in the kernel, so real-time
68631+ clock support is enabled if this option is enabled, to ensure
68632+ that hwclock operates correctly. If hwclock still does not work,
68633+ either update udev or symlink /dev/rtc to /dev/rtc0.
68634+
68635+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
68636+ you may not be able to boot into a graphical environment with this
68637+ option enabled. In this case, you should use the RBAC system instead.
68638+
68639+config GRKERNSEC_BPF_HARDEN
68640+ bool "Harden BPF interpreter"
68641+ default y if GRKERNSEC_CONFIG_AUTO
68642+ help
68643+ Unlike previous versions of grsecurity that hardened both the BPF
68644+ interpreted code against corruption at rest as well as the JIT code
68645+ against JIT-spray attacks and attacker-controlled immediate values
68646+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
68647+ and will ensure the interpreted code is read-only at rest. This feature
68648+ may be removed at a later time when eBPF stabilizes to entirely revert
68649+ back to the more secure pre-3.16 BPF interpreter/JIT.
68650+
68651+ If you're using KERNEXEC, it's recommended that you enable this option
68652+ to supplement the hardening of the kernel.
68653+
68654+config GRKERNSEC_PERF_HARDEN
68655+ bool "Disable unprivileged PERF_EVENTS usage by default"
68656+ default y if GRKERNSEC_CONFIG_AUTO
68657+ depends on PERF_EVENTS
68658+ help
68659+ If you say Y here, the range of acceptable values for the
68660+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68661+ default to a new value: 3. When the sysctl is set to this value, no
68662+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68663+
68664+ Though PERF_EVENTS can be used legitimately for performance monitoring
68665+ and low-level application profiling, it is forced on regardless of
68666+ configuration, has been at fault for several vulnerabilities, and
68667+ creates new opportunities for side channels and other information leaks.
68668+
68669+ This feature puts PERF_EVENTS into a secure default state and permits
68670+ the administrator to change out of it temporarily if unprivileged
68671+ application profiling is needed.
68672+
68673+config GRKERNSEC_RAND_THREADSTACK
68674+ bool "Insert random gaps between thread stacks"
68675+ default y if GRKERNSEC_CONFIG_AUTO
68676+ depends on PAX_RANDMMAP && !PPC
68677+ help
68678+ If you say Y here, a random-sized gap will be enforced between allocated
68679+ thread stacks. Glibc's NPTL and other threading libraries that
68680+ pass MAP_STACK to the kernel for thread stack allocation are supported.
68681+ The implementation currently provides 8 bits of entropy for the gap.
68682+
68683+ Many distributions do not compile threaded remote services with the
68684+ -fstack-check argument to GCC, causing the variable-sized stack-based
68685+ allocator, alloca(), to not probe the stack on allocation. This
68686+ permits an unbounded alloca() to skip over any guard page and potentially
68687+ modify another thread's stack reliably. An enforced random gap
68688+ reduces the reliability of such an attack and increases the chance
68689+ that such a read/write to another thread's stack instead lands in
68690+ an unmapped area, causing a crash and triggering grsecurity's
68691+ anti-bruteforcing logic.
68692+
68693+config GRKERNSEC_PROC_MEMMAP
68694+ bool "Harden ASLR against information leaks and entropy reduction"
68695+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68696+ depends on PAX_NOEXEC || PAX_ASLR
68697+ help
68698+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68699+ give no information about the addresses of its mappings if
68700+ PaX features that rely on random addresses are enabled on the task.
68701+ In addition to sanitizing this information and disabling other
68702+ dangerous sources of information, this option causes reads of sensitive
68703+ /proc/<pid> entries where the file descriptor was opened in a different
68704+ task than the one performing the read. Such attempts are logged.
68705+ This option also limits argv/env strings for suid/sgid binaries
68706+ to 512KB to prevent a complete exhaustion of the stack entropy provided
68707+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68708+ binaries to prevent alternative mmap layouts from being abused.
68709+
68710+ If you use PaX it is essential that you say Y here as it closes up
68711+ several holes that make full ASLR useless locally.
68712+
68713+
68714+config GRKERNSEC_KSTACKOVERFLOW
68715+ bool "Prevent kernel stack overflows"
68716+ default y if GRKERNSEC_CONFIG_AUTO
68717+ depends on !IA64 && 64BIT
68718+ help
68719+ If you say Y here, the kernel's process stacks will be allocated
68720+ with vmalloc instead of the kernel's default allocator. This
68721+ introduces guard pages that in combination with the alloca checking
68722+ of the STACKLEAK feature prevents all forms of kernel process stack
68723+ overflow abuse. Note that this is different from kernel stack
68724+ buffer overflows.
68725+
68726+config GRKERNSEC_BRUTE
68727+ bool "Deter exploit bruteforcing"
68728+ default y if GRKERNSEC_CONFIG_AUTO
68729+ help
68730+ If you say Y here, attempts to bruteforce exploits against forking
68731+ daemons such as apache or sshd, as well as against suid/sgid binaries
68732+ will be deterred. When a child of a forking daemon is killed by PaX
68733+ or crashes due to an illegal instruction or other suspicious signal,
68734+ the parent process will be delayed 30 seconds upon every subsequent
68735+ fork until the administrator is able to assess the situation and
68736+ restart the daemon.
68737+ In the suid/sgid case, the attempt is logged, the user has all their
68738+ existing instances of the suid/sgid binary terminated and will
68739+ be unable to execute any suid/sgid binaries for 15 minutes.
68740+
68741+ It is recommended that you also enable signal logging in the auditing
68742+ section so that logs are generated when a process triggers a suspicious
68743+ signal.
68744+ If the sysctl option is enabled, a sysctl option with name
68745+ "deter_bruteforce" is created.
68746+
68747+config GRKERNSEC_MODHARDEN
68748+ bool "Harden module auto-loading"
68749+ default y if GRKERNSEC_CONFIG_AUTO
68750+ depends on MODULES
68751+ help
68752+ If you say Y here, module auto-loading in response to use of some
68753+ feature implemented by an unloaded module will be restricted to
68754+ root users. Enabling this option helps defend against attacks
68755+ by unprivileged users who abuse the auto-loading behavior to
68756+ cause a vulnerable module to load that is then exploited.
68757+
68758+ If this option prevents a legitimate use of auto-loading for a
68759+ non-root user, the administrator can execute modprobe manually
68760+ with the exact name of the module mentioned in the alert log.
68761+ Alternatively, the administrator can add the module to the list
68762+ of modules loaded at boot by modifying init scripts.
68763+
68764+ Modification of init scripts will most likely be needed on
68765+ Ubuntu servers with encrypted home directory support enabled,
68766+ as the first non-root user logging in will cause the ecb(aes),
68767+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68768+
68769+config GRKERNSEC_HIDESYM
68770+ bool "Hide kernel symbols"
68771+ default y if GRKERNSEC_CONFIG_AUTO
68772+ select PAX_USERCOPY_SLABS
68773+ help
68774+ If you say Y here, getting information on loaded modules, and
68775+ displaying all kernel symbols through a syscall will be restricted
68776+ to users with CAP_SYS_MODULE. For software compatibility reasons,
68777+ /proc/kallsyms will be restricted to the root user. The RBAC
68778+ system can hide that entry even from root.
68779+
68780+ This option also prevents leaking of kernel addresses through
68781+ several /proc entries.
68782+
68783+ Note that this option is only effective provided the following
68784+ conditions are met:
68785+ 1) The kernel using grsecurity is not precompiled by some distribution
68786+ 2) You have also enabled GRKERNSEC_DMESG
68787+ 3) You are using the RBAC system and hiding other files such as your
68788+ kernel image and System.map. Alternatively, enabling this option
68789+ causes the permissions on /boot, /lib/modules, and the kernel
68790+ source directory to change at compile time to prevent
68791+ reading by non-root users.
68792+ If the above conditions are met, this option will aid in providing a
68793+ useful protection against local kernel exploitation of overflows
68794+ and arbitrary read/write vulnerabilities.
68795+
68796+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68797+ in addition to this feature.
68798+
68799+config GRKERNSEC_RANDSTRUCT
68800+ bool "Randomize layout of sensitive kernel structures"
68801+ default y if GRKERNSEC_CONFIG_AUTO
68802+ select GRKERNSEC_HIDESYM
68803+ select MODVERSIONS if MODULES
68804+ help
68805+ If you say Y here, the layouts of a number of sensitive kernel
68806+ structures (task, fs, cred, etc) and all structures composed entirely
68807+ of function pointers (aka "ops" structs) will be randomized at compile-time.
68808+ This can introduce the requirement of an additional infoleak
68809+ vulnerability for exploits targeting these structure types.
68810+
68811+ Enabling this feature will introduce some performance impact, slightly
68812+ increase memory usage, and prevent the use of forensic tools like
68813+ Volatility against the system (unless the kernel source tree isn't
68814+ cleaned after kernel installation).
68815+
68816+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68817+ It remains after a make clean to allow for external modules to be compiled
68818+ with the existing seed and will be removed by a make mrproper or
68819+ make distclean.
68820+
68821+ Note that the implementation requires gcc 4.6.4. or newer. You may need
68822+ to install the supporting headers explicitly in addition to the normal
68823+ gcc package.
68824+
68825+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68826+ bool "Use cacheline-aware structure randomization"
68827+ depends on GRKERNSEC_RANDSTRUCT
68828+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68829+ help
68830+ If you say Y here, the RANDSTRUCT randomization will make a best effort
68831+ at restricting randomization to cacheline-sized groups of elements. It
68832+ will further not randomize bitfields in structures. This reduces the
68833+ performance hit of RANDSTRUCT at the cost of weakened randomization.
68834+
68835+config GRKERNSEC_KERN_LOCKOUT
68836+ bool "Active kernel exploit response"
68837+ default y if GRKERNSEC_CONFIG_AUTO
68838+ depends on X86 || ARM || PPC || SPARC
68839+ help
68840+ If you say Y here, when a PaX alert is triggered due to suspicious
68841+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68842+ or an OOPS occurs due to bad memory accesses, instead of just
68843+ terminating the offending process (and potentially allowing
68844+ a subsequent exploit from the same user), we will take one of two
68845+ actions:
68846+ If the user was root, we will panic the system
68847+ If the user was non-root, we will log the attempt, terminate
68848+ all processes owned by the user, then prevent them from creating
68849+ any new processes until the system is restarted
68850+ This deters repeated kernel exploitation/bruteforcing attempts
68851+ and is useful for later forensics.
68852+
68853+config GRKERNSEC_OLD_ARM_USERLAND
68854+ bool "Old ARM userland compatibility"
68855+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68856+ help
68857+ If you say Y here, stubs of executable code to perform such operations
68858+ as "compare-exchange" will be placed at fixed locations in the ARM vector
68859+ table. This is unfortunately needed for old ARM userland meant to run
68860+ across a wide range of processors. Without this option enabled,
68861+ the get_tls and data memory barrier stubs will be emulated by the kernel,
68862+ which is enough for Linaro userlands or other userlands designed for v6
68863+ and newer ARM CPUs. It's recommended that you try without this option enabled
68864+ first, and only enable it if your userland does not boot (it will likely fail
68865+ at init time).
68866+
68867+endmenu
68868+menu "Role Based Access Control Options"
68869+depends on GRKERNSEC
68870+
68871+config GRKERNSEC_RBAC_DEBUG
68872+ bool
68873+
68874+config GRKERNSEC_NO_RBAC
68875+ bool "Disable RBAC system"
68876+ help
68877+ If you say Y here, the /dev/grsec device will be removed from the kernel,
68878+ preventing the RBAC system from being enabled. You should only say Y
68879+ here if you have no intention of using the RBAC system, so as to prevent
68880+ an attacker with root access from misusing the RBAC system to hide files
68881+ and processes when loadable module support and /dev/[k]mem have been
68882+ locked down.
68883+
68884+config GRKERNSEC_ACL_HIDEKERN
68885+ bool "Hide kernel processes"
68886+ help
68887+ If you say Y here, all kernel threads will be hidden to all
68888+ processes but those whose subject has the "view hidden processes"
68889+ flag.
68890+
68891+config GRKERNSEC_ACL_MAXTRIES
68892+ int "Maximum tries before password lockout"
68893+ default 3
68894+ help
68895+ This option enforces the maximum number of times a user can attempt
68896+ to authorize themselves with the grsecurity RBAC system before being
68897+ denied the ability to attempt authorization again for a specified time.
68898+ The lower the number, the harder it will be to brute-force a password.
68899+
68900+config GRKERNSEC_ACL_TIMEOUT
68901+ int "Time to wait after max password tries, in seconds"
68902+ default 30
68903+ help
68904+ This option specifies the time the user must wait after attempting to
68905+ authorize to the RBAC system with the maximum number of invalid
68906+ passwords. The higher the number, the harder it will be to brute-force
68907+ a password.
68908+
68909+endmenu
68910+menu "Filesystem Protections"
68911+depends on GRKERNSEC
68912+
68913+config GRKERNSEC_PROC
68914+ bool "Proc restrictions"
68915+ default y if GRKERNSEC_CONFIG_AUTO
68916+ help
68917+ If you say Y here, the permissions of the /proc filesystem
68918+ will be altered to enhance system security and privacy. You MUST
68919+ choose either a user only restriction or a user and group restriction.
68920+ Depending upon the option you choose, you can either restrict users to
68921+ see only the processes they themselves run, or choose a group that can
68922+ view all processes and files normally restricted to root if you choose
68923+ the "restrict to user only" option. NOTE: If you're running identd or
68924+ ntpd as a non-root user, you will have to run it as the group you
68925+ specify here.
68926+
68927+config GRKERNSEC_PROC_USER
68928+ bool "Restrict /proc to user only"
68929+ depends on GRKERNSEC_PROC
68930+ help
68931+ If you say Y here, non-root users will only be able to view their own
68932+ processes, and restricts them from viewing network-related information,
68933+ and viewing kernel symbol and module information.
68934+
68935+config GRKERNSEC_PROC_USERGROUP
68936+ bool "Allow special group"
68937+ default y if GRKERNSEC_CONFIG_AUTO
68938+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68939+ help
68940+ If you say Y here, you will be able to select a group that will be
68941+ able to view all processes and network-related information. If you've
68942+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68943+ remain hidden. This option is useful if you want to run identd as
68944+ a non-root user. The group you select may also be chosen at boot time
68945+ via "grsec_proc_gid=" on the kernel commandline.
68946+
68947+config GRKERNSEC_PROC_GID
68948+ int "GID for special group"
68949+ depends on GRKERNSEC_PROC_USERGROUP
68950+ default 1001
68951+
68952+config GRKERNSEC_PROC_ADD
68953+ bool "Additional restrictions"
68954+ default y if GRKERNSEC_CONFIG_AUTO
68955+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68956+ help
68957+ If you say Y here, additional restrictions will be placed on
68958+ /proc that keep normal users from viewing device information and
68959+ slabinfo information that could be useful for exploits.
68960+
68961+config GRKERNSEC_LINK
68962+ bool "Linking restrictions"
68963+ default y if GRKERNSEC_CONFIG_AUTO
68964+ help
68965+ If you say Y here, /tmp race exploits will be prevented, since users
68966+ will no longer be able to follow symlinks owned by other users in
68967+ world-writable +t directories (e.g. /tmp), unless the owner of the
68968+ symlink is the owner of the directory. users will also not be
68969+ able to hardlink to files they do not own. If the sysctl option is
68970+ enabled, a sysctl option with name "linking_restrictions" is created.
68971+
68972+config GRKERNSEC_SYMLINKOWN
68973+ bool "Kernel-enforced SymlinksIfOwnerMatch"
68974+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68975+ help
68976+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
68977+ that prevents it from being used as a security feature. As Apache
68978+ verifies the symlink by performing a stat() against the target of
68979+ the symlink before it is followed, an attacker can setup a symlink
68980+ to point to a same-owned file, then replace the symlink with one
68981+ that targets another user's file just after Apache "validates" the
68982+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
68983+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68984+ will be in place for the group you specify. If the sysctl option
68985+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
68986+ created.
68987+
68988+config GRKERNSEC_SYMLINKOWN_GID
68989+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68990+ depends on GRKERNSEC_SYMLINKOWN
68991+ default 1006
68992+ help
68993+ Setting this GID determines what group kernel-enforced
68994+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68995+ is enabled, a sysctl option with name "symlinkown_gid" is created.
68996+
68997+config GRKERNSEC_FIFO
68998+ bool "FIFO restrictions"
68999+ default y if GRKERNSEC_CONFIG_AUTO
69000+ help
69001+ If you say Y here, users will not be able to write to FIFOs they don't
69002+ own in world-writable +t directories (e.g. /tmp), unless the owner of
69003+ the FIFO is the same owner of the directory it's held in. If the sysctl
69004+ option is enabled, a sysctl option with name "fifo_restrictions" is
69005+ created.
69006+
69007+config GRKERNSEC_SYSFS_RESTRICT
69008+ bool "Sysfs/debugfs restriction"
69009+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
69010+ depends on SYSFS
69011+ help
69012+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
69013+ any filesystem normally mounted under it (e.g. debugfs) will be
69014+ mostly accessible only by root. These filesystems generally provide access
69015+ to hardware and debug information that isn't appropriate for unprivileged
69016+ users of the system. Sysfs and debugfs have also become a large source
69017+ of new vulnerabilities, ranging from infoleaks to local compromise.
69018+ There has been very little oversight with an eye toward security involved
69019+ in adding new exporters of information to these filesystems, so their
69020+ use is discouraged.
69021+ For reasons of compatibility, a few directories have been whitelisted
69022+ for access by non-root users:
69023+ /sys/fs/selinux
69024+ /sys/fs/fuse
69025+ /sys/devices/system/cpu
69026+
69027+config GRKERNSEC_ROFS
69028+ bool "Runtime read-only mount protection"
69029+ depends on SYSCTL
69030+ help
69031+ If you say Y here, a sysctl option with name "romount_protect" will
69032+ be created. By setting this option to 1 at runtime, filesystems
69033+ will be protected in the following ways:
69034+ * No new writable mounts will be allowed
69035+ * Existing read-only mounts won't be able to be remounted read/write
69036+ * Write operations will be denied on all block devices
69037+ This option acts independently of grsec_lock: once it is set to 1,
69038+ it cannot be turned off. Therefore, please be mindful of the resulting
69039+ behavior if this option is enabled in an init script on a read-only
69040+ filesystem.
69041+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
69042+ and GRKERNSEC_IO should be enabled and module loading disabled via
69043+ config or at runtime.
69044+ This feature is mainly intended for secure embedded systems.
69045+
69046+
69047+config GRKERNSEC_DEVICE_SIDECHANNEL
69048+ bool "Eliminate stat/notify-based device sidechannels"
69049+ default y if GRKERNSEC_CONFIG_AUTO
69050+ help
69051+ If you say Y here, timing analyses on block or character
69052+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
69053+ will be thwarted for unprivileged users. If a process without
69054+ CAP_MKNOD stats such a device, the last access and last modify times
69055+ will match the device's create time. No access or modify events
69056+ will be triggered through inotify/dnotify/fanotify for such devices.
69057+ This feature will prevent attacks that may at a minimum
69058+ allow an attacker to determine the administrator's password length.
69059+
69060+config GRKERNSEC_CHROOT
69061+ bool "Chroot jail restrictions"
69062+ default y if GRKERNSEC_CONFIG_AUTO
69063+ help
69064+ If you say Y here, you will be able to choose several options that will
69065+ make breaking out of a chrooted jail much more difficult. If you
69066+ encounter no software incompatibilities with the following options, it
69067+ is recommended that you enable each one.
69068+
69069+ Note that the chroot restrictions are not intended to apply to "chroots"
69070+ to directories that are simple bind mounts of the global root filesystem.
69071+ For several other reasons, a user shouldn't expect any significant
69072+ security by performing such a chroot.
69073+
69074+config GRKERNSEC_CHROOT_MOUNT
69075+ bool "Deny mounts"
69076+ default y if GRKERNSEC_CONFIG_AUTO
69077+ depends on GRKERNSEC_CHROOT
69078+ help
69079+ If you say Y here, processes inside a chroot will not be able to
69080+ mount or remount filesystems. If the sysctl option is enabled, a
69081+ sysctl option with name "chroot_deny_mount" is created.
69082+
69083+config GRKERNSEC_CHROOT_DOUBLE
69084+ bool "Deny double-chroots"
69085+ default y if GRKERNSEC_CONFIG_AUTO
69086+ depends on GRKERNSEC_CHROOT
69087+ help
69088+ If you say Y here, processes inside a chroot will not be able to chroot
69089+ again outside the chroot. This is a widely used method of breaking
69090+ out of a chroot jail and should not be allowed. If the sysctl
69091+ option is enabled, a sysctl option with name
69092+ "chroot_deny_chroot" is created.
69093+
69094+config GRKERNSEC_CHROOT_PIVOT
69095+ bool "Deny pivot_root in chroot"
69096+ default y if GRKERNSEC_CONFIG_AUTO
69097+ depends on GRKERNSEC_CHROOT
69098+ help
69099+ If you say Y here, processes inside a chroot will not be able to use
69100+ a function called pivot_root() that was introduced in Linux 2.3.41. It
69101+ works similar to chroot in that it changes the root filesystem. This
69102+ function could be misused in a chrooted process to attempt to break out
69103+ of the chroot, and therefore should not be allowed. If the sysctl
69104+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
69105+ created.
69106+
69107+config GRKERNSEC_CHROOT_CHDIR
69108+ bool "Enforce chdir(\"/\") on all chroots"
69109+ default y if GRKERNSEC_CONFIG_AUTO
69110+ depends on GRKERNSEC_CHROOT
69111+ help
69112+ If you say Y here, the current working directory of all newly-chrooted
69113+ applications will be set to the the root directory of the chroot.
69114+ The man page on chroot(2) states:
69115+ Note that this call does not change the current working
69116+ directory, so that `.' can be outside the tree rooted at
69117+ `/'. In particular, the super-user can escape from a
69118+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
69119+
69120+ It is recommended that you say Y here, since it's not known to break
69121+ any software. If the sysctl option is enabled, a sysctl option with
69122+ name "chroot_enforce_chdir" is created.
69123+
69124+config GRKERNSEC_CHROOT_CHMOD
69125+ bool "Deny (f)chmod +s"
69126+ default y if GRKERNSEC_CONFIG_AUTO
69127+ depends on GRKERNSEC_CHROOT
69128+ help
69129+ If you say Y here, processes inside a chroot will not be able to chmod
69130+ or fchmod files to make them have suid or sgid bits. This protects
69131+ against another published method of breaking a chroot. If the sysctl
69132+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
69133+ created.
69134+
69135+config GRKERNSEC_CHROOT_FCHDIR
69136+ bool "Deny fchdir and fhandle out of chroot"
69137+ default y if GRKERNSEC_CONFIG_AUTO
69138+ depends on GRKERNSEC_CHROOT
69139+ help
69140+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
69141+ to a file descriptor of the chrooting process that points to a directory
69142+ outside the filesystem will be stopped. Additionally, this option prevents
69143+ use of the recently-created syscall for opening files by a guessable "file
69144+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
69145+ with name "chroot_deny_fchdir" is created.
69146+
69147+config GRKERNSEC_CHROOT_MKNOD
69148+ bool "Deny mknod"
69149+ default y if GRKERNSEC_CONFIG_AUTO
69150+ depends on GRKERNSEC_CHROOT
69151+ help
69152+ If you say Y here, processes inside a chroot will not be allowed to
69153+ mknod. The problem with using mknod inside a chroot is that it
69154+ would allow an attacker to create a device entry that is the same
69155+ as one on the physical root of your system, which could range from
69156+ anything from the console device to a device for your harddrive (which
69157+ they could then use to wipe the drive or steal data). It is recommended
69158+ that you say Y here, unless you run into software incompatibilities.
69159+ If the sysctl option is enabled, a sysctl option with name
69160+ "chroot_deny_mknod" is created.
69161+
69162+config GRKERNSEC_CHROOT_SHMAT
69163+ bool "Deny shmat() out of chroot"
69164+ default y if GRKERNSEC_CONFIG_AUTO
69165+ depends on GRKERNSEC_CHROOT
69166+ help
69167+ If you say Y here, processes inside a chroot will not be able to attach
69168+ to shared memory segments that were created outside of the chroot jail.
69169+ It is recommended that you say Y here. If the sysctl option is enabled,
69170+ a sysctl option with name "chroot_deny_shmat" is created.
69171+
69172+config GRKERNSEC_CHROOT_UNIX
69173+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
69174+ default y if GRKERNSEC_CONFIG_AUTO
69175+ depends on GRKERNSEC_CHROOT
69176+ help
69177+ If you say Y here, processes inside a chroot will not be able to
69178+ connect to abstract (meaning not belonging to a filesystem) Unix
69179+ domain sockets that were bound outside of a chroot. It is recommended
69180+ that you say Y here. If the sysctl option is enabled, a sysctl option
69181+ with name "chroot_deny_unix" is created.
69182+
69183+config GRKERNSEC_CHROOT_FINDTASK
69184+ bool "Protect outside processes"
69185+ default y if GRKERNSEC_CONFIG_AUTO
69186+ depends on GRKERNSEC_CHROOT
69187+ help
69188+ If you say Y here, processes inside a chroot will not be able to
69189+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
69190+ getsid, or view any process outside of the chroot. If the sysctl
69191+ option is enabled, a sysctl option with name "chroot_findtask" is
69192+ created.
69193+
69194+config GRKERNSEC_CHROOT_NICE
69195+ bool "Restrict priority changes"
69196+ default y if GRKERNSEC_CONFIG_AUTO
69197+ depends on GRKERNSEC_CHROOT
69198+ help
69199+ If you say Y here, processes inside a chroot will not be able to raise
69200+ the priority of processes in the chroot, or alter the priority of
69201+ processes outside the chroot. This provides more security than simply
69202+ removing CAP_SYS_NICE from the process' capability set. If the
69203+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
69204+ is created.
69205+
69206+config GRKERNSEC_CHROOT_SYSCTL
69207+ bool "Deny sysctl writes"
69208+ default y if GRKERNSEC_CONFIG_AUTO
69209+ depends on GRKERNSEC_CHROOT
69210+ help
69211+ If you say Y here, an attacker in a chroot will not be able to
69212+ write to sysctl entries, either by sysctl(2) or through a /proc
69213+ interface. It is strongly recommended that you say Y here. If the
69214+ sysctl option is enabled, a sysctl option with name
69215+ "chroot_deny_sysctl" is created.
69216+
69217+config GRKERNSEC_CHROOT_RENAME
69218+ bool "Deny bad renames"
69219+ default y if GRKERNSEC_CONFIG_AUTO
69220+ depends on GRKERNSEC_CHROOT
69221+ help
69222+ If you say Y here, an attacker in a chroot will not be able to
69223+ abuse the ability to create double chroots to break out of the
69224+ chroot by exploiting a race condition between a rename of a directory
69225+ within a chroot against an open of a symlink with relative path
69226+ components. This feature will likewise prevent an accomplice outside
69227+ a chroot from enabling a user inside the chroot to break out and make
69228+ use of their credentials on the global filesystem. Enabling this
69229+ feature is essential to prevent root users from breaking out of a
69230+ chroot. If the sysctl option is enabled, a sysctl option with name
69231+ "chroot_deny_bad_rename" is created.
69232+
69233+config GRKERNSEC_CHROOT_CAPS
69234+ bool "Capability restrictions"
69235+ default y if GRKERNSEC_CONFIG_AUTO
69236+ depends on GRKERNSEC_CHROOT
69237+ help
69238+ If you say Y here, the capabilities on all processes within a
69239+ chroot jail will be lowered to stop module insertion, raw i/o,
69240+ system and net admin tasks, rebooting the system, modifying immutable
69241+ files, modifying IPC owned by another, and changing the system time.
69242+ This is left an option because it can break some apps. Disable this
69243+ if your chrooted apps are having problems performing those kinds of
69244+ tasks. If the sysctl option is enabled, a sysctl option with
69245+ name "chroot_caps" is created.
69246+
69247+config GRKERNSEC_CHROOT_INITRD
69248+ bool "Exempt initrd tasks from restrictions"
69249+ default y if GRKERNSEC_CONFIG_AUTO
69250+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
69251+ help
69252+ If you say Y here, tasks started prior to init will be exempted from
69253+ grsecurity's chroot restrictions. This option is mainly meant to
69254+ resolve Plymouth's performing privileged operations unnecessarily
69255+ in a chroot.
69256+
69257+endmenu
69258+menu "Kernel Auditing"
69259+depends on GRKERNSEC
69260+
69261+config GRKERNSEC_AUDIT_GROUP
69262+ bool "Single group for auditing"
69263+ help
69264+ If you say Y here, the exec and chdir logging features will only operate
69265+ on a group you specify. This option is recommended if you only want to
69266+ watch certain users instead of having a large amount of logs from the
69267+ entire system. If the sysctl option is enabled, a sysctl option with
69268+ name "audit_group" is created.
69269+
69270+config GRKERNSEC_AUDIT_GID
69271+ int "GID for auditing"
69272+ depends on GRKERNSEC_AUDIT_GROUP
69273+ default 1007
69274+
69275+config GRKERNSEC_EXECLOG
69276+ bool "Exec logging"
69277+ help
69278+ If you say Y here, all execve() calls will be logged (since the
69279+ other exec*() calls are frontends to execve(), all execution
69280+ will be logged). Useful for shell-servers that like to keep track
69281+ of their users. If the sysctl option is enabled, a sysctl option with
69282+ name "exec_logging" is created.
69283+ WARNING: This option when enabled will produce a LOT of logs, especially
69284+ on an active system.
69285+
69286+config GRKERNSEC_RESLOG
69287+ bool "Resource logging"
69288+ default y if GRKERNSEC_CONFIG_AUTO
69289+ help
69290+ If you say Y here, all attempts to overstep resource limits will
69291+ be logged with the resource name, the requested size, and the current
69292+ limit. It is highly recommended that you say Y here. If the sysctl
69293+ option is enabled, a sysctl option with name "resource_logging" is
69294+ created. If the RBAC system is enabled, the sysctl value is ignored.
69295+
69296+config GRKERNSEC_CHROOT_EXECLOG
69297+ bool "Log execs within chroot"
69298+ help
69299+ If you say Y here, all executions inside a chroot jail will be logged
69300+ to syslog. This can cause a large amount of logs if certain
69301+ applications (eg. djb's daemontools) are installed on the system, and
69302+ is therefore left as an option. If the sysctl option is enabled, a
69303+ sysctl option with name "chroot_execlog" is created.
69304+
69305+config GRKERNSEC_AUDIT_PTRACE
69306+ bool "Ptrace logging"
69307+ help
69308+ If you say Y here, all attempts to attach to a process via ptrace
69309+ will be logged. If the sysctl option is enabled, a sysctl option
69310+ with name "audit_ptrace" is created.
69311+
69312+config GRKERNSEC_AUDIT_CHDIR
69313+ bool "Chdir logging"
69314+ help
69315+ If you say Y here, all chdir() calls will be logged. If the sysctl
69316+ option is enabled, a sysctl option with name "audit_chdir" is created.
69317+
69318+config GRKERNSEC_AUDIT_MOUNT
69319+ bool "(Un)Mount logging"
69320+ help
69321+ If you say Y here, all mounts and unmounts will be logged. If the
69322+ sysctl option is enabled, a sysctl option with name "audit_mount" is
69323+ created.
69324+
69325+config GRKERNSEC_SIGNAL
69326+ bool "Signal logging"
69327+ default y if GRKERNSEC_CONFIG_AUTO
69328+ help
69329+ If you say Y here, certain important signals will be logged, such as
69330+ SIGSEGV, which will as a result inform you of when a error in a program
69331+ occurred, which in some cases could mean a possible exploit attempt.
69332+ If the sysctl option is enabled, a sysctl option with name
69333+ "signal_logging" is created.
69334+
69335+config GRKERNSEC_FORKFAIL
69336+ bool "Fork failure logging"
69337+ help
69338+ If you say Y here, all failed fork() attempts will be logged.
69339+ This could suggest a fork bomb, or someone attempting to overstep
69340+ their process limit. If the sysctl option is enabled, a sysctl option
69341+ with name "forkfail_logging" is created.
69342+
69343+config GRKERNSEC_TIME
69344+ bool "Time change logging"
69345+ default y if GRKERNSEC_CONFIG_AUTO
69346+ help
69347+ If you say Y here, any changes of the system clock will be logged.
69348+ If the sysctl option is enabled, a sysctl option with name
69349+ "timechange_logging" is created.
69350+
69351+config GRKERNSEC_PROC_IPADDR
69352+ bool "/proc/<pid>/ipaddr support"
69353+ default y if GRKERNSEC_CONFIG_AUTO
69354+ help
69355+ If you say Y here, a new entry will be added to each /proc/<pid>
69356+ directory that contains the IP address of the person using the task.
69357+ The IP is carried across local TCP and AF_UNIX stream sockets.
69358+ This information can be useful for IDS/IPSes to perform remote response
69359+ to a local attack. The entry is readable by only the owner of the
69360+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
69361+ the RBAC system), and thus does not create privacy concerns.
69362+
69363+config GRKERNSEC_RWXMAP_LOG
69364+ bool 'Denied RWX mmap/mprotect logging'
69365+ default y if GRKERNSEC_CONFIG_AUTO
69366+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
69367+ help
69368+ If you say Y here, calls to mmap() and mprotect() with explicit
69369+ usage of PROT_WRITE and PROT_EXEC together will be logged when
69370+ denied by the PAX_MPROTECT feature. This feature will also
69371+ log other problematic scenarios that can occur when PAX_MPROTECT
69372+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
69373+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
69374+ is created.
69375+
69376+endmenu
69377+
69378+menu "Executable Protections"
69379+depends on GRKERNSEC
69380+
69381+config GRKERNSEC_DMESG
69382+ bool "Dmesg(8) restriction"
69383+ default y if GRKERNSEC_CONFIG_AUTO
69384+ help
69385+ If you say Y here, non-root users will not be able to use dmesg(8)
69386+ to view the contents of the kernel's circular log buffer.
69387+ The kernel's log buffer often contains kernel addresses and other
69388+ identifying information useful to an attacker in fingerprinting a
69389+ system for a targeted exploit.
69390+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
69391+ created.
69392+
69393+config GRKERNSEC_HARDEN_PTRACE
69394+ bool "Deter ptrace-based process snooping"
69395+ default y if GRKERNSEC_CONFIG_AUTO
69396+ help
69397+ If you say Y here, TTY sniffers and other malicious monitoring
69398+ programs implemented through ptrace will be defeated. If you
69399+ have been using the RBAC system, this option has already been
69400+ enabled for several years for all users, with the ability to make
69401+ fine-grained exceptions.
69402+
69403+ This option only affects the ability of non-root users to ptrace
69404+ processes that are not a descendent of the ptracing process.
69405+ This means that strace ./binary and gdb ./binary will still work,
69406+ but attaching to arbitrary processes will not. If the sysctl
69407+ option is enabled, a sysctl option with name "harden_ptrace" is
69408+ created.
69409+
69410+config GRKERNSEC_PTRACE_READEXEC
69411+ bool "Require read access to ptrace sensitive binaries"
69412+ default y if GRKERNSEC_CONFIG_AUTO
69413+ help
69414+ If you say Y here, unprivileged users will not be able to ptrace unreadable
69415+ binaries. This option is useful in environments that
69416+ remove the read bits (e.g. file mode 4711) from suid binaries to
69417+ prevent infoleaking of their contents. This option adds
69418+ consistency to the use of that file mode, as the binary could normally
69419+ be read out when run without privileges while ptracing.
69420+
69421+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
69422+ is created.
69423+
69424+config GRKERNSEC_SETXID
69425+ bool "Enforce consistent multithreaded privileges"
69426+ default y if GRKERNSEC_CONFIG_AUTO
69427+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
69428+ help
69429+ If you say Y here, a change from a root uid to a non-root uid
69430+ in a multithreaded application will cause the resulting uids,
69431+ gids, supplementary groups, and capabilities in that thread
69432+ to be propagated to the other threads of the process. In most
69433+ cases this is unnecessary, as glibc will emulate this behavior
69434+ on behalf of the application. Other libcs do not act in the
69435+ same way, allowing the other threads of the process to continue
69436+ running with root privileges. If the sysctl option is enabled,
69437+ a sysctl option with name "consistent_setxid" is created.
69438+
69439+config GRKERNSEC_HARDEN_IPC
69440+ bool "Disallow access to overly-permissive IPC objects"
69441+ default y if GRKERNSEC_CONFIG_AUTO
69442+ depends on SYSVIPC
69443+ help
69444+ If you say Y here, access to overly-permissive IPC objects (shared
69445+ memory, message queues, and semaphores) will be denied for processes
69446+ given the following criteria beyond normal permission checks:
69447+ 1) If the IPC object is world-accessible and the euid doesn't match
69448+ that of the creator or current uid for the IPC object
69449+ 2) If the IPC object is group-accessible and the egid doesn't
69450+ match that of the creator or current gid for the IPC object
69451+ It's a common error to grant too much permission to these objects,
69452+ with impact ranging from denial of service and information leaking to
69453+ privilege escalation. This feature was developed in response to
69454+ research by Tim Brown:
69455+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
69456+ who found hundreds of such insecure usages. Processes with
69457+ CAP_IPC_OWNER are still permitted to access these IPC objects.
69458+ If the sysctl option is enabled, a sysctl option with name
69459+ "harden_ipc" is created.
69460+
69461+config GRKERNSEC_TPE
69462+ bool "Trusted Path Execution (TPE)"
69463+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
69464+ help
69465+ If you say Y here, you will be able to choose a gid to add to the
69466+ supplementary groups of users you want to mark as "untrusted."
69467+ These users will not be able to execute any files that are not in
69468+ root-owned directories writable only by root. If the sysctl option
69469+ is enabled, a sysctl option with name "tpe" is created.
69470+
69471+config GRKERNSEC_TPE_ALL
69472+ bool "Partially restrict all non-root users"
69473+ depends on GRKERNSEC_TPE
69474+ help
69475+ If you say Y here, all non-root users will be covered under
69476+ a weaker TPE restriction. This is separate from, and in addition to,
69477+ the main TPE options that you have selected elsewhere. Thus, if a
69478+ "trusted" GID is chosen, this restriction applies to even that GID.
69479+ Under this restriction, all non-root users will only be allowed to
69480+ execute files in directories they own that are not group or
69481+ world-writable, or in directories owned by root and writable only by
69482+ root. If the sysctl option is enabled, a sysctl option with name
69483+ "tpe_restrict_all" is created.
69484+
69485+config GRKERNSEC_TPE_INVERT
69486+ bool "Invert GID option"
69487+ depends on GRKERNSEC_TPE
69488+ help
69489+ If you say Y here, the group you specify in the TPE configuration will
69490+ decide what group TPE restrictions will be *disabled* for. This
69491+ option is useful if you want TPE restrictions to be applied to most
69492+ users on the system. If the sysctl option is enabled, a sysctl option
69493+ with name "tpe_invert" is created. Unlike other sysctl options, this
69494+ entry will default to on for backward-compatibility.
69495+
69496+config GRKERNSEC_TPE_GID
69497+ int
69498+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
69499+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
69500+
69501+config GRKERNSEC_TPE_UNTRUSTED_GID
69502+ int "GID for TPE-untrusted users"
69503+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
69504+ default 1005
69505+ help
69506+ Setting this GID determines what group TPE restrictions will be
69507+ *enabled* for. If the sysctl option is enabled, a sysctl option
69508+ with name "tpe_gid" is created.
69509+
69510+config GRKERNSEC_TPE_TRUSTED_GID
69511+ int "GID for TPE-trusted users"
69512+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
69513+ default 1005
69514+ help
69515+ Setting this GID determines what group TPE restrictions will be
69516+ *disabled* for. If the sysctl option is enabled, a sysctl option
69517+ with name "tpe_gid" is created.
69518+
69519+endmenu
69520+menu "Network Protections"
69521+depends on GRKERNSEC
69522+
69523+config GRKERNSEC_BLACKHOLE
69524+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
69525+ default y if GRKERNSEC_CONFIG_AUTO
69526+ depends on NET
69527+ help
69528+ If you say Y here, neither TCP resets nor ICMP
69529+ destination-unreachable packets will be sent in response to packets
69530+ sent to ports for which no associated listening process exists.
69531+ It will also prevent the sending of ICMP protocol unreachable packets
69532+ in response to packets with unknown protocols.
69533+ This feature supports both IPV4 and IPV6 and exempts the
69534+ loopback interface from blackholing. Enabling this feature
69535+ makes a host more resilient to DoS attacks and reduces network
69536+ visibility against scanners.
69537+
69538+ The blackhole feature as-implemented is equivalent to the FreeBSD
69539+ blackhole feature, as it prevents RST responses to all packets, not
69540+ just SYNs. Under most application behavior this causes no
69541+ problems, but applications (like haproxy) may not close certain
69542+ connections in a way that cleanly terminates them on the remote
69543+ end, leaving the remote host in LAST_ACK state. Because of this
69544+ side-effect and to prevent intentional LAST_ACK DoSes, this
69545+ feature also adds automatic mitigation against such attacks.
69546+ The mitigation drastically reduces the amount of time a socket
69547+ can spend in LAST_ACK state. If you're using haproxy and not
69548+ all servers it connects to have this option enabled, consider
69549+ disabling this feature on the haproxy host.
69550+
69551+ If the sysctl option is enabled, two sysctl options with names
69552+ "ip_blackhole" and "lastack_retries" will be created.
69553+ While "ip_blackhole" takes the standard zero/non-zero on/off
69554+ toggle, "lastack_retries" uses the same kinds of values as
69555+ "tcp_retries1" and "tcp_retries2". The default value of 4
69556+ prevents a socket from lasting more than 45 seconds in LAST_ACK
69557+ state.
69558+
69559+config GRKERNSEC_NO_SIMULT_CONNECT
69560+ bool "Disable TCP Simultaneous Connect"
69561+ default y if GRKERNSEC_CONFIG_AUTO
69562+ depends on NET
69563+ help
69564+ If you say Y here, a feature by Willy Tarreau will be enabled that
69565+ removes a weakness in Linux's strict implementation of TCP that
69566+ allows two clients to connect to each other without either entering
69567+ a listening state. The weakness allows an attacker to easily prevent
69568+ a client from connecting to a known server provided the source port
69569+ for the connection is guessed correctly.
69570+
69571+ As the weakness could be used to prevent an antivirus or IPS from
69572+ fetching updates, or prevent an SSL gateway from fetching a CRL,
69573+ it should be eliminated by enabling this option. Though Linux is
69574+ one of few operating systems supporting simultaneous connect, it
69575+ has no legitimate use in practice and is rarely supported by firewalls.
69576+
69577+config GRKERNSEC_SOCKET
69578+ bool "Socket restrictions"
69579+ depends on NET
69580+ help
69581+ If you say Y here, you will be able to choose from several options.
69582+ If you assign a GID on your system and add it to the supplementary
69583+ groups of users you want to restrict socket access to, this patch
69584+ will perform up to three things, based on the option(s) you choose.
69585+
69586+config GRKERNSEC_SOCKET_ALL
69587+ bool "Deny any sockets to group"
69588+ depends on GRKERNSEC_SOCKET
69589+ help
69590+ If you say Y here, you will be able to choose a GID of whose users will
69591+ be unable to connect to other hosts from your machine or run server
69592+ applications from your machine. If the sysctl option is enabled, a
69593+ sysctl option with name "socket_all" is created.
69594+
69595+config GRKERNSEC_SOCKET_ALL_GID
69596+ int "GID to deny all sockets for"
69597+ depends on GRKERNSEC_SOCKET_ALL
69598+ default 1004
69599+ help
69600+ Here you can choose the GID to disable socket access for. Remember to
69601+ add the users you want socket access disabled for to the GID
69602+ specified here. If the sysctl option is enabled, a sysctl option
69603+ with name "socket_all_gid" is created.
69604+
69605+config GRKERNSEC_SOCKET_CLIENT
69606+ bool "Deny client sockets to group"
69607+ depends on GRKERNSEC_SOCKET
69608+ help
69609+ If you say Y here, you will be able to choose a GID of whose users will
69610+ be unable to connect to other hosts from your machine, but will be
69611+ able to run servers. If this option is enabled, all users in the group
69612+ you specify will have to use passive mode when initiating ftp transfers
69613+ from the shell on your machine. If the sysctl option is enabled, a
69614+ sysctl option with name "socket_client" is created.
69615+
69616+config GRKERNSEC_SOCKET_CLIENT_GID
69617+ int "GID to deny client sockets for"
69618+ depends on GRKERNSEC_SOCKET_CLIENT
69619+ default 1003
69620+ help
69621+ Here you can choose the GID to disable client socket access for.
69622+ Remember to add the users you want client socket access disabled for to
69623+ the GID specified here. If the sysctl option is enabled, a sysctl
69624+ option with name "socket_client_gid" is created.
69625+
69626+config GRKERNSEC_SOCKET_SERVER
69627+ bool "Deny server sockets to group"
69628+ depends on GRKERNSEC_SOCKET
69629+ help
69630+ If you say Y here, you will be able to choose a GID of whose users will
69631+ be unable to run server applications from your machine. If the sysctl
69632+ option is enabled, a sysctl option with name "socket_server" is created.
69633+
69634+config GRKERNSEC_SOCKET_SERVER_GID
69635+ int "GID to deny server sockets for"
69636+ depends on GRKERNSEC_SOCKET_SERVER
69637+ default 1002
69638+ help
69639+ Here you can choose the GID to disable server socket access for.
69640+ Remember to add the users you want server socket access disabled for to
69641+ the GID specified here. If the sysctl option is enabled, a sysctl
69642+ option with name "socket_server_gid" is created.
69643+
69644+endmenu
69645+
69646+menu "Physical Protections"
69647+depends on GRKERNSEC
69648+
69649+config GRKERNSEC_DENYUSB
69650+ bool "Deny new USB connections after toggle"
69651+ default y if GRKERNSEC_CONFIG_AUTO
69652+ depends on SYSCTL && USB_SUPPORT
69653+ help
69654+ If you say Y here, a new sysctl option with name "deny_new_usb"
69655+ will be created. Setting its value to 1 will prevent any new
69656+ USB devices from being recognized by the OS. Any attempted USB
69657+ device insertion will be logged. This option is intended to be
69658+ used against custom USB devices designed to exploit vulnerabilities
69659+ in various USB device drivers.
69660+
69661+ For greatest effectiveness, this sysctl should be set after any
69662+ relevant init scripts. This option is safe to enable in distros
69663+ as each user can choose whether or not to toggle the sysctl.
69664+
69665+config GRKERNSEC_DENYUSB_FORCE
69666+ bool "Reject all USB devices not connected at boot"
69667+ select USB
69668+ depends on GRKERNSEC_DENYUSB
69669+ help
69670+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69671+ that doesn't involve a sysctl entry. This option should only be
69672+ enabled if you're sure you want to deny all new USB connections
69673+ at runtime and don't want to modify init scripts. This should not
69674+ be enabled by distros. It forces the core USB code to be built
69675+ into the kernel image so that all devices connected at boot time
69676+ can be recognized and new USB device connections can be prevented
69677+ prior to init running.
69678+
69679+endmenu
69680+
69681+menu "Sysctl Support"
69682+depends on GRKERNSEC && SYSCTL
69683+
69684+config GRKERNSEC_SYSCTL
69685+ bool "Sysctl support"
69686+ default y if GRKERNSEC_CONFIG_AUTO
69687+ help
69688+ If you say Y here, you will be able to change the options that
69689+ grsecurity runs with at bootup, without having to recompile your
69690+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69691+ to enable (1) or disable (0) various features. All the sysctl entries
69692+ are mutable until the "grsec_lock" entry is set to a non-zero value.
69693+ All features enabled in the kernel configuration are disabled at boot
69694+ if you do not say Y to the "Turn on features by default" option.
69695+ All options should be set at startup, and the grsec_lock entry should
69696+ be set to a non-zero value after all the options are set.
69697+ *THIS IS EXTREMELY IMPORTANT*
69698+
69699+config GRKERNSEC_SYSCTL_DISTRO
69700+ bool "Extra sysctl support for distro makers (READ HELP)"
69701+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69702+ help
69703+ If you say Y here, additional sysctl options will be created
69704+ for features that affect processes running as root. Therefore,
69705+ it is critical when using this option that the grsec_lock entry be
69706+ enabled after boot. Only distros with prebuilt kernel packages
69707+ with this option enabled that can ensure grsec_lock is enabled
69708+ after boot should use this option.
69709+ *Failure to set grsec_lock after boot makes all grsec features
69710+ this option covers useless*
69711+
69712+ Currently this option creates the following sysctl entries:
69713+ "Disable Privileged I/O": "disable_priv_io"
69714+
69715+config GRKERNSEC_SYSCTL_ON
69716+ bool "Turn on features by default"
69717+ default y if GRKERNSEC_CONFIG_AUTO
69718+ depends on GRKERNSEC_SYSCTL
69719+ help
69720+ If you say Y here, instead of having all features enabled in the
69721+ kernel configuration disabled at boot time, the features will be
69722+ enabled at boot time. It is recommended you say Y here unless
69723+ there is some reason you would want all sysctl-tunable features to
69724+ be disabled by default. As mentioned elsewhere, it is important
69725+ to enable the grsec_lock entry once you have finished modifying
69726+ the sysctl entries.
69727+
69728+endmenu
69729+menu "Logging Options"
69730+depends on GRKERNSEC
69731+
69732+config GRKERNSEC_FLOODTIME
69733+ int "Seconds in between log messages (minimum)"
69734+ default 10
69735+ help
69736+ This option allows you to enforce the number of seconds between
69737+ grsecurity log messages. The default should be suitable for most
69738+ people, however, if you choose to change it, choose a value small enough
69739+ to allow informative logs to be produced, but large enough to
69740+ prevent flooding.
69741+
69742+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69743+ any rate limiting on grsecurity log messages.
69744+
69745+config GRKERNSEC_FLOODBURST
69746+ int "Number of messages in a burst (maximum)"
69747+ default 6
69748+ help
69749+ This option allows you to choose the maximum number of messages allowed
69750+ within the flood time interval you chose in a separate option. The
69751+ default should be suitable for most people, however if you find that
69752+ many of your logs are being interpreted as flooding, you may want to
69753+ raise this value.
69754+
69755+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69756+ any rate limiting on grsecurity log messages.
69757+
69758+endmenu
69759diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69760new file mode 100644
69761index 0000000..30ababb
69762--- /dev/null
69763+++ b/grsecurity/Makefile
69764@@ -0,0 +1,54 @@
69765+# grsecurity – access control and security hardening for Linux
69766+# All code in this directory and various hooks located throughout the Linux kernel are
69767+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69768+# http://www.grsecurity.net spender@grsecurity.net
69769+#
69770+# This program is free software; you can redistribute it and/or
69771+# modify it under the terms of the GNU General Public License version 2
69772+# as published by the Free Software Foundation.
69773+#
69774+# This program is distributed in the hope that it will be useful,
69775+# but WITHOUT ANY WARRANTY; without even the implied warranty of
69776+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69777+# GNU General Public License for more details.
69778+#
69779+# You should have received a copy of the GNU General Public License
69780+# along with this program; if not, write to the Free Software
69781+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69782+
69783+KBUILD_CFLAGS += -Werror
69784+
69785+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69786+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
69787+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69788+ grsec_usb.o grsec_ipc.o grsec_proc.o
69789+
69790+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69791+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69792+ gracl_learn.o grsec_log.o gracl_policy.o
69793+ifdef CONFIG_COMPAT
69794+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69795+endif
69796+
69797+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69798+
69799+ifdef CONFIG_NET
69800+obj-y += grsec_sock.o
69801+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69802+endif
69803+
69804+ifndef CONFIG_GRKERNSEC
69805+obj-y += grsec_disabled.o
69806+endif
69807+
69808+ifdef CONFIG_GRKERNSEC_HIDESYM
69809+extra-y := grsec_hidesym.o
69810+$(obj)/grsec_hidesym.o:
69811+ @-chmod -f 500 /boot
69812+ @-chmod -f 500 /lib/modules
69813+ @-chmod -f 500 /lib64/modules
69814+ @-chmod -f 500 /lib32/modules
69815+ @-chmod -f 700 .
69816+ @-chmod -f 700 $(objtree)
69817+ @echo ' grsec: protected kernel image paths'
69818+endif
69819diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69820new file mode 100644
69821index 0000000..6c1e154
69822--- /dev/null
69823+++ b/grsecurity/gracl.c
69824@@ -0,0 +1,2749 @@
69825+#include <linux/kernel.h>
69826+#include <linux/module.h>
69827+#include <linux/sched.h>
69828+#include <linux/mm.h>
69829+#include <linux/file.h>
69830+#include <linux/fs.h>
69831+#include <linux/namei.h>
69832+#include <linux/mount.h>
69833+#include <linux/tty.h>
69834+#include <linux/proc_fs.h>
69835+#include <linux/lglock.h>
69836+#include <linux/slab.h>
69837+#include <linux/vmalloc.h>
69838+#include <linux/types.h>
69839+#include <linux/sysctl.h>
69840+#include <linux/netdevice.h>
69841+#include <linux/ptrace.h>
69842+#include <linux/gracl.h>
69843+#include <linux/gralloc.h>
69844+#include <linux/security.h>
69845+#include <linux/grinternal.h>
69846+#include <linux/pid_namespace.h>
69847+#include <linux/stop_machine.h>
69848+#include <linux/fdtable.h>
69849+#include <linux/percpu.h>
69850+#include <linux/lglock.h>
69851+#include <linux/hugetlb.h>
69852+#include <linux/posix-timers.h>
69853+#include <linux/prefetch.h>
69854+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69855+#include <linux/magic.h>
69856+#include <linux/pagemap.h>
69857+#include "../fs/btrfs/async-thread.h"
69858+#include "../fs/btrfs/ctree.h"
69859+#include "../fs/btrfs/btrfs_inode.h"
69860+#endif
69861+#include "../fs/mount.h"
69862+
69863+#include <asm/uaccess.h>
69864+#include <asm/errno.h>
69865+#include <asm/mman.h>
69866+
69867+#define FOR_EACH_ROLE_START(role) \
69868+ role = running_polstate.role_list; \
69869+ while (role) {
69870+
69871+#define FOR_EACH_ROLE_END(role) \
69872+ role = role->prev; \
69873+ }
69874+
69875+extern struct path gr_real_root;
69876+
69877+static struct gr_policy_state running_polstate;
69878+struct gr_policy_state *polstate = &running_polstate;
69879+extern struct gr_alloc_state *current_alloc_state;
69880+
69881+extern char *gr_shared_page[4];
69882+DEFINE_RWLOCK(gr_inode_lock);
69883+
69884+static unsigned int gr_status __read_only = GR_STATUS_INIT;
69885+
69886+#ifdef CONFIG_NET
69887+extern struct vfsmount *sock_mnt;
69888+#endif
69889+
69890+extern struct vfsmount *pipe_mnt;
69891+extern struct vfsmount *shm_mnt;
69892+
69893+#ifdef CONFIG_HUGETLBFS
69894+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69895+#endif
69896+
69897+extern u16 acl_sp_role_value;
69898+extern struct acl_object_label *fakefs_obj_rw;
69899+extern struct acl_object_label *fakefs_obj_rwx;
69900+
69901+int gr_acl_is_enabled(void)
69902+{
69903+ return (gr_status & GR_READY);
69904+}
69905+
69906+void gr_enable_rbac_system(void)
69907+{
69908+ pax_open_kernel();
69909+ gr_status |= GR_READY;
69910+ pax_close_kernel();
69911+}
69912+
69913+int gr_rbac_disable(void *unused)
69914+{
69915+ pax_open_kernel();
69916+ gr_status &= ~GR_READY;
69917+ pax_close_kernel();
69918+
69919+ return 0;
69920+}
69921+
69922+static inline dev_t __get_dev(const struct dentry *dentry)
69923+{
69924+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69925+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69926+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69927+ else
69928+#endif
69929+ return dentry->d_sb->s_dev;
69930+}
69931+
69932+static inline u64 __get_ino(const struct dentry *dentry)
69933+{
69934+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69935+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69936+ return btrfs_ino(dentry->d_inode);
69937+ else
69938+#endif
69939+ return dentry->d_inode->i_ino;
69940+}
69941+
69942+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69943+{
69944+ return __get_dev(dentry);
69945+}
69946+
69947+u64 gr_get_ino_from_dentry(struct dentry *dentry)
69948+{
69949+ return __get_ino(dentry);
69950+}
69951+
69952+static char gr_task_roletype_to_char(struct task_struct *task)
69953+{
69954+ switch (task->role->roletype &
69955+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69956+ GR_ROLE_SPECIAL)) {
69957+ case GR_ROLE_DEFAULT:
69958+ return 'D';
69959+ case GR_ROLE_USER:
69960+ return 'U';
69961+ case GR_ROLE_GROUP:
69962+ return 'G';
69963+ case GR_ROLE_SPECIAL:
69964+ return 'S';
69965+ }
69966+
69967+ return 'X';
69968+}
69969+
69970+char gr_roletype_to_char(void)
69971+{
69972+ return gr_task_roletype_to_char(current);
69973+}
69974+
69975+__inline__ int
69976+gr_acl_tpe_check(void)
69977+{
69978+ if (unlikely(!(gr_status & GR_READY)))
69979+ return 0;
69980+ if (current->role->roletype & GR_ROLE_TPE)
69981+ return 1;
69982+ else
69983+ return 0;
69984+}
69985+
69986+int
69987+gr_handle_rawio(const struct inode *inode)
69988+{
69989+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69990+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69991+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69992+ !capable(CAP_SYS_RAWIO))
69993+ return 1;
69994+#endif
69995+ return 0;
69996+}
69997+
69998+int
69999+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
70000+{
70001+ if (likely(lena != lenb))
70002+ return 0;
70003+
70004+ return !memcmp(a, b, lena);
70005+}
70006+
70007+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
70008+{
70009+ *buflen -= namelen;
70010+ if (*buflen < 0)
70011+ return -ENAMETOOLONG;
70012+ *buffer -= namelen;
70013+ memcpy(*buffer, str, namelen);
70014+ return 0;
70015+}
70016+
70017+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
70018+{
70019+ return prepend(buffer, buflen, name->name, name->len);
70020+}
70021+
70022+static int prepend_path(const struct path *path, struct path *root,
70023+ char **buffer, int *buflen)
70024+{
70025+ struct dentry *dentry = path->dentry;
70026+ struct vfsmount *vfsmnt = path->mnt;
70027+ struct mount *mnt = real_mount(vfsmnt);
70028+ bool slash = false;
70029+ int error = 0;
70030+
70031+ while (dentry != root->dentry || vfsmnt != root->mnt) {
70032+ struct dentry * parent;
70033+
70034+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
70035+ /* Global root? */
70036+ if (!mnt_has_parent(mnt)) {
70037+ goto out;
70038+ }
70039+ dentry = mnt->mnt_mountpoint;
70040+ mnt = mnt->mnt_parent;
70041+ vfsmnt = &mnt->mnt;
70042+ continue;
70043+ }
70044+ parent = dentry->d_parent;
70045+ prefetch(parent);
70046+ spin_lock(&dentry->d_lock);
70047+ error = prepend_name(buffer, buflen, &dentry->d_name);
70048+ spin_unlock(&dentry->d_lock);
70049+ if (!error)
70050+ error = prepend(buffer, buflen, "/", 1);
70051+ if (error)
70052+ break;
70053+
70054+ slash = true;
70055+ dentry = parent;
70056+ }
70057+
70058+out:
70059+ if (!error && !slash)
70060+ error = prepend(buffer, buflen, "/", 1);
70061+
70062+ return error;
70063+}
70064+
70065+/* this must be called with mount_lock and rename_lock held */
70066+
70067+static char *__our_d_path(const struct path *path, struct path *root,
70068+ char *buf, int buflen)
70069+{
70070+ char *res = buf + buflen;
70071+ int error;
70072+
70073+ prepend(&res, &buflen, "\0", 1);
70074+ error = prepend_path(path, root, &res, &buflen);
70075+ if (error)
70076+ return ERR_PTR(error);
70077+
70078+ return res;
70079+}
70080+
70081+static char *
70082+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
70083+{
70084+ char *retval;
70085+
70086+ retval = __our_d_path(path, root, buf, buflen);
70087+ if (unlikely(IS_ERR(retval)))
70088+ retval = strcpy(buf, "<path too long>");
70089+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
70090+ retval[1] = '\0';
70091+
70092+ return retval;
70093+}
70094+
70095+static char *
70096+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70097+ char *buf, int buflen)
70098+{
70099+ struct path path;
70100+ char *res;
70101+
70102+ path.dentry = (struct dentry *)dentry;
70103+ path.mnt = (struct vfsmount *)vfsmnt;
70104+
70105+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
70106+ by the RBAC system */
70107+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
70108+
70109+ return res;
70110+}
70111+
70112+static char *
70113+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70114+ char *buf, int buflen)
70115+{
70116+ char *res;
70117+ struct path path;
70118+ struct path root;
70119+ struct task_struct *reaper = init_pid_ns.child_reaper;
70120+
70121+ path.dentry = (struct dentry *)dentry;
70122+ path.mnt = (struct vfsmount *)vfsmnt;
70123+
70124+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
70125+ get_fs_root(reaper->fs, &root);
70126+
70127+ read_seqlock_excl(&mount_lock);
70128+ write_seqlock(&rename_lock);
70129+ res = gen_full_path(&path, &root, buf, buflen);
70130+ write_sequnlock(&rename_lock);
70131+ read_sequnlock_excl(&mount_lock);
70132+
70133+ path_put(&root);
70134+ return res;
70135+}
70136+
70137+char *
70138+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70139+{
70140+ char *ret;
70141+ read_seqlock_excl(&mount_lock);
70142+ write_seqlock(&rename_lock);
70143+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70144+ PAGE_SIZE);
70145+ write_sequnlock(&rename_lock);
70146+ read_sequnlock_excl(&mount_lock);
70147+ return ret;
70148+}
70149+
70150+static char *
70151+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70152+{
70153+ char *ret;
70154+ char *buf;
70155+ int buflen;
70156+
70157+ read_seqlock_excl(&mount_lock);
70158+ write_seqlock(&rename_lock);
70159+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
70160+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
70161+ buflen = (int)(ret - buf);
70162+ if (buflen >= 5)
70163+ prepend(&ret, &buflen, "/proc", 5);
70164+ else
70165+ ret = strcpy(buf, "<path too long>");
70166+ write_sequnlock(&rename_lock);
70167+ read_sequnlock_excl(&mount_lock);
70168+ return ret;
70169+}
70170+
70171+char *
70172+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
70173+{
70174+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70175+ PAGE_SIZE);
70176+}
70177+
70178+char *
70179+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
70180+{
70181+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
70182+ PAGE_SIZE);
70183+}
70184+
70185+char *
70186+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
70187+{
70188+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
70189+ PAGE_SIZE);
70190+}
70191+
70192+char *
70193+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
70194+{
70195+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
70196+ PAGE_SIZE);
70197+}
70198+
70199+char *
70200+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
70201+{
70202+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
70203+ PAGE_SIZE);
70204+}
70205+
70206+__inline__ __u32
70207+to_gr_audit(const __u32 reqmode)
70208+{
70209+ /* masks off auditable permission flags, then shifts them to create
70210+ auditing flags, and adds the special case of append auditing if
70211+ we're requesting write */
70212+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
70213+}
70214+
70215+struct acl_role_label *
70216+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
70217+ const gid_t gid)
70218+{
70219+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
70220+ struct acl_role_label *match;
70221+ struct role_allowed_ip *ipp;
70222+ unsigned int x;
70223+ u32 curr_ip = task->signal->saved_ip;
70224+
70225+ match = state->acl_role_set.r_hash[index];
70226+
70227+ while (match) {
70228+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
70229+ for (x = 0; x < match->domain_child_num; x++) {
70230+ if (match->domain_children[x] == uid)
70231+ goto found;
70232+ }
70233+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
70234+ break;
70235+ match = match->next;
70236+ }
70237+found:
70238+ if (match == NULL) {
70239+ try_group:
70240+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
70241+ match = state->acl_role_set.r_hash[index];
70242+
70243+ while (match) {
70244+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
70245+ for (x = 0; x < match->domain_child_num; x++) {
70246+ if (match->domain_children[x] == gid)
70247+ goto found2;
70248+ }
70249+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
70250+ break;
70251+ match = match->next;
70252+ }
70253+found2:
70254+ if (match == NULL)
70255+ match = state->default_role;
70256+ if (match->allowed_ips == NULL)
70257+ return match;
70258+ else {
70259+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70260+ if (likely
70261+ ((ntohl(curr_ip) & ipp->netmask) ==
70262+ (ntohl(ipp->addr) & ipp->netmask)))
70263+ return match;
70264+ }
70265+ match = state->default_role;
70266+ }
70267+ } else if (match->allowed_ips == NULL) {
70268+ return match;
70269+ } else {
70270+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70271+ if (likely
70272+ ((ntohl(curr_ip) & ipp->netmask) ==
70273+ (ntohl(ipp->addr) & ipp->netmask)))
70274+ return match;
70275+ }
70276+ goto try_group;
70277+ }
70278+
70279+ return match;
70280+}
70281+
70282+static struct acl_role_label *
70283+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
70284+ const gid_t gid)
70285+{
70286+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
70287+}
70288+
70289+struct acl_subject_label *
70290+lookup_acl_subj_label(const u64 ino, const dev_t dev,
70291+ const struct acl_role_label *role)
70292+{
70293+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70294+ struct acl_subject_label *match;
70295+
70296+ match = role->subj_hash[index];
70297+
70298+ while (match && (match->inode != ino || match->device != dev ||
70299+ (match->mode & GR_DELETED))) {
70300+ match = match->next;
70301+ }
70302+
70303+ if (match && !(match->mode & GR_DELETED))
70304+ return match;
70305+ else
70306+ return NULL;
70307+}
70308+
70309+struct acl_subject_label *
70310+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
70311+ const struct acl_role_label *role)
70312+{
70313+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70314+ struct acl_subject_label *match;
70315+
70316+ match = role->subj_hash[index];
70317+
70318+ while (match && (match->inode != ino || match->device != dev ||
70319+ !(match->mode & GR_DELETED))) {
70320+ match = match->next;
70321+ }
70322+
70323+ if (match && (match->mode & GR_DELETED))
70324+ return match;
70325+ else
70326+ return NULL;
70327+}
70328+
70329+static struct acl_object_label *
70330+lookup_acl_obj_label(const u64 ino, const dev_t dev,
70331+ const struct acl_subject_label *subj)
70332+{
70333+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70334+ struct acl_object_label *match;
70335+
70336+ match = subj->obj_hash[index];
70337+
70338+ while (match && (match->inode != ino || match->device != dev ||
70339+ (match->mode & GR_DELETED))) {
70340+ match = match->next;
70341+ }
70342+
70343+ if (match && !(match->mode & GR_DELETED))
70344+ return match;
70345+ else
70346+ return NULL;
70347+}
70348+
70349+static struct acl_object_label *
70350+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
70351+ const struct acl_subject_label *subj)
70352+{
70353+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70354+ struct acl_object_label *match;
70355+
70356+ match = subj->obj_hash[index];
70357+
70358+ while (match && (match->inode != ino || match->device != dev ||
70359+ !(match->mode & GR_DELETED))) {
70360+ match = match->next;
70361+ }
70362+
70363+ if (match && (match->mode & GR_DELETED))
70364+ return match;
70365+
70366+ match = subj->obj_hash[index];
70367+
70368+ while (match && (match->inode != ino || match->device != dev ||
70369+ (match->mode & GR_DELETED))) {
70370+ match = match->next;
70371+ }
70372+
70373+ if (match && !(match->mode & GR_DELETED))
70374+ return match;
70375+ else
70376+ return NULL;
70377+}
70378+
70379+struct name_entry *
70380+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
70381+{
70382+ unsigned int len = strlen(name);
70383+ unsigned int key = full_name_hash(name, len);
70384+ unsigned int index = key % state->name_set.n_size;
70385+ struct name_entry *match;
70386+
70387+ match = state->name_set.n_hash[index];
70388+
70389+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
70390+ match = match->next;
70391+
70392+ return match;
70393+}
70394+
70395+static struct name_entry *
70396+lookup_name_entry(const char *name)
70397+{
70398+ return __lookup_name_entry(&running_polstate, name);
70399+}
70400+
70401+static struct name_entry *
70402+lookup_name_entry_create(const char *name)
70403+{
70404+ unsigned int len = strlen(name);
70405+ unsigned int key = full_name_hash(name, len);
70406+ unsigned int index = key % running_polstate.name_set.n_size;
70407+ struct name_entry *match;
70408+
70409+ match = running_polstate.name_set.n_hash[index];
70410+
70411+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
70412+ !match->deleted))
70413+ match = match->next;
70414+
70415+ if (match && match->deleted)
70416+ return match;
70417+
70418+ match = running_polstate.name_set.n_hash[index];
70419+
70420+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
70421+ match->deleted))
70422+ match = match->next;
70423+
70424+ if (match && !match->deleted)
70425+ return match;
70426+ else
70427+ return NULL;
70428+}
70429+
70430+static struct inodev_entry *
70431+lookup_inodev_entry(const u64 ino, const dev_t dev)
70432+{
70433+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
70434+ struct inodev_entry *match;
70435+
70436+ match = running_polstate.inodev_set.i_hash[index];
70437+
70438+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
70439+ match = match->next;
70440+
70441+ return match;
70442+}
70443+
70444+void
70445+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
70446+{
70447+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
70448+ state->inodev_set.i_size);
70449+ struct inodev_entry **curr;
70450+
70451+ entry->prev = NULL;
70452+
70453+ curr = &state->inodev_set.i_hash[index];
70454+ if (*curr != NULL)
70455+ (*curr)->prev = entry;
70456+
70457+ entry->next = *curr;
70458+ *curr = entry;
70459+
70460+ return;
70461+}
70462+
70463+static void
70464+insert_inodev_entry(struct inodev_entry *entry)
70465+{
70466+ __insert_inodev_entry(&running_polstate, entry);
70467+}
70468+
70469+void
70470+insert_acl_obj_label(struct acl_object_label *obj,
70471+ struct acl_subject_label *subj)
70472+{
70473+ unsigned int index =
70474+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
70475+ struct acl_object_label **curr;
70476+
70477+ obj->prev = NULL;
70478+
70479+ curr = &subj->obj_hash[index];
70480+ if (*curr != NULL)
70481+ (*curr)->prev = obj;
70482+
70483+ obj->next = *curr;
70484+ *curr = obj;
70485+
70486+ return;
70487+}
70488+
70489+void
70490+insert_acl_subj_label(struct acl_subject_label *obj,
70491+ struct acl_role_label *role)
70492+{
70493+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
70494+ struct acl_subject_label **curr;
70495+
70496+ obj->prev = NULL;
70497+
70498+ curr = &role->subj_hash[index];
70499+ if (*curr != NULL)
70500+ (*curr)->prev = obj;
70501+
70502+ obj->next = *curr;
70503+ *curr = obj;
70504+
70505+ return;
70506+}
70507+
70508+/* derived from glibc fnmatch() 0: match, 1: no match*/
70509+
70510+static int
70511+glob_match(const char *p, const char *n)
70512+{
70513+ char c;
70514+
70515+ while ((c = *p++) != '\0') {
70516+ switch (c) {
70517+ case '?':
70518+ if (*n == '\0')
70519+ return 1;
70520+ else if (*n == '/')
70521+ return 1;
70522+ break;
70523+ case '\\':
70524+ if (*n != c)
70525+ return 1;
70526+ break;
70527+ case '*':
70528+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
70529+ if (*n == '/')
70530+ return 1;
70531+ else if (c == '?') {
70532+ if (*n == '\0')
70533+ return 1;
70534+ else
70535+ ++n;
70536+ }
70537+ }
70538+ if (c == '\0') {
70539+ return 0;
70540+ } else {
70541+ const char *endp;
70542+
70543+ if ((endp = strchr(n, '/')) == NULL)
70544+ endp = n + strlen(n);
70545+
70546+ if (c == '[') {
70547+ for (--p; n < endp; ++n)
70548+ if (!glob_match(p, n))
70549+ return 0;
70550+ } else if (c == '/') {
70551+ while (*n != '\0' && *n != '/')
70552+ ++n;
70553+ if (*n == '/' && !glob_match(p, n + 1))
70554+ return 0;
70555+ } else {
70556+ for (--p; n < endp; ++n)
70557+ if (*n == c && !glob_match(p, n))
70558+ return 0;
70559+ }
70560+
70561+ return 1;
70562+ }
70563+ case '[':
70564+ {
70565+ int not;
70566+ char cold;
70567+
70568+ if (*n == '\0' || *n == '/')
70569+ return 1;
70570+
70571+ not = (*p == '!' || *p == '^');
70572+ if (not)
70573+ ++p;
70574+
70575+ c = *p++;
70576+ for (;;) {
70577+ unsigned char fn = (unsigned char)*n;
70578+
70579+ if (c == '\0')
70580+ return 1;
70581+ else {
70582+ if (c == fn)
70583+ goto matched;
70584+ cold = c;
70585+ c = *p++;
70586+
70587+ if (c == '-' && *p != ']') {
70588+ unsigned char cend = *p++;
70589+
70590+ if (cend == '\0')
70591+ return 1;
70592+
70593+ if (cold <= fn && fn <= cend)
70594+ goto matched;
70595+
70596+ c = *p++;
70597+ }
70598+ }
70599+
70600+ if (c == ']')
70601+ break;
70602+ }
70603+ if (!not)
70604+ return 1;
70605+ break;
70606+ matched:
70607+ while (c != ']') {
70608+ if (c == '\0')
70609+ return 1;
70610+
70611+ c = *p++;
70612+ }
70613+ if (not)
70614+ return 1;
70615+ }
70616+ break;
70617+ default:
70618+ if (c != *n)
70619+ return 1;
70620+ }
70621+
70622+ ++n;
70623+ }
70624+
70625+ if (*n == '\0')
70626+ return 0;
70627+
70628+ if (*n == '/')
70629+ return 0;
70630+
70631+ return 1;
70632+}
70633+
70634+static struct acl_object_label *
70635+chk_glob_label(struct acl_object_label *globbed,
70636+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
70637+{
70638+ struct acl_object_label *tmp;
70639+
70640+ if (*path == NULL)
70641+ *path = gr_to_filename_nolock(dentry, mnt);
70642+
70643+ tmp = globbed;
70644+
70645+ while (tmp) {
70646+ if (!glob_match(tmp->filename, *path))
70647+ return tmp;
70648+ tmp = tmp->next;
70649+ }
70650+
70651+ return NULL;
70652+}
70653+
70654+static struct acl_object_label *
70655+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70656+ const u64 curr_ino, const dev_t curr_dev,
70657+ const struct acl_subject_label *subj, char **path, const int checkglob)
70658+{
70659+ struct acl_subject_label *tmpsubj;
70660+ struct acl_object_label *retval;
70661+ struct acl_object_label *retval2;
70662+
70663+ tmpsubj = (struct acl_subject_label *) subj;
70664+ read_lock(&gr_inode_lock);
70665+ do {
70666+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
70667+ if (retval) {
70668+ if (checkglob && retval->globbed) {
70669+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
70670+ if (retval2)
70671+ retval = retval2;
70672+ }
70673+ break;
70674+ }
70675+ } while ((tmpsubj = tmpsubj->parent_subject));
70676+ read_unlock(&gr_inode_lock);
70677+
70678+ return retval;
70679+}
70680+
70681+static __inline__ struct acl_object_label *
70682+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70683+ struct dentry *curr_dentry,
70684+ const struct acl_subject_label *subj, char **path, const int checkglob)
70685+{
70686+ int newglob = checkglob;
70687+ u64 inode;
70688+ dev_t device;
70689+
70690+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70691+ as we don't want a / * rule to match instead of the / object
70692+ don't do this for create lookups that call this function though, since they're looking up
70693+ on the parent and thus need globbing checks on all paths
70694+ */
70695+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70696+ newglob = GR_NO_GLOB;
70697+
70698+ spin_lock(&curr_dentry->d_lock);
70699+ inode = __get_ino(curr_dentry);
70700+ device = __get_dev(curr_dentry);
70701+ spin_unlock(&curr_dentry->d_lock);
70702+
70703+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70704+}
70705+
70706+#ifdef CONFIG_HUGETLBFS
70707+static inline bool
70708+is_hugetlbfs_mnt(const struct vfsmount *mnt)
70709+{
70710+ int i;
70711+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70712+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70713+ return true;
70714+ }
70715+
70716+ return false;
70717+}
70718+#endif
70719+
70720+static struct acl_object_label *
70721+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70722+ const struct acl_subject_label *subj, char *path, const int checkglob)
70723+{
70724+ struct dentry *dentry = (struct dentry *) l_dentry;
70725+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70726+ struct mount *real_mnt = real_mount(mnt);
70727+ struct acl_object_label *retval;
70728+ struct dentry *parent;
70729+
70730+ read_seqlock_excl(&mount_lock);
70731+ write_seqlock(&rename_lock);
70732+
70733+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70734+#ifdef CONFIG_NET
70735+ mnt == sock_mnt ||
70736+#endif
70737+#ifdef CONFIG_HUGETLBFS
70738+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70739+#endif
70740+ /* ignore Eric Biederman */
70741+ IS_PRIVATE(l_dentry->d_inode))) {
70742+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70743+ goto out;
70744+ }
70745+
70746+ for (;;) {
70747+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70748+ break;
70749+
70750+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70751+ if (!mnt_has_parent(real_mnt))
70752+ break;
70753+
70754+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70755+ if (retval != NULL)
70756+ goto out;
70757+
70758+ dentry = real_mnt->mnt_mountpoint;
70759+ real_mnt = real_mnt->mnt_parent;
70760+ mnt = &real_mnt->mnt;
70761+ continue;
70762+ }
70763+
70764+ parent = dentry->d_parent;
70765+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70766+ if (retval != NULL)
70767+ goto out;
70768+
70769+ dentry = parent;
70770+ }
70771+
70772+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70773+
70774+ /* gr_real_root is pinned so we don't have to hold a reference */
70775+ if (retval == NULL)
70776+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70777+out:
70778+ write_sequnlock(&rename_lock);
70779+ read_sequnlock_excl(&mount_lock);
70780+
70781+ BUG_ON(retval == NULL);
70782+
70783+ return retval;
70784+}
70785+
70786+static __inline__ struct acl_object_label *
70787+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70788+ const struct acl_subject_label *subj)
70789+{
70790+ char *path = NULL;
70791+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70792+}
70793+
70794+static __inline__ struct acl_object_label *
70795+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70796+ const struct acl_subject_label *subj)
70797+{
70798+ char *path = NULL;
70799+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70800+}
70801+
70802+static __inline__ struct acl_object_label *
70803+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70804+ const struct acl_subject_label *subj, char *path)
70805+{
70806+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70807+}
70808+
70809+struct acl_subject_label *
70810+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70811+ const struct acl_role_label *role)
70812+{
70813+ struct dentry *dentry = (struct dentry *) l_dentry;
70814+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70815+ struct mount *real_mnt = real_mount(mnt);
70816+ struct acl_subject_label *retval;
70817+ struct dentry *parent;
70818+
70819+ read_seqlock_excl(&mount_lock);
70820+ write_seqlock(&rename_lock);
70821+
70822+ for (;;) {
70823+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70824+ break;
70825+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70826+ if (!mnt_has_parent(real_mnt))
70827+ break;
70828+
70829+ spin_lock(&dentry->d_lock);
70830+ read_lock(&gr_inode_lock);
70831+ retval =
70832+ lookup_acl_subj_label(__get_ino(dentry),
70833+ __get_dev(dentry), role);
70834+ read_unlock(&gr_inode_lock);
70835+ spin_unlock(&dentry->d_lock);
70836+ if (retval != NULL)
70837+ goto out;
70838+
70839+ dentry = real_mnt->mnt_mountpoint;
70840+ real_mnt = real_mnt->mnt_parent;
70841+ mnt = &real_mnt->mnt;
70842+ continue;
70843+ }
70844+
70845+ spin_lock(&dentry->d_lock);
70846+ read_lock(&gr_inode_lock);
70847+ retval = lookup_acl_subj_label(__get_ino(dentry),
70848+ __get_dev(dentry), role);
70849+ read_unlock(&gr_inode_lock);
70850+ parent = dentry->d_parent;
70851+ spin_unlock(&dentry->d_lock);
70852+
70853+ if (retval != NULL)
70854+ goto out;
70855+
70856+ dentry = parent;
70857+ }
70858+
70859+ spin_lock(&dentry->d_lock);
70860+ read_lock(&gr_inode_lock);
70861+ retval = lookup_acl_subj_label(__get_ino(dentry),
70862+ __get_dev(dentry), role);
70863+ read_unlock(&gr_inode_lock);
70864+ spin_unlock(&dentry->d_lock);
70865+
70866+ if (unlikely(retval == NULL)) {
70867+ /* gr_real_root is pinned, we don't need to hold a reference */
70868+ read_lock(&gr_inode_lock);
70869+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
70870+ __get_dev(gr_real_root.dentry), role);
70871+ read_unlock(&gr_inode_lock);
70872+ }
70873+out:
70874+ write_sequnlock(&rename_lock);
70875+ read_sequnlock_excl(&mount_lock);
70876+
70877+ BUG_ON(retval == NULL);
70878+
70879+ return retval;
70880+}
70881+
70882+void
70883+assign_special_role(const char *rolename)
70884+{
70885+ struct acl_object_label *obj;
70886+ struct acl_role_label *r;
70887+ struct acl_role_label *assigned = NULL;
70888+ struct task_struct *tsk;
70889+ struct file *filp;
70890+
70891+ FOR_EACH_ROLE_START(r)
70892+ if (!strcmp(rolename, r->rolename) &&
70893+ (r->roletype & GR_ROLE_SPECIAL)) {
70894+ assigned = r;
70895+ break;
70896+ }
70897+ FOR_EACH_ROLE_END(r)
70898+
70899+ if (!assigned)
70900+ return;
70901+
70902+ read_lock(&tasklist_lock);
70903+ read_lock(&grsec_exec_file_lock);
70904+
70905+ tsk = current->real_parent;
70906+ if (tsk == NULL)
70907+ goto out_unlock;
70908+
70909+ filp = tsk->exec_file;
70910+ if (filp == NULL)
70911+ goto out_unlock;
70912+
70913+ tsk->is_writable = 0;
70914+ tsk->inherited = 0;
70915+
70916+ tsk->acl_sp_role = 1;
70917+ tsk->acl_role_id = ++acl_sp_role_value;
70918+ tsk->role = assigned;
70919+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70920+
70921+ /* ignore additional mmap checks for processes that are writable
70922+ by the default ACL */
70923+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70924+ if (unlikely(obj->mode & GR_WRITE))
70925+ tsk->is_writable = 1;
70926+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70927+ if (unlikely(obj->mode & GR_WRITE))
70928+ tsk->is_writable = 1;
70929+
70930+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70931+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70932+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70933+#endif
70934+
70935+out_unlock:
70936+ read_unlock(&grsec_exec_file_lock);
70937+ read_unlock(&tasklist_lock);
70938+ return;
70939+}
70940+
70941+
70942+static void
70943+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70944+{
70945+ struct task_struct *task = current;
70946+ const struct cred *cred = current_cred();
70947+
70948+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70949+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70950+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70951+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70952+
70953+ return;
70954+}
70955+
70956+static void
70957+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70958+{
70959+ struct task_struct *task = current;
70960+ const struct cred *cred = current_cred();
70961+
70962+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70963+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70964+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70965+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70966+
70967+ return;
70968+}
70969+
70970+static void
70971+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70972+{
70973+ struct task_struct *task = current;
70974+ const struct cred *cred = current_cred();
70975+
70976+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70977+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70978+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70979+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70980+
70981+ return;
70982+}
70983+
70984+static void
70985+gr_set_proc_res(struct task_struct *task)
70986+{
70987+ struct acl_subject_label *proc;
70988+ unsigned short i;
70989+
70990+ proc = task->acl;
70991+
70992+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70993+ return;
70994+
70995+ for (i = 0; i < RLIM_NLIMITS; i++) {
70996+ unsigned long rlim_cur, rlim_max;
70997+
70998+ if (!(proc->resmask & (1U << i)))
70999+ continue;
71000+
71001+ rlim_cur = proc->res[i].rlim_cur;
71002+ rlim_max = proc->res[i].rlim_max;
71003+
71004+ if (i == RLIMIT_NOFILE) {
71005+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
71006+ if (rlim_cur > saved_sysctl_nr_open)
71007+ rlim_cur = saved_sysctl_nr_open;
71008+ if (rlim_max > saved_sysctl_nr_open)
71009+ rlim_max = saved_sysctl_nr_open;
71010+ }
71011+
71012+ task->signal->rlim[i].rlim_cur = rlim_cur;
71013+ task->signal->rlim[i].rlim_max = rlim_max;
71014+
71015+ if (i == RLIMIT_CPU)
71016+ update_rlimit_cpu(task, rlim_cur);
71017+ }
71018+
71019+ return;
71020+}
71021+
71022+/* both of the below must be called with
71023+ rcu_read_lock();
71024+ read_lock(&tasklist_lock);
71025+ read_lock(&grsec_exec_file_lock);
71026+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
71027+*/
71028+
71029+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
71030+{
71031+ char *tmpname;
71032+ struct acl_subject_label *tmpsubj;
71033+ struct file *filp;
71034+ struct name_entry *nmatch;
71035+
71036+ filp = task->exec_file;
71037+ if (filp == NULL)
71038+ return NULL;
71039+
71040+ /* the following is to apply the correct subject
71041+ on binaries running when the RBAC system
71042+ is enabled, when the binaries have been
71043+ replaced or deleted since their execution
71044+ -----
71045+ when the RBAC system starts, the inode/dev
71046+ from exec_file will be one the RBAC system
71047+ is unaware of. It only knows the inode/dev
71048+ of the present file on disk, or the absence
71049+ of it.
71050+ */
71051+
71052+ if (filename)
71053+ nmatch = __lookup_name_entry(state, filename);
71054+ else {
71055+ preempt_disable();
71056+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
71057+
71058+ nmatch = __lookup_name_entry(state, tmpname);
71059+ preempt_enable();
71060+ }
71061+ tmpsubj = NULL;
71062+ if (nmatch) {
71063+ if (nmatch->deleted)
71064+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
71065+ else
71066+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
71067+ }
71068+ /* this also works for the reload case -- if we don't match a potentially inherited subject
71069+ then we fall back to a normal lookup based on the binary's ino/dev
71070+ */
71071+ if (tmpsubj == NULL && fallback)
71072+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
71073+
71074+ return tmpsubj;
71075+}
71076+
71077+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
71078+{
71079+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
71080+}
71081+
71082+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
71083+{
71084+ struct acl_object_label *obj;
71085+ struct file *filp;
71086+
71087+ filp = task->exec_file;
71088+
71089+ task->acl = subj;
71090+ task->is_writable = 0;
71091+ /* ignore additional mmap checks for processes that are writable
71092+ by the default ACL */
71093+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
71094+ if (unlikely(obj->mode & GR_WRITE))
71095+ task->is_writable = 1;
71096+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71097+ if (unlikely(obj->mode & GR_WRITE))
71098+ task->is_writable = 1;
71099+
71100+ gr_set_proc_res(task);
71101+
71102+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71103+ 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);
71104+#endif
71105+}
71106+
71107+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
71108+{
71109+ __gr_apply_subject_to_task(&running_polstate, task, subj);
71110+}
71111+
71112+__u32
71113+gr_search_file(const struct dentry * dentry, const __u32 mode,
71114+ const struct vfsmount * mnt)
71115+{
71116+ __u32 retval = mode;
71117+ struct acl_subject_label *curracl;
71118+ struct acl_object_label *currobj;
71119+
71120+ if (unlikely(!(gr_status & GR_READY)))
71121+ return (mode & ~GR_AUDITS);
71122+
71123+ curracl = current->acl;
71124+
71125+ currobj = chk_obj_label(dentry, mnt, curracl);
71126+ retval = currobj->mode & mode;
71127+
71128+ /* if we're opening a specified transfer file for writing
71129+ (e.g. /dev/initctl), then transfer our role to init
71130+ */
71131+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
71132+ current->role->roletype & GR_ROLE_PERSIST)) {
71133+ struct task_struct *task = init_pid_ns.child_reaper;
71134+
71135+ if (task->role != current->role) {
71136+ struct acl_subject_label *subj;
71137+
71138+ task->acl_sp_role = 0;
71139+ task->acl_role_id = current->acl_role_id;
71140+ task->role = current->role;
71141+ rcu_read_lock();
71142+ read_lock(&grsec_exec_file_lock);
71143+ subj = gr_get_subject_for_task(task, NULL, 1);
71144+ gr_apply_subject_to_task(task, subj);
71145+ read_unlock(&grsec_exec_file_lock);
71146+ rcu_read_unlock();
71147+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
71148+ }
71149+ }
71150+
71151+ if (unlikely
71152+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
71153+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
71154+ __u32 new_mode = mode;
71155+
71156+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71157+
71158+ retval = new_mode;
71159+
71160+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
71161+ new_mode |= GR_INHERIT;
71162+
71163+ if (!(mode & GR_NOLEARN))
71164+ gr_log_learn(dentry, mnt, new_mode);
71165+ }
71166+
71167+ return retval;
71168+}
71169+
71170+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
71171+ const struct dentry *parent,
71172+ const struct vfsmount *mnt)
71173+{
71174+ struct name_entry *match;
71175+ struct acl_object_label *matchpo;
71176+ struct acl_subject_label *curracl;
71177+ char *path;
71178+
71179+ if (unlikely(!(gr_status & GR_READY)))
71180+ return NULL;
71181+
71182+ preempt_disable();
71183+ path = gr_to_filename_rbac(new_dentry, mnt);
71184+ match = lookup_name_entry_create(path);
71185+
71186+ curracl = current->acl;
71187+
71188+ if (match) {
71189+ read_lock(&gr_inode_lock);
71190+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
71191+ read_unlock(&gr_inode_lock);
71192+
71193+ if (matchpo) {
71194+ preempt_enable();
71195+ return matchpo;
71196+ }
71197+ }
71198+
71199+ // lookup parent
71200+
71201+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
71202+
71203+ preempt_enable();
71204+ return matchpo;
71205+}
71206+
71207+__u32
71208+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
71209+ const struct vfsmount * mnt, const __u32 mode)
71210+{
71211+ struct acl_object_label *matchpo;
71212+ __u32 retval;
71213+
71214+ if (unlikely(!(gr_status & GR_READY)))
71215+ return (mode & ~GR_AUDITS);
71216+
71217+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
71218+
71219+ retval = matchpo->mode & mode;
71220+
71221+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
71222+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71223+ __u32 new_mode = mode;
71224+
71225+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71226+
71227+ gr_log_learn(new_dentry, mnt, new_mode);
71228+ return new_mode;
71229+ }
71230+
71231+ return retval;
71232+}
71233+
71234+__u32
71235+gr_check_link(const struct dentry * new_dentry,
71236+ const struct dentry * parent_dentry,
71237+ const struct vfsmount * parent_mnt,
71238+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
71239+{
71240+ struct acl_object_label *obj;
71241+ __u32 oldmode, newmode;
71242+ __u32 needmode;
71243+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
71244+ GR_DELETE | GR_INHERIT;
71245+
71246+ if (unlikely(!(gr_status & GR_READY)))
71247+ return (GR_CREATE | GR_LINK);
71248+
71249+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
71250+ oldmode = obj->mode;
71251+
71252+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
71253+ newmode = obj->mode;
71254+
71255+ needmode = newmode & checkmodes;
71256+
71257+ // old name for hardlink must have at least the permissions of the new name
71258+ if ((oldmode & needmode) != needmode)
71259+ goto bad;
71260+
71261+ // if old name had restrictions/auditing, make sure the new name does as well
71262+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
71263+
71264+ // don't allow hardlinking of suid/sgid/fcapped files without permission
71265+ if (is_privileged_binary(old_dentry))
71266+ needmode |= GR_SETID;
71267+
71268+ if ((newmode & needmode) != needmode)
71269+ goto bad;
71270+
71271+ // enforce minimum permissions
71272+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
71273+ return newmode;
71274+bad:
71275+ needmode = oldmode;
71276+ if (is_privileged_binary(old_dentry))
71277+ needmode |= GR_SETID;
71278+
71279+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
71280+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
71281+ return (GR_CREATE | GR_LINK);
71282+ } else if (newmode & GR_SUPPRESS)
71283+ return GR_SUPPRESS;
71284+ else
71285+ return 0;
71286+}
71287+
71288+int
71289+gr_check_hidden_task(const struct task_struct *task)
71290+{
71291+ if (unlikely(!(gr_status & GR_READY)))
71292+ return 0;
71293+
71294+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
71295+ return 1;
71296+
71297+ return 0;
71298+}
71299+
71300+int
71301+gr_check_protected_task(const struct task_struct *task)
71302+{
71303+ if (unlikely(!(gr_status & GR_READY) || !task))
71304+ return 0;
71305+
71306+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71307+ task->acl != current->acl)
71308+ return 1;
71309+
71310+ return 0;
71311+}
71312+
71313+int
71314+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
71315+{
71316+ struct task_struct *p;
71317+ int ret = 0;
71318+
71319+ if (unlikely(!(gr_status & GR_READY) || !pid))
71320+ return ret;
71321+
71322+ read_lock(&tasklist_lock);
71323+ do_each_pid_task(pid, type, p) {
71324+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71325+ p->acl != current->acl) {
71326+ ret = 1;
71327+ goto out;
71328+ }
71329+ } while_each_pid_task(pid, type, p);
71330+out:
71331+ read_unlock(&tasklist_lock);
71332+
71333+ return ret;
71334+}
71335+
71336+void
71337+gr_copy_label(struct task_struct *tsk)
71338+{
71339+ struct task_struct *p = current;
71340+
71341+ tsk->inherited = p->inherited;
71342+ tsk->acl_sp_role = 0;
71343+ tsk->acl_role_id = p->acl_role_id;
71344+ tsk->acl = p->acl;
71345+ tsk->role = p->role;
71346+ tsk->signal->used_accept = 0;
71347+ tsk->signal->curr_ip = p->signal->curr_ip;
71348+ tsk->signal->saved_ip = p->signal->saved_ip;
71349+ if (p->exec_file)
71350+ get_file(p->exec_file);
71351+ tsk->exec_file = p->exec_file;
71352+ tsk->is_writable = p->is_writable;
71353+ if (unlikely(p->signal->used_accept)) {
71354+ p->signal->curr_ip = 0;
71355+ p->signal->saved_ip = 0;
71356+ }
71357+
71358+ return;
71359+}
71360+
71361+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
71362+
71363+int
71364+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
71365+{
71366+ unsigned int i;
71367+ __u16 num;
71368+ uid_t *uidlist;
71369+ uid_t curuid;
71370+ int realok = 0;
71371+ int effectiveok = 0;
71372+ int fsok = 0;
71373+ uid_t globalreal, globaleffective, globalfs;
71374+
71375+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
71376+ struct user_struct *user;
71377+
71378+ if (!uid_valid(real))
71379+ goto skipit;
71380+
71381+ /* find user based on global namespace */
71382+
71383+ globalreal = GR_GLOBAL_UID(real);
71384+
71385+ user = find_user(make_kuid(&init_user_ns, globalreal));
71386+ if (user == NULL)
71387+ goto skipit;
71388+
71389+ if (gr_process_kernel_setuid_ban(user)) {
71390+ /* for find_user */
71391+ free_uid(user);
71392+ return 1;
71393+ }
71394+
71395+ /* for find_user */
71396+ free_uid(user);
71397+
71398+skipit:
71399+#endif
71400+
71401+ if (unlikely(!(gr_status & GR_READY)))
71402+ return 0;
71403+
71404+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71405+ gr_log_learn_uid_change(real, effective, fs);
71406+
71407+ num = current->acl->user_trans_num;
71408+ uidlist = current->acl->user_transitions;
71409+
71410+ if (uidlist == NULL)
71411+ return 0;
71412+
71413+ if (!uid_valid(real)) {
71414+ realok = 1;
71415+ globalreal = (uid_t)-1;
71416+ } else {
71417+ globalreal = GR_GLOBAL_UID(real);
71418+ }
71419+ if (!uid_valid(effective)) {
71420+ effectiveok = 1;
71421+ globaleffective = (uid_t)-1;
71422+ } else {
71423+ globaleffective = GR_GLOBAL_UID(effective);
71424+ }
71425+ if (!uid_valid(fs)) {
71426+ fsok = 1;
71427+ globalfs = (uid_t)-1;
71428+ } else {
71429+ globalfs = GR_GLOBAL_UID(fs);
71430+ }
71431+
71432+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
71433+ for (i = 0; i < num; i++) {
71434+ curuid = uidlist[i];
71435+ if (globalreal == curuid)
71436+ realok = 1;
71437+ if (globaleffective == curuid)
71438+ effectiveok = 1;
71439+ if (globalfs == curuid)
71440+ fsok = 1;
71441+ }
71442+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
71443+ for (i = 0; i < num; i++) {
71444+ curuid = uidlist[i];
71445+ if (globalreal == curuid)
71446+ break;
71447+ if (globaleffective == curuid)
71448+ break;
71449+ if (globalfs == curuid)
71450+ break;
71451+ }
71452+ /* not in deny list */
71453+ if (i == num) {
71454+ realok = 1;
71455+ effectiveok = 1;
71456+ fsok = 1;
71457+ }
71458+ }
71459+
71460+ if (realok && effectiveok && fsok)
71461+ return 0;
71462+ else {
71463+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
71464+ return 1;
71465+ }
71466+}
71467+
71468+int
71469+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
71470+{
71471+ unsigned int i;
71472+ __u16 num;
71473+ gid_t *gidlist;
71474+ gid_t curgid;
71475+ int realok = 0;
71476+ int effectiveok = 0;
71477+ int fsok = 0;
71478+ gid_t globalreal, globaleffective, globalfs;
71479+
71480+ if (unlikely(!(gr_status & GR_READY)))
71481+ return 0;
71482+
71483+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71484+ gr_log_learn_gid_change(real, effective, fs);
71485+
71486+ num = current->acl->group_trans_num;
71487+ gidlist = current->acl->group_transitions;
71488+
71489+ if (gidlist == NULL)
71490+ return 0;
71491+
71492+ if (!gid_valid(real)) {
71493+ realok = 1;
71494+ globalreal = (gid_t)-1;
71495+ } else {
71496+ globalreal = GR_GLOBAL_GID(real);
71497+ }
71498+ if (!gid_valid(effective)) {
71499+ effectiveok = 1;
71500+ globaleffective = (gid_t)-1;
71501+ } else {
71502+ globaleffective = GR_GLOBAL_GID(effective);
71503+ }
71504+ if (!gid_valid(fs)) {
71505+ fsok = 1;
71506+ globalfs = (gid_t)-1;
71507+ } else {
71508+ globalfs = GR_GLOBAL_GID(fs);
71509+ }
71510+
71511+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
71512+ for (i = 0; i < num; i++) {
71513+ curgid = gidlist[i];
71514+ if (globalreal == curgid)
71515+ realok = 1;
71516+ if (globaleffective == curgid)
71517+ effectiveok = 1;
71518+ if (globalfs == curgid)
71519+ fsok = 1;
71520+ }
71521+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
71522+ for (i = 0; i < num; i++) {
71523+ curgid = gidlist[i];
71524+ if (globalreal == curgid)
71525+ break;
71526+ if (globaleffective == curgid)
71527+ break;
71528+ if (globalfs == curgid)
71529+ break;
71530+ }
71531+ /* not in deny list */
71532+ if (i == num) {
71533+ realok = 1;
71534+ effectiveok = 1;
71535+ fsok = 1;
71536+ }
71537+ }
71538+
71539+ if (realok && effectiveok && fsok)
71540+ return 0;
71541+ else {
71542+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
71543+ return 1;
71544+ }
71545+}
71546+
71547+extern int gr_acl_is_capable(const int cap);
71548+
71549+void
71550+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
71551+{
71552+ struct acl_role_label *role = task->role;
71553+ struct acl_role_label *origrole = role;
71554+ struct acl_subject_label *subj = NULL;
71555+ struct acl_object_label *obj;
71556+ struct file *filp;
71557+ uid_t uid;
71558+ gid_t gid;
71559+
71560+ if (unlikely(!(gr_status & GR_READY)))
71561+ return;
71562+
71563+ uid = GR_GLOBAL_UID(kuid);
71564+ gid = GR_GLOBAL_GID(kgid);
71565+
71566+ filp = task->exec_file;
71567+
71568+ /* kernel process, we'll give them the kernel role */
71569+ if (unlikely(!filp)) {
71570+ task->role = running_polstate.kernel_role;
71571+ task->acl = running_polstate.kernel_role->root_label;
71572+ return;
71573+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
71574+ /* save the current ip at time of role lookup so that the proper
71575+ IP will be learned for role_allowed_ip */
71576+ task->signal->saved_ip = task->signal->curr_ip;
71577+ role = lookup_acl_role_label(task, uid, gid);
71578+ }
71579+
71580+ /* don't change the role if we're not a privileged process */
71581+ if (role && task->role != role &&
71582+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
71583+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
71584+ return;
71585+
71586+ task->role = role;
71587+
71588+ if (task->inherited) {
71589+ /* if we reached our subject through inheritance, then first see
71590+ if there's a subject of the same name in the new role that has
71591+ an object that would result in the same inherited subject
71592+ */
71593+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
71594+ if (subj) {
71595+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
71596+ if (!(obj->mode & GR_INHERIT))
71597+ subj = NULL;
71598+ }
71599+
71600+ }
71601+ if (subj == NULL) {
71602+ /* otherwise:
71603+ perform subject lookup in possibly new role
71604+ we can use this result below in the case where role == task->role
71605+ */
71606+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
71607+ }
71608+
71609+ /* if we changed uid/gid, but result in the same role
71610+ and are using inheritance, don't lose the inherited subject
71611+ if current subject is other than what normal lookup
71612+ would result in, we arrived via inheritance, don't
71613+ lose subject
71614+ */
71615+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
71616+ (subj == task->acl)))
71617+ task->acl = subj;
71618+
71619+ /* leave task->inherited unaffected */
71620+
71621+ task->is_writable = 0;
71622+
71623+ /* ignore additional mmap checks for processes that are writable
71624+ by the default ACL */
71625+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71626+ if (unlikely(obj->mode & GR_WRITE))
71627+ task->is_writable = 1;
71628+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71629+ if (unlikely(obj->mode & GR_WRITE))
71630+ task->is_writable = 1;
71631+
71632+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71633+ 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);
71634+#endif
71635+
71636+ gr_set_proc_res(task);
71637+
71638+ return;
71639+}
71640+
71641+int
71642+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
71643+ const int unsafe_flags)
71644+{
71645+ struct task_struct *task = current;
71646+ struct acl_subject_label *newacl;
71647+ struct acl_object_label *obj;
71648+ __u32 retmode;
71649+
71650+ if (unlikely(!(gr_status & GR_READY)))
71651+ return 0;
71652+
71653+ newacl = chk_subj_label(dentry, mnt, task->role);
71654+
71655+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
71656+ did an exec
71657+ */
71658+ rcu_read_lock();
71659+ read_lock(&tasklist_lock);
71660+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
71661+ (task->parent->acl->mode & GR_POVERRIDE))) {
71662+ read_unlock(&tasklist_lock);
71663+ rcu_read_unlock();
71664+ goto skip_check;
71665+ }
71666+ read_unlock(&tasklist_lock);
71667+ rcu_read_unlock();
71668+
71669+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
71670+ !(task->role->roletype & GR_ROLE_GOD) &&
71671+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
71672+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71673+ if (unsafe_flags & LSM_UNSAFE_SHARE)
71674+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
71675+ else
71676+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
71677+ return -EACCES;
71678+ }
71679+
71680+skip_check:
71681+
71682+ obj = chk_obj_label(dentry, mnt, task->acl);
71683+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
71684+
71685+ if (!(task->acl->mode & GR_INHERITLEARN) &&
71686+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
71687+ if (obj->nested)
71688+ task->acl = obj->nested;
71689+ else
71690+ task->acl = newacl;
71691+ task->inherited = 0;
71692+ } else {
71693+ task->inherited = 1;
71694+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
71695+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
71696+ }
71697+
71698+ task->is_writable = 0;
71699+
71700+ /* ignore additional mmap checks for processes that are writable
71701+ by the default ACL */
71702+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
71703+ if (unlikely(obj->mode & GR_WRITE))
71704+ task->is_writable = 1;
71705+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
71706+ if (unlikely(obj->mode & GR_WRITE))
71707+ task->is_writable = 1;
71708+
71709+ gr_set_proc_res(task);
71710+
71711+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71712+ 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);
71713+#endif
71714+ return 0;
71715+}
71716+
71717+/* always called with valid inodev ptr */
71718+static void
71719+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
71720+{
71721+ struct acl_object_label *matchpo;
71722+ struct acl_subject_label *matchps;
71723+ struct acl_subject_label *subj;
71724+ struct acl_role_label *role;
71725+ unsigned int x;
71726+
71727+ FOR_EACH_ROLE_START(role)
71728+ FOR_EACH_SUBJECT_START(role, subj, x)
71729+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71730+ matchpo->mode |= GR_DELETED;
71731+ FOR_EACH_SUBJECT_END(subj,x)
71732+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71733+ /* nested subjects aren't in the role's subj_hash table */
71734+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71735+ matchpo->mode |= GR_DELETED;
71736+ FOR_EACH_NESTED_SUBJECT_END(subj)
71737+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71738+ matchps->mode |= GR_DELETED;
71739+ FOR_EACH_ROLE_END(role)
71740+
71741+ inodev->nentry->deleted = 1;
71742+
71743+ return;
71744+}
71745+
71746+void
71747+gr_handle_delete(const u64 ino, const dev_t dev)
71748+{
71749+ struct inodev_entry *inodev;
71750+
71751+ if (unlikely(!(gr_status & GR_READY)))
71752+ return;
71753+
71754+ write_lock(&gr_inode_lock);
71755+ inodev = lookup_inodev_entry(ino, dev);
71756+ if (inodev != NULL)
71757+ do_handle_delete(inodev, ino, dev);
71758+ write_unlock(&gr_inode_lock);
71759+
71760+ return;
71761+}
71762+
71763+static void
71764+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
71765+ const u64 newinode, const dev_t newdevice,
71766+ struct acl_subject_label *subj)
71767+{
71768+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71769+ struct acl_object_label *match;
71770+
71771+ match = subj->obj_hash[index];
71772+
71773+ while (match && (match->inode != oldinode ||
71774+ match->device != olddevice ||
71775+ !(match->mode & GR_DELETED)))
71776+ match = match->next;
71777+
71778+ if (match && (match->inode == oldinode)
71779+ && (match->device == olddevice)
71780+ && (match->mode & GR_DELETED)) {
71781+ if (match->prev == NULL) {
71782+ subj->obj_hash[index] = match->next;
71783+ if (match->next != NULL)
71784+ match->next->prev = NULL;
71785+ } else {
71786+ match->prev->next = match->next;
71787+ if (match->next != NULL)
71788+ match->next->prev = match->prev;
71789+ }
71790+ match->prev = NULL;
71791+ match->next = NULL;
71792+ match->inode = newinode;
71793+ match->device = newdevice;
71794+ match->mode &= ~GR_DELETED;
71795+
71796+ insert_acl_obj_label(match, subj);
71797+ }
71798+
71799+ return;
71800+}
71801+
71802+static void
71803+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
71804+ const u64 newinode, const dev_t newdevice,
71805+ struct acl_role_label *role)
71806+{
71807+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71808+ struct acl_subject_label *match;
71809+
71810+ match = role->subj_hash[index];
71811+
71812+ while (match && (match->inode != oldinode ||
71813+ match->device != olddevice ||
71814+ !(match->mode & GR_DELETED)))
71815+ match = match->next;
71816+
71817+ if (match && (match->inode == oldinode)
71818+ && (match->device == olddevice)
71819+ && (match->mode & GR_DELETED)) {
71820+ if (match->prev == NULL) {
71821+ role->subj_hash[index] = match->next;
71822+ if (match->next != NULL)
71823+ match->next->prev = NULL;
71824+ } else {
71825+ match->prev->next = match->next;
71826+ if (match->next != NULL)
71827+ match->next->prev = match->prev;
71828+ }
71829+ match->prev = NULL;
71830+ match->next = NULL;
71831+ match->inode = newinode;
71832+ match->device = newdevice;
71833+ match->mode &= ~GR_DELETED;
71834+
71835+ insert_acl_subj_label(match, role);
71836+ }
71837+
71838+ return;
71839+}
71840+
71841+static void
71842+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
71843+ const u64 newinode, const dev_t newdevice)
71844+{
71845+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71846+ struct inodev_entry *match;
71847+
71848+ match = running_polstate.inodev_set.i_hash[index];
71849+
71850+ while (match && (match->nentry->inode != oldinode ||
71851+ match->nentry->device != olddevice || !match->nentry->deleted))
71852+ match = match->next;
71853+
71854+ if (match && (match->nentry->inode == oldinode)
71855+ && (match->nentry->device == olddevice) &&
71856+ match->nentry->deleted) {
71857+ if (match->prev == NULL) {
71858+ running_polstate.inodev_set.i_hash[index] = match->next;
71859+ if (match->next != NULL)
71860+ match->next->prev = NULL;
71861+ } else {
71862+ match->prev->next = match->next;
71863+ if (match->next != NULL)
71864+ match->next->prev = match->prev;
71865+ }
71866+ match->prev = NULL;
71867+ match->next = NULL;
71868+ match->nentry->inode = newinode;
71869+ match->nentry->device = newdevice;
71870+ match->nentry->deleted = 0;
71871+
71872+ insert_inodev_entry(match);
71873+ }
71874+
71875+ return;
71876+}
71877+
71878+static void
71879+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
71880+{
71881+ struct acl_subject_label *subj;
71882+ struct acl_role_label *role;
71883+ unsigned int x;
71884+
71885+ FOR_EACH_ROLE_START(role)
71886+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71887+
71888+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71889+ if ((subj->inode == ino) && (subj->device == dev)) {
71890+ subj->inode = ino;
71891+ subj->device = dev;
71892+ }
71893+ /* nested subjects aren't in the role's subj_hash table */
71894+ update_acl_obj_label(matchn->inode, matchn->device,
71895+ ino, dev, subj);
71896+ FOR_EACH_NESTED_SUBJECT_END(subj)
71897+ FOR_EACH_SUBJECT_START(role, subj, x)
71898+ update_acl_obj_label(matchn->inode, matchn->device,
71899+ ino, dev, subj);
71900+ FOR_EACH_SUBJECT_END(subj,x)
71901+ FOR_EACH_ROLE_END(role)
71902+
71903+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71904+
71905+ return;
71906+}
71907+
71908+static void
71909+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71910+ const struct vfsmount *mnt)
71911+{
71912+ u64 ino = __get_ino(dentry);
71913+ dev_t dev = __get_dev(dentry);
71914+
71915+ __do_handle_create(matchn, ino, dev);
71916+
71917+ return;
71918+}
71919+
71920+void
71921+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71922+{
71923+ struct name_entry *matchn;
71924+
71925+ if (unlikely(!(gr_status & GR_READY)))
71926+ return;
71927+
71928+ preempt_disable();
71929+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71930+
71931+ if (unlikely((unsigned long)matchn)) {
71932+ write_lock(&gr_inode_lock);
71933+ do_handle_create(matchn, dentry, mnt);
71934+ write_unlock(&gr_inode_lock);
71935+ }
71936+ preempt_enable();
71937+
71938+ return;
71939+}
71940+
71941+void
71942+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71943+{
71944+ struct name_entry *matchn;
71945+
71946+ if (unlikely(!(gr_status & GR_READY)))
71947+ return;
71948+
71949+ preempt_disable();
71950+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71951+
71952+ if (unlikely((unsigned long)matchn)) {
71953+ write_lock(&gr_inode_lock);
71954+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71955+ write_unlock(&gr_inode_lock);
71956+ }
71957+ preempt_enable();
71958+
71959+ return;
71960+}
71961+
71962+void
71963+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71964+ struct dentry *old_dentry,
71965+ struct dentry *new_dentry,
71966+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71967+{
71968+ struct name_entry *matchn;
71969+ struct name_entry *matchn2 = NULL;
71970+ struct inodev_entry *inodev;
71971+ struct inode *inode = new_dentry->d_inode;
71972+ u64 old_ino = __get_ino(old_dentry);
71973+ dev_t old_dev = __get_dev(old_dentry);
71974+ unsigned int exchange = flags & RENAME_EXCHANGE;
71975+
71976+ /* vfs_rename swaps the name and parent link for old_dentry and
71977+ new_dentry
71978+ at this point, old_dentry has the new name, parent link, and inode
71979+ for the renamed file
71980+ if a file is being replaced by a rename, new_dentry has the inode
71981+ and name for the replaced file
71982+ */
71983+
71984+ if (unlikely(!(gr_status & GR_READY)))
71985+ return;
71986+
71987+ preempt_disable();
71988+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71989+
71990+ /* exchange cases:
71991+ a filename exists for the source, but not dest
71992+ do a recreate on source
71993+ a filename exists for the dest, but not source
71994+ do a recreate on dest
71995+ a filename exists for both source and dest
71996+ delete source and dest, then create source and dest
71997+ a filename exists for neither source nor dest
71998+ no updates needed
71999+
72000+ the name entry lookups get us the old inode/dev associated with
72001+ each name, so do the deletes first (if possible) so that when
72002+ we do the create, we pick up on the right entries
72003+ */
72004+
72005+ if (exchange)
72006+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
72007+
72008+ /* we wouldn't have to check d_inode if it weren't for
72009+ NFS silly-renaming
72010+ */
72011+
72012+ write_lock(&gr_inode_lock);
72013+ if (unlikely((replace || exchange) && inode)) {
72014+ u64 new_ino = __get_ino(new_dentry);
72015+ dev_t new_dev = __get_dev(new_dentry);
72016+
72017+ inodev = lookup_inodev_entry(new_ino, new_dev);
72018+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
72019+ do_handle_delete(inodev, new_ino, new_dev);
72020+ }
72021+
72022+ inodev = lookup_inodev_entry(old_ino, old_dev);
72023+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
72024+ do_handle_delete(inodev, old_ino, old_dev);
72025+
72026+ if (unlikely(matchn != NULL))
72027+ do_handle_create(matchn, old_dentry, mnt);
72028+
72029+ if (unlikely(matchn2 != NULL))
72030+ do_handle_create(matchn2, new_dentry, mnt);
72031+
72032+ write_unlock(&gr_inode_lock);
72033+ preempt_enable();
72034+
72035+ return;
72036+}
72037+
72038+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
72039+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
72040+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
72041+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
72042+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
72043+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
72044+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
72045+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
72046+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
72047+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
72048+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
72049+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
72050+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
72051+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
72052+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
72053+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
72054+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
72055+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
72056+};
72057+
72058+void
72059+gr_learn_resource(const struct task_struct *task,
72060+ const int res, const unsigned long wanted, const int gt)
72061+{
72062+ struct acl_subject_label *acl;
72063+ const struct cred *cred;
72064+
72065+ if (unlikely((gr_status & GR_READY) &&
72066+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
72067+ goto skip_reslog;
72068+
72069+ gr_log_resource(task, res, wanted, gt);
72070+skip_reslog:
72071+
72072+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
72073+ return;
72074+
72075+ acl = task->acl;
72076+
72077+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
72078+ !(acl->resmask & (1U << (unsigned short) res))))
72079+ return;
72080+
72081+ if (wanted >= acl->res[res].rlim_cur) {
72082+ unsigned long res_add;
72083+
72084+ res_add = wanted + res_learn_bumps[res];
72085+
72086+ acl->res[res].rlim_cur = res_add;
72087+
72088+ if (wanted > acl->res[res].rlim_max)
72089+ acl->res[res].rlim_max = res_add;
72090+
72091+ /* only log the subject filename, since resource logging is supported for
72092+ single-subject learning only */
72093+ rcu_read_lock();
72094+ cred = __task_cred(task);
72095+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72096+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
72097+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
72098+ "", (unsigned long) res, &task->signal->saved_ip);
72099+ rcu_read_unlock();
72100+ }
72101+
72102+ return;
72103+}
72104+EXPORT_SYMBOL_GPL(gr_learn_resource);
72105+#endif
72106+
72107+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
72108+void
72109+pax_set_initial_flags(struct linux_binprm *bprm)
72110+{
72111+ struct task_struct *task = current;
72112+ struct acl_subject_label *proc;
72113+ unsigned long flags;
72114+
72115+ if (unlikely(!(gr_status & GR_READY)))
72116+ return;
72117+
72118+ flags = pax_get_flags(task);
72119+
72120+ proc = task->acl;
72121+
72122+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
72123+ flags &= ~MF_PAX_PAGEEXEC;
72124+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
72125+ flags &= ~MF_PAX_SEGMEXEC;
72126+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
72127+ flags &= ~MF_PAX_RANDMMAP;
72128+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
72129+ flags &= ~MF_PAX_EMUTRAMP;
72130+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
72131+ flags &= ~MF_PAX_MPROTECT;
72132+
72133+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
72134+ flags |= MF_PAX_PAGEEXEC;
72135+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
72136+ flags |= MF_PAX_SEGMEXEC;
72137+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
72138+ flags |= MF_PAX_RANDMMAP;
72139+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
72140+ flags |= MF_PAX_EMUTRAMP;
72141+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
72142+ flags |= MF_PAX_MPROTECT;
72143+
72144+ pax_set_flags(task, flags);
72145+
72146+ return;
72147+}
72148+#endif
72149+
72150+int
72151+gr_handle_proc_ptrace(struct task_struct *task)
72152+{
72153+ struct file *filp;
72154+ struct task_struct *tmp = task;
72155+ struct task_struct *curtemp = current;
72156+ __u32 retmode;
72157+
72158+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72159+ if (unlikely(!(gr_status & GR_READY)))
72160+ return 0;
72161+#endif
72162+
72163+ read_lock(&tasklist_lock);
72164+ read_lock(&grsec_exec_file_lock);
72165+ filp = task->exec_file;
72166+
72167+ while (task_pid_nr(tmp) > 0) {
72168+ if (tmp == curtemp)
72169+ break;
72170+ tmp = tmp->real_parent;
72171+ }
72172+
72173+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72174+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
72175+ read_unlock(&grsec_exec_file_lock);
72176+ read_unlock(&tasklist_lock);
72177+ return 1;
72178+ }
72179+
72180+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72181+ if (!(gr_status & GR_READY)) {
72182+ read_unlock(&grsec_exec_file_lock);
72183+ read_unlock(&tasklist_lock);
72184+ return 0;
72185+ }
72186+#endif
72187+
72188+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
72189+ read_unlock(&grsec_exec_file_lock);
72190+ read_unlock(&tasklist_lock);
72191+
72192+ if (retmode & GR_NOPTRACE)
72193+ return 1;
72194+
72195+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
72196+ && (current->acl != task->acl || (current->acl != current->role->root_label
72197+ && task_pid_nr(current) != task_pid_nr(task))))
72198+ return 1;
72199+
72200+ return 0;
72201+}
72202+
72203+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
72204+{
72205+ if (unlikely(!(gr_status & GR_READY)))
72206+ return;
72207+
72208+ if (!(current->role->roletype & GR_ROLE_GOD))
72209+ return;
72210+
72211+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
72212+ p->role->rolename, gr_task_roletype_to_char(p),
72213+ p->acl->filename);
72214+}
72215+
72216+int
72217+gr_handle_ptrace(struct task_struct *task, const long request)
72218+{
72219+ struct task_struct *tmp = task;
72220+ struct task_struct *curtemp = current;
72221+ __u32 retmode;
72222+
72223+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72224+ if (unlikely(!(gr_status & GR_READY)))
72225+ return 0;
72226+#endif
72227+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
72228+ read_lock(&tasklist_lock);
72229+ while (task_pid_nr(tmp) > 0) {
72230+ if (tmp == curtemp)
72231+ break;
72232+ tmp = tmp->real_parent;
72233+ }
72234+
72235+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72236+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
72237+ read_unlock(&tasklist_lock);
72238+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72239+ return 1;
72240+ }
72241+ read_unlock(&tasklist_lock);
72242+ }
72243+
72244+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72245+ if (!(gr_status & GR_READY))
72246+ return 0;
72247+#endif
72248+
72249+ read_lock(&grsec_exec_file_lock);
72250+ if (unlikely(!task->exec_file)) {
72251+ read_unlock(&grsec_exec_file_lock);
72252+ return 0;
72253+ }
72254+
72255+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
72256+ read_unlock(&grsec_exec_file_lock);
72257+
72258+ if (retmode & GR_NOPTRACE) {
72259+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72260+ return 1;
72261+ }
72262+
72263+ if (retmode & GR_PTRACERD) {
72264+ switch (request) {
72265+ case PTRACE_SEIZE:
72266+ case PTRACE_POKETEXT:
72267+ case PTRACE_POKEDATA:
72268+ case PTRACE_POKEUSR:
72269+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
72270+ case PTRACE_SETREGS:
72271+ case PTRACE_SETFPREGS:
72272+#endif
72273+#ifdef CONFIG_X86
72274+ case PTRACE_SETFPXREGS:
72275+#endif
72276+#ifdef CONFIG_ALTIVEC
72277+ case PTRACE_SETVRREGS:
72278+#endif
72279+ return 1;
72280+ default:
72281+ return 0;
72282+ }
72283+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
72284+ !(current->role->roletype & GR_ROLE_GOD) &&
72285+ (current->acl != task->acl)) {
72286+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72287+ return 1;
72288+ }
72289+
72290+ return 0;
72291+}
72292+
72293+static int is_writable_mmap(const struct file *filp)
72294+{
72295+ struct task_struct *task = current;
72296+ struct acl_object_label *obj, *obj2;
72297+
72298+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
72299+ !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))) {
72300+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
72301+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
72302+ task->role->root_label);
72303+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
72304+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
72305+ return 1;
72306+ }
72307+ }
72308+ return 0;
72309+}
72310+
72311+int
72312+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
72313+{
72314+ __u32 mode;
72315+
72316+ if (unlikely(!file || !(prot & PROT_EXEC)))
72317+ return 1;
72318+
72319+ if (is_writable_mmap(file))
72320+ return 0;
72321+
72322+ mode =
72323+ gr_search_file(file->f_path.dentry,
72324+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72325+ file->f_path.mnt);
72326+
72327+ if (!gr_tpe_allow(file))
72328+ return 0;
72329+
72330+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72331+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72332+ return 0;
72333+ } else if (unlikely(!(mode & GR_EXEC))) {
72334+ return 0;
72335+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72336+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72337+ return 1;
72338+ }
72339+
72340+ return 1;
72341+}
72342+
72343+int
72344+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
72345+{
72346+ __u32 mode;
72347+
72348+ if (unlikely(!file || !(prot & PROT_EXEC)))
72349+ return 1;
72350+
72351+ if (is_writable_mmap(file))
72352+ return 0;
72353+
72354+ mode =
72355+ gr_search_file(file->f_path.dentry,
72356+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72357+ file->f_path.mnt);
72358+
72359+ if (!gr_tpe_allow(file))
72360+ return 0;
72361+
72362+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72363+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72364+ return 0;
72365+ } else if (unlikely(!(mode & GR_EXEC))) {
72366+ return 0;
72367+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72368+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72369+ return 1;
72370+ }
72371+
72372+ return 1;
72373+}
72374+
72375+void
72376+gr_acl_handle_psacct(struct task_struct *task, const long code)
72377+{
72378+ unsigned long runtime, cputime;
72379+ cputime_t utime, stime;
72380+ unsigned int wday, cday;
72381+ __u8 whr, chr;
72382+ __u8 wmin, cmin;
72383+ __u8 wsec, csec;
72384+ struct timespec curtime, starttime;
72385+
72386+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
72387+ !(task->acl->mode & GR_PROCACCT)))
72388+ return;
72389+
72390+ curtime = ns_to_timespec(ktime_get_ns());
72391+ starttime = ns_to_timespec(task->start_time);
72392+ runtime = curtime.tv_sec - starttime.tv_sec;
72393+ wday = runtime / (60 * 60 * 24);
72394+ runtime -= wday * (60 * 60 * 24);
72395+ whr = runtime / (60 * 60);
72396+ runtime -= whr * (60 * 60);
72397+ wmin = runtime / 60;
72398+ runtime -= wmin * 60;
72399+ wsec = runtime;
72400+
72401+ task_cputime(task, &utime, &stime);
72402+ cputime = cputime_to_secs(utime + stime);
72403+ cday = cputime / (60 * 60 * 24);
72404+ cputime -= cday * (60 * 60 * 24);
72405+ chr = cputime / (60 * 60);
72406+ cputime -= chr * (60 * 60);
72407+ cmin = cputime / 60;
72408+ cputime -= cmin * 60;
72409+ csec = cputime;
72410+
72411+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
72412+
72413+ return;
72414+}
72415+
72416+#ifdef CONFIG_TASKSTATS
72417+int gr_is_taskstats_denied(int pid)
72418+{
72419+ struct task_struct *task;
72420+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72421+ const struct cred *cred;
72422+#endif
72423+ int ret = 0;
72424+
72425+ /* restrict taskstats viewing to un-chrooted root users
72426+ who have the 'view' subject flag if the RBAC system is enabled
72427+ */
72428+
72429+ rcu_read_lock();
72430+ read_lock(&tasklist_lock);
72431+ task = find_task_by_vpid(pid);
72432+ if (task) {
72433+#ifdef CONFIG_GRKERNSEC_CHROOT
72434+ if (proc_is_chrooted(task))
72435+ ret = -EACCES;
72436+#endif
72437+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72438+ cred = __task_cred(task);
72439+#ifdef CONFIG_GRKERNSEC_PROC_USER
72440+ if (gr_is_global_nonroot(cred->uid))
72441+ ret = -EACCES;
72442+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72443+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
72444+ ret = -EACCES;
72445+#endif
72446+#endif
72447+ if (gr_status & GR_READY) {
72448+ if (!(task->acl->mode & GR_VIEW))
72449+ ret = -EACCES;
72450+ }
72451+ } else
72452+ ret = -ENOENT;
72453+
72454+ read_unlock(&tasklist_lock);
72455+ rcu_read_unlock();
72456+
72457+ return ret;
72458+}
72459+#endif
72460+
72461+/* AUXV entries are filled via a descendant of search_binary_handler
72462+ after we've already applied the subject for the target
72463+*/
72464+int gr_acl_enable_at_secure(void)
72465+{
72466+ if (unlikely(!(gr_status & GR_READY)))
72467+ return 0;
72468+
72469+ if (current->acl->mode & GR_ATSECURE)
72470+ return 1;
72471+
72472+ return 0;
72473+}
72474+
72475+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
72476+{
72477+ struct task_struct *task = current;
72478+ struct dentry *dentry = file->f_path.dentry;
72479+ struct vfsmount *mnt = file->f_path.mnt;
72480+ struct acl_object_label *obj, *tmp;
72481+ struct acl_subject_label *subj;
72482+ unsigned int bufsize;
72483+ int is_not_root;
72484+ char *path;
72485+ dev_t dev = __get_dev(dentry);
72486+
72487+ if (unlikely(!(gr_status & GR_READY)))
72488+ return 1;
72489+
72490+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
72491+ return 1;
72492+
72493+ /* ignore Eric Biederman */
72494+ if (IS_PRIVATE(dentry->d_inode))
72495+ return 1;
72496+
72497+ subj = task->acl;
72498+ read_lock(&gr_inode_lock);
72499+ do {
72500+ obj = lookup_acl_obj_label(ino, dev, subj);
72501+ if (obj != NULL) {
72502+ read_unlock(&gr_inode_lock);
72503+ return (obj->mode & GR_FIND) ? 1 : 0;
72504+ }
72505+ } while ((subj = subj->parent_subject));
72506+ read_unlock(&gr_inode_lock);
72507+
72508+ /* this is purely an optimization since we're looking for an object
72509+ for the directory we're doing a readdir on
72510+ if it's possible for any globbed object to match the entry we're
72511+ filling into the directory, then the object we find here will be
72512+ an anchor point with attached globbed objects
72513+ */
72514+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
72515+ if (obj->globbed == NULL)
72516+ return (obj->mode & GR_FIND) ? 1 : 0;
72517+
72518+ is_not_root = ((obj->filename[0] == '/') &&
72519+ (obj->filename[1] == '\0')) ? 0 : 1;
72520+ bufsize = PAGE_SIZE - namelen - is_not_root;
72521+
72522+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
72523+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
72524+ return 1;
72525+
72526+ preempt_disable();
72527+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
72528+ bufsize);
72529+
72530+ bufsize = strlen(path);
72531+
72532+ /* if base is "/", don't append an additional slash */
72533+ if (is_not_root)
72534+ *(path + bufsize) = '/';
72535+ memcpy(path + bufsize + is_not_root, name, namelen);
72536+ *(path + bufsize + namelen + is_not_root) = '\0';
72537+
72538+ tmp = obj->globbed;
72539+ while (tmp) {
72540+ if (!glob_match(tmp->filename, path)) {
72541+ preempt_enable();
72542+ return (tmp->mode & GR_FIND) ? 1 : 0;
72543+ }
72544+ tmp = tmp->next;
72545+ }
72546+ preempt_enable();
72547+ return (obj->mode & GR_FIND) ? 1 : 0;
72548+}
72549+
72550+void gr_put_exec_file(struct task_struct *task)
72551+{
72552+ struct file *filp;
72553+
72554+ write_lock(&grsec_exec_file_lock);
72555+ filp = task->exec_file;
72556+ task->exec_file = NULL;
72557+ write_unlock(&grsec_exec_file_lock);
72558+
72559+ if (filp)
72560+ fput(filp);
72561+
72562+ return;
72563+}
72564+
72565+
72566+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
72567+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
72568+#endif
72569+#ifdef CONFIG_SECURITY
72570+EXPORT_SYMBOL_GPL(gr_check_user_change);
72571+EXPORT_SYMBOL_GPL(gr_check_group_change);
72572+#endif
72573+
72574diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
72575new file mode 100644
72576index 0000000..18ffbbd
72577--- /dev/null
72578+++ b/grsecurity/gracl_alloc.c
72579@@ -0,0 +1,105 @@
72580+#include <linux/kernel.h>
72581+#include <linux/mm.h>
72582+#include <linux/slab.h>
72583+#include <linux/vmalloc.h>
72584+#include <linux/gracl.h>
72585+#include <linux/grsecurity.h>
72586+
72587+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
72588+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
72589+
72590+static __inline__ int
72591+alloc_pop(void)
72592+{
72593+ if (current_alloc_state->alloc_stack_next == 1)
72594+ return 0;
72595+
72596+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
72597+
72598+ current_alloc_state->alloc_stack_next--;
72599+
72600+ return 1;
72601+}
72602+
72603+static __inline__ int
72604+alloc_push(void *buf)
72605+{
72606+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
72607+ return 1;
72608+
72609+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
72610+
72611+ current_alloc_state->alloc_stack_next++;
72612+
72613+ return 0;
72614+}
72615+
72616+void *
72617+acl_alloc(unsigned long len)
72618+{
72619+ void *ret = NULL;
72620+
72621+ if (!len || len > PAGE_SIZE)
72622+ goto out;
72623+
72624+ ret = kmalloc(len, GFP_KERNEL);
72625+
72626+ if (ret) {
72627+ if (alloc_push(ret)) {
72628+ kfree(ret);
72629+ ret = NULL;
72630+ }
72631+ }
72632+
72633+out:
72634+ return ret;
72635+}
72636+
72637+void *
72638+acl_alloc_num(unsigned long num, unsigned long len)
72639+{
72640+ if (!len || (num > (PAGE_SIZE / len)))
72641+ return NULL;
72642+
72643+ return acl_alloc(num * len);
72644+}
72645+
72646+void
72647+acl_free_all(void)
72648+{
72649+ if (!current_alloc_state->alloc_stack)
72650+ return;
72651+
72652+ while (alloc_pop()) ;
72653+
72654+ if (current_alloc_state->alloc_stack) {
72655+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
72656+ kfree(current_alloc_state->alloc_stack);
72657+ else
72658+ vfree(current_alloc_state->alloc_stack);
72659+ }
72660+
72661+ current_alloc_state->alloc_stack = NULL;
72662+ current_alloc_state->alloc_stack_size = 1;
72663+ current_alloc_state->alloc_stack_next = 1;
72664+
72665+ return;
72666+}
72667+
72668+int
72669+acl_alloc_stack_init(unsigned long size)
72670+{
72671+ if ((size * sizeof (void *)) <= PAGE_SIZE)
72672+ current_alloc_state->alloc_stack =
72673+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
72674+ else
72675+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
72676+
72677+ current_alloc_state->alloc_stack_size = size;
72678+ current_alloc_state->alloc_stack_next = 1;
72679+
72680+ if (!current_alloc_state->alloc_stack)
72681+ return 0;
72682+ else
72683+ return 1;
72684+}
72685diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
72686new file mode 100644
72687index 0000000..1a94c11
72688--- /dev/null
72689+++ b/grsecurity/gracl_cap.c
72690@@ -0,0 +1,127 @@
72691+#include <linux/kernel.h>
72692+#include <linux/module.h>
72693+#include <linux/sched.h>
72694+#include <linux/gracl.h>
72695+#include <linux/grsecurity.h>
72696+#include <linux/grinternal.h>
72697+
72698+extern const char *captab_log[];
72699+extern int captab_log_entries;
72700+
72701+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
72702+{
72703+ struct acl_subject_label *curracl;
72704+
72705+ if (!gr_acl_is_enabled())
72706+ return 1;
72707+
72708+ curracl = task->acl;
72709+
72710+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72711+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72712+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
72713+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
72714+ gr_to_filename(task->exec_file->f_path.dentry,
72715+ task->exec_file->f_path.mnt) : curracl->filename,
72716+ curracl->filename, 0UL,
72717+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72718+ return 1;
72719+ }
72720+
72721+ return 0;
72722+}
72723+
72724+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72725+{
72726+ struct acl_subject_label *curracl;
72727+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72728+ kernel_cap_t cap_audit = __cap_empty_set;
72729+
72730+ if (!gr_acl_is_enabled())
72731+ return 1;
72732+
72733+ curracl = task->acl;
72734+
72735+ cap_drop = curracl->cap_lower;
72736+ cap_mask = curracl->cap_mask;
72737+ cap_audit = curracl->cap_invert_audit;
72738+
72739+ while ((curracl = curracl->parent_subject)) {
72740+ /* if the cap isn't specified in the current computed mask but is specified in the
72741+ current level subject, and is lowered in the current level subject, then add
72742+ it to the set of dropped capabilities
72743+ otherwise, add the current level subject's mask to the current computed mask
72744+ */
72745+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72746+ cap_raise(cap_mask, cap);
72747+ if (cap_raised(curracl->cap_lower, cap))
72748+ cap_raise(cap_drop, cap);
72749+ if (cap_raised(curracl->cap_invert_audit, cap))
72750+ cap_raise(cap_audit, cap);
72751+ }
72752+ }
72753+
72754+ if (!cap_raised(cap_drop, cap)) {
72755+ if (cap_raised(cap_audit, cap))
72756+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72757+ return 1;
72758+ }
72759+
72760+ /* only learn the capability use if the process has the capability in the
72761+ general case, the two uses in sys.c of gr_learn_cap are an exception
72762+ to this rule to ensure any role transition involves what the full-learned
72763+ policy believes in a privileged process
72764+ */
72765+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72766+ return 1;
72767+
72768+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72769+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72770+
72771+ return 0;
72772+}
72773+
72774+int
72775+gr_acl_is_capable(const int cap)
72776+{
72777+ return gr_task_acl_is_capable(current, current_cred(), cap);
72778+}
72779+
72780+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72781+{
72782+ struct acl_subject_label *curracl;
72783+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72784+
72785+ if (!gr_acl_is_enabled())
72786+ return 1;
72787+
72788+ curracl = task->acl;
72789+
72790+ cap_drop = curracl->cap_lower;
72791+ cap_mask = curracl->cap_mask;
72792+
72793+ while ((curracl = curracl->parent_subject)) {
72794+ /* if the cap isn't specified in the current computed mask but is specified in the
72795+ current level subject, and is lowered in the current level subject, then add
72796+ it to the set of dropped capabilities
72797+ otherwise, add the current level subject's mask to the current computed mask
72798+ */
72799+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72800+ cap_raise(cap_mask, cap);
72801+ if (cap_raised(curracl->cap_lower, cap))
72802+ cap_raise(cap_drop, cap);
72803+ }
72804+ }
72805+
72806+ if (!cap_raised(cap_drop, cap))
72807+ return 1;
72808+
72809+ return 0;
72810+}
72811+
72812+int
72813+gr_acl_is_capable_nolog(const int cap)
72814+{
72815+ return gr_task_acl_is_capable_nolog(current, cap);
72816+}
72817+
72818diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72819new file mode 100644
72820index 0000000..a43dd06
72821--- /dev/null
72822+++ b/grsecurity/gracl_compat.c
72823@@ -0,0 +1,269 @@
72824+#include <linux/kernel.h>
72825+#include <linux/gracl.h>
72826+#include <linux/compat.h>
72827+#include <linux/gracl_compat.h>
72828+
72829+#include <asm/uaccess.h>
72830+
72831+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72832+{
72833+ struct gr_arg_wrapper_compat uwrapcompat;
72834+
72835+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72836+ return -EFAULT;
72837+
72838+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
72839+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72840+ return -EINVAL;
72841+
72842+ uwrap->arg = compat_ptr(uwrapcompat.arg);
72843+ uwrap->version = uwrapcompat.version;
72844+ uwrap->size = sizeof(struct gr_arg);
72845+
72846+ return 0;
72847+}
72848+
72849+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72850+{
72851+ struct gr_arg_compat argcompat;
72852+
72853+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72854+ return -EFAULT;
72855+
72856+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72857+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72858+ arg->role_db.num_roles = argcompat.role_db.num_roles;
72859+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72860+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72861+ arg->role_db.num_objects = argcompat.role_db.num_objects;
72862+
72863+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72864+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72865+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72866+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72867+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72868+ arg->segv_device = argcompat.segv_device;
72869+ arg->segv_inode = argcompat.segv_inode;
72870+ arg->segv_uid = argcompat.segv_uid;
72871+ arg->num_sprole_pws = argcompat.num_sprole_pws;
72872+ arg->mode = argcompat.mode;
72873+
72874+ return 0;
72875+}
72876+
72877+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72878+{
72879+ struct acl_object_label_compat objcompat;
72880+
72881+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72882+ return -EFAULT;
72883+
72884+ obj->filename = compat_ptr(objcompat.filename);
72885+ obj->inode = objcompat.inode;
72886+ obj->device = objcompat.device;
72887+ obj->mode = objcompat.mode;
72888+
72889+ obj->nested = compat_ptr(objcompat.nested);
72890+ obj->globbed = compat_ptr(objcompat.globbed);
72891+
72892+ obj->prev = compat_ptr(objcompat.prev);
72893+ obj->next = compat_ptr(objcompat.next);
72894+
72895+ return 0;
72896+}
72897+
72898+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72899+{
72900+ unsigned int i;
72901+ struct acl_subject_label_compat subjcompat;
72902+
72903+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72904+ return -EFAULT;
72905+
72906+ subj->filename = compat_ptr(subjcompat.filename);
72907+ subj->inode = subjcompat.inode;
72908+ subj->device = subjcompat.device;
72909+ subj->mode = subjcompat.mode;
72910+ subj->cap_mask = subjcompat.cap_mask;
72911+ subj->cap_lower = subjcompat.cap_lower;
72912+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
72913+
72914+ for (i = 0; i < GR_NLIMITS; i++) {
72915+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72916+ subj->res[i].rlim_cur = RLIM_INFINITY;
72917+ else
72918+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72919+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72920+ subj->res[i].rlim_max = RLIM_INFINITY;
72921+ else
72922+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72923+ }
72924+ subj->resmask = subjcompat.resmask;
72925+
72926+ subj->user_trans_type = subjcompat.user_trans_type;
72927+ subj->group_trans_type = subjcompat.group_trans_type;
72928+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72929+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72930+ subj->user_trans_num = subjcompat.user_trans_num;
72931+ subj->group_trans_num = subjcompat.group_trans_num;
72932+
72933+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72934+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72935+ subj->ip_type = subjcompat.ip_type;
72936+ subj->ips = compat_ptr(subjcompat.ips);
72937+ subj->ip_num = subjcompat.ip_num;
72938+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
72939+
72940+ subj->crashes = subjcompat.crashes;
72941+ subj->expires = subjcompat.expires;
72942+
72943+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72944+ subj->hash = compat_ptr(subjcompat.hash);
72945+ subj->prev = compat_ptr(subjcompat.prev);
72946+ subj->next = compat_ptr(subjcompat.next);
72947+
72948+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72949+ subj->obj_hash_size = subjcompat.obj_hash_size;
72950+ subj->pax_flags = subjcompat.pax_flags;
72951+
72952+ return 0;
72953+}
72954+
72955+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72956+{
72957+ struct acl_role_label_compat rolecompat;
72958+
72959+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72960+ return -EFAULT;
72961+
72962+ role->rolename = compat_ptr(rolecompat.rolename);
72963+ role->uidgid = rolecompat.uidgid;
72964+ role->roletype = rolecompat.roletype;
72965+
72966+ role->auth_attempts = rolecompat.auth_attempts;
72967+ role->expires = rolecompat.expires;
72968+
72969+ role->root_label = compat_ptr(rolecompat.root_label);
72970+ role->hash = compat_ptr(rolecompat.hash);
72971+
72972+ role->prev = compat_ptr(rolecompat.prev);
72973+ role->next = compat_ptr(rolecompat.next);
72974+
72975+ role->transitions = compat_ptr(rolecompat.transitions);
72976+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72977+ role->domain_children = compat_ptr(rolecompat.domain_children);
72978+ role->domain_child_num = rolecompat.domain_child_num;
72979+
72980+ role->umask = rolecompat.umask;
72981+
72982+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
72983+ role->subj_hash_size = rolecompat.subj_hash_size;
72984+
72985+ return 0;
72986+}
72987+
72988+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72989+{
72990+ struct role_allowed_ip_compat roleip_compat;
72991+
72992+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72993+ return -EFAULT;
72994+
72995+ roleip->addr = roleip_compat.addr;
72996+ roleip->netmask = roleip_compat.netmask;
72997+
72998+ roleip->prev = compat_ptr(roleip_compat.prev);
72999+ roleip->next = compat_ptr(roleip_compat.next);
73000+
73001+ return 0;
73002+}
73003+
73004+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
73005+{
73006+ struct role_transition_compat trans_compat;
73007+
73008+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
73009+ return -EFAULT;
73010+
73011+ trans->rolename = compat_ptr(trans_compat.rolename);
73012+
73013+ trans->prev = compat_ptr(trans_compat.prev);
73014+ trans->next = compat_ptr(trans_compat.next);
73015+
73016+ return 0;
73017+
73018+}
73019+
73020+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73021+{
73022+ struct gr_hash_struct_compat hash_compat;
73023+
73024+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
73025+ return -EFAULT;
73026+
73027+ hash->table = compat_ptr(hash_compat.table);
73028+ hash->nametable = compat_ptr(hash_compat.nametable);
73029+ hash->first = compat_ptr(hash_compat.first);
73030+
73031+ hash->table_size = hash_compat.table_size;
73032+ hash->used_size = hash_compat.used_size;
73033+
73034+ hash->type = hash_compat.type;
73035+
73036+ return 0;
73037+}
73038+
73039+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
73040+{
73041+ compat_uptr_t ptrcompat;
73042+
73043+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
73044+ return -EFAULT;
73045+
73046+ *(void **)ptr = compat_ptr(ptrcompat);
73047+
73048+ return 0;
73049+}
73050+
73051+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73052+{
73053+ struct acl_ip_label_compat ip_compat;
73054+
73055+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
73056+ return -EFAULT;
73057+
73058+ ip->iface = compat_ptr(ip_compat.iface);
73059+ ip->addr = ip_compat.addr;
73060+ ip->netmask = ip_compat.netmask;
73061+ ip->low = ip_compat.low;
73062+ ip->high = ip_compat.high;
73063+ ip->mode = ip_compat.mode;
73064+ ip->type = ip_compat.type;
73065+
73066+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
73067+
73068+ ip->prev = compat_ptr(ip_compat.prev);
73069+ ip->next = compat_ptr(ip_compat.next);
73070+
73071+ return 0;
73072+}
73073+
73074+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73075+{
73076+ struct sprole_pw_compat pw_compat;
73077+
73078+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
73079+ return -EFAULT;
73080+
73081+ pw->rolename = compat_ptr(pw_compat.rolename);
73082+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
73083+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
73084+
73085+ return 0;
73086+}
73087+
73088+size_t get_gr_arg_wrapper_size_compat(void)
73089+{
73090+ return sizeof(struct gr_arg_wrapper_compat);
73091+}
73092+
73093diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
73094new file mode 100644
73095index 0000000..8ee8e4f
73096--- /dev/null
73097+++ b/grsecurity/gracl_fs.c
73098@@ -0,0 +1,447 @@
73099+#include <linux/kernel.h>
73100+#include <linux/sched.h>
73101+#include <linux/types.h>
73102+#include <linux/fs.h>
73103+#include <linux/file.h>
73104+#include <linux/stat.h>
73105+#include <linux/grsecurity.h>
73106+#include <linux/grinternal.h>
73107+#include <linux/gracl.h>
73108+
73109+umode_t
73110+gr_acl_umask(void)
73111+{
73112+ if (unlikely(!gr_acl_is_enabled()))
73113+ return 0;
73114+
73115+ return current->role->umask;
73116+}
73117+
73118+__u32
73119+gr_acl_handle_hidden_file(const struct dentry * dentry,
73120+ const struct vfsmount * mnt)
73121+{
73122+ __u32 mode;
73123+
73124+ if (unlikely(d_is_negative(dentry)))
73125+ return GR_FIND;
73126+
73127+ mode =
73128+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
73129+
73130+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
73131+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73132+ return mode;
73133+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
73134+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73135+ return 0;
73136+ } else if (unlikely(!(mode & GR_FIND)))
73137+ return 0;
73138+
73139+ return GR_FIND;
73140+}
73141+
73142+__u32
73143+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
73144+ int acc_mode)
73145+{
73146+ __u32 reqmode = GR_FIND;
73147+ __u32 mode;
73148+
73149+ if (unlikely(d_is_negative(dentry)))
73150+ return reqmode;
73151+
73152+ if (acc_mode & MAY_APPEND)
73153+ reqmode |= GR_APPEND;
73154+ else if (acc_mode & MAY_WRITE)
73155+ reqmode |= GR_WRITE;
73156+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
73157+ reqmode |= GR_READ;
73158+
73159+ mode =
73160+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73161+ mnt);
73162+
73163+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73164+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73165+ reqmode & GR_READ ? " reading" : "",
73166+ reqmode & GR_WRITE ? " writing" : reqmode &
73167+ GR_APPEND ? " appending" : "");
73168+ return reqmode;
73169+ } else
73170+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73171+ {
73172+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73173+ reqmode & GR_READ ? " reading" : "",
73174+ reqmode & GR_WRITE ? " writing" : reqmode &
73175+ GR_APPEND ? " appending" : "");
73176+ return 0;
73177+ } else if (unlikely((mode & reqmode) != reqmode))
73178+ return 0;
73179+
73180+ return reqmode;
73181+}
73182+
73183+__u32
73184+gr_acl_handle_creat(const struct dentry * dentry,
73185+ const struct dentry * p_dentry,
73186+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
73187+ const int imode)
73188+{
73189+ __u32 reqmode = GR_WRITE | GR_CREATE;
73190+ __u32 mode;
73191+
73192+ if (acc_mode & MAY_APPEND)
73193+ reqmode |= GR_APPEND;
73194+ // if a directory was required or the directory already exists, then
73195+ // don't count this open as a read
73196+ if ((acc_mode & MAY_READ) &&
73197+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
73198+ reqmode |= GR_READ;
73199+ if ((open_flags & O_CREAT) &&
73200+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
73201+ reqmode |= GR_SETID;
73202+
73203+ mode =
73204+ gr_check_create(dentry, p_dentry, p_mnt,
73205+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
73206+
73207+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73208+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73209+ reqmode & GR_READ ? " reading" : "",
73210+ reqmode & GR_WRITE ? " writing" : reqmode &
73211+ GR_APPEND ? " appending" : "");
73212+ return reqmode;
73213+ } else
73214+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73215+ {
73216+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73217+ reqmode & GR_READ ? " reading" : "",
73218+ reqmode & GR_WRITE ? " writing" : reqmode &
73219+ GR_APPEND ? " appending" : "");
73220+ return 0;
73221+ } else if (unlikely((mode & reqmode) != reqmode))
73222+ return 0;
73223+
73224+ return reqmode;
73225+}
73226+
73227+__u32
73228+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
73229+ const int fmode)
73230+{
73231+ __u32 mode, reqmode = GR_FIND;
73232+
73233+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
73234+ reqmode |= GR_EXEC;
73235+ if (fmode & S_IWOTH)
73236+ reqmode |= GR_WRITE;
73237+ if (fmode & S_IROTH)
73238+ reqmode |= GR_READ;
73239+
73240+ mode =
73241+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73242+ mnt);
73243+
73244+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73245+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73246+ reqmode & GR_READ ? " reading" : "",
73247+ reqmode & GR_WRITE ? " writing" : "",
73248+ reqmode & GR_EXEC ? " executing" : "");
73249+ return reqmode;
73250+ } else
73251+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73252+ {
73253+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73254+ reqmode & GR_READ ? " reading" : "",
73255+ reqmode & GR_WRITE ? " writing" : "",
73256+ reqmode & GR_EXEC ? " executing" : "");
73257+ return 0;
73258+ } else if (unlikely((mode & reqmode) != reqmode))
73259+ return 0;
73260+
73261+ return reqmode;
73262+}
73263+
73264+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
73265+{
73266+ __u32 mode;
73267+
73268+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
73269+
73270+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
73271+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
73272+ return mode;
73273+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
73274+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
73275+ return 0;
73276+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
73277+ return 0;
73278+
73279+ return (reqmode);
73280+}
73281+
73282+__u32
73283+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
73284+{
73285+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
73286+}
73287+
73288+__u32
73289+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
73290+{
73291+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
73292+}
73293+
73294+__u32
73295+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
73296+{
73297+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
73298+}
73299+
73300+__u32
73301+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
73302+{
73303+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
73304+}
73305+
73306+__u32
73307+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
73308+ umode_t *modeptr)
73309+{
73310+ umode_t mode;
73311+
73312+ *modeptr &= ~gr_acl_umask();
73313+ mode = *modeptr;
73314+
73315+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
73316+ return 1;
73317+
73318+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
73319+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
73320+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
73321+ GR_CHMOD_ACL_MSG);
73322+ } else {
73323+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
73324+ }
73325+}
73326+
73327+__u32
73328+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
73329+{
73330+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
73331+}
73332+
73333+__u32
73334+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
73335+{
73336+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
73337+}
73338+
73339+__u32
73340+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
73341+{
73342+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
73343+}
73344+
73345+__u32
73346+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
73347+{
73348+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
73349+}
73350+
73351+__u32
73352+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
73353+{
73354+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
73355+ GR_UNIXCONNECT_ACL_MSG);
73356+}
73357+
73358+/* hardlinks require at minimum create and link permission,
73359+ any additional privilege required is based on the
73360+ privilege of the file being linked to
73361+*/
73362+__u32
73363+gr_acl_handle_link(const struct dentry * new_dentry,
73364+ const struct dentry * parent_dentry,
73365+ const struct vfsmount * parent_mnt,
73366+ const struct dentry * old_dentry,
73367+ const struct vfsmount * old_mnt, const struct filename *to)
73368+{
73369+ __u32 mode;
73370+ __u32 needmode = GR_CREATE | GR_LINK;
73371+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
73372+
73373+ mode =
73374+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
73375+ old_mnt);
73376+
73377+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
73378+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73379+ return mode;
73380+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73381+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73382+ return 0;
73383+ } else if (unlikely((mode & needmode) != needmode))
73384+ return 0;
73385+
73386+ return 1;
73387+}
73388+
73389+__u32
73390+gr_acl_handle_symlink(const struct dentry * new_dentry,
73391+ const struct dentry * parent_dentry,
73392+ const struct vfsmount * parent_mnt, const struct filename *from)
73393+{
73394+ __u32 needmode = GR_WRITE | GR_CREATE;
73395+ __u32 mode;
73396+
73397+ mode =
73398+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
73399+ GR_CREATE | GR_AUDIT_CREATE |
73400+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
73401+
73402+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
73403+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73404+ return mode;
73405+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73406+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73407+ return 0;
73408+ } else if (unlikely((mode & needmode) != needmode))
73409+ return 0;
73410+
73411+ return (GR_WRITE | GR_CREATE);
73412+}
73413+
73414+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)
73415+{
73416+ __u32 mode;
73417+
73418+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
73419+
73420+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
73421+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
73422+ return mode;
73423+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
73424+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
73425+ return 0;
73426+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
73427+ return 0;
73428+
73429+ return (reqmode);
73430+}
73431+
73432+__u32
73433+gr_acl_handle_mknod(const struct dentry * new_dentry,
73434+ const struct dentry * parent_dentry,
73435+ const struct vfsmount * parent_mnt,
73436+ const int mode)
73437+{
73438+ __u32 reqmode = GR_WRITE | GR_CREATE;
73439+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
73440+ reqmode |= GR_SETID;
73441+
73442+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
73443+ reqmode, GR_MKNOD_ACL_MSG);
73444+}
73445+
73446+__u32
73447+gr_acl_handle_mkdir(const struct dentry *new_dentry,
73448+ const struct dentry *parent_dentry,
73449+ const struct vfsmount *parent_mnt)
73450+{
73451+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
73452+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
73453+}
73454+
73455+#define RENAME_CHECK_SUCCESS(old, new) \
73456+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
73457+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
73458+
73459+int
73460+gr_acl_handle_rename(struct dentry *new_dentry,
73461+ struct dentry *parent_dentry,
73462+ const struct vfsmount *parent_mnt,
73463+ struct dentry *old_dentry,
73464+ struct inode *old_parent_inode,
73465+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
73466+{
73467+ __u32 comp1, comp2;
73468+ int error = 0;
73469+
73470+ if (unlikely(!gr_acl_is_enabled()))
73471+ return 0;
73472+
73473+ if (flags & RENAME_EXCHANGE) {
73474+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
73475+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73476+ GR_SUPPRESS, parent_mnt);
73477+ comp2 =
73478+ gr_search_file(old_dentry,
73479+ GR_READ | GR_WRITE | GR_AUDIT_READ |
73480+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73481+ } else if (d_is_negative(new_dentry)) {
73482+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
73483+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
73484+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
73485+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
73486+ GR_DELETE | GR_AUDIT_DELETE |
73487+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73488+ GR_SUPPRESS, old_mnt);
73489+ } else {
73490+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
73491+ GR_CREATE | GR_DELETE |
73492+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
73493+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73494+ GR_SUPPRESS, parent_mnt);
73495+ comp2 =
73496+ gr_search_file(old_dentry,
73497+ GR_READ | GR_WRITE | GR_AUDIT_READ |
73498+ GR_DELETE | GR_AUDIT_DELETE |
73499+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73500+ }
73501+
73502+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
73503+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
73504+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73505+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
73506+ && !(comp2 & GR_SUPPRESS)) {
73507+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73508+ error = -EACCES;
73509+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
73510+ error = -EACCES;
73511+
73512+ return error;
73513+}
73514+
73515+void
73516+gr_acl_handle_exit(void)
73517+{
73518+ u16 id;
73519+ char *rolename;
73520+
73521+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
73522+ !(current->role->roletype & GR_ROLE_PERSIST))) {
73523+ id = current->acl_role_id;
73524+ rolename = current->role->rolename;
73525+ gr_set_acls(1);
73526+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
73527+ }
73528+
73529+ gr_put_exec_file(current);
73530+ return;
73531+}
73532+
73533+int
73534+gr_acl_handle_procpidmem(const struct task_struct *task)
73535+{
73536+ if (unlikely(!gr_acl_is_enabled()))
73537+ return 0;
73538+
73539+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
73540+ !(current->acl->mode & GR_POVERRIDE) &&
73541+ !(current->role->roletype & GR_ROLE_GOD))
73542+ return -EACCES;
73543+
73544+ return 0;
73545+}
73546diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
73547new file mode 100644
73548index 0000000..f056b81
73549--- /dev/null
73550+++ b/grsecurity/gracl_ip.c
73551@@ -0,0 +1,386 @@
73552+#include <linux/kernel.h>
73553+#include <asm/uaccess.h>
73554+#include <asm/errno.h>
73555+#include <net/sock.h>
73556+#include <linux/file.h>
73557+#include <linux/fs.h>
73558+#include <linux/net.h>
73559+#include <linux/in.h>
73560+#include <linux/skbuff.h>
73561+#include <linux/ip.h>
73562+#include <linux/udp.h>
73563+#include <linux/types.h>
73564+#include <linux/sched.h>
73565+#include <linux/netdevice.h>
73566+#include <linux/inetdevice.h>
73567+#include <linux/gracl.h>
73568+#include <linux/grsecurity.h>
73569+#include <linux/grinternal.h>
73570+
73571+#define GR_BIND 0x01
73572+#define GR_CONNECT 0x02
73573+#define GR_INVERT 0x04
73574+#define GR_BINDOVERRIDE 0x08
73575+#define GR_CONNECTOVERRIDE 0x10
73576+#define GR_SOCK_FAMILY 0x20
73577+
73578+static const char * gr_protocols[IPPROTO_MAX] = {
73579+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
73580+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
73581+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
73582+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
73583+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
73584+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
73585+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
73586+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
73587+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
73588+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
73589+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
73590+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
73591+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
73592+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
73593+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
73594+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
73595+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
73596+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
73597+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
73598+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
73599+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
73600+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
73601+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
73602+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
73603+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
73604+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
73605+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
73606+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
73607+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
73608+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
73609+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
73610+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
73611+ };
73612+
73613+static const char * gr_socktypes[SOCK_MAX] = {
73614+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
73615+ "unknown:7", "unknown:8", "unknown:9", "packet"
73616+ };
73617+
73618+static const char * gr_sockfamilies[AF_MAX+1] = {
73619+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
73620+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
73621+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
73622+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
73623+ };
73624+
73625+const char *
73626+gr_proto_to_name(unsigned char proto)
73627+{
73628+ return gr_protocols[proto];
73629+}
73630+
73631+const char *
73632+gr_socktype_to_name(unsigned char type)
73633+{
73634+ return gr_socktypes[type];
73635+}
73636+
73637+const char *
73638+gr_sockfamily_to_name(unsigned char family)
73639+{
73640+ return gr_sockfamilies[family];
73641+}
73642+
73643+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
73644+
73645+int
73646+gr_search_socket(const int domain, const int type, const int protocol)
73647+{
73648+ struct acl_subject_label *curr;
73649+ const struct cred *cred = current_cred();
73650+
73651+ if (unlikely(!gr_acl_is_enabled()))
73652+ goto exit;
73653+
73654+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
73655+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
73656+ goto exit; // let the kernel handle it
73657+
73658+ curr = current->acl;
73659+
73660+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
73661+ /* the family is allowed, if this is PF_INET allow it only if
73662+ the extra sock type/protocol checks pass */
73663+ if (domain == PF_INET)
73664+ goto inet_check;
73665+ goto exit;
73666+ } else {
73667+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73668+ __u32 fakeip = 0;
73669+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73670+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73671+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73672+ gr_to_filename(current->exec_file->f_path.dentry,
73673+ current->exec_file->f_path.mnt) :
73674+ curr->filename, curr->filename,
73675+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
73676+ &current->signal->saved_ip);
73677+ goto exit;
73678+ }
73679+ goto exit_fail;
73680+ }
73681+
73682+inet_check:
73683+ /* the rest of this checking is for IPv4 only */
73684+ if (!curr->ips)
73685+ goto exit;
73686+
73687+ if ((curr->ip_type & (1U << type)) &&
73688+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
73689+ goto exit;
73690+
73691+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73692+ /* we don't place acls on raw sockets , and sometimes
73693+ dgram/ip sockets are opened for ioctl and not
73694+ bind/connect, so we'll fake a bind learn log */
73695+ if (type == SOCK_RAW || type == SOCK_PACKET) {
73696+ __u32 fakeip = 0;
73697+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73698+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73699+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73700+ gr_to_filename(current->exec_file->f_path.dentry,
73701+ current->exec_file->f_path.mnt) :
73702+ curr->filename, curr->filename,
73703+ &fakeip, 0, type,
73704+ protocol, GR_CONNECT, &current->signal->saved_ip);
73705+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
73706+ __u32 fakeip = 0;
73707+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73708+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73709+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73710+ gr_to_filename(current->exec_file->f_path.dentry,
73711+ current->exec_file->f_path.mnt) :
73712+ curr->filename, curr->filename,
73713+ &fakeip, 0, type,
73714+ protocol, GR_BIND, &current->signal->saved_ip);
73715+ }
73716+ /* we'll log when they use connect or bind */
73717+ goto exit;
73718+ }
73719+
73720+exit_fail:
73721+ if (domain == PF_INET)
73722+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73723+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
73724+ else if (rcu_access_pointer(net_families[domain]) != NULL)
73725+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73726+ gr_socktype_to_name(type), protocol);
73727+
73728+ return 0;
73729+exit:
73730+ return 1;
73731+}
73732+
73733+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)
73734+{
73735+ if ((ip->mode & mode) &&
73736+ (ip_port >= ip->low) &&
73737+ (ip_port <= ip->high) &&
73738+ ((ntohl(ip_addr) & our_netmask) ==
73739+ (ntohl(our_addr) & our_netmask))
73740+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73741+ && (ip->type & (1U << type))) {
73742+ if (ip->mode & GR_INVERT)
73743+ return 2; // specifically denied
73744+ else
73745+ return 1; // allowed
73746+ }
73747+
73748+ return 0; // not specifically allowed, may continue parsing
73749+}
73750+
73751+static int
73752+gr_search_connectbind(const int full_mode, struct sock *sk,
73753+ struct sockaddr_in *addr, const int type)
73754+{
73755+ char iface[IFNAMSIZ] = {0};
73756+ struct acl_subject_label *curr;
73757+ struct acl_ip_label *ip;
73758+ struct inet_sock *isk;
73759+ struct net_device *dev;
73760+ struct in_device *idev;
73761+ unsigned long i;
73762+ int ret;
73763+ int mode = full_mode & (GR_BIND | GR_CONNECT);
73764+ __u32 ip_addr = 0;
73765+ __u32 our_addr;
73766+ __u32 our_netmask;
73767+ char *p;
73768+ __u16 ip_port = 0;
73769+ const struct cred *cred = current_cred();
73770+
73771+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73772+ return 0;
73773+
73774+ curr = current->acl;
73775+ isk = inet_sk(sk);
73776+
73777+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73778+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73779+ addr->sin_addr.s_addr = curr->inaddr_any_override;
73780+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73781+ struct sockaddr_in saddr;
73782+ int err;
73783+
73784+ saddr.sin_family = AF_INET;
73785+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
73786+ saddr.sin_port = isk->inet_sport;
73787+
73788+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73789+ if (err)
73790+ return err;
73791+
73792+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73793+ if (err)
73794+ return err;
73795+ }
73796+
73797+ if (!curr->ips)
73798+ return 0;
73799+
73800+ ip_addr = addr->sin_addr.s_addr;
73801+ ip_port = ntohs(addr->sin_port);
73802+
73803+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73804+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73805+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73806+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73807+ gr_to_filename(current->exec_file->f_path.dentry,
73808+ current->exec_file->f_path.mnt) :
73809+ curr->filename, curr->filename,
73810+ &ip_addr, ip_port, type,
73811+ sk->sk_protocol, mode, &current->signal->saved_ip);
73812+ return 0;
73813+ }
73814+
73815+ for (i = 0; i < curr->ip_num; i++) {
73816+ ip = *(curr->ips + i);
73817+ if (ip->iface != NULL) {
73818+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
73819+ p = strchr(iface, ':');
73820+ if (p != NULL)
73821+ *p = '\0';
73822+ dev = dev_get_by_name(sock_net(sk), iface);
73823+ if (dev == NULL)
73824+ continue;
73825+ idev = in_dev_get(dev);
73826+ if (idev == NULL) {
73827+ dev_put(dev);
73828+ continue;
73829+ }
73830+ rcu_read_lock();
73831+ for_ifa(idev) {
73832+ if (!strcmp(ip->iface, ifa->ifa_label)) {
73833+ our_addr = ifa->ifa_address;
73834+ our_netmask = 0xffffffff;
73835+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73836+ if (ret == 1) {
73837+ rcu_read_unlock();
73838+ in_dev_put(idev);
73839+ dev_put(dev);
73840+ return 0;
73841+ } else if (ret == 2) {
73842+ rcu_read_unlock();
73843+ in_dev_put(idev);
73844+ dev_put(dev);
73845+ goto denied;
73846+ }
73847+ }
73848+ } endfor_ifa(idev);
73849+ rcu_read_unlock();
73850+ in_dev_put(idev);
73851+ dev_put(dev);
73852+ } else {
73853+ our_addr = ip->addr;
73854+ our_netmask = ip->netmask;
73855+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73856+ if (ret == 1)
73857+ return 0;
73858+ else if (ret == 2)
73859+ goto denied;
73860+ }
73861+ }
73862+
73863+denied:
73864+ if (mode == GR_BIND)
73865+ 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));
73866+ else if (mode == GR_CONNECT)
73867+ 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));
73868+
73869+ return -EACCES;
73870+}
73871+
73872+int
73873+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73874+{
73875+ /* always allow disconnection of dgram sockets with connect */
73876+ if (addr->sin_family == AF_UNSPEC)
73877+ return 0;
73878+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73879+}
73880+
73881+int
73882+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73883+{
73884+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73885+}
73886+
73887+int gr_search_listen(struct socket *sock)
73888+{
73889+ struct sock *sk = sock->sk;
73890+ struct sockaddr_in addr;
73891+
73892+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73893+ addr.sin_port = inet_sk(sk)->inet_sport;
73894+
73895+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73896+}
73897+
73898+int gr_search_accept(struct socket *sock)
73899+{
73900+ struct sock *sk = sock->sk;
73901+ struct sockaddr_in addr;
73902+
73903+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73904+ addr.sin_port = inet_sk(sk)->inet_sport;
73905+
73906+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73907+}
73908+
73909+int
73910+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73911+{
73912+ if (addr)
73913+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73914+ else {
73915+ struct sockaddr_in sin;
73916+ const struct inet_sock *inet = inet_sk(sk);
73917+
73918+ sin.sin_addr.s_addr = inet->inet_daddr;
73919+ sin.sin_port = inet->inet_dport;
73920+
73921+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73922+ }
73923+}
73924+
73925+int
73926+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73927+{
73928+ struct sockaddr_in sin;
73929+
73930+ if (unlikely(skb->len < sizeof (struct udphdr)))
73931+ return 0; // skip this packet
73932+
73933+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73934+ sin.sin_port = udp_hdr(skb)->source;
73935+
73936+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73937+}
73938diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73939new file mode 100644
73940index 0000000..25f54ef
73941--- /dev/null
73942+++ b/grsecurity/gracl_learn.c
73943@@ -0,0 +1,207 @@
73944+#include <linux/kernel.h>
73945+#include <linux/mm.h>
73946+#include <linux/sched.h>
73947+#include <linux/poll.h>
73948+#include <linux/string.h>
73949+#include <linux/file.h>
73950+#include <linux/types.h>
73951+#include <linux/vmalloc.h>
73952+#include <linux/grinternal.h>
73953+
73954+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73955+ size_t count, loff_t *ppos);
73956+extern int gr_acl_is_enabled(void);
73957+
73958+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73959+static int gr_learn_attached;
73960+
73961+/* use a 512k buffer */
73962+#define LEARN_BUFFER_SIZE (512 * 1024)
73963+
73964+static DEFINE_SPINLOCK(gr_learn_lock);
73965+static DEFINE_MUTEX(gr_learn_user_mutex);
73966+
73967+/* we need to maintain two buffers, so that the kernel context of grlearn
73968+ uses a semaphore around the userspace copying, and the other kernel contexts
73969+ use a spinlock when copying into the buffer, since they cannot sleep
73970+*/
73971+static char *learn_buffer;
73972+static char *learn_buffer_user;
73973+static int learn_buffer_len;
73974+static int learn_buffer_user_len;
73975+
73976+static ssize_t
73977+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73978+{
73979+ DECLARE_WAITQUEUE(wait, current);
73980+ ssize_t retval = 0;
73981+
73982+ add_wait_queue(&learn_wait, &wait);
73983+ set_current_state(TASK_INTERRUPTIBLE);
73984+ do {
73985+ mutex_lock(&gr_learn_user_mutex);
73986+ spin_lock(&gr_learn_lock);
73987+ if (learn_buffer_len)
73988+ break;
73989+ spin_unlock(&gr_learn_lock);
73990+ mutex_unlock(&gr_learn_user_mutex);
73991+ if (file->f_flags & O_NONBLOCK) {
73992+ retval = -EAGAIN;
73993+ goto out;
73994+ }
73995+ if (signal_pending(current)) {
73996+ retval = -ERESTARTSYS;
73997+ goto out;
73998+ }
73999+
74000+ schedule();
74001+ } while (1);
74002+
74003+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
74004+ learn_buffer_user_len = learn_buffer_len;
74005+ retval = learn_buffer_len;
74006+ learn_buffer_len = 0;
74007+
74008+ spin_unlock(&gr_learn_lock);
74009+
74010+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
74011+ retval = -EFAULT;
74012+
74013+ mutex_unlock(&gr_learn_user_mutex);
74014+out:
74015+ set_current_state(TASK_RUNNING);
74016+ remove_wait_queue(&learn_wait, &wait);
74017+ return retval;
74018+}
74019+
74020+static unsigned int
74021+poll_learn(struct file * file, poll_table * wait)
74022+{
74023+ poll_wait(file, &learn_wait, wait);
74024+
74025+ if (learn_buffer_len)
74026+ return (POLLIN | POLLRDNORM);
74027+
74028+ return 0;
74029+}
74030+
74031+void
74032+gr_clear_learn_entries(void)
74033+{
74034+ char *tmp;
74035+
74036+ mutex_lock(&gr_learn_user_mutex);
74037+ spin_lock(&gr_learn_lock);
74038+ tmp = learn_buffer;
74039+ learn_buffer = NULL;
74040+ spin_unlock(&gr_learn_lock);
74041+ if (tmp)
74042+ vfree(tmp);
74043+ if (learn_buffer_user != NULL) {
74044+ vfree(learn_buffer_user);
74045+ learn_buffer_user = NULL;
74046+ }
74047+ learn_buffer_len = 0;
74048+ mutex_unlock(&gr_learn_user_mutex);
74049+
74050+ return;
74051+}
74052+
74053+void
74054+gr_add_learn_entry(const char *fmt, ...)
74055+{
74056+ va_list args;
74057+ unsigned int len;
74058+
74059+ if (!gr_learn_attached)
74060+ return;
74061+
74062+ spin_lock(&gr_learn_lock);
74063+
74064+ /* leave a gap at the end so we know when it's "full" but don't have to
74065+ compute the exact length of the string we're trying to append
74066+ */
74067+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
74068+ spin_unlock(&gr_learn_lock);
74069+ wake_up_interruptible(&learn_wait);
74070+ return;
74071+ }
74072+ if (learn_buffer == NULL) {
74073+ spin_unlock(&gr_learn_lock);
74074+ return;
74075+ }
74076+
74077+ va_start(args, fmt);
74078+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
74079+ va_end(args);
74080+
74081+ learn_buffer_len += len + 1;
74082+
74083+ spin_unlock(&gr_learn_lock);
74084+ wake_up_interruptible(&learn_wait);
74085+
74086+ return;
74087+}
74088+
74089+static int
74090+open_learn(struct inode *inode, struct file *file)
74091+{
74092+ if (file->f_mode & FMODE_READ && gr_learn_attached)
74093+ return -EBUSY;
74094+ if (file->f_mode & FMODE_READ) {
74095+ int retval = 0;
74096+ mutex_lock(&gr_learn_user_mutex);
74097+ if (learn_buffer == NULL)
74098+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
74099+ if (learn_buffer_user == NULL)
74100+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
74101+ if (learn_buffer == NULL) {
74102+ retval = -ENOMEM;
74103+ goto out_error;
74104+ }
74105+ if (learn_buffer_user == NULL) {
74106+ retval = -ENOMEM;
74107+ goto out_error;
74108+ }
74109+ learn_buffer_len = 0;
74110+ learn_buffer_user_len = 0;
74111+ gr_learn_attached = 1;
74112+out_error:
74113+ mutex_unlock(&gr_learn_user_mutex);
74114+ return retval;
74115+ }
74116+ return 0;
74117+}
74118+
74119+static int
74120+close_learn(struct inode *inode, struct file *file)
74121+{
74122+ if (file->f_mode & FMODE_READ) {
74123+ char *tmp = NULL;
74124+ mutex_lock(&gr_learn_user_mutex);
74125+ spin_lock(&gr_learn_lock);
74126+ tmp = learn_buffer;
74127+ learn_buffer = NULL;
74128+ spin_unlock(&gr_learn_lock);
74129+ if (tmp)
74130+ vfree(tmp);
74131+ if (learn_buffer_user != NULL) {
74132+ vfree(learn_buffer_user);
74133+ learn_buffer_user = NULL;
74134+ }
74135+ learn_buffer_len = 0;
74136+ learn_buffer_user_len = 0;
74137+ gr_learn_attached = 0;
74138+ mutex_unlock(&gr_learn_user_mutex);
74139+ }
74140+
74141+ return 0;
74142+}
74143+
74144+const struct file_operations grsec_fops = {
74145+ .read = read_learn,
74146+ .write = write_grsec_handler,
74147+ .open = open_learn,
74148+ .release = close_learn,
74149+ .poll = poll_learn,
74150+};
74151diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
74152new file mode 100644
74153index 0000000..fd26052
74154--- /dev/null
74155+++ b/grsecurity/gracl_policy.c
74156@@ -0,0 +1,1781 @@
74157+#include <linux/kernel.h>
74158+#include <linux/module.h>
74159+#include <linux/sched.h>
74160+#include <linux/mm.h>
74161+#include <linux/file.h>
74162+#include <linux/fs.h>
74163+#include <linux/namei.h>
74164+#include <linux/mount.h>
74165+#include <linux/tty.h>
74166+#include <linux/proc_fs.h>
74167+#include <linux/lglock.h>
74168+#include <linux/slab.h>
74169+#include <linux/vmalloc.h>
74170+#include <linux/types.h>
74171+#include <linux/sysctl.h>
74172+#include <linux/netdevice.h>
74173+#include <linux/ptrace.h>
74174+#include <linux/gracl.h>
74175+#include <linux/gralloc.h>
74176+#include <linux/security.h>
74177+#include <linux/grinternal.h>
74178+#include <linux/pid_namespace.h>
74179+#include <linux/stop_machine.h>
74180+#include <linux/fdtable.h>
74181+#include <linux/percpu.h>
74182+#include <linux/lglock.h>
74183+#include <linux/hugetlb.h>
74184+#include <linux/posix-timers.h>
74185+#include "../fs/mount.h"
74186+
74187+#include <asm/uaccess.h>
74188+#include <asm/errno.h>
74189+#include <asm/mman.h>
74190+
74191+extern struct gr_policy_state *polstate;
74192+
74193+#define FOR_EACH_ROLE_START(role) \
74194+ role = polstate->role_list; \
74195+ while (role) {
74196+
74197+#define FOR_EACH_ROLE_END(role) \
74198+ role = role->prev; \
74199+ }
74200+
74201+struct path gr_real_root;
74202+
74203+extern struct gr_alloc_state *current_alloc_state;
74204+
74205+u16 acl_sp_role_value;
74206+
74207+static DEFINE_MUTEX(gr_dev_mutex);
74208+
74209+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
74210+extern void gr_clear_learn_entries(void);
74211+
74212+struct gr_arg *gr_usermode __read_only;
74213+unsigned char *gr_system_salt __read_only;
74214+unsigned char *gr_system_sum __read_only;
74215+
74216+static unsigned int gr_auth_attempts = 0;
74217+static unsigned long gr_auth_expires = 0UL;
74218+
74219+struct acl_object_label *fakefs_obj_rw;
74220+struct acl_object_label *fakefs_obj_rwx;
74221+
74222+extern int gr_init_uidset(void);
74223+extern void gr_free_uidset(void);
74224+extern void gr_remove_uid(uid_t uid);
74225+extern int gr_find_uid(uid_t uid);
74226+
74227+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);
74228+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
74229+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
74230+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
74231+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);
74232+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
74233+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
74234+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
74235+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
74236+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74237+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74238+extern void assign_special_role(const char *rolename);
74239+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
74240+extern int gr_rbac_disable(void *unused);
74241+extern void gr_enable_rbac_system(void);
74242+
74243+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
74244+{
74245+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
74246+ return -EFAULT;
74247+
74248+ return 0;
74249+}
74250+
74251+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
74252+{
74253+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
74254+ return -EFAULT;
74255+
74256+ return 0;
74257+}
74258+
74259+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
74260+{
74261+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
74262+ return -EFAULT;
74263+
74264+ return 0;
74265+}
74266+
74267+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
74268+{
74269+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
74270+ return -EFAULT;
74271+
74272+ return 0;
74273+}
74274+
74275+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
74276+{
74277+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
74278+ return -EFAULT;
74279+
74280+ return 0;
74281+}
74282+
74283+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
74284+{
74285+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
74286+ return -EFAULT;
74287+
74288+ return 0;
74289+}
74290+
74291+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
74292+{
74293+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
74294+ return -EFAULT;
74295+
74296+ return 0;
74297+}
74298+
74299+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
74300+{
74301+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
74302+ return -EFAULT;
74303+
74304+ return 0;
74305+}
74306+
74307+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
74308+{
74309+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
74310+ return -EFAULT;
74311+
74312+ return 0;
74313+}
74314+
74315+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
74316+{
74317+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
74318+ return -EFAULT;
74319+
74320+ if ((uwrap->version != GRSECURITY_VERSION) ||
74321+ (uwrap->size != sizeof(struct gr_arg)))
74322+ return -EINVAL;
74323+
74324+ return 0;
74325+}
74326+
74327+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
74328+{
74329+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
74330+ return -EFAULT;
74331+
74332+ return 0;
74333+}
74334+
74335+static size_t get_gr_arg_wrapper_size_normal(void)
74336+{
74337+ return sizeof(struct gr_arg_wrapper);
74338+}
74339+
74340+#ifdef CONFIG_COMPAT
74341+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
74342+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
74343+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
74344+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
74345+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
74346+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
74347+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
74348+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
74349+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
74350+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
74351+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
74352+extern size_t get_gr_arg_wrapper_size_compat(void);
74353+
74354+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
74355+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
74356+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
74357+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
74358+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
74359+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
74360+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
74361+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
74362+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
74363+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
74364+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
74365+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
74366+
74367+#else
74368+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
74369+#define copy_gr_arg copy_gr_arg_normal
74370+#define copy_gr_hash_struct copy_gr_hash_struct_normal
74371+#define copy_acl_object_label copy_acl_object_label_normal
74372+#define copy_acl_subject_label copy_acl_subject_label_normal
74373+#define copy_acl_role_label copy_acl_role_label_normal
74374+#define copy_acl_ip_label copy_acl_ip_label_normal
74375+#define copy_pointer_from_array copy_pointer_from_array_normal
74376+#define copy_sprole_pw copy_sprole_pw_normal
74377+#define copy_role_transition copy_role_transition_normal
74378+#define copy_role_allowed_ip copy_role_allowed_ip_normal
74379+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
74380+#endif
74381+
74382+static struct acl_subject_label *
74383+lookup_subject_map(const struct acl_subject_label *userp)
74384+{
74385+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
74386+ struct subject_map *match;
74387+
74388+ match = polstate->subj_map_set.s_hash[index];
74389+
74390+ while (match && match->user != userp)
74391+ match = match->next;
74392+
74393+ if (match != NULL)
74394+ return match->kernel;
74395+ else
74396+ return NULL;
74397+}
74398+
74399+static void
74400+insert_subj_map_entry(struct subject_map *subjmap)
74401+{
74402+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
74403+ struct subject_map **curr;
74404+
74405+ subjmap->prev = NULL;
74406+
74407+ curr = &polstate->subj_map_set.s_hash[index];
74408+ if (*curr != NULL)
74409+ (*curr)->prev = subjmap;
74410+
74411+ subjmap->next = *curr;
74412+ *curr = subjmap;
74413+
74414+ return;
74415+}
74416+
74417+static void
74418+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
74419+{
74420+ unsigned int index =
74421+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
74422+ struct acl_role_label **curr;
74423+ struct acl_role_label *tmp, *tmp2;
74424+
74425+ curr = &polstate->acl_role_set.r_hash[index];
74426+
74427+ /* simple case, slot is empty, just set it to our role */
74428+ if (*curr == NULL) {
74429+ *curr = role;
74430+ } else {
74431+ /* example:
74432+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
74433+ 2 -> 3
74434+ */
74435+ /* first check to see if we can already be reached via this slot */
74436+ tmp = *curr;
74437+ while (tmp && tmp != role)
74438+ tmp = tmp->next;
74439+ if (tmp == role) {
74440+ /* we don't need to add ourselves to this slot's chain */
74441+ return;
74442+ }
74443+ /* we need to add ourselves to this chain, two cases */
74444+ if (role->next == NULL) {
74445+ /* simple case, append the current chain to our role */
74446+ role->next = *curr;
74447+ *curr = role;
74448+ } else {
74449+ /* 1 -> 2 -> 3 -> 4
74450+ 2 -> 3 -> 4
74451+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
74452+ */
74453+ /* trickier case: walk our role's chain until we find
74454+ the role for the start of the current slot's chain */
74455+ tmp = role;
74456+ tmp2 = *curr;
74457+ while (tmp->next && tmp->next != tmp2)
74458+ tmp = tmp->next;
74459+ if (tmp->next == tmp2) {
74460+ /* from example above, we found 3, so just
74461+ replace this slot's chain with ours */
74462+ *curr = role;
74463+ } else {
74464+ /* we didn't find a subset of our role's chain
74465+ in the current slot's chain, so append their
74466+ chain to ours, and set us as the first role in
74467+ the slot's chain
74468+
74469+ we could fold this case with the case above,
74470+ but making it explicit for clarity
74471+ */
74472+ tmp->next = tmp2;
74473+ *curr = role;
74474+ }
74475+ }
74476+ }
74477+
74478+ return;
74479+}
74480+
74481+static void
74482+insert_acl_role_label(struct acl_role_label *role)
74483+{
74484+ int i;
74485+
74486+ if (polstate->role_list == NULL) {
74487+ polstate->role_list = role;
74488+ role->prev = NULL;
74489+ } else {
74490+ role->prev = polstate->role_list;
74491+ polstate->role_list = role;
74492+ }
74493+
74494+ /* used for hash chains */
74495+ role->next = NULL;
74496+
74497+ if (role->roletype & GR_ROLE_DOMAIN) {
74498+ for (i = 0; i < role->domain_child_num; i++)
74499+ __insert_acl_role_label(role, role->domain_children[i]);
74500+ } else
74501+ __insert_acl_role_label(role, role->uidgid);
74502+}
74503+
74504+static int
74505+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
74506+{
74507+ struct name_entry **curr, *nentry;
74508+ struct inodev_entry *ientry;
74509+ unsigned int len = strlen(name);
74510+ unsigned int key = full_name_hash(name, len);
74511+ unsigned int index = key % polstate->name_set.n_size;
74512+
74513+ curr = &polstate->name_set.n_hash[index];
74514+
74515+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
74516+ curr = &((*curr)->next);
74517+
74518+ if (*curr != NULL)
74519+ return 1;
74520+
74521+ nentry = acl_alloc(sizeof (struct name_entry));
74522+ if (nentry == NULL)
74523+ return 0;
74524+ ientry = acl_alloc(sizeof (struct inodev_entry));
74525+ if (ientry == NULL)
74526+ return 0;
74527+ ientry->nentry = nentry;
74528+
74529+ nentry->key = key;
74530+ nentry->name = name;
74531+ nentry->inode = inode;
74532+ nentry->device = device;
74533+ nentry->len = len;
74534+ nentry->deleted = deleted;
74535+
74536+ nentry->prev = NULL;
74537+ curr = &polstate->name_set.n_hash[index];
74538+ if (*curr != NULL)
74539+ (*curr)->prev = nentry;
74540+ nentry->next = *curr;
74541+ *curr = nentry;
74542+
74543+ /* insert us into the table searchable by inode/dev */
74544+ __insert_inodev_entry(polstate, ientry);
74545+
74546+ return 1;
74547+}
74548+
74549+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
74550+
74551+static void *
74552+create_table(__u32 * len, int elementsize)
74553+{
74554+ unsigned int table_sizes[] = {
74555+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
74556+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
74557+ 4194301, 8388593, 16777213, 33554393, 67108859
74558+ };
74559+ void *newtable = NULL;
74560+ unsigned int pwr = 0;
74561+
74562+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
74563+ table_sizes[pwr] <= *len)
74564+ pwr++;
74565+
74566+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
74567+ return newtable;
74568+
74569+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
74570+ newtable =
74571+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
74572+ else
74573+ newtable = vmalloc(table_sizes[pwr] * elementsize);
74574+
74575+ *len = table_sizes[pwr];
74576+
74577+ return newtable;
74578+}
74579+
74580+static int
74581+init_variables(const struct gr_arg *arg, bool reload)
74582+{
74583+ struct task_struct *reaper = init_pid_ns.child_reaper;
74584+ unsigned int stacksize;
74585+
74586+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
74587+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
74588+ polstate->name_set.n_size = arg->role_db.num_objects;
74589+ polstate->inodev_set.i_size = arg->role_db.num_objects;
74590+
74591+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
74592+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
74593+ return 1;
74594+
74595+ if (!reload) {
74596+ if (!gr_init_uidset())
74597+ return 1;
74598+ }
74599+
74600+ /* set up the stack that holds allocation info */
74601+
74602+ stacksize = arg->role_db.num_pointers + 5;
74603+
74604+ if (!acl_alloc_stack_init(stacksize))
74605+ return 1;
74606+
74607+ if (!reload) {
74608+ /* grab reference for the real root dentry and vfsmount */
74609+ get_fs_root(reaper->fs, &gr_real_root);
74610+
74611+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74612+ 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);
74613+#endif
74614+
74615+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74616+ if (fakefs_obj_rw == NULL)
74617+ return 1;
74618+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
74619+
74620+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74621+ if (fakefs_obj_rwx == NULL)
74622+ return 1;
74623+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
74624+ }
74625+
74626+ polstate->subj_map_set.s_hash =
74627+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
74628+ polstate->acl_role_set.r_hash =
74629+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
74630+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
74631+ polstate->inodev_set.i_hash =
74632+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
74633+
74634+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
74635+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
74636+ return 1;
74637+
74638+ memset(polstate->subj_map_set.s_hash, 0,
74639+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
74640+ memset(polstate->acl_role_set.r_hash, 0,
74641+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
74642+ memset(polstate->name_set.n_hash, 0,
74643+ sizeof (struct name_entry *) * polstate->name_set.n_size);
74644+ memset(polstate->inodev_set.i_hash, 0,
74645+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
74646+
74647+ return 0;
74648+}
74649+
74650+/* free information not needed after startup
74651+ currently contains user->kernel pointer mappings for subjects
74652+*/
74653+
74654+static void
74655+free_init_variables(void)
74656+{
74657+ __u32 i;
74658+
74659+ if (polstate->subj_map_set.s_hash) {
74660+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
74661+ if (polstate->subj_map_set.s_hash[i]) {
74662+ kfree(polstate->subj_map_set.s_hash[i]);
74663+ polstate->subj_map_set.s_hash[i] = NULL;
74664+ }
74665+ }
74666+
74667+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
74668+ PAGE_SIZE)
74669+ kfree(polstate->subj_map_set.s_hash);
74670+ else
74671+ vfree(polstate->subj_map_set.s_hash);
74672+ }
74673+
74674+ return;
74675+}
74676+
74677+static void
74678+free_variables(bool reload)
74679+{
74680+ struct acl_subject_label *s;
74681+ struct acl_role_label *r;
74682+ struct task_struct *task, *task2;
74683+ unsigned int x;
74684+
74685+ if (!reload) {
74686+ gr_clear_learn_entries();
74687+
74688+ read_lock(&tasklist_lock);
74689+ do_each_thread(task2, task) {
74690+ task->acl_sp_role = 0;
74691+ task->acl_role_id = 0;
74692+ task->inherited = 0;
74693+ task->acl = NULL;
74694+ task->role = NULL;
74695+ } while_each_thread(task2, task);
74696+ read_unlock(&tasklist_lock);
74697+
74698+ kfree(fakefs_obj_rw);
74699+ fakefs_obj_rw = NULL;
74700+ kfree(fakefs_obj_rwx);
74701+ fakefs_obj_rwx = NULL;
74702+
74703+ /* release the reference to the real root dentry and vfsmount */
74704+ path_put(&gr_real_root);
74705+ memset(&gr_real_root, 0, sizeof(gr_real_root));
74706+ }
74707+
74708+ /* free all object hash tables */
74709+
74710+ FOR_EACH_ROLE_START(r)
74711+ if (r->subj_hash == NULL)
74712+ goto next_role;
74713+ FOR_EACH_SUBJECT_START(r, s, x)
74714+ if (s->obj_hash == NULL)
74715+ break;
74716+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74717+ kfree(s->obj_hash);
74718+ else
74719+ vfree(s->obj_hash);
74720+ FOR_EACH_SUBJECT_END(s, x)
74721+ FOR_EACH_NESTED_SUBJECT_START(r, s)
74722+ if (s->obj_hash == NULL)
74723+ break;
74724+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74725+ kfree(s->obj_hash);
74726+ else
74727+ vfree(s->obj_hash);
74728+ FOR_EACH_NESTED_SUBJECT_END(s)
74729+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74730+ kfree(r->subj_hash);
74731+ else
74732+ vfree(r->subj_hash);
74733+ r->subj_hash = NULL;
74734+next_role:
74735+ FOR_EACH_ROLE_END(r)
74736+
74737+ acl_free_all();
74738+
74739+ if (polstate->acl_role_set.r_hash) {
74740+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74741+ PAGE_SIZE)
74742+ kfree(polstate->acl_role_set.r_hash);
74743+ else
74744+ vfree(polstate->acl_role_set.r_hash);
74745+ }
74746+ if (polstate->name_set.n_hash) {
74747+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74748+ PAGE_SIZE)
74749+ kfree(polstate->name_set.n_hash);
74750+ else
74751+ vfree(polstate->name_set.n_hash);
74752+ }
74753+
74754+ if (polstate->inodev_set.i_hash) {
74755+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74756+ PAGE_SIZE)
74757+ kfree(polstate->inodev_set.i_hash);
74758+ else
74759+ vfree(polstate->inodev_set.i_hash);
74760+ }
74761+
74762+ if (!reload)
74763+ gr_free_uidset();
74764+
74765+ memset(&polstate->name_set, 0, sizeof (struct name_db));
74766+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74767+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74768+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74769+
74770+ polstate->default_role = NULL;
74771+ polstate->kernel_role = NULL;
74772+ polstate->role_list = NULL;
74773+
74774+ return;
74775+}
74776+
74777+static struct acl_subject_label *
74778+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74779+
74780+static int alloc_and_copy_string(char **name, unsigned int maxlen)
74781+{
74782+ unsigned int len = strnlen_user(*name, maxlen);
74783+ char *tmp;
74784+
74785+ if (!len || len >= maxlen)
74786+ return -EINVAL;
74787+
74788+ if ((tmp = (char *) acl_alloc(len)) == NULL)
74789+ return -ENOMEM;
74790+
74791+ if (copy_from_user(tmp, *name, len))
74792+ return -EFAULT;
74793+
74794+ tmp[len-1] = '\0';
74795+ *name = tmp;
74796+
74797+ return 0;
74798+}
74799+
74800+static int
74801+copy_user_glob(struct acl_object_label *obj)
74802+{
74803+ struct acl_object_label *g_tmp, **guser;
74804+ int error;
74805+
74806+ if (obj->globbed == NULL)
74807+ return 0;
74808+
74809+ guser = &obj->globbed;
74810+ while (*guser) {
74811+ g_tmp = (struct acl_object_label *)
74812+ acl_alloc(sizeof (struct acl_object_label));
74813+ if (g_tmp == NULL)
74814+ return -ENOMEM;
74815+
74816+ if (copy_acl_object_label(g_tmp, *guser))
74817+ return -EFAULT;
74818+
74819+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74820+ if (error)
74821+ return error;
74822+
74823+ *guser = g_tmp;
74824+ guser = &(g_tmp->next);
74825+ }
74826+
74827+ return 0;
74828+}
74829+
74830+static int
74831+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74832+ struct acl_role_label *role)
74833+{
74834+ struct acl_object_label *o_tmp;
74835+ int ret;
74836+
74837+ while (userp) {
74838+ if ((o_tmp = (struct acl_object_label *)
74839+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
74840+ return -ENOMEM;
74841+
74842+ if (copy_acl_object_label(o_tmp, userp))
74843+ return -EFAULT;
74844+
74845+ userp = o_tmp->prev;
74846+
74847+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74848+ if (ret)
74849+ return ret;
74850+
74851+ insert_acl_obj_label(o_tmp, subj);
74852+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74853+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74854+ return -ENOMEM;
74855+
74856+ ret = copy_user_glob(o_tmp);
74857+ if (ret)
74858+ return ret;
74859+
74860+ if (o_tmp->nested) {
74861+ int already_copied;
74862+
74863+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74864+ if (IS_ERR(o_tmp->nested))
74865+ return PTR_ERR(o_tmp->nested);
74866+
74867+ /* insert into nested subject list if we haven't copied this one yet
74868+ to prevent duplicate entries */
74869+ if (!already_copied) {
74870+ o_tmp->nested->next = role->hash->first;
74871+ role->hash->first = o_tmp->nested;
74872+ }
74873+ }
74874+ }
74875+
74876+ return 0;
74877+}
74878+
74879+static __u32
74880+count_user_subjs(struct acl_subject_label *userp)
74881+{
74882+ struct acl_subject_label s_tmp;
74883+ __u32 num = 0;
74884+
74885+ while (userp) {
74886+ if (copy_acl_subject_label(&s_tmp, userp))
74887+ break;
74888+
74889+ userp = s_tmp.prev;
74890+ }
74891+
74892+ return num;
74893+}
74894+
74895+static int
74896+copy_user_allowedips(struct acl_role_label *rolep)
74897+{
74898+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74899+
74900+ ruserip = rolep->allowed_ips;
74901+
74902+ while (ruserip) {
74903+ rlast = rtmp;
74904+
74905+ if ((rtmp = (struct role_allowed_ip *)
74906+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74907+ return -ENOMEM;
74908+
74909+ if (copy_role_allowed_ip(rtmp, ruserip))
74910+ return -EFAULT;
74911+
74912+ ruserip = rtmp->prev;
74913+
74914+ if (!rlast) {
74915+ rtmp->prev = NULL;
74916+ rolep->allowed_ips = rtmp;
74917+ } else {
74918+ rlast->next = rtmp;
74919+ rtmp->prev = rlast;
74920+ }
74921+
74922+ if (!ruserip)
74923+ rtmp->next = NULL;
74924+ }
74925+
74926+ return 0;
74927+}
74928+
74929+static int
74930+copy_user_transitions(struct acl_role_label *rolep)
74931+{
74932+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
74933+ int error;
74934+
74935+ rusertp = rolep->transitions;
74936+
74937+ while (rusertp) {
74938+ rlast = rtmp;
74939+
74940+ if ((rtmp = (struct role_transition *)
74941+ acl_alloc(sizeof (struct role_transition))) == NULL)
74942+ return -ENOMEM;
74943+
74944+ if (copy_role_transition(rtmp, rusertp))
74945+ return -EFAULT;
74946+
74947+ rusertp = rtmp->prev;
74948+
74949+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74950+ if (error)
74951+ return error;
74952+
74953+ if (!rlast) {
74954+ rtmp->prev = NULL;
74955+ rolep->transitions = rtmp;
74956+ } else {
74957+ rlast->next = rtmp;
74958+ rtmp->prev = rlast;
74959+ }
74960+
74961+ if (!rusertp)
74962+ rtmp->next = NULL;
74963+ }
74964+
74965+ return 0;
74966+}
74967+
74968+static __u32 count_user_objs(const struct acl_object_label __user *userp)
74969+{
74970+ struct acl_object_label o_tmp;
74971+ __u32 num = 0;
74972+
74973+ while (userp) {
74974+ if (copy_acl_object_label(&o_tmp, userp))
74975+ break;
74976+
74977+ userp = o_tmp.prev;
74978+ num++;
74979+ }
74980+
74981+ return num;
74982+}
74983+
74984+static struct acl_subject_label *
74985+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74986+{
74987+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74988+ __u32 num_objs;
74989+ struct acl_ip_label **i_tmp, *i_utmp2;
74990+ struct gr_hash_struct ghash;
74991+ struct subject_map *subjmap;
74992+ unsigned int i_num;
74993+ int err;
74994+
74995+ if (already_copied != NULL)
74996+ *already_copied = 0;
74997+
74998+ s_tmp = lookup_subject_map(userp);
74999+
75000+ /* we've already copied this subject into the kernel, just return
75001+ the reference to it, and don't copy it over again
75002+ */
75003+ if (s_tmp) {
75004+ if (already_copied != NULL)
75005+ *already_copied = 1;
75006+ return(s_tmp);
75007+ }
75008+
75009+ if ((s_tmp = (struct acl_subject_label *)
75010+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
75011+ return ERR_PTR(-ENOMEM);
75012+
75013+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
75014+ if (subjmap == NULL)
75015+ return ERR_PTR(-ENOMEM);
75016+
75017+ subjmap->user = userp;
75018+ subjmap->kernel = s_tmp;
75019+ insert_subj_map_entry(subjmap);
75020+
75021+ if (copy_acl_subject_label(s_tmp, userp))
75022+ return ERR_PTR(-EFAULT);
75023+
75024+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
75025+ if (err)
75026+ return ERR_PTR(err);
75027+
75028+ if (!strcmp(s_tmp->filename, "/"))
75029+ role->root_label = s_tmp;
75030+
75031+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
75032+ return ERR_PTR(-EFAULT);
75033+
75034+ /* copy user and group transition tables */
75035+
75036+ if (s_tmp->user_trans_num) {
75037+ uid_t *uidlist;
75038+
75039+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
75040+ if (uidlist == NULL)
75041+ return ERR_PTR(-ENOMEM);
75042+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
75043+ return ERR_PTR(-EFAULT);
75044+
75045+ s_tmp->user_transitions = uidlist;
75046+ }
75047+
75048+ if (s_tmp->group_trans_num) {
75049+ gid_t *gidlist;
75050+
75051+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
75052+ if (gidlist == NULL)
75053+ return ERR_PTR(-ENOMEM);
75054+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
75055+ return ERR_PTR(-EFAULT);
75056+
75057+ s_tmp->group_transitions = gidlist;
75058+ }
75059+
75060+ /* set up object hash table */
75061+ num_objs = count_user_objs(ghash.first);
75062+
75063+ s_tmp->obj_hash_size = num_objs;
75064+ s_tmp->obj_hash =
75065+ (struct acl_object_label **)
75066+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
75067+
75068+ if (!s_tmp->obj_hash)
75069+ return ERR_PTR(-ENOMEM);
75070+
75071+ memset(s_tmp->obj_hash, 0,
75072+ s_tmp->obj_hash_size *
75073+ sizeof (struct acl_object_label *));
75074+
75075+ /* add in objects */
75076+ err = copy_user_objs(ghash.first, s_tmp, role);
75077+
75078+ if (err)
75079+ return ERR_PTR(err);
75080+
75081+ /* set pointer for parent subject */
75082+ if (s_tmp->parent_subject) {
75083+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
75084+
75085+ if (IS_ERR(s_tmp2))
75086+ return s_tmp2;
75087+
75088+ s_tmp->parent_subject = s_tmp2;
75089+ }
75090+
75091+ /* add in ip acls */
75092+
75093+ if (!s_tmp->ip_num) {
75094+ s_tmp->ips = NULL;
75095+ goto insert;
75096+ }
75097+
75098+ i_tmp =
75099+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
75100+ sizeof (struct acl_ip_label *));
75101+
75102+ if (!i_tmp)
75103+ return ERR_PTR(-ENOMEM);
75104+
75105+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
75106+ *(i_tmp + i_num) =
75107+ (struct acl_ip_label *)
75108+ acl_alloc(sizeof (struct acl_ip_label));
75109+ if (!*(i_tmp + i_num))
75110+ return ERR_PTR(-ENOMEM);
75111+
75112+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
75113+ return ERR_PTR(-EFAULT);
75114+
75115+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
75116+ return ERR_PTR(-EFAULT);
75117+
75118+ if ((*(i_tmp + i_num))->iface == NULL)
75119+ continue;
75120+
75121+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
75122+ if (err)
75123+ return ERR_PTR(err);
75124+ }
75125+
75126+ s_tmp->ips = i_tmp;
75127+
75128+insert:
75129+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
75130+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
75131+ return ERR_PTR(-ENOMEM);
75132+
75133+ return s_tmp;
75134+}
75135+
75136+static int
75137+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
75138+{
75139+ struct acl_subject_label s_pre;
75140+ struct acl_subject_label * ret;
75141+ int err;
75142+
75143+ while (userp) {
75144+ if (copy_acl_subject_label(&s_pre, userp))
75145+ return -EFAULT;
75146+
75147+ ret = do_copy_user_subj(userp, role, NULL);
75148+
75149+ err = PTR_ERR(ret);
75150+ if (IS_ERR(ret))
75151+ return err;
75152+
75153+ insert_acl_subj_label(ret, role);
75154+
75155+ userp = s_pre.prev;
75156+ }
75157+
75158+ return 0;
75159+}
75160+
75161+static int
75162+copy_user_acl(struct gr_arg *arg)
75163+{
75164+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
75165+ struct acl_subject_label *subj_list;
75166+ struct sprole_pw *sptmp;
75167+ struct gr_hash_struct *ghash;
75168+ uid_t *domainlist;
75169+ unsigned int r_num;
75170+ int err = 0;
75171+ __u16 i;
75172+ __u32 num_subjs;
75173+
75174+ /* we need a default and kernel role */
75175+ if (arg->role_db.num_roles < 2)
75176+ return -EINVAL;
75177+
75178+ /* copy special role authentication info from userspace */
75179+
75180+ polstate->num_sprole_pws = arg->num_sprole_pws;
75181+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
75182+
75183+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
75184+ return -ENOMEM;
75185+
75186+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75187+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
75188+ if (!sptmp)
75189+ return -ENOMEM;
75190+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
75191+ return -EFAULT;
75192+
75193+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
75194+ if (err)
75195+ return err;
75196+
75197+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
75198+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
75199+#endif
75200+
75201+ polstate->acl_special_roles[i] = sptmp;
75202+ }
75203+
75204+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
75205+
75206+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
75207+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
75208+
75209+ if (!r_tmp)
75210+ return -ENOMEM;
75211+
75212+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
75213+ return -EFAULT;
75214+
75215+ if (copy_acl_role_label(r_tmp, r_utmp2))
75216+ return -EFAULT;
75217+
75218+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
75219+ if (err)
75220+ return err;
75221+
75222+ if (!strcmp(r_tmp->rolename, "default")
75223+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
75224+ polstate->default_role = r_tmp;
75225+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
75226+ polstate->kernel_role = r_tmp;
75227+ }
75228+
75229+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
75230+ return -ENOMEM;
75231+
75232+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
75233+ return -EFAULT;
75234+
75235+ r_tmp->hash = ghash;
75236+
75237+ num_subjs = count_user_subjs(r_tmp->hash->first);
75238+
75239+ r_tmp->subj_hash_size = num_subjs;
75240+ r_tmp->subj_hash =
75241+ (struct acl_subject_label **)
75242+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
75243+
75244+ if (!r_tmp->subj_hash)
75245+ return -ENOMEM;
75246+
75247+ err = copy_user_allowedips(r_tmp);
75248+ if (err)
75249+ return err;
75250+
75251+ /* copy domain info */
75252+ if (r_tmp->domain_children != NULL) {
75253+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
75254+ if (domainlist == NULL)
75255+ return -ENOMEM;
75256+
75257+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
75258+ return -EFAULT;
75259+
75260+ r_tmp->domain_children = domainlist;
75261+ }
75262+
75263+ err = copy_user_transitions(r_tmp);
75264+ if (err)
75265+ return err;
75266+
75267+ memset(r_tmp->subj_hash, 0,
75268+ r_tmp->subj_hash_size *
75269+ sizeof (struct acl_subject_label *));
75270+
75271+ /* acquire the list of subjects, then NULL out
75272+ the list prior to parsing the subjects for this role,
75273+ as during this parsing the list is replaced with a list
75274+ of *nested* subjects for the role
75275+ */
75276+ subj_list = r_tmp->hash->first;
75277+
75278+ /* set nested subject list to null */
75279+ r_tmp->hash->first = NULL;
75280+
75281+ err = copy_user_subjs(subj_list, r_tmp);
75282+
75283+ if (err)
75284+ return err;
75285+
75286+ insert_acl_role_label(r_tmp);
75287+ }
75288+
75289+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
75290+ return -EINVAL;
75291+
75292+ return err;
75293+}
75294+
75295+static int gracl_reload_apply_policies(void *reload)
75296+{
75297+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
75298+ struct task_struct *task, *task2;
75299+ struct acl_role_label *role, *rtmp;
75300+ struct acl_subject_label *subj;
75301+ const struct cred *cred;
75302+ int role_applied;
75303+ int ret = 0;
75304+
75305+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
75306+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
75307+
75308+ /* first make sure we'll be able to apply the new policy cleanly */
75309+ do_each_thread(task2, task) {
75310+ if (task->exec_file == NULL)
75311+ continue;
75312+ role_applied = 0;
75313+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75314+ /* preserve special roles */
75315+ FOR_EACH_ROLE_START(role)
75316+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75317+ rtmp = task->role;
75318+ task->role = role;
75319+ role_applied = 1;
75320+ break;
75321+ }
75322+ FOR_EACH_ROLE_END(role)
75323+ }
75324+ if (!role_applied) {
75325+ cred = __task_cred(task);
75326+ rtmp = task->role;
75327+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75328+ }
75329+ /* this handles non-nested inherited subjects, nested subjects will still
75330+ be dropped currently */
75331+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75332+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
75333+ /* change the role back so that we've made no modifications to the policy */
75334+ task->role = rtmp;
75335+
75336+ if (subj == NULL || task->tmpacl == NULL) {
75337+ ret = -EINVAL;
75338+ goto out;
75339+ }
75340+ } while_each_thread(task2, task);
75341+
75342+ /* now actually apply the policy */
75343+
75344+ do_each_thread(task2, task) {
75345+ if (task->exec_file) {
75346+ role_applied = 0;
75347+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75348+ /* preserve special roles */
75349+ FOR_EACH_ROLE_START(role)
75350+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75351+ task->role = role;
75352+ role_applied = 1;
75353+ break;
75354+ }
75355+ FOR_EACH_ROLE_END(role)
75356+ }
75357+ if (!role_applied) {
75358+ cred = __task_cred(task);
75359+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75360+ }
75361+ /* this handles non-nested inherited subjects, nested subjects will still
75362+ be dropped currently */
75363+ if (!reload_state->oldmode && task->inherited)
75364+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75365+ else {
75366+ /* looked up and tagged to the task previously */
75367+ subj = task->tmpacl;
75368+ }
75369+ /* subj will be non-null */
75370+ __gr_apply_subject_to_task(polstate, task, subj);
75371+ if (reload_state->oldmode) {
75372+ task->acl_role_id = 0;
75373+ task->acl_sp_role = 0;
75374+ task->inherited = 0;
75375+ }
75376+ } else {
75377+ // it's a kernel process
75378+ task->role = polstate->kernel_role;
75379+ task->acl = polstate->kernel_role->root_label;
75380+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75381+ task->acl->mode &= ~GR_PROCFIND;
75382+#endif
75383+ }
75384+ } while_each_thread(task2, task);
75385+
75386+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
75387+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
75388+
75389+out:
75390+
75391+ return ret;
75392+}
75393+
75394+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
75395+{
75396+ struct gr_reload_state new_reload_state = { };
75397+ int err;
75398+
75399+ new_reload_state.oldpolicy_ptr = polstate;
75400+ new_reload_state.oldalloc_ptr = current_alloc_state;
75401+ new_reload_state.oldmode = oldmode;
75402+
75403+ current_alloc_state = &new_reload_state.newalloc;
75404+ polstate = &new_reload_state.newpolicy;
75405+
75406+ /* everything relevant is now saved off, copy in the new policy */
75407+ if (init_variables(args, true)) {
75408+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
75409+ err = -ENOMEM;
75410+ goto error;
75411+ }
75412+
75413+ err = copy_user_acl(args);
75414+ free_init_variables();
75415+ if (err)
75416+ goto error;
75417+ /* the new policy is copied in, with the old policy available via saved_state
75418+ first go through applying roles, making sure to preserve special roles
75419+ then apply new subjects, making sure to preserve inherited and nested subjects,
75420+ though currently only inherited subjects will be preserved
75421+ */
75422+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
75423+ if (err)
75424+ goto error;
75425+
75426+ /* we've now applied the new policy, so restore the old policy state to free it */
75427+ polstate = &new_reload_state.oldpolicy;
75428+ current_alloc_state = &new_reload_state.oldalloc;
75429+ free_variables(true);
75430+
75431+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
75432+ to running_polstate/current_alloc_state inside stop_machine
75433+ */
75434+ err = 0;
75435+ goto out;
75436+error:
75437+ /* on error of loading the new policy, we'll just keep the previous
75438+ policy set around
75439+ */
75440+ free_variables(true);
75441+
75442+ /* doesn't affect runtime, but maintains consistent state */
75443+out:
75444+ polstate = new_reload_state.oldpolicy_ptr;
75445+ current_alloc_state = new_reload_state.oldalloc_ptr;
75446+
75447+ return err;
75448+}
75449+
75450+static int
75451+gracl_init(struct gr_arg *args)
75452+{
75453+ int error = 0;
75454+
75455+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
75456+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
75457+
75458+ if (init_variables(args, false)) {
75459+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
75460+ error = -ENOMEM;
75461+ goto out;
75462+ }
75463+
75464+ error = copy_user_acl(args);
75465+ free_init_variables();
75466+ if (error)
75467+ goto out;
75468+
75469+ error = gr_set_acls(0);
75470+ if (error)
75471+ goto out;
75472+
75473+ gr_enable_rbac_system();
75474+
75475+ return 0;
75476+
75477+out:
75478+ free_variables(false);
75479+ return error;
75480+}
75481+
75482+static int
75483+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
75484+ unsigned char **sum)
75485+{
75486+ struct acl_role_label *r;
75487+ struct role_allowed_ip *ipp;
75488+ struct role_transition *trans;
75489+ unsigned int i;
75490+ int found = 0;
75491+ u32 curr_ip = current->signal->curr_ip;
75492+
75493+ current->signal->saved_ip = curr_ip;
75494+
75495+ /* check transition table */
75496+
75497+ for (trans = current->role->transitions; trans; trans = trans->next) {
75498+ if (!strcmp(rolename, trans->rolename)) {
75499+ found = 1;
75500+ break;
75501+ }
75502+ }
75503+
75504+ if (!found)
75505+ return 0;
75506+
75507+ /* handle special roles that do not require authentication
75508+ and check ip */
75509+
75510+ FOR_EACH_ROLE_START(r)
75511+ if (!strcmp(rolename, r->rolename) &&
75512+ (r->roletype & GR_ROLE_SPECIAL)) {
75513+ found = 0;
75514+ if (r->allowed_ips != NULL) {
75515+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
75516+ if ((ntohl(curr_ip) & ipp->netmask) ==
75517+ (ntohl(ipp->addr) & ipp->netmask))
75518+ found = 1;
75519+ }
75520+ } else
75521+ found = 2;
75522+ if (!found)
75523+ return 0;
75524+
75525+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
75526+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
75527+ *salt = NULL;
75528+ *sum = NULL;
75529+ return 1;
75530+ }
75531+ }
75532+ FOR_EACH_ROLE_END(r)
75533+
75534+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75535+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
75536+ *salt = polstate->acl_special_roles[i]->salt;
75537+ *sum = polstate->acl_special_roles[i]->sum;
75538+ return 1;
75539+ }
75540+ }
75541+
75542+ return 0;
75543+}
75544+
75545+int gr_check_secure_terminal(struct task_struct *task)
75546+{
75547+ struct task_struct *p, *p2, *p3;
75548+ struct files_struct *files;
75549+ struct fdtable *fdt;
75550+ struct file *our_file = NULL, *file;
75551+ int i;
75552+
75553+ if (task->signal->tty == NULL)
75554+ return 1;
75555+
75556+ files = get_files_struct(task);
75557+ if (files != NULL) {
75558+ rcu_read_lock();
75559+ fdt = files_fdtable(files);
75560+ for (i=0; i < fdt->max_fds; i++) {
75561+ file = fcheck_files(files, i);
75562+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
75563+ get_file(file);
75564+ our_file = file;
75565+ }
75566+ }
75567+ rcu_read_unlock();
75568+ put_files_struct(files);
75569+ }
75570+
75571+ if (our_file == NULL)
75572+ return 1;
75573+
75574+ read_lock(&tasklist_lock);
75575+ do_each_thread(p2, p) {
75576+ files = get_files_struct(p);
75577+ if (files == NULL ||
75578+ (p->signal && p->signal->tty == task->signal->tty)) {
75579+ if (files != NULL)
75580+ put_files_struct(files);
75581+ continue;
75582+ }
75583+ rcu_read_lock();
75584+ fdt = files_fdtable(files);
75585+ for (i=0; i < fdt->max_fds; i++) {
75586+ file = fcheck_files(files, i);
75587+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
75588+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
75589+ p3 = task;
75590+ while (task_pid_nr(p3) > 0) {
75591+ if (p3 == p)
75592+ break;
75593+ p3 = p3->real_parent;
75594+ }
75595+ if (p3 == p)
75596+ break;
75597+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
75598+ gr_handle_alertkill(p);
75599+ rcu_read_unlock();
75600+ put_files_struct(files);
75601+ read_unlock(&tasklist_lock);
75602+ fput(our_file);
75603+ return 0;
75604+ }
75605+ }
75606+ rcu_read_unlock();
75607+ put_files_struct(files);
75608+ } while_each_thread(p2, p);
75609+ read_unlock(&tasklist_lock);
75610+
75611+ fput(our_file);
75612+ return 1;
75613+}
75614+
75615+ssize_t
75616+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
75617+{
75618+ struct gr_arg_wrapper uwrap;
75619+ unsigned char *sprole_salt = NULL;
75620+ unsigned char *sprole_sum = NULL;
75621+ int error = 0;
75622+ int error2 = 0;
75623+ size_t req_count = 0;
75624+ unsigned char oldmode = 0;
75625+
75626+ mutex_lock(&gr_dev_mutex);
75627+
75628+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
75629+ error = -EPERM;
75630+ goto out;
75631+ }
75632+
75633+#ifdef CONFIG_COMPAT
75634+ pax_open_kernel();
75635+ if (is_compat_task()) {
75636+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
75637+ copy_gr_arg = &copy_gr_arg_compat;
75638+ copy_acl_object_label = &copy_acl_object_label_compat;
75639+ copy_acl_subject_label = &copy_acl_subject_label_compat;
75640+ copy_acl_role_label = &copy_acl_role_label_compat;
75641+ copy_acl_ip_label = &copy_acl_ip_label_compat;
75642+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
75643+ copy_role_transition = &copy_role_transition_compat;
75644+ copy_sprole_pw = &copy_sprole_pw_compat;
75645+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
75646+ copy_pointer_from_array = &copy_pointer_from_array_compat;
75647+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
75648+ } else {
75649+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
75650+ copy_gr_arg = &copy_gr_arg_normal;
75651+ copy_acl_object_label = &copy_acl_object_label_normal;
75652+ copy_acl_subject_label = &copy_acl_subject_label_normal;
75653+ copy_acl_role_label = &copy_acl_role_label_normal;
75654+ copy_acl_ip_label = &copy_acl_ip_label_normal;
75655+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
75656+ copy_role_transition = &copy_role_transition_normal;
75657+ copy_sprole_pw = &copy_sprole_pw_normal;
75658+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
75659+ copy_pointer_from_array = &copy_pointer_from_array_normal;
75660+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
75661+ }
75662+ pax_close_kernel();
75663+#endif
75664+
75665+ req_count = get_gr_arg_wrapper_size();
75666+
75667+ if (count != req_count) {
75668+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
75669+ error = -EINVAL;
75670+ goto out;
75671+ }
75672+
75673+
75674+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
75675+ gr_auth_expires = 0;
75676+ gr_auth_attempts = 0;
75677+ }
75678+
75679+ error = copy_gr_arg_wrapper(buf, &uwrap);
75680+ if (error)
75681+ goto out;
75682+
75683+ error = copy_gr_arg(uwrap.arg, gr_usermode);
75684+ if (error)
75685+ goto out;
75686+
75687+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75688+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75689+ time_after(gr_auth_expires, get_seconds())) {
75690+ error = -EBUSY;
75691+ goto out;
75692+ }
75693+
75694+ /* if non-root trying to do anything other than use a special role,
75695+ do not attempt authentication, do not count towards authentication
75696+ locking
75697+ */
75698+
75699+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
75700+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75701+ gr_is_global_nonroot(current_uid())) {
75702+ error = -EPERM;
75703+ goto out;
75704+ }
75705+
75706+ /* ensure pw and special role name are null terminated */
75707+
75708+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75709+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75710+
75711+ /* Okay.
75712+ * We have our enough of the argument structure..(we have yet
75713+ * to copy_from_user the tables themselves) . Copy the tables
75714+ * only if we need them, i.e. for loading operations. */
75715+
75716+ switch (gr_usermode->mode) {
75717+ case GR_STATUS:
75718+ if (gr_acl_is_enabled()) {
75719+ error = 1;
75720+ if (!gr_check_secure_terminal(current))
75721+ error = 3;
75722+ } else
75723+ error = 2;
75724+ goto out;
75725+ case GR_SHUTDOWN:
75726+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75727+ stop_machine(gr_rbac_disable, NULL, NULL);
75728+ free_variables(false);
75729+ memset(gr_usermode, 0, sizeof(struct gr_arg));
75730+ memset(gr_system_salt, 0, GR_SALT_LEN);
75731+ memset(gr_system_sum, 0, GR_SHA_LEN);
75732+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75733+ } else if (gr_acl_is_enabled()) {
75734+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75735+ error = -EPERM;
75736+ } else {
75737+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75738+ error = -EAGAIN;
75739+ }
75740+ break;
75741+ case GR_ENABLE:
75742+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75743+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75744+ else {
75745+ if (gr_acl_is_enabled())
75746+ error = -EAGAIN;
75747+ else
75748+ error = error2;
75749+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75750+ }
75751+ break;
75752+ case GR_OLDRELOAD:
75753+ oldmode = 1;
75754+ case GR_RELOAD:
75755+ if (!gr_acl_is_enabled()) {
75756+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75757+ error = -EAGAIN;
75758+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75759+ error2 = gracl_reload(gr_usermode, oldmode);
75760+ if (!error2)
75761+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75762+ else {
75763+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75764+ error = error2;
75765+ }
75766+ } else {
75767+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75768+ error = -EPERM;
75769+ }
75770+ break;
75771+ case GR_SEGVMOD:
75772+ if (unlikely(!gr_acl_is_enabled())) {
75773+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75774+ error = -EAGAIN;
75775+ break;
75776+ }
75777+
75778+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75779+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75780+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75781+ struct acl_subject_label *segvacl;
75782+ segvacl =
75783+ lookup_acl_subj_label(gr_usermode->segv_inode,
75784+ gr_usermode->segv_device,
75785+ current->role);
75786+ if (segvacl) {
75787+ segvacl->crashes = 0;
75788+ segvacl->expires = 0;
75789+ }
75790+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75791+ gr_remove_uid(gr_usermode->segv_uid);
75792+ }
75793+ } else {
75794+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75795+ error = -EPERM;
75796+ }
75797+ break;
75798+ case GR_SPROLE:
75799+ case GR_SPROLEPAM:
75800+ if (unlikely(!gr_acl_is_enabled())) {
75801+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75802+ error = -EAGAIN;
75803+ break;
75804+ }
75805+
75806+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75807+ current->role->expires = 0;
75808+ current->role->auth_attempts = 0;
75809+ }
75810+
75811+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75812+ time_after(current->role->expires, get_seconds())) {
75813+ error = -EBUSY;
75814+ goto out;
75815+ }
75816+
75817+ if (lookup_special_role_auth
75818+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75819+ && ((!sprole_salt && !sprole_sum)
75820+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75821+ char *p = "";
75822+ assign_special_role(gr_usermode->sp_role);
75823+ read_lock(&tasklist_lock);
75824+ if (current->real_parent)
75825+ p = current->real_parent->role->rolename;
75826+ read_unlock(&tasklist_lock);
75827+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75828+ p, acl_sp_role_value);
75829+ } else {
75830+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75831+ error = -EPERM;
75832+ if(!(current->role->auth_attempts++))
75833+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75834+
75835+ goto out;
75836+ }
75837+ break;
75838+ case GR_UNSPROLE:
75839+ if (unlikely(!gr_acl_is_enabled())) {
75840+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75841+ error = -EAGAIN;
75842+ break;
75843+ }
75844+
75845+ if (current->role->roletype & GR_ROLE_SPECIAL) {
75846+ char *p = "";
75847+ int i = 0;
75848+
75849+ read_lock(&tasklist_lock);
75850+ if (current->real_parent) {
75851+ p = current->real_parent->role->rolename;
75852+ i = current->real_parent->acl_role_id;
75853+ }
75854+ read_unlock(&tasklist_lock);
75855+
75856+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75857+ gr_set_acls(1);
75858+ } else {
75859+ error = -EPERM;
75860+ goto out;
75861+ }
75862+ break;
75863+ default:
75864+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75865+ error = -EINVAL;
75866+ break;
75867+ }
75868+
75869+ if (error != -EPERM)
75870+ goto out;
75871+
75872+ if(!(gr_auth_attempts++))
75873+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75874+
75875+ out:
75876+ mutex_unlock(&gr_dev_mutex);
75877+
75878+ if (!error)
75879+ error = req_count;
75880+
75881+ return error;
75882+}
75883+
75884+int
75885+gr_set_acls(const int type)
75886+{
75887+ struct task_struct *task, *task2;
75888+ struct acl_role_label *role = current->role;
75889+ struct acl_subject_label *subj;
75890+ __u16 acl_role_id = current->acl_role_id;
75891+ const struct cred *cred;
75892+ int ret;
75893+
75894+ rcu_read_lock();
75895+ read_lock(&tasklist_lock);
75896+ read_lock(&grsec_exec_file_lock);
75897+ do_each_thread(task2, task) {
75898+ /* check to see if we're called from the exit handler,
75899+ if so, only replace ACLs that have inherited the admin
75900+ ACL */
75901+
75902+ if (type && (task->role != role ||
75903+ task->acl_role_id != acl_role_id))
75904+ continue;
75905+
75906+ task->acl_role_id = 0;
75907+ task->acl_sp_role = 0;
75908+ task->inherited = 0;
75909+
75910+ if (task->exec_file) {
75911+ cred = __task_cred(task);
75912+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75913+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
75914+ if (subj == NULL) {
75915+ ret = -EINVAL;
75916+ read_unlock(&grsec_exec_file_lock);
75917+ read_unlock(&tasklist_lock);
75918+ rcu_read_unlock();
75919+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75920+ return ret;
75921+ }
75922+ __gr_apply_subject_to_task(polstate, task, subj);
75923+ } else {
75924+ // it's a kernel process
75925+ task->role = polstate->kernel_role;
75926+ task->acl = polstate->kernel_role->root_label;
75927+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75928+ task->acl->mode &= ~GR_PROCFIND;
75929+#endif
75930+ }
75931+ } while_each_thread(task2, task);
75932+ read_unlock(&grsec_exec_file_lock);
75933+ read_unlock(&tasklist_lock);
75934+ rcu_read_unlock();
75935+
75936+ return 0;
75937+}
75938diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75939new file mode 100644
75940index 0000000..39645c9
75941--- /dev/null
75942+++ b/grsecurity/gracl_res.c
75943@@ -0,0 +1,68 @@
75944+#include <linux/kernel.h>
75945+#include <linux/sched.h>
75946+#include <linux/gracl.h>
75947+#include <linux/grinternal.h>
75948+
75949+static const char *restab_log[] = {
75950+ [RLIMIT_CPU] = "RLIMIT_CPU",
75951+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75952+ [RLIMIT_DATA] = "RLIMIT_DATA",
75953+ [RLIMIT_STACK] = "RLIMIT_STACK",
75954+ [RLIMIT_CORE] = "RLIMIT_CORE",
75955+ [RLIMIT_RSS] = "RLIMIT_RSS",
75956+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
75957+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75958+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75959+ [RLIMIT_AS] = "RLIMIT_AS",
75960+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75961+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75962+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75963+ [RLIMIT_NICE] = "RLIMIT_NICE",
75964+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75965+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75966+ [GR_CRASH_RES] = "RLIMIT_CRASH"
75967+};
75968+
75969+void
75970+gr_log_resource(const struct task_struct *task,
75971+ const int res, const unsigned long wanted, const int gt)
75972+{
75973+ const struct cred *cred;
75974+ unsigned long rlim;
75975+
75976+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
75977+ return;
75978+
75979+ // not yet supported resource
75980+ if (unlikely(!restab_log[res]))
75981+ return;
75982+
75983+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75984+ rlim = task_rlimit_max(task, res);
75985+ else
75986+ rlim = task_rlimit(task, res);
75987+
75988+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75989+ return;
75990+
75991+ rcu_read_lock();
75992+ cred = __task_cred(task);
75993+
75994+ if (res == RLIMIT_NPROC &&
75995+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75996+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75997+ goto out_rcu_unlock;
75998+ else if (res == RLIMIT_MEMLOCK &&
75999+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
76000+ goto out_rcu_unlock;
76001+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
76002+ goto out_rcu_unlock;
76003+ rcu_read_unlock();
76004+
76005+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
76006+
76007+ return;
76008+out_rcu_unlock:
76009+ rcu_read_unlock();
76010+ return;
76011+}
76012diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
76013new file mode 100644
76014index 0000000..218b66b
76015--- /dev/null
76016+++ b/grsecurity/gracl_segv.c
76017@@ -0,0 +1,324 @@
76018+#include <linux/kernel.h>
76019+#include <linux/mm.h>
76020+#include <asm/uaccess.h>
76021+#include <asm/errno.h>
76022+#include <asm/mman.h>
76023+#include <net/sock.h>
76024+#include <linux/file.h>
76025+#include <linux/fs.h>
76026+#include <linux/net.h>
76027+#include <linux/in.h>
76028+#include <linux/slab.h>
76029+#include <linux/types.h>
76030+#include <linux/sched.h>
76031+#include <linux/timer.h>
76032+#include <linux/gracl.h>
76033+#include <linux/grsecurity.h>
76034+#include <linux/grinternal.h>
76035+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76036+#include <linux/magic.h>
76037+#include <linux/pagemap.h>
76038+#include "../fs/btrfs/async-thread.h"
76039+#include "../fs/btrfs/ctree.h"
76040+#include "../fs/btrfs/btrfs_inode.h"
76041+#endif
76042+
76043+static struct crash_uid *uid_set;
76044+static unsigned short uid_used;
76045+static DEFINE_SPINLOCK(gr_uid_lock);
76046+extern rwlock_t gr_inode_lock;
76047+extern struct acl_subject_label *
76048+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
76049+ struct acl_role_label *role);
76050+
76051+static inline dev_t __get_dev(const struct dentry *dentry)
76052+{
76053+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76054+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76055+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
76056+ else
76057+#endif
76058+ return dentry->d_sb->s_dev;
76059+}
76060+
76061+static inline u64 __get_ino(const struct dentry *dentry)
76062+{
76063+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76064+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76065+ return btrfs_ino(dentry->d_inode);
76066+ else
76067+#endif
76068+ return dentry->d_inode->i_ino;
76069+}
76070+
76071+int
76072+gr_init_uidset(void)
76073+{
76074+ uid_set =
76075+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
76076+ uid_used = 0;
76077+
76078+ return uid_set ? 1 : 0;
76079+}
76080+
76081+void
76082+gr_free_uidset(void)
76083+{
76084+ if (uid_set) {
76085+ struct crash_uid *tmpset;
76086+ spin_lock(&gr_uid_lock);
76087+ tmpset = uid_set;
76088+ uid_set = NULL;
76089+ uid_used = 0;
76090+ spin_unlock(&gr_uid_lock);
76091+ if (tmpset)
76092+ kfree(tmpset);
76093+ }
76094+
76095+ return;
76096+}
76097+
76098+int
76099+gr_find_uid(const uid_t uid)
76100+{
76101+ struct crash_uid *tmp = uid_set;
76102+ uid_t buid;
76103+ int low = 0, high = uid_used - 1, mid;
76104+
76105+ while (high >= low) {
76106+ mid = (low + high) >> 1;
76107+ buid = tmp[mid].uid;
76108+ if (buid == uid)
76109+ return mid;
76110+ if (buid > uid)
76111+ high = mid - 1;
76112+ if (buid < uid)
76113+ low = mid + 1;
76114+ }
76115+
76116+ return -1;
76117+}
76118+
76119+static __inline__ void
76120+gr_insertsort(void)
76121+{
76122+ unsigned short i, j;
76123+ struct crash_uid index;
76124+
76125+ for (i = 1; i < uid_used; i++) {
76126+ index = uid_set[i];
76127+ j = i;
76128+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
76129+ uid_set[j] = uid_set[j - 1];
76130+ j--;
76131+ }
76132+ uid_set[j] = index;
76133+ }
76134+
76135+ return;
76136+}
76137+
76138+static __inline__ void
76139+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
76140+{
76141+ int loc;
76142+ uid_t uid = GR_GLOBAL_UID(kuid);
76143+
76144+ if (uid_used == GR_UIDTABLE_MAX)
76145+ return;
76146+
76147+ loc = gr_find_uid(uid);
76148+
76149+ if (loc >= 0) {
76150+ uid_set[loc].expires = expires;
76151+ return;
76152+ }
76153+
76154+ uid_set[uid_used].uid = uid;
76155+ uid_set[uid_used].expires = expires;
76156+ uid_used++;
76157+
76158+ gr_insertsort();
76159+
76160+ return;
76161+}
76162+
76163+void
76164+gr_remove_uid(const unsigned short loc)
76165+{
76166+ unsigned short i;
76167+
76168+ for (i = loc + 1; i < uid_used; i++)
76169+ uid_set[i - 1] = uid_set[i];
76170+
76171+ uid_used--;
76172+
76173+ return;
76174+}
76175+
76176+int
76177+gr_check_crash_uid(const kuid_t kuid)
76178+{
76179+ int loc;
76180+ int ret = 0;
76181+ uid_t uid;
76182+
76183+ if (unlikely(!gr_acl_is_enabled()))
76184+ return 0;
76185+
76186+ uid = GR_GLOBAL_UID(kuid);
76187+
76188+ spin_lock(&gr_uid_lock);
76189+ loc = gr_find_uid(uid);
76190+
76191+ if (loc < 0)
76192+ goto out_unlock;
76193+
76194+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
76195+ gr_remove_uid(loc);
76196+ else
76197+ ret = 1;
76198+
76199+out_unlock:
76200+ spin_unlock(&gr_uid_lock);
76201+ return ret;
76202+}
76203+
76204+static __inline__ int
76205+proc_is_setxid(const struct cred *cred)
76206+{
76207+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
76208+ !uid_eq(cred->uid, cred->fsuid))
76209+ return 1;
76210+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
76211+ !gid_eq(cred->gid, cred->fsgid))
76212+ return 1;
76213+
76214+ return 0;
76215+}
76216+
76217+extern int gr_fake_force_sig(int sig, struct task_struct *t);
76218+
76219+void
76220+gr_handle_crash(struct task_struct *task, const int sig)
76221+{
76222+ struct acl_subject_label *curr;
76223+ struct task_struct *tsk, *tsk2;
76224+ const struct cred *cred;
76225+ const struct cred *cred2;
76226+
76227+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
76228+ return;
76229+
76230+ if (unlikely(!gr_acl_is_enabled()))
76231+ return;
76232+
76233+ curr = task->acl;
76234+
76235+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
76236+ return;
76237+
76238+ if (time_before_eq(curr->expires, get_seconds())) {
76239+ curr->expires = 0;
76240+ curr->crashes = 0;
76241+ }
76242+
76243+ curr->crashes++;
76244+
76245+ if (!curr->expires)
76246+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
76247+
76248+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76249+ time_after(curr->expires, get_seconds())) {
76250+ rcu_read_lock();
76251+ cred = __task_cred(task);
76252+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
76253+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76254+ spin_lock(&gr_uid_lock);
76255+ gr_insert_uid(cred->uid, curr->expires);
76256+ spin_unlock(&gr_uid_lock);
76257+ curr->expires = 0;
76258+ curr->crashes = 0;
76259+ read_lock(&tasklist_lock);
76260+ do_each_thread(tsk2, tsk) {
76261+ cred2 = __task_cred(tsk);
76262+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
76263+ gr_fake_force_sig(SIGKILL, tsk);
76264+ } while_each_thread(tsk2, tsk);
76265+ read_unlock(&tasklist_lock);
76266+ } else {
76267+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76268+ read_lock(&tasklist_lock);
76269+ read_lock(&grsec_exec_file_lock);
76270+ do_each_thread(tsk2, tsk) {
76271+ if (likely(tsk != task)) {
76272+ // if this thread has the same subject as the one that triggered
76273+ // RES_CRASH and it's the same binary, kill it
76274+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
76275+ gr_fake_force_sig(SIGKILL, tsk);
76276+ }
76277+ } while_each_thread(tsk2, tsk);
76278+ read_unlock(&grsec_exec_file_lock);
76279+ read_unlock(&tasklist_lock);
76280+ }
76281+ rcu_read_unlock();
76282+ }
76283+
76284+ return;
76285+}
76286+
76287+int
76288+gr_check_crash_exec(const struct file *filp)
76289+{
76290+ struct acl_subject_label *curr;
76291+ struct dentry *dentry;
76292+
76293+ if (unlikely(!gr_acl_is_enabled()))
76294+ return 0;
76295+
76296+ read_lock(&gr_inode_lock);
76297+ dentry = filp->f_path.dentry;
76298+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
76299+ current->role);
76300+ read_unlock(&gr_inode_lock);
76301+
76302+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
76303+ (!curr->crashes && !curr->expires))
76304+ return 0;
76305+
76306+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76307+ time_after(curr->expires, get_seconds()))
76308+ return 1;
76309+ else if (time_before_eq(curr->expires, get_seconds())) {
76310+ curr->crashes = 0;
76311+ curr->expires = 0;
76312+ }
76313+
76314+ return 0;
76315+}
76316+
76317+void
76318+gr_handle_alertkill(struct task_struct *task)
76319+{
76320+ struct acl_subject_label *curracl;
76321+ __u32 curr_ip;
76322+ struct task_struct *p, *p2;
76323+
76324+ if (unlikely(!gr_acl_is_enabled()))
76325+ return;
76326+
76327+ curracl = task->acl;
76328+ curr_ip = task->signal->curr_ip;
76329+
76330+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
76331+ read_lock(&tasklist_lock);
76332+ do_each_thread(p2, p) {
76333+ if (p->signal->curr_ip == curr_ip)
76334+ gr_fake_force_sig(SIGKILL, p);
76335+ } while_each_thread(p2, p);
76336+ read_unlock(&tasklist_lock);
76337+ } else if (curracl->mode & GR_KILLPROC)
76338+ gr_fake_force_sig(SIGKILL, task);
76339+
76340+ return;
76341+}
76342diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
76343new file mode 100644
76344index 0000000..6b0c9cc
76345--- /dev/null
76346+++ b/grsecurity/gracl_shm.c
76347@@ -0,0 +1,40 @@
76348+#include <linux/kernel.h>
76349+#include <linux/mm.h>
76350+#include <linux/sched.h>
76351+#include <linux/file.h>
76352+#include <linux/ipc.h>
76353+#include <linux/gracl.h>
76354+#include <linux/grsecurity.h>
76355+#include <linux/grinternal.h>
76356+
76357+int
76358+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76359+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76360+{
76361+ struct task_struct *task;
76362+
76363+ if (!gr_acl_is_enabled())
76364+ return 1;
76365+
76366+ rcu_read_lock();
76367+ read_lock(&tasklist_lock);
76368+
76369+ task = find_task_by_vpid(shm_cprid);
76370+
76371+ if (unlikely(!task))
76372+ task = find_task_by_vpid(shm_lapid);
76373+
76374+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
76375+ (task_pid_nr(task) == shm_lapid)) &&
76376+ (task->acl->mode & GR_PROTSHM) &&
76377+ (task->acl != current->acl))) {
76378+ read_unlock(&tasklist_lock);
76379+ rcu_read_unlock();
76380+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
76381+ return 0;
76382+ }
76383+ read_unlock(&tasklist_lock);
76384+ rcu_read_unlock();
76385+
76386+ return 1;
76387+}
76388diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
76389new file mode 100644
76390index 0000000..bc0be01
76391--- /dev/null
76392+++ b/grsecurity/grsec_chdir.c
76393@@ -0,0 +1,19 @@
76394+#include <linux/kernel.h>
76395+#include <linux/sched.h>
76396+#include <linux/fs.h>
76397+#include <linux/file.h>
76398+#include <linux/grsecurity.h>
76399+#include <linux/grinternal.h>
76400+
76401+void
76402+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
76403+{
76404+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76405+ if ((grsec_enable_chdir && grsec_enable_group &&
76406+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
76407+ !grsec_enable_group)) {
76408+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
76409+ }
76410+#endif
76411+ return;
76412+}
76413diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
76414new file mode 100644
76415index 0000000..114ea4f
76416--- /dev/null
76417+++ b/grsecurity/grsec_chroot.c
76418@@ -0,0 +1,467 @@
76419+#include <linux/kernel.h>
76420+#include <linux/module.h>
76421+#include <linux/sched.h>
76422+#include <linux/file.h>
76423+#include <linux/fs.h>
76424+#include <linux/mount.h>
76425+#include <linux/types.h>
76426+#include "../fs/mount.h"
76427+#include <linux/grsecurity.h>
76428+#include <linux/grinternal.h>
76429+
76430+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76431+int gr_init_ran;
76432+#endif
76433+
76434+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
76435+{
76436+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76437+ struct dentry *tmpd = dentry;
76438+
76439+ read_seqlock_excl(&mount_lock);
76440+ write_seqlock(&rename_lock);
76441+
76442+ while (tmpd != mnt->mnt_root) {
76443+ atomic_inc(&tmpd->chroot_refcnt);
76444+ tmpd = tmpd->d_parent;
76445+ }
76446+ atomic_inc(&tmpd->chroot_refcnt);
76447+
76448+ write_sequnlock(&rename_lock);
76449+ read_sequnlock_excl(&mount_lock);
76450+#endif
76451+}
76452+
76453+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
76454+{
76455+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76456+ struct dentry *tmpd = dentry;
76457+
76458+ read_seqlock_excl(&mount_lock);
76459+ write_seqlock(&rename_lock);
76460+
76461+ while (tmpd != mnt->mnt_root) {
76462+ atomic_dec(&tmpd->chroot_refcnt);
76463+ tmpd = tmpd->d_parent;
76464+ }
76465+ atomic_dec(&tmpd->chroot_refcnt);
76466+
76467+ write_sequnlock(&rename_lock);
76468+ read_sequnlock_excl(&mount_lock);
76469+#endif
76470+}
76471+
76472+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76473+static struct dentry *get_closest_chroot(struct dentry *dentry)
76474+{
76475+ write_seqlock(&rename_lock);
76476+ do {
76477+ if (atomic_read(&dentry->chroot_refcnt)) {
76478+ write_sequnlock(&rename_lock);
76479+ return dentry;
76480+ }
76481+ dentry = dentry->d_parent;
76482+ } while (!IS_ROOT(dentry));
76483+ write_sequnlock(&rename_lock);
76484+ return NULL;
76485+}
76486+#endif
76487+
76488+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
76489+ struct dentry *newdentry, struct vfsmount *newmnt)
76490+{
76491+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76492+ struct dentry *chroot;
76493+
76494+ if (unlikely(!grsec_enable_chroot_rename))
76495+ return 0;
76496+
76497+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
76498+ return 0;
76499+
76500+ chroot = get_closest_chroot(olddentry);
76501+
76502+ if (chroot == NULL)
76503+ return 0;
76504+
76505+ if (is_subdir(newdentry, chroot))
76506+ return 0;
76507+
76508+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
76509+
76510+ return 1;
76511+#else
76512+ return 0;
76513+#endif
76514+}
76515+
76516+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
76517+{
76518+#ifdef CONFIG_GRKERNSEC
76519+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
76520+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
76521+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76522+ && gr_init_ran
76523+#endif
76524+ )
76525+ task->gr_is_chrooted = 1;
76526+ else {
76527+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76528+ if (task_pid_nr(task) == 1 && !gr_init_ran)
76529+ gr_init_ran = 1;
76530+#endif
76531+ task->gr_is_chrooted = 0;
76532+ }
76533+
76534+ task->gr_chroot_dentry = path->dentry;
76535+#endif
76536+ return;
76537+}
76538+
76539+void gr_clear_chroot_entries(struct task_struct *task)
76540+{
76541+#ifdef CONFIG_GRKERNSEC
76542+ task->gr_is_chrooted = 0;
76543+ task->gr_chroot_dentry = NULL;
76544+#endif
76545+ return;
76546+}
76547+
76548+int
76549+gr_handle_chroot_unix(const pid_t pid)
76550+{
76551+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76552+ struct task_struct *p;
76553+
76554+ if (unlikely(!grsec_enable_chroot_unix))
76555+ return 1;
76556+
76557+ if (likely(!proc_is_chrooted(current)))
76558+ return 1;
76559+
76560+ rcu_read_lock();
76561+ read_lock(&tasklist_lock);
76562+ p = find_task_by_vpid_unrestricted(pid);
76563+ if (unlikely(p && !have_same_root(current, p))) {
76564+ read_unlock(&tasklist_lock);
76565+ rcu_read_unlock();
76566+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
76567+ return 0;
76568+ }
76569+ read_unlock(&tasklist_lock);
76570+ rcu_read_unlock();
76571+#endif
76572+ return 1;
76573+}
76574+
76575+int
76576+gr_handle_chroot_nice(void)
76577+{
76578+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76579+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
76580+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
76581+ return -EPERM;
76582+ }
76583+#endif
76584+ return 0;
76585+}
76586+
76587+int
76588+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
76589+{
76590+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76591+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
76592+ && proc_is_chrooted(current)) {
76593+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
76594+ return -EACCES;
76595+ }
76596+#endif
76597+ return 0;
76598+}
76599+
76600+int
76601+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
76602+{
76603+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76604+ struct task_struct *p;
76605+ int ret = 0;
76606+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
76607+ return ret;
76608+
76609+ read_lock(&tasklist_lock);
76610+ do_each_pid_task(pid, type, p) {
76611+ if (!have_same_root(current, p)) {
76612+ ret = 1;
76613+ goto out;
76614+ }
76615+ } while_each_pid_task(pid, type, p);
76616+out:
76617+ read_unlock(&tasklist_lock);
76618+ return ret;
76619+#endif
76620+ return 0;
76621+}
76622+
76623+int
76624+gr_pid_is_chrooted(struct task_struct *p)
76625+{
76626+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76627+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
76628+ return 0;
76629+
76630+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
76631+ !have_same_root(current, p)) {
76632+ return 1;
76633+ }
76634+#endif
76635+ return 0;
76636+}
76637+
76638+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
76639+
76640+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
76641+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
76642+{
76643+ struct path path, currentroot;
76644+ int ret = 0;
76645+
76646+ path.dentry = (struct dentry *)u_dentry;
76647+ path.mnt = (struct vfsmount *)u_mnt;
76648+ get_fs_root(current->fs, &currentroot);
76649+ if (path_is_under(&path, &currentroot))
76650+ ret = 1;
76651+ path_put(&currentroot);
76652+
76653+ return ret;
76654+}
76655+#endif
76656+
76657+int
76658+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
76659+{
76660+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76661+ if (!grsec_enable_chroot_fchdir)
76662+ return 1;
76663+
76664+ if (!proc_is_chrooted(current))
76665+ return 1;
76666+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
76667+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
76668+ return 0;
76669+ }
76670+#endif
76671+ return 1;
76672+}
76673+
76674+int
76675+gr_chroot_fhandle(void)
76676+{
76677+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76678+ if (!grsec_enable_chroot_fchdir)
76679+ return 1;
76680+
76681+ if (!proc_is_chrooted(current))
76682+ return 1;
76683+ else {
76684+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
76685+ return 0;
76686+ }
76687+#endif
76688+ return 1;
76689+}
76690+
76691+int
76692+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76693+ const u64 shm_createtime)
76694+{
76695+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76696+ struct task_struct *p;
76697+
76698+ if (unlikely(!grsec_enable_chroot_shmat))
76699+ return 1;
76700+
76701+ if (likely(!proc_is_chrooted(current)))
76702+ return 1;
76703+
76704+ rcu_read_lock();
76705+ read_lock(&tasklist_lock);
76706+
76707+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
76708+ if (time_before_eq64(p->start_time, shm_createtime)) {
76709+ if (have_same_root(current, p)) {
76710+ goto allow;
76711+ } else {
76712+ read_unlock(&tasklist_lock);
76713+ rcu_read_unlock();
76714+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76715+ return 0;
76716+ }
76717+ }
76718+ /* creator exited, pid reuse, fall through to next check */
76719+ }
76720+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
76721+ if (unlikely(!have_same_root(current, p))) {
76722+ read_unlock(&tasklist_lock);
76723+ rcu_read_unlock();
76724+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76725+ return 0;
76726+ }
76727+ }
76728+
76729+allow:
76730+ read_unlock(&tasklist_lock);
76731+ rcu_read_unlock();
76732+#endif
76733+ return 1;
76734+}
76735+
76736+void
76737+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
76738+{
76739+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76740+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
76741+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
76742+#endif
76743+ return;
76744+}
76745+
76746+int
76747+gr_handle_chroot_mknod(const struct dentry *dentry,
76748+ const struct vfsmount *mnt, const int mode)
76749+{
76750+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76751+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
76752+ proc_is_chrooted(current)) {
76753+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
76754+ return -EPERM;
76755+ }
76756+#endif
76757+ return 0;
76758+}
76759+
76760+int
76761+gr_handle_chroot_mount(const struct dentry *dentry,
76762+ const struct vfsmount *mnt, const char *dev_name)
76763+{
76764+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76765+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
76766+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
76767+ return -EPERM;
76768+ }
76769+#endif
76770+ return 0;
76771+}
76772+
76773+int
76774+gr_handle_chroot_pivot(void)
76775+{
76776+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76777+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
76778+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
76779+ return -EPERM;
76780+ }
76781+#endif
76782+ return 0;
76783+}
76784+
76785+int
76786+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
76787+{
76788+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76789+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
76790+ !gr_is_outside_chroot(dentry, mnt)) {
76791+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
76792+ return -EPERM;
76793+ }
76794+#endif
76795+ return 0;
76796+}
76797+
76798+extern const char *captab_log[];
76799+extern int captab_log_entries;
76800+
76801+int
76802+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76803+{
76804+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76805+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76806+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76807+ if (cap_raised(chroot_caps, cap)) {
76808+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76809+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76810+ }
76811+ return 0;
76812+ }
76813+ }
76814+#endif
76815+ return 1;
76816+}
76817+
76818+int
76819+gr_chroot_is_capable(const int cap)
76820+{
76821+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76822+ return gr_task_chroot_is_capable(current, current_cred(), cap);
76823+#endif
76824+ return 1;
76825+}
76826+
76827+int
76828+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76829+{
76830+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76831+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76832+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76833+ if (cap_raised(chroot_caps, cap)) {
76834+ return 0;
76835+ }
76836+ }
76837+#endif
76838+ return 1;
76839+}
76840+
76841+int
76842+gr_chroot_is_capable_nolog(const int cap)
76843+{
76844+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76845+ return gr_task_chroot_is_capable_nolog(current, cap);
76846+#endif
76847+ return 1;
76848+}
76849+
76850+int
76851+gr_handle_chroot_sysctl(const int op)
76852+{
76853+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76854+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76855+ proc_is_chrooted(current))
76856+ return -EACCES;
76857+#endif
76858+ return 0;
76859+}
76860+
76861+void
76862+gr_handle_chroot_chdir(const struct path *path)
76863+{
76864+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76865+ if (grsec_enable_chroot_chdir)
76866+ set_fs_pwd(current->fs, path);
76867+#endif
76868+ return;
76869+}
76870+
76871+int
76872+gr_handle_chroot_chmod(const struct dentry *dentry,
76873+ const struct vfsmount *mnt, const int mode)
76874+{
76875+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76876+ /* allow chmod +s on directories, but not files */
76877+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76878+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76879+ proc_is_chrooted(current)) {
76880+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76881+ return -EPERM;
76882+ }
76883+#endif
76884+ return 0;
76885+}
76886diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76887new file mode 100644
76888index 0000000..946f750
76889--- /dev/null
76890+++ b/grsecurity/grsec_disabled.c
76891@@ -0,0 +1,445 @@
76892+#include <linux/kernel.h>
76893+#include <linux/module.h>
76894+#include <linux/sched.h>
76895+#include <linux/file.h>
76896+#include <linux/fs.h>
76897+#include <linux/kdev_t.h>
76898+#include <linux/net.h>
76899+#include <linux/in.h>
76900+#include <linux/ip.h>
76901+#include <linux/skbuff.h>
76902+#include <linux/sysctl.h>
76903+
76904+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76905+void
76906+pax_set_initial_flags(struct linux_binprm *bprm)
76907+{
76908+ return;
76909+}
76910+#endif
76911+
76912+#ifdef CONFIG_SYSCTL
76913+__u32
76914+gr_handle_sysctl(const struct ctl_table * table, const int op)
76915+{
76916+ return 0;
76917+}
76918+#endif
76919+
76920+#ifdef CONFIG_TASKSTATS
76921+int gr_is_taskstats_denied(int pid)
76922+{
76923+ return 0;
76924+}
76925+#endif
76926+
76927+int
76928+gr_acl_is_enabled(void)
76929+{
76930+ return 0;
76931+}
76932+
76933+int
76934+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76935+{
76936+ return 0;
76937+}
76938+
76939+void
76940+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76941+{
76942+ return;
76943+}
76944+
76945+int
76946+gr_handle_rawio(const struct inode *inode)
76947+{
76948+ return 0;
76949+}
76950+
76951+void
76952+gr_acl_handle_psacct(struct task_struct *task, const long code)
76953+{
76954+ return;
76955+}
76956+
76957+int
76958+gr_handle_ptrace(struct task_struct *task, const long request)
76959+{
76960+ return 0;
76961+}
76962+
76963+int
76964+gr_handle_proc_ptrace(struct task_struct *task)
76965+{
76966+ return 0;
76967+}
76968+
76969+int
76970+gr_set_acls(const int type)
76971+{
76972+ return 0;
76973+}
76974+
76975+int
76976+gr_check_hidden_task(const struct task_struct *tsk)
76977+{
76978+ return 0;
76979+}
76980+
76981+int
76982+gr_check_protected_task(const struct task_struct *task)
76983+{
76984+ return 0;
76985+}
76986+
76987+int
76988+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76989+{
76990+ return 0;
76991+}
76992+
76993+void
76994+gr_copy_label(struct task_struct *tsk)
76995+{
76996+ return;
76997+}
76998+
76999+void
77000+gr_set_pax_flags(struct task_struct *task)
77001+{
77002+ return;
77003+}
77004+
77005+int
77006+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
77007+ const int unsafe_share)
77008+{
77009+ return 0;
77010+}
77011+
77012+void
77013+gr_handle_delete(const u64 ino, const dev_t dev)
77014+{
77015+ return;
77016+}
77017+
77018+void
77019+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
77020+{
77021+ return;
77022+}
77023+
77024+void
77025+gr_handle_crash(struct task_struct *task, const int sig)
77026+{
77027+ return;
77028+}
77029+
77030+int
77031+gr_check_crash_exec(const struct file *filp)
77032+{
77033+ return 0;
77034+}
77035+
77036+int
77037+gr_check_crash_uid(const kuid_t uid)
77038+{
77039+ return 0;
77040+}
77041+
77042+void
77043+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
77044+ struct dentry *old_dentry,
77045+ struct dentry *new_dentry,
77046+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
77047+{
77048+ return;
77049+}
77050+
77051+int
77052+gr_search_socket(const int family, const int type, const int protocol)
77053+{
77054+ return 1;
77055+}
77056+
77057+int
77058+gr_search_connectbind(const int mode, const struct socket *sock,
77059+ const struct sockaddr_in *addr)
77060+{
77061+ return 0;
77062+}
77063+
77064+void
77065+gr_handle_alertkill(struct task_struct *task)
77066+{
77067+ return;
77068+}
77069+
77070+__u32
77071+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
77072+{
77073+ return 1;
77074+}
77075+
77076+__u32
77077+gr_acl_handle_hidden_file(const struct dentry * dentry,
77078+ const struct vfsmount * mnt)
77079+{
77080+ return 1;
77081+}
77082+
77083+__u32
77084+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
77085+ int acc_mode)
77086+{
77087+ return 1;
77088+}
77089+
77090+__u32
77091+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
77092+{
77093+ return 1;
77094+}
77095+
77096+__u32
77097+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
77098+{
77099+ return 1;
77100+}
77101+
77102+int
77103+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
77104+ unsigned int *vm_flags)
77105+{
77106+ return 1;
77107+}
77108+
77109+__u32
77110+gr_acl_handle_truncate(const struct dentry * dentry,
77111+ const struct vfsmount * mnt)
77112+{
77113+ return 1;
77114+}
77115+
77116+__u32
77117+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
77118+{
77119+ return 1;
77120+}
77121+
77122+__u32
77123+gr_acl_handle_access(const struct dentry * dentry,
77124+ const struct vfsmount * mnt, const int fmode)
77125+{
77126+ return 1;
77127+}
77128+
77129+__u32
77130+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
77131+ umode_t *mode)
77132+{
77133+ return 1;
77134+}
77135+
77136+__u32
77137+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
77138+{
77139+ return 1;
77140+}
77141+
77142+__u32
77143+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
77144+{
77145+ return 1;
77146+}
77147+
77148+__u32
77149+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
77150+{
77151+ return 1;
77152+}
77153+
77154+void
77155+grsecurity_init(void)
77156+{
77157+ return;
77158+}
77159+
77160+umode_t gr_acl_umask(void)
77161+{
77162+ return 0;
77163+}
77164+
77165+__u32
77166+gr_acl_handle_mknod(const struct dentry * new_dentry,
77167+ const struct dentry * parent_dentry,
77168+ const struct vfsmount * parent_mnt,
77169+ const int mode)
77170+{
77171+ return 1;
77172+}
77173+
77174+__u32
77175+gr_acl_handle_mkdir(const struct dentry * new_dentry,
77176+ const struct dentry * parent_dentry,
77177+ const struct vfsmount * parent_mnt)
77178+{
77179+ return 1;
77180+}
77181+
77182+__u32
77183+gr_acl_handle_symlink(const struct dentry * new_dentry,
77184+ const struct dentry * parent_dentry,
77185+ const struct vfsmount * parent_mnt, const struct filename *from)
77186+{
77187+ return 1;
77188+}
77189+
77190+__u32
77191+gr_acl_handle_link(const struct dentry * new_dentry,
77192+ const struct dentry * parent_dentry,
77193+ const struct vfsmount * parent_mnt,
77194+ const struct dentry * old_dentry,
77195+ const struct vfsmount * old_mnt, const struct filename *to)
77196+{
77197+ return 1;
77198+}
77199+
77200+int
77201+gr_acl_handle_rename(const struct dentry *new_dentry,
77202+ const struct dentry *parent_dentry,
77203+ const struct vfsmount *parent_mnt,
77204+ const struct dentry *old_dentry,
77205+ const struct inode *old_parent_inode,
77206+ const struct vfsmount *old_mnt, const struct filename *newname,
77207+ unsigned int flags)
77208+{
77209+ return 0;
77210+}
77211+
77212+int
77213+gr_acl_handle_filldir(const struct file *file, const char *name,
77214+ const int namelen, const u64 ino)
77215+{
77216+ return 1;
77217+}
77218+
77219+int
77220+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77221+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
77222+{
77223+ return 1;
77224+}
77225+
77226+int
77227+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
77228+{
77229+ return 0;
77230+}
77231+
77232+int
77233+gr_search_accept(const struct socket *sock)
77234+{
77235+ return 0;
77236+}
77237+
77238+int
77239+gr_search_listen(const struct socket *sock)
77240+{
77241+ return 0;
77242+}
77243+
77244+int
77245+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
77246+{
77247+ return 0;
77248+}
77249+
77250+__u32
77251+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
77252+{
77253+ return 1;
77254+}
77255+
77256+__u32
77257+gr_acl_handle_creat(const struct dentry * dentry,
77258+ const struct dentry * p_dentry,
77259+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
77260+ const int imode)
77261+{
77262+ return 1;
77263+}
77264+
77265+void
77266+gr_acl_handle_exit(void)
77267+{
77268+ return;
77269+}
77270+
77271+int
77272+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
77273+{
77274+ return 1;
77275+}
77276+
77277+void
77278+gr_set_role_label(const kuid_t uid, const kgid_t gid)
77279+{
77280+ return;
77281+}
77282+
77283+int
77284+gr_acl_handle_procpidmem(const struct task_struct *task)
77285+{
77286+ return 0;
77287+}
77288+
77289+int
77290+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
77291+{
77292+ return 0;
77293+}
77294+
77295+int
77296+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
77297+{
77298+ return 0;
77299+}
77300+
77301+int
77302+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
77303+{
77304+ return 0;
77305+}
77306+
77307+int
77308+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
77309+{
77310+ return 0;
77311+}
77312+
77313+int gr_acl_enable_at_secure(void)
77314+{
77315+ return 0;
77316+}
77317+
77318+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77319+{
77320+ return dentry->d_sb->s_dev;
77321+}
77322+
77323+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77324+{
77325+ return dentry->d_inode->i_ino;
77326+}
77327+
77328+void gr_put_exec_file(struct task_struct *task)
77329+{
77330+ return;
77331+}
77332+
77333+#ifdef CONFIG_SECURITY
77334+EXPORT_SYMBOL_GPL(gr_check_user_change);
77335+EXPORT_SYMBOL_GPL(gr_check_group_change);
77336+#endif
77337diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
77338new file mode 100644
77339index 0000000..fb7531e
77340--- /dev/null
77341+++ b/grsecurity/grsec_exec.c
77342@@ -0,0 +1,189 @@
77343+#include <linux/kernel.h>
77344+#include <linux/sched.h>
77345+#include <linux/file.h>
77346+#include <linux/binfmts.h>
77347+#include <linux/fs.h>
77348+#include <linux/types.h>
77349+#include <linux/grdefs.h>
77350+#include <linux/grsecurity.h>
77351+#include <linux/grinternal.h>
77352+#include <linux/capability.h>
77353+#include <linux/module.h>
77354+#include <linux/compat.h>
77355+
77356+#include <asm/uaccess.h>
77357+
77358+#ifdef CONFIG_GRKERNSEC_EXECLOG
77359+static char gr_exec_arg_buf[132];
77360+static DEFINE_MUTEX(gr_exec_arg_mutex);
77361+#endif
77362+
77363+struct user_arg_ptr {
77364+#ifdef CONFIG_COMPAT
77365+ bool is_compat;
77366+#endif
77367+ union {
77368+ const char __user *const __user *native;
77369+#ifdef CONFIG_COMPAT
77370+ const compat_uptr_t __user *compat;
77371+#endif
77372+ } ptr;
77373+};
77374+
77375+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
77376+
77377+void
77378+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
77379+{
77380+#ifdef CONFIG_GRKERNSEC_EXECLOG
77381+ char *grarg = gr_exec_arg_buf;
77382+ unsigned int i, x, execlen = 0;
77383+ char c;
77384+
77385+ if (!((grsec_enable_execlog && grsec_enable_group &&
77386+ in_group_p(grsec_audit_gid))
77387+ || (grsec_enable_execlog && !grsec_enable_group)))
77388+ return;
77389+
77390+ mutex_lock(&gr_exec_arg_mutex);
77391+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
77392+
77393+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
77394+ const char __user *p;
77395+ unsigned int len;
77396+
77397+ p = get_user_arg_ptr(argv, i);
77398+ if (IS_ERR(p))
77399+ goto log;
77400+
77401+ len = strnlen_user(p, 128 - execlen);
77402+ if (len > 128 - execlen)
77403+ len = 128 - execlen;
77404+ else if (len > 0)
77405+ len--;
77406+ if (copy_from_user(grarg + execlen, p, len))
77407+ goto log;
77408+
77409+ /* rewrite unprintable characters */
77410+ for (x = 0; x < len; x++) {
77411+ c = *(grarg + execlen + x);
77412+ if (c < 32 || c > 126)
77413+ *(grarg + execlen + x) = ' ';
77414+ }
77415+
77416+ execlen += len;
77417+ *(grarg + execlen) = ' ';
77418+ *(grarg + execlen + 1) = '\0';
77419+ execlen++;
77420+ }
77421+
77422+ log:
77423+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
77424+ bprm->file->f_path.mnt, grarg);
77425+ mutex_unlock(&gr_exec_arg_mutex);
77426+#endif
77427+ return;
77428+}
77429+
77430+#ifdef CONFIG_GRKERNSEC
77431+extern int gr_acl_is_capable(const int cap);
77432+extern int gr_acl_is_capable_nolog(const int cap);
77433+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
77434+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
77435+extern int gr_chroot_is_capable(const int cap);
77436+extern int gr_chroot_is_capable_nolog(const int cap);
77437+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
77438+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
77439+#endif
77440+
77441+const char *captab_log[] = {
77442+ "CAP_CHOWN",
77443+ "CAP_DAC_OVERRIDE",
77444+ "CAP_DAC_READ_SEARCH",
77445+ "CAP_FOWNER",
77446+ "CAP_FSETID",
77447+ "CAP_KILL",
77448+ "CAP_SETGID",
77449+ "CAP_SETUID",
77450+ "CAP_SETPCAP",
77451+ "CAP_LINUX_IMMUTABLE",
77452+ "CAP_NET_BIND_SERVICE",
77453+ "CAP_NET_BROADCAST",
77454+ "CAP_NET_ADMIN",
77455+ "CAP_NET_RAW",
77456+ "CAP_IPC_LOCK",
77457+ "CAP_IPC_OWNER",
77458+ "CAP_SYS_MODULE",
77459+ "CAP_SYS_RAWIO",
77460+ "CAP_SYS_CHROOT",
77461+ "CAP_SYS_PTRACE",
77462+ "CAP_SYS_PACCT",
77463+ "CAP_SYS_ADMIN",
77464+ "CAP_SYS_BOOT",
77465+ "CAP_SYS_NICE",
77466+ "CAP_SYS_RESOURCE",
77467+ "CAP_SYS_TIME",
77468+ "CAP_SYS_TTY_CONFIG",
77469+ "CAP_MKNOD",
77470+ "CAP_LEASE",
77471+ "CAP_AUDIT_WRITE",
77472+ "CAP_AUDIT_CONTROL",
77473+ "CAP_SETFCAP",
77474+ "CAP_MAC_OVERRIDE",
77475+ "CAP_MAC_ADMIN",
77476+ "CAP_SYSLOG",
77477+ "CAP_WAKE_ALARM",
77478+ "CAP_BLOCK_SUSPEND",
77479+ "CAP_AUDIT_READ"
77480+};
77481+
77482+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
77483+
77484+int gr_is_capable(const int cap)
77485+{
77486+#ifdef CONFIG_GRKERNSEC
77487+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
77488+ return 1;
77489+ return 0;
77490+#else
77491+ return 1;
77492+#endif
77493+}
77494+
77495+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
77496+{
77497+#ifdef CONFIG_GRKERNSEC
77498+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
77499+ return 1;
77500+ return 0;
77501+#else
77502+ return 1;
77503+#endif
77504+}
77505+
77506+int gr_is_capable_nolog(const int cap)
77507+{
77508+#ifdef CONFIG_GRKERNSEC
77509+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
77510+ return 1;
77511+ return 0;
77512+#else
77513+ return 1;
77514+#endif
77515+}
77516+
77517+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
77518+{
77519+#ifdef CONFIG_GRKERNSEC
77520+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
77521+ return 1;
77522+ return 0;
77523+#else
77524+ return 1;
77525+#endif
77526+}
77527+
77528+EXPORT_SYMBOL_GPL(gr_is_capable);
77529+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
77530+EXPORT_SYMBOL_GPL(gr_task_is_capable);
77531+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
77532diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
77533new file mode 100644
77534index 0000000..06cc6ea
77535--- /dev/null
77536+++ b/grsecurity/grsec_fifo.c
77537@@ -0,0 +1,24 @@
77538+#include <linux/kernel.h>
77539+#include <linux/sched.h>
77540+#include <linux/fs.h>
77541+#include <linux/file.h>
77542+#include <linux/grinternal.h>
77543+
77544+int
77545+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
77546+ const struct dentry *dir, const int flag, const int acc_mode)
77547+{
77548+#ifdef CONFIG_GRKERNSEC_FIFO
77549+ const struct cred *cred = current_cred();
77550+
77551+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
77552+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
77553+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
77554+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
77555+ if (!inode_permission(dentry->d_inode, acc_mode))
77556+ 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));
77557+ return -EACCES;
77558+ }
77559+#endif
77560+ return 0;
77561+}
77562diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
77563new file mode 100644
77564index 0000000..8ca18bf
77565--- /dev/null
77566+++ b/grsecurity/grsec_fork.c
77567@@ -0,0 +1,23 @@
77568+#include <linux/kernel.h>
77569+#include <linux/sched.h>
77570+#include <linux/grsecurity.h>
77571+#include <linux/grinternal.h>
77572+#include <linux/errno.h>
77573+
77574+void
77575+gr_log_forkfail(const int retval)
77576+{
77577+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77578+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
77579+ switch (retval) {
77580+ case -EAGAIN:
77581+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
77582+ break;
77583+ case -ENOMEM:
77584+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
77585+ break;
77586+ }
77587+ }
77588+#endif
77589+ return;
77590+}
77591diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
77592new file mode 100644
77593index 0000000..4ed9e7d
77594--- /dev/null
77595+++ b/grsecurity/grsec_init.c
77596@@ -0,0 +1,290 @@
77597+#include <linux/kernel.h>
77598+#include <linux/sched.h>
77599+#include <linux/mm.h>
77600+#include <linux/gracl.h>
77601+#include <linux/slab.h>
77602+#include <linux/vmalloc.h>
77603+#include <linux/percpu.h>
77604+#include <linux/module.h>
77605+
77606+int grsec_enable_ptrace_readexec;
77607+int grsec_enable_setxid;
77608+int grsec_enable_symlinkown;
77609+kgid_t grsec_symlinkown_gid;
77610+int grsec_enable_brute;
77611+int grsec_enable_link;
77612+int grsec_enable_dmesg;
77613+int grsec_enable_harden_ptrace;
77614+int grsec_enable_harden_ipc;
77615+int grsec_enable_fifo;
77616+int grsec_enable_execlog;
77617+int grsec_enable_signal;
77618+int grsec_enable_forkfail;
77619+int grsec_enable_audit_ptrace;
77620+int grsec_enable_time;
77621+int grsec_enable_group;
77622+kgid_t grsec_audit_gid;
77623+int grsec_enable_chdir;
77624+int grsec_enable_mount;
77625+int grsec_enable_rofs;
77626+int grsec_deny_new_usb;
77627+int grsec_enable_chroot_findtask;
77628+int grsec_enable_chroot_mount;
77629+int grsec_enable_chroot_shmat;
77630+int grsec_enable_chroot_fchdir;
77631+int grsec_enable_chroot_double;
77632+int grsec_enable_chroot_pivot;
77633+int grsec_enable_chroot_chdir;
77634+int grsec_enable_chroot_chmod;
77635+int grsec_enable_chroot_mknod;
77636+int grsec_enable_chroot_nice;
77637+int grsec_enable_chroot_execlog;
77638+int grsec_enable_chroot_caps;
77639+int grsec_enable_chroot_rename;
77640+int grsec_enable_chroot_sysctl;
77641+int grsec_enable_chroot_unix;
77642+int grsec_enable_tpe;
77643+kgid_t grsec_tpe_gid;
77644+int grsec_enable_blackhole;
77645+#ifdef CONFIG_IPV6_MODULE
77646+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
77647+#endif
77648+int grsec_lastack_retries;
77649+int grsec_enable_tpe_all;
77650+int grsec_enable_tpe_invert;
77651+int grsec_enable_socket_all;
77652+kgid_t grsec_socket_all_gid;
77653+int grsec_enable_socket_client;
77654+kgid_t grsec_socket_client_gid;
77655+int grsec_enable_socket_server;
77656+kgid_t grsec_socket_server_gid;
77657+int grsec_resource_logging;
77658+int grsec_disable_privio;
77659+int grsec_enable_log_rwxmaps;
77660+int grsec_lock;
77661+
77662+DEFINE_SPINLOCK(grsec_alert_lock);
77663+unsigned long grsec_alert_wtime = 0;
77664+unsigned long grsec_alert_fyet = 0;
77665+
77666+DEFINE_SPINLOCK(grsec_audit_lock);
77667+
77668+DEFINE_RWLOCK(grsec_exec_file_lock);
77669+
77670+char *gr_shared_page[4];
77671+
77672+char *gr_alert_log_fmt;
77673+char *gr_audit_log_fmt;
77674+char *gr_alert_log_buf;
77675+char *gr_audit_log_buf;
77676+
77677+extern struct gr_arg *gr_usermode;
77678+extern unsigned char *gr_system_salt;
77679+extern unsigned char *gr_system_sum;
77680+
77681+void __init
77682+grsecurity_init(void)
77683+{
77684+ int j;
77685+ /* create the per-cpu shared pages */
77686+
77687+#ifdef CONFIG_X86
77688+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
77689+#endif
77690+
77691+ for (j = 0; j < 4; j++) {
77692+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
77693+ if (gr_shared_page[j] == NULL) {
77694+ panic("Unable to allocate grsecurity shared page");
77695+ return;
77696+ }
77697+ }
77698+
77699+ /* allocate log buffers */
77700+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
77701+ if (!gr_alert_log_fmt) {
77702+ panic("Unable to allocate grsecurity alert log format buffer");
77703+ return;
77704+ }
77705+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
77706+ if (!gr_audit_log_fmt) {
77707+ panic("Unable to allocate grsecurity audit log format buffer");
77708+ return;
77709+ }
77710+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77711+ if (!gr_alert_log_buf) {
77712+ panic("Unable to allocate grsecurity alert log buffer");
77713+ return;
77714+ }
77715+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77716+ if (!gr_audit_log_buf) {
77717+ panic("Unable to allocate grsecurity audit log buffer");
77718+ return;
77719+ }
77720+
77721+ /* allocate memory for authentication structure */
77722+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
77723+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
77724+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
77725+
77726+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
77727+ panic("Unable to allocate grsecurity authentication structure");
77728+ return;
77729+ }
77730+
77731+#ifdef CONFIG_GRKERNSEC_IO
77732+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
77733+ grsec_disable_privio = 1;
77734+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77735+ grsec_disable_privio = 1;
77736+#else
77737+ grsec_disable_privio = 0;
77738+#endif
77739+#endif
77740+
77741+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
77742+ /* for backward compatibility, tpe_invert always defaults to on if
77743+ enabled in the kernel
77744+ */
77745+ grsec_enable_tpe_invert = 1;
77746+#endif
77747+
77748+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77749+#ifndef CONFIG_GRKERNSEC_SYSCTL
77750+ grsec_lock = 1;
77751+#endif
77752+
77753+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77754+ grsec_enable_log_rwxmaps = 1;
77755+#endif
77756+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
77757+ grsec_enable_group = 1;
77758+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
77759+#endif
77760+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77761+ grsec_enable_ptrace_readexec = 1;
77762+#endif
77763+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
77764+ grsec_enable_chdir = 1;
77765+#endif
77766+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
77767+ grsec_enable_harden_ptrace = 1;
77768+#endif
77769+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77770+ grsec_enable_harden_ipc = 1;
77771+#endif
77772+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77773+ grsec_enable_mount = 1;
77774+#endif
77775+#ifdef CONFIG_GRKERNSEC_LINK
77776+ grsec_enable_link = 1;
77777+#endif
77778+#ifdef CONFIG_GRKERNSEC_BRUTE
77779+ grsec_enable_brute = 1;
77780+#endif
77781+#ifdef CONFIG_GRKERNSEC_DMESG
77782+ grsec_enable_dmesg = 1;
77783+#endif
77784+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77785+ grsec_enable_blackhole = 1;
77786+ grsec_lastack_retries = 4;
77787+#endif
77788+#ifdef CONFIG_GRKERNSEC_FIFO
77789+ grsec_enable_fifo = 1;
77790+#endif
77791+#ifdef CONFIG_GRKERNSEC_EXECLOG
77792+ grsec_enable_execlog = 1;
77793+#endif
77794+#ifdef CONFIG_GRKERNSEC_SETXID
77795+ grsec_enable_setxid = 1;
77796+#endif
77797+#ifdef CONFIG_GRKERNSEC_SIGNAL
77798+ grsec_enable_signal = 1;
77799+#endif
77800+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77801+ grsec_enable_forkfail = 1;
77802+#endif
77803+#ifdef CONFIG_GRKERNSEC_TIME
77804+ grsec_enable_time = 1;
77805+#endif
77806+#ifdef CONFIG_GRKERNSEC_RESLOG
77807+ grsec_resource_logging = 1;
77808+#endif
77809+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77810+ grsec_enable_chroot_findtask = 1;
77811+#endif
77812+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77813+ grsec_enable_chroot_unix = 1;
77814+#endif
77815+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77816+ grsec_enable_chroot_mount = 1;
77817+#endif
77818+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77819+ grsec_enable_chroot_fchdir = 1;
77820+#endif
77821+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77822+ grsec_enable_chroot_shmat = 1;
77823+#endif
77824+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77825+ grsec_enable_audit_ptrace = 1;
77826+#endif
77827+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77828+ grsec_enable_chroot_double = 1;
77829+#endif
77830+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77831+ grsec_enable_chroot_pivot = 1;
77832+#endif
77833+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77834+ grsec_enable_chroot_chdir = 1;
77835+#endif
77836+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77837+ grsec_enable_chroot_chmod = 1;
77838+#endif
77839+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77840+ grsec_enable_chroot_mknod = 1;
77841+#endif
77842+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77843+ grsec_enable_chroot_nice = 1;
77844+#endif
77845+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77846+ grsec_enable_chroot_execlog = 1;
77847+#endif
77848+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77849+ grsec_enable_chroot_caps = 1;
77850+#endif
77851+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77852+ grsec_enable_chroot_rename = 1;
77853+#endif
77854+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77855+ grsec_enable_chroot_sysctl = 1;
77856+#endif
77857+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77858+ grsec_enable_symlinkown = 1;
77859+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77860+#endif
77861+#ifdef CONFIG_GRKERNSEC_TPE
77862+ grsec_enable_tpe = 1;
77863+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77864+#ifdef CONFIG_GRKERNSEC_TPE_ALL
77865+ grsec_enable_tpe_all = 1;
77866+#endif
77867+#endif
77868+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77869+ grsec_enable_socket_all = 1;
77870+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77871+#endif
77872+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77873+ grsec_enable_socket_client = 1;
77874+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77875+#endif
77876+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77877+ grsec_enable_socket_server = 1;
77878+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77879+#endif
77880+#endif
77881+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77882+ grsec_deny_new_usb = 1;
77883+#endif
77884+
77885+ return;
77886+}
77887diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77888new file mode 100644
77889index 0000000..1773300
77890--- /dev/null
77891+++ b/grsecurity/grsec_ipc.c
77892@@ -0,0 +1,48 @@
77893+#include <linux/kernel.h>
77894+#include <linux/mm.h>
77895+#include <linux/sched.h>
77896+#include <linux/file.h>
77897+#include <linux/ipc.h>
77898+#include <linux/ipc_namespace.h>
77899+#include <linux/grsecurity.h>
77900+#include <linux/grinternal.h>
77901+
77902+int
77903+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77904+{
77905+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77906+ int write;
77907+ int orig_granted_mode;
77908+ kuid_t euid;
77909+ kgid_t egid;
77910+
77911+ if (!grsec_enable_harden_ipc)
77912+ return 1;
77913+
77914+ euid = current_euid();
77915+ egid = current_egid();
77916+
77917+ write = requested_mode & 00002;
77918+ orig_granted_mode = ipcp->mode;
77919+
77920+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77921+ orig_granted_mode >>= 6;
77922+ else {
77923+ /* if likely wrong permissions, lock to user */
77924+ if (orig_granted_mode & 0007)
77925+ orig_granted_mode = 0;
77926+ /* otherwise do a egid-only check */
77927+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77928+ orig_granted_mode >>= 3;
77929+ /* otherwise, no access */
77930+ else
77931+ orig_granted_mode = 0;
77932+ }
77933+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77934+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77935+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77936+ return 0;
77937+ }
77938+#endif
77939+ return 1;
77940+}
77941diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77942new file mode 100644
77943index 0000000..5e05e20
77944--- /dev/null
77945+++ b/grsecurity/grsec_link.c
77946@@ -0,0 +1,58 @@
77947+#include <linux/kernel.h>
77948+#include <linux/sched.h>
77949+#include <linux/fs.h>
77950+#include <linux/file.h>
77951+#include <linux/grinternal.h>
77952+
77953+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77954+{
77955+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77956+ const struct inode *link_inode = link->dentry->d_inode;
77957+
77958+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77959+ /* ignore root-owned links, e.g. /proc/self */
77960+ gr_is_global_nonroot(link_inode->i_uid) && target &&
77961+ !uid_eq(link_inode->i_uid, target->i_uid)) {
77962+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77963+ return 1;
77964+ }
77965+#endif
77966+ return 0;
77967+}
77968+
77969+int
77970+gr_handle_follow_link(const struct inode *parent,
77971+ const struct inode *inode,
77972+ const struct dentry *dentry, const struct vfsmount *mnt)
77973+{
77974+#ifdef CONFIG_GRKERNSEC_LINK
77975+ const struct cred *cred = current_cred();
77976+
77977+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77978+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77979+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77980+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77981+ return -EACCES;
77982+ }
77983+#endif
77984+ return 0;
77985+}
77986+
77987+int
77988+gr_handle_hardlink(const struct dentry *dentry,
77989+ const struct vfsmount *mnt,
77990+ struct inode *inode, const int mode, const struct filename *to)
77991+{
77992+#ifdef CONFIG_GRKERNSEC_LINK
77993+ const struct cred *cred = current_cred();
77994+
77995+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77996+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77997+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77998+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77999+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
78000+ return -EPERM;
78001+ }
78002+#endif
78003+ return 0;
78004+}
78005diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
78006new file mode 100644
78007index 0000000..dbe0a6b
78008--- /dev/null
78009+++ b/grsecurity/grsec_log.c
78010@@ -0,0 +1,341 @@
78011+#include <linux/kernel.h>
78012+#include <linux/sched.h>
78013+#include <linux/file.h>
78014+#include <linux/tty.h>
78015+#include <linux/fs.h>
78016+#include <linux/mm.h>
78017+#include <linux/grinternal.h>
78018+
78019+#ifdef CONFIG_TREE_PREEMPT_RCU
78020+#define DISABLE_PREEMPT() preempt_disable()
78021+#define ENABLE_PREEMPT() preempt_enable()
78022+#else
78023+#define DISABLE_PREEMPT()
78024+#define ENABLE_PREEMPT()
78025+#endif
78026+
78027+#define BEGIN_LOCKS(x) \
78028+ DISABLE_PREEMPT(); \
78029+ rcu_read_lock(); \
78030+ read_lock(&tasklist_lock); \
78031+ read_lock(&grsec_exec_file_lock); \
78032+ if (x != GR_DO_AUDIT) \
78033+ spin_lock(&grsec_alert_lock); \
78034+ else \
78035+ spin_lock(&grsec_audit_lock)
78036+
78037+#define END_LOCKS(x) \
78038+ if (x != GR_DO_AUDIT) \
78039+ spin_unlock(&grsec_alert_lock); \
78040+ else \
78041+ spin_unlock(&grsec_audit_lock); \
78042+ read_unlock(&grsec_exec_file_lock); \
78043+ read_unlock(&tasklist_lock); \
78044+ rcu_read_unlock(); \
78045+ ENABLE_PREEMPT(); \
78046+ if (x == GR_DONT_AUDIT) \
78047+ gr_handle_alertkill(current)
78048+
78049+enum {
78050+ FLOODING,
78051+ NO_FLOODING
78052+};
78053+
78054+extern char *gr_alert_log_fmt;
78055+extern char *gr_audit_log_fmt;
78056+extern char *gr_alert_log_buf;
78057+extern char *gr_audit_log_buf;
78058+
78059+static int gr_log_start(int audit)
78060+{
78061+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
78062+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
78063+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78064+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
78065+ unsigned long curr_secs = get_seconds();
78066+
78067+ if (audit == GR_DO_AUDIT)
78068+ goto set_fmt;
78069+
78070+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
78071+ grsec_alert_wtime = curr_secs;
78072+ grsec_alert_fyet = 0;
78073+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
78074+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
78075+ grsec_alert_fyet++;
78076+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
78077+ grsec_alert_wtime = curr_secs;
78078+ grsec_alert_fyet++;
78079+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
78080+ return FLOODING;
78081+ }
78082+ else return FLOODING;
78083+
78084+set_fmt:
78085+#endif
78086+ memset(buf, 0, PAGE_SIZE);
78087+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
78088+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
78089+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78090+ } else if (current->signal->curr_ip) {
78091+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
78092+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
78093+ } else if (gr_acl_is_enabled()) {
78094+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
78095+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78096+ } else {
78097+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
78098+ strcpy(buf, fmt);
78099+ }
78100+
78101+ return NO_FLOODING;
78102+}
78103+
78104+static void gr_log_middle(int audit, const char *msg, va_list ap)
78105+ __attribute__ ((format (printf, 2, 0)));
78106+
78107+static void gr_log_middle(int audit, const char *msg, va_list ap)
78108+{
78109+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78110+ unsigned int len = strlen(buf);
78111+
78112+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78113+
78114+ return;
78115+}
78116+
78117+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78118+ __attribute__ ((format (printf, 2, 3)));
78119+
78120+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78121+{
78122+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78123+ unsigned int len = strlen(buf);
78124+ va_list ap;
78125+
78126+ va_start(ap, msg);
78127+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78128+ va_end(ap);
78129+
78130+ return;
78131+}
78132+
78133+static void gr_log_end(int audit, int append_default)
78134+{
78135+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78136+ if (append_default) {
78137+ struct task_struct *task = current;
78138+ struct task_struct *parent = task->real_parent;
78139+ const struct cred *cred = __task_cred(task);
78140+ const struct cred *pcred = __task_cred(parent);
78141+ unsigned int len = strlen(buf);
78142+
78143+ 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));
78144+ }
78145+
78146+ printk("%s\n", buf);
78147+
78148+ return;
78149+}
78150+
78151+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
78152+{
78153+ int logtype;
78154+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
78155+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
78156+ void *voidptr = NULL;
78157+ int num1 = 0, num2 = 0;
78158+ unsigned long ulong1 = 0, ulong2 = 0;
78159+ struct dentry *dentry = NULL;
78160+ struct vfsmount *mnt = NULL;
78161+ struct file *file = NULL;
78162+ struct task_struct *task = NULL;
78163+ struct vm_area_struct *vma = NULL;
78164+ const struct cred *cred, *pcred;
78165+ va_list ap;
78166+
78167+ BEGIN_LOCKS(audit);
78168+ logtype = gr_log_start(audit);
78169+ if (logtype == FLOODING) {
78170+ END_LOCKS(audit);
78171+ return;
78172+ }
78173+ va_start(ap, argtypes);
78174+ switch (argtypes) {
78175+ case GR_TTYSNIFF:
78176+ task = va_arg(ap, struct task_struct *);
78177+ 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));
78178+ break;
78179+ case GR_SYSCTL_HIDDEN:
78180+ str1 = va_arg(ap, char *);
78181+ gr_log_middle_varargs(audit, msg, result, str1);
78182+ break;
78183+ case GR_RBAC:
78184+ dentry = va_arg(ap, struct dentry *);
78185+ mnt = va_arg(ap, struct vfsmount *);
78186+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
78187+ break;
78188+ case GR_RBAC_STR:
78189+ dentry = va_arg(ap, struct dentry *);
78190+ mnt = va_arg(ap, struct vfsmount *);
78191+ str1 = va_arg(ap, char *);
78192+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
78193+ break;
78194+ case GR_STR_RBAC:
78195+ str1 = va_arg(ap, char *);
78196+ dentry = va_arg(ap, struct dentry *);
78197+ mnt = va_arg(ap, struct vfsmount *);
78198+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
78199+ break;
78200+ case GR_RBAC_MODE2:
78201+ dentry = va_arg(ap, struct dentry *);
78202+ mnt = va_arg(ap, struct vfsmount *);
78203+ str1 = va_arg(ap, char *);
78204+ str2 = va_arg(ap, char *);
78205+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
78206+ break;
78207+ case GR_RBAC_MODE3:
78208+ dentry = va_arg(ap, struct dentry *);
78209+ mnt = va_arg(ap, struct vfsmount *);
78210+ str1 = va_arg(ap, char *);
78211+ str2 = va_arg(ap, char *);
78212+ str3 = va_arg(ap, char *);
78213+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
78214+ break;
78215+ case GR_FILENAME:
78216+ dentry = va_arg(ap, struct dentry *);
78217+ mnt = va_arg(ap, struct vfsmount *);
78218+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
78219+ break;
78220+ case GR_STR_FILENAME:
78221+ str1 = va_arg(ap, char *);
78222+ dentry = va_arg(ap, struct dentry *);
78223+ mnt = va_arg(ap, struct vfsmount *);
78224+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
78225+ break;
78226+ case GR_FILENAME_STR:
78227+ dentry = va_arg(ap, struct dentry *);
78228+ mnt = va_arg(ap, struct vfsmount *);
78229+ str1 = va_arg(ap, char *);
78230+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
78231+ break;
78232+ case GR_FILENAME_TWO_INT:
78233+ dentry = va_arg(ap, struct dentry *);
78234+ mnt = va_arg(ap, struct vfsmount *);
78235+ num1 = va_arg(ap, int);
78236+ num2 = va_arg(ap, int);
78237+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
78238+ break;
78239+ case GR_FILENAME_TWO_INT_STR:
78240+ dentry = va_arg(ap, struct dentry *);
78241+ mnt = va_arg(ap, struct vfsmount *);
78242+ num1 = va_arg(ap, int);
78243+ num2 = va_arg(ap, int);
78244+ str1 = va_arg(ap, char *);
78245+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
78246+ break;
78247+ case GR_TEXTREL:
78248+ file = va_arg(ap, struct file *);
78249+ ulong1 = va_arg(ap, unsigned long);
78250+ ulong2 = va_arg(ap, unsigned long);
78251+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
78252+ break;
78253+ case GR_PTRACE:
78254+ task = va_arg(ap, struct task_struct *);
78255+ 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));
78256+ break;
78257+ case GR_RESOURCE:
78258+ task = va_arg(ap, struct task_struct *);
78259+ cred = __task_cred(task);
78260+ pcred = __task_cred(task->real_parent);
78261+ ulong1 = va_arg(ap, unsigned long);
78262+ str1 = va_arg(ap, char *);
78263+ ulong2 = va_arg(ap, unsigned long);
78264+ 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));
78265+ break;
78266+ case GR_CAP:
78267+ task = va_arg(ap, struct task_struct *);
78268+ cred = __task_cred(task);
78269+ pcred = __task_cred(task->real_parent);
78270+ str1 = va_arg(ap, char *);
78271+ 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));
78272+ break;
78273+ case GR_SIG:
78274+ str1 = va_arg(ap, char *);
78275+ voidptr = va_arg(ap, void *);
78276+ gr_log_middle_varargs(audit, msg, str1, voidptr);
78277+ break;
78278+ case GR_SIG2:
78279+ task = va_arg(ap, struct task_struct *);
78280+ cred = __task_cred(task);
78281+ pcred = __task_cred(task->real_parent);
78282+ num1 = va_arg(ap, int);
78283+ 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));
78284+ break;
78285+ case GR_CRASH1:
78286+ task = va_arg(ap, struct task_struct *);
78287+ cred = __task_cred(task);
78288+ pcred = __task_cred(task->real_parent);
78289+ ulong1 = va_arg(ap, unsigned long);
78290+ 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);
78291+ break;
78292+ case GR_CRASH2:
78293+ task = va_arg(ap, struct task_struct *);
78294+ cred = __task_cred(task);
78295+ pcred = __task_cred(task->real_parent);
78296+ ulong1 = va_arg(ap, unsigned long);
78297+ 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);
78298+ break;
78299+ case GR_RWXMAP:
78300+ file = va_arg(ap, struct file *);
78301+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
78302+ break;
78303+ case GR_RWXMAPVMA:
78304+ vma = va_arg(ap, struct vm_area_struct *);
78305+ if (vma->vm_file)
78306+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
78307+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
78308+ str1 = "<stack>";
78309+ else if (vma->vm_start <= current->mm->brk &&
78310+ vma->vm_end >= current->mm->start_brk)
78311+ str1 = "<heap>";
78312+ else
78313+ str1 = "<anonymous mapping>";
78314+ gr_log_middle_varargs(audit, msg, str1);
78315+ break;
78316+ case GR_PSACCT:
78317+ {
78318+ unsigned int wday, cday;
78319+ __u8 whr, chr;
78320+ __u8 wmin, cmin;
78321+ __u8 wsec, csec;
78322+ char cur_tty[64] = { 0 };
78323+ char parent_tty[64] = { 0 };
78324+
78325+ task = va_arg(ap, struct task_struct *);
78326+ wday = va_arg(ap, unsigned int);
78327+ cday = va_arg(ap, unsigned int);
78328+ whr = va_arg(ap, int);
78329+ chr = va_arg(ap, int);
78330+ wmin = va_arg(ap, int);
78331+ cmin = va_arg(ap, int);
78332+ wsec = va_arg(ap, int);
78333+ csec = va_arg(ap, int);
78334+ ulong1 = va_arg(ap, unsigned long);
78335+ cred = __task_cred(task);
78336+ pcred = __task_cred(task->real_parent);
78337+
78338+ 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));
78339+ }
78340+ break;
78341+ default:
78342+ gr_log_middle(audit, msg, ap);
78343+ }
78344+ va_end(ap);
78345+ // these don't need DEFAULTSECARGS printed on the end
78346+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
78347+ gr_log_end(audit, 0);
78348+ else
78349+ gr_log_end(audit, 1);
78350+ END_LOCKS(audit);
78351+}
78352diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
78353new file mode 100644
78354index 0000000..0e39d8c
78355--- /dev/null
78356+++ b/grsecurity/grsec_mem.c
78357@@ -0,0 +1,48 @@
78358+#include <linux/kernel.h>
78359+#include <linux/sched.h>
78360+#include <linux/mm.h>
78361+#include <linux/mman.h>
78362+#include <linux/module.h>
78363+#include <linux/grinternal.h>
78364+
78365+void gr_handle_msr_write(void)
78366+{
78367+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
78368+ return;
78369+}
78370+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
78371+
78372+void
78373+gr_handle_ioperm(void)
78374+{
78375+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
78376+ return;
78377+}
78378+
78379+void
78380+gr_handle_iopl(void)
78381+{
78382+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
78383+ return;
78384+}
78385+
78386+void
78387+gr_handle_mem_readwrite(u64 from, u64 to)
78388+{
78389+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
78390+ return;
78391+}
78392+
78393+void
78394+gr_handle_vm86(void)
78395+{
78396+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
78397+ return;
78398+}
78399+
78400+void
78401+gr_log_badprocpid(const char *entry)
78402+{
78403+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
78404+ return;
78405+}
78406diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
78407new file mode 100644
78408index 0000000..6f9eb73
78409--- /dev/null
78410+++ b/grsecurity/grsec_mount.c
78411@@ -0,0 +1,65 @@
78412+#include <linux/kernel.h>
78413+#include <linux/sched.h>
78414+#include <linux/mount.h>
78415+#include <linux/major.h>
78416+#include <linux/grsecurity.h>
78417+#include <linux/grinternal.h>
78418+
78419+void
78420+gr_log_remount(const char *devname, const int retval)
78421+{
78422+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78423+ if (grsec_enable_mount && (retval >= 0))
78424+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
78425+#endif
78426+ return;
78427+}
78428+
78429+void
78430+gr_log_unmount(const char *devname, const int retval)
78431+{
78432+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78433+ if (grsec_enable_mount && (retval >= 0))
78434+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
78435+#endif
78436+ return;
78437+}
78438+
78439+void
78440+gr_log_mount(const char *from, struct path *to, const int retval)
78441+{
78442+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78443+ if (grsec_enable_mount && (retval >= 0))
78444+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
78445+#endif
78446+ return;
78447+}
78448+
78449+int
78450+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
78451+{
78452+#ifdef CONFIG_GRKERNSEC_ROFS
78453+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
78454+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
78455+ return -EPERM;
78456+ } else
78457+ return 0;
78458+#endif
78459+ return 0;
78460+}
78461+
78462+int
78463+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
78464+{
78465+#ifdef CONFIG_GRKERNSEC_ROFS
78466+ struct inode *inode = dentry->d_inode;
78467+
78468+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
78469+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
78470+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
78471+ return -EPERM;
78472+ } else
78473+ return 0;
78474+#endif
78475+ return 0;
78476+}
78477diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
78478new file mode 100644
78479index 0000000..6ee9d50
78480--- /dev/null
78481+++ b/grsecurity/grsec_pax.c
78482@@ -0,0 +1,45 @@
78483+#include <linux/kernel.h>
78484+#include <linux/sched.h>
78485+#include <linux/mm.h>
78486+#include <linux/file.h>
78487+#include <linux/grinternal.h>
78488+#include <linux/grsecurity.h>
78489+
78490+void
78491+gr_log_textrel(struct vm_area_struct * vma)
78492+{
78493+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78494+ if (grsec_enable_log_rwxmaps)
78495+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
78496+#endif
78497+ return;
78498+}
78499+
78500+void gr_log_ptgnustack(struct file *file)
78501+{
78502+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78503+ if (grsec_enable_log_rwxmaps)
78504+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
78505+#endif
78506+ return;
78507+}
78508+
78509+void
78510+gr_log_rwxmmap(struct file *file)
78511+{
78512+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78513+ if (grsec_enable_log_rwxmaps)
78514+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
78515+#endif
78516+ return;
78517+}
78518+
78519+void
78520+gr_log_rwxmprotect(struct vm_area_struct *vma)
78521+{
78522+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78523+ if (grsec_enable_log_rwxmaps)
78524+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
78525+#endif
78526+ return;
78527+}
78528diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
78529new file mode 100644
78530index 0000000..2005a3a
78531--- /dev/null
78532+++ b/grsecurity/grsec_proc.c
78533@@ -0,0 +1,20 @@
78534+#include <linux/kernel.h>
78535+#include <linux/sched.h>
78536+#include <linux/grsecurity.h>
78537+#include <linux/grinternal.h>
78538+
78539+int gr_proc_is_restricted(void)
78540+{
78541+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78542+ const struct cred *cred = current_cred();
78543+#endif
78544+
78545+#ifdef CONFIG_GRKERNSEC_PROC_USER
78546+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
78547+ return -EACCES;
78548+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78549+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
78550+ return -EACCES;
78551+#endif
78552+ return 0;
78553+}
78554diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
78555new file mode 100644
78556index 0000000..f7f29aa
78557--- /dev/null
78558+++ b/grsecurity/grsec_ptrace.c
78559@@ -0,0 +1,30 @@
78560+#include <linux/kernel.h>
78561+#include <linux/sched.h>
78562+#include <linux/grinternal.h>
78563+#include <linux/security.h>
78564+
78565+void
78566+gr_audit_ptrace(struct task_struct *task)
78567+{
78568+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78569+ if (grsec_enable_audit_ptrace)
78570+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
78571+#endif
78572+ return;
78573+}
78574+
78575+int
78576+gr_ptrace_readexec(struct file *file, int unsafe_flags)
78577+{
78578+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78579+ const struct dentry *dentry = file->f_path.dentry;
78580+ const struct vfsmount *mnt = file->f_path.mnt;
78581+
78582+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
78583+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
78584+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
78585+ return -EACCES;
78586+ }
78587+#endif
78588+ return 0;
78589+}
78590diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
78591new file mode 100644
78592index 0000000..3860c7e
78593--- /dev/null
78594+++ b/grsecurity/grsec_sig.c
78595@@ -0,0 +1,236 @@
78596+#include <linux/kernel.h>
78597+#include <linux/sched.h>
78598+#include <linux/fs.h>
78599+#include <linux/delay.h>
78600+#include <linux/grsecurity.h>
78601+#include <linux/grinternal.h>
78602+#include <linux/hardirq.h>
78603+
78604+char *signames[] = {
78605+ [SIGSEGV] = "Segmentation fault",
78606+ [SIGILL] = "Illegal instruction",
78607+ [SIGABRT] = "Abort",
78608+ [SIGBUS] = "Invalid alignment/Bus error"
78609+};
78610+
78611+void
78612+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
78613+{
78614+#ifdef CONFIG_GRKERNSEC_SIGNAL
78615+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
78616+ (sig == SIGABRT) || (sig == SIGBUS))) {
78617+ if (task_pid_nr(t) == task_pid_nr(current)) {
78618+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
78619+ } else {
78620+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
78621+ }
78622+ }
78623+#endif
78624+ return;
78625+}
78626+
78627+int
78628+gr_handle_signal(const struct task_struct *p, const int sig)
78629+{
78630+#ifdef CONFIG_GRKERNSEC
78631+ /* ignore the 0 signal for protected task checks */
78632+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
78633+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
78634+ return -EPERM;
78635+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
78636+ return -EPERM;
78637+ }
78638+#endif
78639+ return 0;
78640+}
78641+
78642+#ifdef CONFIG_GRKERNSEC
78643+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
78644+
78645+int gr_fake_force_sig(int sig, struct task_struct *t)
78646+{
78647+ unsigned long int flags;
78648+ int ret, blocked, ignored;
78649+ struct k_sigaction *action;
78650+
78651+ spin_lock_irqsave(&t->sighand->siglock, flags);
78652+ action = &t->sighand->action[sig-1];
78653+ ignored = action->sa.sa_handler == SIG_IGN;
78654+ blocked = sigismember(&t->blocked, sig);
78655+ if (blocked || ignored) {
78656+ action->sa.sa_handler = SIG_DFL;
78657+ if (blocked) {
78658+ sigdelset(&t->blocked, sig);
78659+ recalc_sigpending_and_wake(t);
78660+ }
78661+ }
78662+ if (action->sa.sa_handler == SIG_DFL)
78663+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
78664+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
78665+
78666+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
78667+
78668+ return ret;
78669+}
78670+#endif
78671+
78672+#define GR_USER_BAN_TIME (15 * 60)
78673+#define GR_DAEMON_BRUTE_TIME (30 * 60)
78674+
78675+void gr_handle_brute_attach(int dumpable)
78676+{
78677+#ifdef CONFIG_GRKERNSEC_BRUTE
78678+ struct task_struct *p = current;
78679+ kuid_t uid = GLOBAL_ROOT_UID;
78680+ int daemon = 0;
78681+
78682+ if (!grsec_enable_brute)
78683+ return;
78684+
78685+ rcu_read_lock();
78686+ read_lock(&tasklist_lock);
78687+ read_lock(&grsec_exec_file_lock);
78688+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
78689+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
78690+ p->real_parent->brute = 1;
78691+ daemon = 1;
78692+ } else {
78693+ const struct cred *cred = __task_cred(p), *cred2;
78694+ struct task_struct *tsk, *tsk2;
78695+
78696+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
78697+ struct user_struct *user;
78698+
78699+ uid = cred->uid;
78700+
78701+ /* this is put upon execution past expiration */
78702+ user = find_user(uid);
78703+ if (user == NULL)
78704+ goto unlock;
78705+ user->suid_banned = 1;
78706+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
78707+ if (user->suid_ban_expires == ~0UL)
78708+ user->suid_ban_expires--;
78709+
78710+ /* only kill other threads of the same binary, from the same user */
78711+ do_each_thread(tsk2, tsk) {
78712+ cred2 = __task_cred(tsk);
78713+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
78714+ gr_fake_force_sig(SIGKILL, tsk);
78715+ } while_each_thread(tsk2, tsk);
78716+ }
78717+ }
78718+unlock:
78719+ read_unlock(&grsec_exec_file_lock);
78720+ read_unlock(&tasklist_lock);
78721+ rcu_read_unlock();
78722+
78723+ if (gr_is_global_nonroot(uid))
78724+ 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);
78725+ else if (daemon)
78726+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
78727+
78728+#endif
78729+ return;
78730+}
78731+
78732+void gr_handle_brute_check(void)
78733+{
78734+#ifdef CONFIG_GRKERNSEC_BRUTE
78735+ struct task_struct *p = current;
78736+
78737+ if (unlikely(p->brute)) {
78738+ if (!grsec_enable_brute)
78739+ p->brute = 0;
78740+ else if (time_before(get_seconds(), p->brute_expires))
78741+ msleep(30 * 1000);
78742+ }
78743+#endif
78744+ return;
78745+}
78746+
78747+void gr_handle_kernel_exploit(void)
78748+{
78749+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78750+ const struct cred *cred;
78751+ struct task_struct *tsk, *tsk2;
78752+ struct user_struct *user;
78753+ kuid_t uid;
78754+
78755+ if (in_irq() || in_serving_softirq() || in_nmi())
78756+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
78757+
78758+ uid = current_uid();
78759+
78760+ if (gr_is_global_root(uid))
78761+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
78762+ else {
78763+ /* kill all the processes of this user, hold a reference
78764+ to their creds struct, and prevent them from creating
78765+ another process until system reset
78766+ */
78767+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
78768+ GR_GLOBAL_UID(uid));
78769+ /* we intentionally leak this ref */
78770+ user = get_uid(current->cred->user);
78771+ if (user)
78772+ user->kernel_banned = 1;
78773+
78774+ /* kill all processes of this user */
78775+ read_lock(&tasklist_lock);
78776+ do_each_thread(tsk2, tsk) {
78777+ cred = __task_cred(tsk);
78778+ if (uid_eq(cred->uid, uid))
78779+ gr_fake_force_sig(SIGKILL, tsk);
78780+ } while_each_thread(tsk2, tsk);
78781+ read_unlock(&tasklist_lock);
78782+ }
78783+#endif
78784+}
78785+
78786+#ifdef CONFIG_GRKERNSEC_BRUTE
78787+static bool suid_ban_expired(struct user_struct *user)
78788+{
78789+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
78790+ user->suid_banned = 0;
78791+ user->suid_ban_expires = 0;
78792+ free_uid(user);
78793+ return true;
78794+ }
78795+
78796+ return false;
78797+}
78798+#endif
78799+
78800+int gr_process_kernel_exec_ban(void)
78801+{
78802+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78803+ if (unlikely(current->cred->user->kernel_banned))
78804+ return -EPERM;
78805+#endif
78806+ return 0;
78807+}
78808+
78809+int gr_process_kernel_setuid_ban(struct user_struct *user)
78810+{
78811+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78812+ if (unlikely(user->kernel_banned))
78813+ gr_fake_force_sig(SIGKILL, current);
78814+#endif
78815+ return 0;
78816+}
78817+
78818+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78819+{
78820+#ifdef CONFIG_GRKERNSEC_BRUTE
78821+ struct user_struct *user = current->cred->user;
78822+ if (unlikely(user->suid_banned)) {
78823+ if (suid_ban_expired(user))
78824+ return 0;
78825+ /* disallow execution of suid binaries only */
78826+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78827+ return -EPERM;
78828+ }
78829+#endif
78830+ return 0;
78831+}
78832diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78833new file mode 100644
78834index 0000000..e3650b6
78835--- /dev/null
78836+++ b/grsecurity/grsec_sock.c
78837@@ -0,0 +1,244 @@
78838+#include <linux/kernel.h>
78839+#include <linux/module.h>
78840+#include <linux/sched.h>
78841+#include <linux/file.h>
78842+#include <linux/net.h>
78843+#include <linux/in.h>
78844+#include <linux/ip.h>
78845+#include <net/sock.h>
78846+#include <net/inet_sock.h>
78847+#include <linux/grsecurity.h>
78848+#include <linux/grinternal.h>
78849+#include <linux/gracl.h>
78850+
78851+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78852+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78853+
78854+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78855+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78856+
78857+#ifdef CONFIG_UNIX_MODULE
78858+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78859+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78860+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78861+EXPORT_SYMBOL_GPL(gr_handle_create);
78862+#endif
78863+
78864+#ifdef CONFIG_GRKERNSEC
78865+#define gr_conn_table_size 32749
78866+struct conn_table_entry {
78867+ struct conn_table_entry *next;
78868+ struct signal_struct *sig;
78869+};
78870+
78871+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78872+DEFINE_SPINLOCK(gr_conn_table_lock);
78873+
78874+extern const char * gr_socktype_to_name(unsigned char type);
78875+extern const char * gr_proto_to_name(unsigned char proto);
78876+extern const char * gr_sockfamily_to_name(unsigned char family);
78877+
78878+static __inline__ int
78879+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78880+{
78881+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78882+}
78883+
78884+static __inline__ int
78885+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78886+ __u16 sport, __u16 dport)
78887+{
78888+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78889+ sig->gr_sport == sport && sig->gr_dport == dport))
78890+ return 1;
78891+ else
78892+ return 0;
78893+}
78894+
78895+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78896+{
78897+ struct conn_table_entry **match;
78898+ unsigned int index;
78899+
78900+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78901+ sig->gr_sport, sig->gr_dport,
78902+ gr_conn_table_size);
78903+
78904+ newent->sig = sig;
78905+
78906+ match = &gr_conn_table[index];
78907+ newent->next = *match;
78908+ *match = newent;
78909+
78910+ return;
78911+}
78912+
78913+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78914+{
78915+ struct conn_table_entry *match, *last = NULL;
78916+ unsigned int index;
78917+
78918+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78919+ sig->gr_sport, sig->gr_dport,
78920+ gr_conn_table_size);
78921+
78922+ match = gr_conn_table[index];
78923+ while (match && !conn_match(match->sig,
78924+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78925+ sig->gr_dport)) {
78926+ last = match;
78927+ match = match->next;
78928+ }
78929+
78930+ if (match) {
78931+ if (last)
78932+ last->next = match->next;
78933+ else
78934+ gr_conn_table[index] = NULL;
78935+ kfree(match);
78936+ }
78937+
78938+ return;
78939+}
78940+
78941+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78942+ __u16 sport, __u16 dport)
78943+{
78944+ struct conn_table_entry *match;
78945+ unsigned int index;
78946+
78947+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78948+
78949+ match = gr_conn_table[index];
78950+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78951+ match = match->next;
78952+
78953+ if (match)
78954+ return match->sig;
78955+ else
78956+ return NULL;
78957+}
78958+
78959+#endif
78960+
78961+void gr_update_task_in_ip_table(const struct inet_sock *inet)
78962+{
78963+#ifdef CONFIG_GRKERNSEC
78964+ struct signal_struct *sig = current->signal;
78965+ struct conn_table_entry *newent;
78966+
78967+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78968+ if (newent == NULL)
78969+ return;
78970+ /* no bh lock needed since we are called with bh disabled */
78971+ spin_lock(&gr_conn_table_lock);
78972+ gr_del_task_from_ip_table_nolock(sig);
78973+ sig->gr_saddr = inet->inet_rcv_saddr;
78974+ sig->gr_daddr = inet->inet_daddr;
78975+ sig->gr_sport = inet->inet_sport;
78976+ sig->gr_dport = inet->inet_dport;
78977+ gr_add_to_task_ip_table_nolock(sig, newent);
78978+ spin_unlock(&gr_conn_table_lock);
78979+#endif
78980+ return;
78981+}
78982+
78983+void gr_del_task_from_ip_table(struct task_struct *task)
78984+{
78985+#ifdef CONFIG_GRKERNSEC
78986+ spin_lock_bh(&gr_conn_table_lock);
78987+ gr_del_task_from_ip_table_nolock(task->signal);
78988+ spin_unlock_bh(&gr_conn_table_lock);
78989+#endif
78990+ return;
78991+}
78992+
78993+void
78994+gr_attach_curr_ip(const struct sock *sk)
78995+{
78996+#ifdef CONFIG_GRKERNSEC
78997+ struct signal_struct *p, *set;
78998+ const struct inet_sock *inet = inet_sk(sk);
78999+
79000+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
79001+ return;
79002+
79003+ set = current->signal;
79004+
79005+ spin_lock_bh(&gr_conn_table_lock);
79006+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
79007+ inet->inet_dport, inet->inet_sport);
79008+ if (unlikely(p != NULL)) {
79009+ set->curr_ip = p->curr_ip;
79010+ set->used_accept = 1;
79011+ gr_del_task_from_ip_table_nolock(p);
79012+ spin_unlock_bh(&gr_conn_table_lock);
79013+ return;
79014+ }
79015+ spin_unlock_bh(&gr_conn_table_lock);
79016+
79017+ set->curr_ip = inet->inet_daddr;
79018+ set->used_accept = 1;
79019+#endif
79020+ return;
79021+}
79022+
79023+int
79024+gr_handle_sock_all(const int family, const int type, const int protocol)
79025+{
79026+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79027+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
79028+ (family != AF_UNIX)) {
79029+ if (family == AF_INET)
79030+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
79031+ else
79032+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
79033+ return -EACCES;
79034+ }
79035+#endif
79036+ return 0;
79037+}
79038+
79039+int
79040+gr_handle_sock_server(const struct sockaddr *sck)
79041+{
79042+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79043+ if (grsec_enable_socket_server &&
79044+ in_group_p(grsec_socket_server_gid) &&
79045+ sck && (sck->sa_family != AF_UNIX) &&
79046+ (sck->sa_family != AF_LOCAL)) {
79047+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79048+ return -EACCES;
79049+ }
79050+#endif
79051+ return 0;
79052+}
79053+
79054+int
79055+gr_handle_sock_server_other(const struct sock *sck)
79056+{
79057+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79058+ if (grsec_enable_socket_server &&
79059+ in_group_p(grsec_socket_server_gid) &&
79060+ sck && (sck->sk_family != AF_UNIX) &&
79061+ (sck->sk_family != AF_LOCAL)) {
79062+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79063+ return -EACCES;
79064+ }
79065+#endif
79066+ return 0;
79067+}
79068+
79069+int
79070+gr_handle_sock_client(const struct sockaddr *sck)
79071+{
79072+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
79073+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
79074+ sck && (sck->sa_family != AF_UNIX) &&
79075+ (sck->sa_family != AF_LOCAL)) {
79076+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
79077+ return -EACCES;
79078+ }
79079+#endif
79080+ return 0;
79081+}
79082diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
79083new file mode 100644
79084index 0000000..cce889e
79085--- /dev/null
79086+++ b/grsecurity/grsec_sysctl.c
79087@@ -0,0 +1,488 @@
79088+#include <linux/kernel.h>
79089+#include <linux/sched.h>
79090+#include <linux/sysctl.h>
79091+#include <linux/grsecurity.h>
79092+#include <linux/grinternal.h>
79093+
79094+int
79095+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
79096+{
79097+#ifdef CONFIG_GRKERNSEC_SYSCTL
79098+ if (dirname == NULL || name == NULL)
79099+ return 0;
79100+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
79101+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
79102+ return -EACCES;
79103+ }
79104+#endif
79105+ return 0;
79106+}
79107+
79108+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
79109+static int __maybe_unused __read_only one = 1;
79110+#endif
79111+
79112+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
79113+ defined(CONFIG_GRKERNSEC_DENYUSB)
79114+struct ctl_table grsecurity_table[] = {
79115+#ifdef CONFIG_GRKERNSEC_SYSCTL
79116+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
79117+#ifdef CONFIG_GRKERNSEC_IO
79118+ {
79119+ .procname = "disable_priv_io",
79120+ .data = &grsec_disable_privio,
79121+ .maxlen = sizeof(int),
79122+ .mode = 0600,
79123+ .proc_handler = &proc_dointvec,
79124+ },
79125+#endif
79126+#endif
79127+#ifdef CONFIG_GRKERNSEC_LINK
79128+ {
79129+ .procname = "linking_restrictions",
79130+ .data = &grsec_enable_link,
79131+ .maxlen = sizeof(int),
79132+ .mode = 0600,
79133+ .proc_handler = &proc_dointvec,
79134+ },
79135+#endif
79136+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
79137+ {
79138+ .procname = "enforce_symlinksifowner",
79139+ .data = &grsec_enable_symlinkown,
79140+ .maxlen = sizeof(int),
79141+ .mode = 0600,
79142+ .proc_handler = &proc_dointvec,
79143+ },
79144+ {
79145+ .procname = "symlinkown_gid",
79146+ .data = &grsec_symlinkown_gid,
79147+ .maxlen = sizeof(int),
79148+ .mode = 0600,
79149+ .proc_handler = &proc_dointvec,
79150+ },
79151+#endif
79152+#ifdef CONFIG_GRKERNSEC_BRUTE
79153+ {
79154+ .procname = "deter_bruteforce",
79155+ .data = &grsec_enable_brute,
79156+ .maxlen = sizeof(int),
79157+ .mode = 0600,
79158+ .proc_handler = &proc_dointvec,
79159+ },
79160+#endif
79161+#ifdef CONFIG_GRKERNSEC_FIFO
79162+ {
79163+ .procname = "fifo_restrictions",
79164+ .data = &grsec_enable_fifo,
79165+ .maxlen = sizeof(int),
79166+ .mode = 0600,
79167+ .proc_handler = &proc_dointvec,
79168+ },
79169+#endif
79170+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
79171+ {
79172+ .procname = "ptrace_readexec",
79173+ .data = &grsec_enable_ptrace_readexec,
79174+ .maxlen = sizeof(int),
79175+ .mode = 0600,
79176+ .proc_handler = &proc_dointvec,
79177+ },
79178+#endif
79179+#ifdef CONFIG_GRKERNSEC_SETXID
79180+ {
79181+ .procname = "consistent_setxid",
79182+ .data = &grsec_enable_setxid,
79183+ .maxlen = sizeof(int),
79184+ .mode = 0600,
79185+ .proc_handler = &proc_dointvec,
79186+ },
79187+#endif
79188+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
79189+ {
79190+ .procname = "ip_blackhole",
79191+ .data = &grsec_enable_blackhole,
79192+ .maxlen = sizeof(int),
79193+ .mode = 0600,
79194+ .proc_handler = &proc_dointvec,
79195+ },
79196+ {
79197+ .procname = "lastack_retries",
79198+ .data = &grsec_lastack_retries,
79199+ .maxlen = sizeof(int),
79200+ .mode = 0600,
79201+ .proc_handler = &proc_dointvec,
79202+ },
79203+#endif
79204+#ifdef CONFIG_GRKERNSEC_EXECLOG
79205+ {
79206+ .procname = "exec_logging",
79207+ .data = &grsec_enable_execlog,
79208+ .maxlen = sizeof(int),
79209+ .mode = 0600,
79210+ .proc_handler = &proc_dointvec,
79211+ },
79212+#endif
79213+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79214+ {
79215+ .procname = "rwxmap_logging",
79216+ .data = &grsec_enable_log_rwxmaps,
79217+ .maxlen = sizeof(int),
79218+ .mode = 0600,
79219+ .proc_handler = &proc_dointvec,
79220+ },
79221+#endif
79222+#ifdef CONFIG_GRKERNSEC_SIGNAL
79223+ {
79224+ .procname = "signal_logging",
79225+ .data = &grsec_enable_signal,
79226+ .maxlen = sizeof(int),
79227+ .mode = 0600,
79228+ .proc_handler = &proc_dointvec,
79229+ },
79230+#endif
79231+#ifdef CONFIG_GRKERNSEC_FORKFAIL
79232+ {
79233+ .procname = "forkfail_logging",
79234+ .data = &grsec_enable_forkfail,
79235+ .maxlen = sizeof(int),
79236+ .mode = 0600,
79237+ .proc_handler = &proc_dointvec,
79238+ },
79239+#endif
79240+#ifdef CONFIG_GRKERNSEC_TIME
79241+ {
79242+ .procname = "timechange_logging",
79243+ .data = &grsec_enable_time,
79244+ .maxlen = sizeof(int),
79245+ .mode = 0600,
79246+ .proc_handler = &proc_dointvec,
79247+ },
79248+#endif
79249+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
79250+ {
79251+ .procname = "chroot_deny_shmat",
79252+ .data = &grsec_enable_chroot_shmat,
79253+ .maxlen = sizeof(int),
79254+ .mode = 0600,
79255+ .proc_handler = &proc_dointvec,
79256+ },
79257+#endif
79258+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
79259+ {
79260+ .procname = "chroot_deny_unix",
79261+ .data = &grsec_enable_chroot_unix,
79262+ .maxlen = sizeof(int),
79263+ .mode = 0600,
79264+ .proc_handler = &proc_dointvec,
79265+ },
79266+#endif
79267+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
79268+ {
79269+ .procname = "chroot_deny_mount",
79270+ .data = &grsec_enable_chroot_mount,
79271+ .maxlen = sizeof(int),
79272+ .mode = 0600,
79273+ .proc_handler = &proc_dointvec,
79274+ },
79275+#endif
79276+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
79277+ {
79278+ .procname = "chroot_deny_fchdir",
79279+ .data = &grsec_enable_chroot_fchdir,
79280+ .maxlen = sizeof(int),
79281+ .mode = 0600,
79282+ .proc_handler = &proc_dointvec,
79283+ },
79284+#endif
79285+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
79286+ {
79287+ .procname = "chroot_deny_chroot",
79288+ .data = &grsec_enable_chroot_double,
79289+ .maxlen = sizeof(int),
79290+ .mode = 0600,
79291+ .proc_handler = &proc_dointvec,
79292+ },
79293+#endif
79294+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
79295+ {
79296+ .procname = "chroot_deny_pivot",
79297+ .data = &grsec_enable_chroot_pivot,
79298+ .maxlen = sizeof(int),
79299+ .mode = 0600,
79300+ .proc_handler = &proc_dointvec,
79301+ },
79302+#endif
79303+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
79304+ {
79305+ .procname = "chroot_enforce_chdir",
79306+ .data = &grsec_enable_chroot_chdir,
79307+ .maxlen = sizeof(int),
79308+ .mode = 0600,
79309+ .proc_handler = &proc_dointvec,
79310+ },
79311+#endif
79312+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
79313+ {
79314+ .procname = "chroot_deny_chmod",
79315+ .data = &grsec_enable_chroot_chmod,
79316+ .maxlen = sizeof(int),
79317+ .mode = 0600,
79318+ .proc_handler = &proc_dointvec,
79319+ },
79320+#endif
79321+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
79322+ {
79323+ .procname = "chroot_deny_mknod",
79324+ .data = &grsec_enable_chroot_mknod,
79325+ .maxlen = sizeof(int),
79326+ .mode = 0600,
79327+ .proc_handler = &proc_dointvec,
79328+ },
79329+#endif
79330+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
79331+ {
79332+ .procname = "chroot_restrict_nice",
79333+ .data = &grsec_enable_chroot_nice,
79334+ .maxlen = sizeof(int),
79335+ .mode = 0600,
79336+ .proc_handler = &proc_dointvec,
79337+ },
79338+#endif
79339+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
79340+ {
79341+ .procname = "chroot_execlog",
79342+ .data = &grsec_enable_chroot_execlog,
79343+ .maxlen = sizeof(int),
79344+ .mode = 0600,
79345+ .proc_handler = &proc_dointvec,
79346+ },
79347+#endif
79348+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
79349+ {
79350+ .procname = "chroot_caps",
79351+ .data = &grsec_enable_chroot_caps,
79352+ .maxlen = sizeof(int),
79353+ .mode = 0600,
79354+ .proc_handler = &proc_dointvec,
79355+ },
79356+#endif
79357+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
79358+ {
79359+ .procname = "chroot_deny_bad_rename",
79360+ .data = &grsec_enable_chroot_rename,
79361+ .maxlen = sizeof(int),
79362+ .mode = 0600,
79363+ .proc_handler = &proc_dointvec,
79364+ },
79365+#endif
79366+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
79367+ {
79368+ .procname = "chroot_deny_sysctl",
79369+ .data = &grsec_enable_chroot_sysctl,
79370+ .maxlen = sizeof(int),
79371+ .mode = 0600,
79372+ .proc_handler = &proc_dointvec,
79373+ },
79374+#endif
79375+#ifdef CONFIG_GRKERNSEC_TPE
79376+ {
79377+ .procname = "tpe",
79378+ .data = &grsec_enable_tpe,
79379+ .maxlen = sizeof(int),
79380+ .mode = 0600,
79381+ .proc_handler = &proc_dointvec,
79382+ },
79383+ {
79384+ .procname = "tpe_gid",
79385+ .data = &grsec_tpe_gid,
79386+ .maxlen = sizeof(int),
79387+ .mode = 0600,
79388+ .proc_handler = &proc_dointvec,
79389+ },
79390+#endif
79391+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79392+ {
79393+ .procname = "tpe_invert",
79394+ .data = &grsec_enable_tpe_invert,
79395+ .maxlen = sizeof(int),
79396+ .mode = 0600,
79397+ .proc_handler = &proc_dointvec,
79398+ },
79399+#endif
79400+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79401+ {
79402+ .procname = "tpe_restrict_all",
79403+ .data = &grsec_enable_tpe_all,
79404+ .maxlen = sizeof(int),
79405+ .mode = 0600,
79406+ .proc_handler = &proc_dointvec,
79407+ },
79408+#endif
79409+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79410+ {
79411+ .procname = "socket_all",
79412+ .data = &grsec_enable_socket_all,
79413+ .maxlen = sizeof(int),
79414+ .mode = 0600,
79415+ .proc_handler = &proc_dointvec,
79416+ },
79417+ {
79418+ .procname = "socket_all_gid",
79419+ .data = &grsec_socket_all_gid,
79420+ .maxlen = sizeof(int),
79421+ .mode = 0600,
79422+ .proc_handler = &proc_dointvec,
79423+ },
79424+#endif
79425+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
79426+ {
79427+ .procname = "socket_client",
79428+ .data = &grsec_enable_socket_client,
79429+ .maxlen = sizeof(int),
79430+ .mode = 0600,
79431+ .proc_handler = &proc_dointvec,
79432+ },
79433+ {
79434+ .procname = "socket_client_gid",
79435+ .data = &grsec_socket_client_gid,
79436+ .maxlen = sizeof(int),
79437+ .mode = 0600,
79438+ .proc_handler = &proc_dointvec,
79439+ },
79440+#endif
79441+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79442+ {
79443+ .procname = "socket_server",
79444+ .data = &grsec_enable_socket_server,
79445+ .maxlen = sizeof(int),
79446+ .mode = 0600,
79447+ .proc_handler = &proc_dointvec,
79448+ },
79449+ {
79450+ .procname = "socket_server_gid",
79451+ .data = &grsec_socket_server_gid,
79452+ .maxlen = sizeof(int),
79453+ .mode = 0600,
79454+ .proc_handler = &proc_dointvec,
79455+ },
79456+#endif
79457+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
79458+ {
79459+ .procname = "audit_group",
79460+ .data = &grsec_enable_group,
79461+ .maxlen = sizeof(int),
79462+ .mode = 0600,
79463+ .proc_handler = &proc_dointvec,
79464+ },
79465+ {
79466+ .procname = "audit_gid",
79467+ .data = &grsec_audit_gid,
79468+ .maxlen = sizeof(int),
79469+ .mode = 0600,
79470+ .proc_handler = &proc_dointvec,
79471+ },
79472+#endif
79473+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
79474+ {
79475+ .procname = "audit_chdir",
79476+ .data = &grsec_enable_chdir,
79477+ .maxlen = sizeof(int),
79478+ .mode = 0600,
79479+ .proc_handler = &proc_dointvec,
79480+ },
79481+#endif
79482+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
79483+ {
79484+ .procname = "audit_mount",
79485+ .data = &grsec_enable_mount,
79486+ .maxlen = sizeof(int),
79487+ .mode = 0600,
79488+ .proc_handler = &proc_dointvec,
79489+ },
79490+#endif
79491+#ifdef CONFIG_GRKERNSEC_DMESG
79492+ {
79493+ .procname = "dmesg",
79494+ .data = &grsec_enable_dmesg,
79495+ .maxlen = sizeof(int),
79496+ .mode = 0600,
79497+ .proc_handler = &proc_dointvec,
79498+ },
79499+#endif
79500+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
79501+ {
79502+ .procname = "chroot_findtask",
79503+ .data = &grsec_enable_chroot_findtask,
79504+ .maxlen = sizeof(int),
79505+ .mode = 0600,
79506+ .proc_handler = &proc_dointvec,
79507+ },
79508+#endif
79509+#ifdef CONFIG_GRKERNSEC_RESLOG
79510+ {
79511+ .procname = "resource_logging",
79512+ .data = &grsec_resource_logging,
79513+ .maxlen = sizeof(int),
79514+ .mode = 0600,
79515+ .proc_handler = &proc_dointvec,
79516+ },
79517+#endif
79518+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
79519+ {
79520+ .procname = "audit_ptrace",
79521+ .data = &grsec_enable_audit_ptrace,
79522+ .maxlen = sizeof(int),
79523+ .mode = 0600,
79524+ .proc_handler = &proc_dointvec,
79525+ },
79526+#endif
79527+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79528+ {
79529+ .procname = "harden_ptrace",
79530+ .data = &grsec_enable_harden_ptrace,
79531+ .maxlen = sizeof(int),
79532+ .mode = 0600,
79533+ .proc_handler = &proc_dointvec,
79534+ },
79535+#endif
79536+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
79537+ {
79538+ .procname = "harden_ipc",
79539+ .data = &grsec_enable_harden_ipc,
79540+ .maxlen = sizeof(int),
79541+ .mode = 0600,
79542+ .proc_handler = &proc_dointvec,
79543+ },
79544+#endif
79545+ {
79546+ .procname = "grsec_lock",
79547+ .data = &grsec_lock,
79548+ .maxlen = sizeof(int),
79549+ .mode = 0600,
79550+ .proc_handler = &proc_dointvec,
79551+ },
79552+#endif
79553+#ifdef CONFIG_GRKERNSEC_ROFS
79554+ {
79555+ .procname = "romount_protect",
79556+ .data = &grsec_enable_rofs,
79557+ .maxlen = sizeof(int),
79558+ .mode = 0600,
79559+ .proc_handler = &proc_dointvec_minmax,
79560+ .extra1 = &one,
79561+ .extra2 = &one,
79562+ },
79563+#endif
79564+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
79565+ {
79566+ .procname = "deny_new_usb",
79567+ .data = &grsec_deny_new_usb,
79568+ .maxlen = sizeof(int),
79569+ .mode = 0600,
79570+ .proc_handler = &proc_dointvec,
79571+ },
79572+#endif
79573+ { }
79574+};
79575+#endif
79576diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
79577new file mode 100644
79578index 0000000..61b514e
79579--- /dev/null
79580+++ b/grsecurity/grsec_time.c
79581@@ -0,0 +1,16 @@
79582+#include <linux/kernel.h>
79583+#include <linux/sched.h>
79584+#include <linux/grinternal.h>
79585+#include <linux/module.h>
79586+
79587+void
79588+gr_log_timechange(void)
79589+{
79590+#ifdef CONFIG_GRKERNSEC_TIME
79591+ if (grsec_enable_time)
79592+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
79593+#endif
79594+ return;
79595+}
79596+
79597+EXPORT_SYMBOL_GPL(gr_log_timechange);
79598diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
79599new file mode 100644
79600index 0000000..d1953de
79601--- /dev/null
79602+++ b/grsecurity/grsec_tpe.c
79603@@ -0,0 +1,78 @@
79604+#include <linux/kernel.h>
79605+#include <linux/sched.h>
79606+#include <linux/file.h>
79607+#include <linux/fs.h>
79608+#include <linux/grinternal.h>
79609+
79610+extern int gr_acl_tpe_check(void);
79611+
79612+int
79613+gr_tpe_allow(const struct file *file)
79614+{
79615+#ifdef CONFIG_GRKERNSEC
79616+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
79617+ struct inode *file_inode = file->f_path.dentry->d_inode;
79618+ const struct cred *cred = current_cred();
79619+ char *msg = NULL;
79620+ char *msg2 = NULL;
79621+
79622+ // never restrict root
79623+ if (gr_is_global_root(cred->uid))
79624+ return 1;
79625+
79626+ if (grsec_enable_tpe) {
79627+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79628+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
79629+ msg = "not being in trusted group";
79630+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
79631+ msg = "being in untrusted group";
79632+#else
79633+ if (in_group_p(grsec_tpe_gid))
79634+ msg = "being in untrusted group";
79635+#endif
79636+ }
79637+ if (!msg && gr_acl_tpe_check())
79638+ msg = "being in untrusted role";
79639+
79640+ // not in any affected group/role
79641+ if (!msg)
79642+ goto next_check;
79643+
79644+ if (gr_is_global_nonroot(inode->i_uid))
79645+ msg2 = "file in non-root-owned directory";
79646+ else if (inode->i_mode & S_IWOTH)
79647+ msg2 = "file in world-writable directory";
79648+ else if (inode->i_mode & S_IWGRP)
79649+ msg2 = "file in group-writable directory";
79650+ else if (file_inode->i_mode & S_IWOTH)
79651+ msg2 = "file is world-writable";
79652+
79653+ if (msg && msg2) {
79654+ char fullmsg[70] = {0};
79655+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
79656+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
79657+ return 0;
79658+ }
79659+ msg = NULL;
79660+next_check:
79661+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79662+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
79663+ return 1;
79664+
79665+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
79666+ msg = "directory not owned by user";
79667+ else if (inode->i_mode & S_IWOTH)
79668+ msg = "file in world-writable directory";
79669+ else if (inode->i_mode & S_IWGRP)
79670+ msg = "file in group-writable directory";
79671+ else if (file_inode->i_mode & S_IWOTH)
79672+ msg = "file is world-writable";
79673+
79674+ if (msg) {
79675+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
79676+ return 0;
79677+ }
79678+#endif
79679+#endif
79680+ return 1;
79681+}
79682diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
79683new file mode 100644
79684index 0000000..ae02d8e
79685--- /dev/null
79686+++ b/grsecurity/grsec_usb.c
79687@@ -0,0 +1,15 @@
79688+#include <linux/kernel.h>
79689+#include <linux/grinternal.h>
79690+#include <linux/module.h>
79691+
79692+int gr_handle_new_usb(void)
79693+{
79694+#ifdef CONFIG_GRKERNSEC_DENYUSB
79695+ if (grsec_deny_new_usb) {
79696+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
79697+ return 1;
79698+ }
79699+#endif
79700+ return 0;
79701+}
79702+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
79703diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
79704new file mode 100644
79705index 0000000..158b330
79706--- /dev/null
79707+++ b/grsecurity/grsum.c
79708@@ -0,0 +1,64 @@
79709+#include <linux/err.h>
79710+#include <linux/kernel.h>
79711+#include <linux/sched.h>
79712+#include <linux/mm.h>
79713+#include <linux/scatterlist.h>
79714+#include <linux/crypto.h>
79715+#include <linux/gracl.h>
79716+
79717+
79718+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
79719+#error "crypto and sha256 must be built into the kernel"
79720+#endif
79721+
79722+int
79723+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
79724+{
79725+ struct crypto_hash *tfm;
79726+ struct hash_desc desc;
79727+ struct scatterlist sg[2];
79728+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
79729+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
79730+ unsigned long *sumptr = (unsigned long *)sum;
79731+ int cryptres;
79732+ int retval = 1;
79733+ volatile int mismatched = 0;
79734+ volatile int dummy = 0;
79735+ unsigned int i;
79736+
79737+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
79738+ if (IS_ERR(tfm)) {
79739+ /* should never happen, since sha256 should be built in */
79740+ memset(entry->pw, 0, GR_PW_LEN);
79741+ return 1;
79742+ }
79743+
79744+ sg_init_table(sg, 2);
79745+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
79746+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
79747+
79748+ desc.tfm = tfm;
79749+ desc.flags = 0;
79750+
79751+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
79752+ temp_sum);
79753+
79754+ memset(entry->pw, 0, GR_PW_LEN);
79755+
79756+ if (cryptres)
79757+ goto out;
79758+
79759+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
79760+ if (sumptr[i] != tmpsumptr[i])
79761+ mismatched = 1;
79762+ else
79763+ dummy = 1; // waste a cycle
79764+
79765+ if (!mismatched)
79766+ retval = dummy - 1;
79767+
79768+out:
79769+ crypto_free_hash(tfm);
79770+
79771+ return retval;
79772+}
79773diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
79774index 77ff547..181834f 100644
79775--- a/include/asm-generic/4level-fixup.h
79776+++ b/include/asm-generic/4level-fixup.h
79777@@ -13,8 +13,10 @@
79778 #define pmd_alloc(mm, pud, address) \
79779 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
79780 NULL: pmd_offset(pud, address))
79781+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
79782
79783 #define pud_alloc(mm, pgd, address) (pgd)
79784+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
79785 #define pud_offset(pgd, start) (pgd)
79786 #define pud_none(pud) 0
79787 #define pud_bad(pud) 0
79788diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
79789index b7babf0..1e4b4f1 100644
79790--- a/include/asm-generic/atomic-long.h
79791+++ b/include/asm-generic/atomic-long.h
79792@@ -22,6 +22,12 @@
79793
79794 typedef atomic64_t atomic_long_t;
79795
79796+#ifdef CONFIG_PAX_REFCOUNT
79797+typedef atomic64_unchecked_t atomic_long_unchecked_t;
79798+#else
79799+typedef atomic64_t atomic_long_unchecked_t;
79800+#endif
79801+
79802 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
79803
79804 static inline long atomic_long_read(atomic_long_t *l)
79805@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79806 return (long)atomic64_read(v);
79807 }
79808
79809+#ifdef CONFIG_PAX_REFCOUNT
79810+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79811+{
79812+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79813+
79814+ return (long)atomic64_read_unchecked(v);
79815+}
79816+#endif
79817+
79818 static inline void atomic_long_set(atomic_long_t *l, long i)
79819 {
79820 atomic64_t *v = (atomic64_t *)l;
79821@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79822 atomic64_set(v, i);
79823 }
79824
79825+#ifdef CONFIG_PAX_REFCOUNT
79826+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79827+{
79828+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79829+
79830+ atomic64_set_unchecked(v, i);
79831+}
79832+#endif
79833+
79834 static inline void atomic_long_inc(atomic_long_t *l)
79835 {
79836 atomic64_t *v = (atomic64_t *)l;
79837@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79838 atomic64_inc(v);
79839 }
79840
79841+#ifdef CONFIG_PAX_REFCOUNT
79842+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79843+{
79844+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79845+
79846+ atomic64_inc_unchecked(v);
79847+}
79848+#endif
79849+
79850 static inline void atomic_long_dec(atomic_long_t *l)
79851 {
79852 atomic64_t *v = (atomic64_t *)l;
79853@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79854 atomic64_dec(v);
79855 }
79856
79857+#ifdef CONFIG_PAX_REFCOUNT
79858+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79859+{
79860+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79861+
79862+ atomic64_dec_unchecked(v);
79863+}
79864+#endif
79865+
79866 static inline void atomic_long_add(long i, atomic_long_t *l)
79867 {
79868 atomic64_t *v = (atomic64_t *)l;
79869@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79870 atomic64_add(i, v);
79871 }
79872
79873+#ifdef CONFIG_PAX_REFCOUNT
79874+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79875+{
79876+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79877+
79878+ atomic64_add_unchecked(i, v);
79879+}
79880+#endif
79881+
79882 static inline void atomic_long_sub(long i, atomic_long_t *l)
79883 {
79884 atomic64_t *v = (atomic64_t *)l;
79885@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79886 atomic64_sub(i, v);
79887 }
79888
79889+#ifdef CONFIG_PAX_REFCOUNT
79890+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79891+{
79892+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79893+
79894+ atomic64_sub_unchecked(i, v);
79895+}
79896+#endif
79897+
79898 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79899 {
79900 atomic64_t *v = (atomic64_t *)l;
79901@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79902 return atomic64_add_negative(i, v);
79903 }
79904
79905-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79906+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79907 {
79908 atomic64_t *v = (atomic64_t *)l;
79909
79910 return (long)atomic64_add_return(i, v);
79911 }
79912
79913+#ifdef CONFIG_PAX_REFCOUNT
79914+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79915+{
79916+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79917+
79918+ return (long)atomic64_add_return_unchecked(i, v);
79919+}
79920+#endif
79921+
79922 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79923 {
79924 atomic64_t *v = (atomic64_t *)l;
79925@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79926 return (long)atomic64_inc_return(v);
79927 }
79928
79929+#ifdef CONFIG_PAX_REFCOUNT
79930+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79931+{
79932+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79933+
79934+ return (long)atomic64_inc_return_unchecked(v);
79935+}
79936+#endif
79937+
79938 static inline long atomic_long_dec_return(atomic_long_t *l)
79939 {
79940 atomic64_t *v = (atomic64_t *)l;
79941@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79942
79943 typedef atomic_t atomic_long_t;
79944
79945+#ifdef CONFIG_PAX_REFCOUNT
79946+typedef atomic_unchecked_t atomic_long_unchecked_t;
79947+#else
79948+typedef atomic_t atomic_long_unchecked_t;
79949+#endif
79950+
79951 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79952 static inline long atomic_long_read(atomic_long_t *l)
79953 {
79954@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79955 return (long)atomic_read(v);
79956 }
79957
79958+#ifdef CONFIG_PAX_REFCOUNT
79959+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79960+{
79961+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79962+
79963+ return (long)atomic_read_unchecked(v);
79964+}
79965+#endif
79966+
79967 static inline void atomic_long_set(atomic_long_t *l, long i)
79968 {
79969 atomic_t *v = (atomic_t *)l;
79970@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79971 atomic_set(v, i);
79972 }
79973
79974+#ifdef CONFIG_PAX_REFCOUNT
79975+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79976+{
79977+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79978+
79979+ atomic_set_unchecked(v, i);
79980+}
79981+#endif
79982+
79983 static inline void atomic_long_inc(atomic_long_t *l)
79984 {
79985 atomic_t *v = (atomic_t *)l;
79986@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79987 atomic_inc(v);
79988 }
79989
79990+#ifdef CONFIG_PAX_REFCOUNT
79991+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79992+{
79993+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79994+
79995+ atomic_inc_unchecked(v);
79996+}
79997+#endif
79998+
79999 static inline void atomic_long_dec(atomic_long_t *l)
80000 {
80001 atomic_t *v = (atomic_t *)l;
80002@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
80003 atomic_dec(v);
80004 }
80005
80006+#ifdef CONFIG_PAX_REFCOUNT
80007+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
80008+{
80009+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80010+
80011+ atomic_dec_unchecked(v);
80012+}
80013+#endif
80014+
80015 static inline void atomic_long_add(long i, atomic_long_t *l)
80016 {
80017 atomic_t *v = (atomic_t *)l;
80018@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
80019 atomic_add(i, v);
80020 }
80021
80022+#ifdef CONFIG_PAX_REFCOUNT
80023+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
80024+{
80025+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80026+
80027+ atomic_add_unchecked(i, v);
80028+}
80029+#endif
80030+
80031 static inline void atomic_long_sub(long i, atomic_long_t *l)
80032 {
80033 atomic_t *v = (atomic_t *)l;
80034@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
80035 atomic_sub(i, v);
80036 }
80037
80038+#ifdef CONFIG_PAX_REFCOUNT
80039+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
80040+{
80041+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80042+
80043+ atomic_sub_unchecked(i, v);
80044+}
80045+#endif
80046+
80047 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
80048 {
80049 atomic_t *v = (atomic_t *)l;
80050@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
80051 return atomic_add_negative(i, v);
80052 }
80053
80054-static inline long atomic_long_add_return(long i, atomic_long_t *l)
80055+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
80056 {
80057 atomic_t *v = (atomic_t *)l;
80058
80059 return (long)atomic_add_return(i, v);
80060 }
80061
80062+#ifdef CONFIG_PAX_REFCOUNT
80063+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
80064+{
80065+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80066+
80067+ return (long)atomic_add_return_unchecked(i, v);
80068+}
80069+
80070+#endif
80071+
80072 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
80073 {
80074 atomic_t *v = (atomic_t *)l;
80075@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
80076 return (long)atomic_inc_return(v);
80077 }
80078
80079+#ifdef CONFIG_PAX_REFCOUNT
80080+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
80081+{
80082+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80083+
80084+ return (long)atomic_inc_return_unchecked(v);
80085+}
80086+#endif
80087+
80088 static inline long atomic_long_dec_return(atomic_long_t *l)
80089 {
80090 atomic_t *v = (atomic_t *)l;
80091@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
80092
80093 #endif /* BITS_PER_LONG == 64 */
80094
80095+#ifdef CONFIG_PAX_REFCOUNT
80096+static inline void pax_refcount_needs_these_functions(void)
80097+{
80098+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
80099+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
80100+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
80101+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
80102+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
80103+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
80104+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
80105+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
80106+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
80107+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
80108+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
80109+#ifdef CONFIG_X86
80110+ atomic_clear_mask_unchecked(0, NULL);
80111+ atomic_set_mask_unchecked(0, NULL);
80112+#endif
80113+
80114+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
80115+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
80116+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
80117+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
80118+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
80119+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
80120+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
80121+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
80122+}
80123+#else
80124+#define atomic_read_unchecked(v) atomic_read(v)
80125+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
80126+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
80127+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
80128+#define atomic_inc_unchecked(v) atomic_inc(v)
80129+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
80130+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
80131+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
80132+#define atomic_dec_unchecked(v) atomic_dec(v)
80133+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
80134+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
80135+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
80136+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
80137+
80138+#define atomic_long_read_unchecked(v) atomic_long_read(v)
80139+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
80140+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
80141+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
80142+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
80143+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
80144+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
80145+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
80146+#endif
80147+
80148 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
80149diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
80150index 30ad9c8..c70c170 100644
80151--- a/include/asm-generic/atomic64.h
80152+++ b/include/asm-generic/atomic64.h
80153@@ -16,6 +16,8 @@ typedef struct {
80154 long long counter;
80155 } atomic64_t;
80156
80157+typedef atomic64_t atomic64_unchecked_t;
80158+
80159 #define ATOMIC64_INIT(i) { (i) }
80160
80161 extern long long atomic64_read(const atomic64_t *v);
80162@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
80163 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
80164 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
80165
80166+#define atomic64_read_unchecked(v) atomic64_read(v)
80167+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
80168+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
80169+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
80170+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
80171+#define atomic64_inc_unchecked(v) atomic64_inc(v)
80172+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
80173+#define atomic64_dec_unchecked(v) atomic64_dec(v)
80174+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
80175+
80176 #endif /* _ASM_GENERIC_ATOMIC64_H */
80177diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
80178index f5c40b0..e902f9d 100644
80179--- a/include/asm-generic/barrier.h
80180+++ b/include/asm-generic/barrier.h
80181@@ -82,7 +82,7 @@
80182 do { \
80183 compiletime_assert_atomic_type(*p); \
80184 smp_mb(); \
80185- ACCESS_ONCE(*p) = (v); \
80186+ ACCESS_ONCE_RW(*p) = (v); \
80187 } while (0)
80188
80189 #define smp_load_acquire(p) \
80190diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
80191index a60a7cc..0fe12f2 100644
80192--- a/include/asm-generic/bitops/__fls.h
80193+++ b/include/asm-generic/bitops/__fls.h
80194@@ -9,7 +9,7 @@
80195 *
80196 * Undefined if no set bit exists, so code should check against 0 first.
80197 */
80198-static __always_inline unsigned long __fls(unsigned long word)
80199+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
80200 {
80201 int num = BITS_PER_LONG - 1;
80202
80203diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
80204index 0576d1f..dad6c71 100644
80205--- a/include/asm-generic/bitops/fls.h
80206+++ b/include/asm-generic/bitops/fls.h
80207@@ -9,7 +9,7 @@
80208 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
80209 */
80210
80211-static __always_inline int fls(int x)
80212+static __always_inline int __intentional_overflow(-1) fls(int x)
80213 {
80214 int r = 32;
80215
80216diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
80217index b097cf8..3d40e14 100644
80218--- a/include/asm-generic/bitops/fls64.h
80219+++ b/include/asm-generic/bitops/fls64.h
80220@@ -15,7 +15,7 @@
80221 * at position 64.
80222 */
80223 #if BITS_PER_LONG == 32
80224-static __always_inline int fls64(__u64 x)
80225+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80226 {
80227 __u32 h = x >> 32;
80228 if (h)
80229@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
80230 return fls(x);
80231 }
80232 #elif BITS_PER_LONG == 64
80233-static __always_inline int fls64(__u64 x)
80234+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80235 {
80236 if (x == 0)
80237 return 0;
80238diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
80239index 1bfcfe5..e04c5c9 100644
80240--- a/include/asm-generic/cache.h
80241+++ b/include/asm-generic/cache.h
80242@@ -6,7 +6,7 @@
80243 * cache lines need to provide their own cache.h.
80244 */
80245
80246-#define L1_CACHE_SHIFT 5
80247-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
80248+#define L1_CACHE_SHIFT 5UL
80249+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
80250
80251 #endif /* __ASM_GENERIC_CACHE_H */
80252diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
80253index 0d68a1e..b74a761 100644
80254--- a/include/asm-generic/emergency-restart.h
80255+++ b/include/asm-generic/emergency-restart.h
80256@@ -1,7 +1,7 @@
80257 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
80258 #define _ASM_GENERIC_EMERGENCY_RESTART_H
80259
80260-static inline void machine_emergency_restart(void)
80261+static inline __noreturn void machine_emergency_restart(void)
80262 {
80263 machine_restart(NULL);
80264 }
80265diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
80266index 90f99c7..00ce236 100644
80267--- a/include/asm-generic/kmap_types.h
80268+++ b/include/asm-generic/kmap_types.h
80269@@ -2,9 +2,9 @@
80270 #define _ASM_GENERIC_KMAP_TYPES_H
80271
80272 #ifdef __WITH_KM_FENCE
80273-# define KM_TYPE_NR 41
80274+# define KM_TYPE_NR 42
80275 #else
80276-# define KM_TYPE_NR 20
80277+# define KM_TYPE_NR 21
80278 #endif
80279
80280 #endif
80281diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
80282index 9ceb03b..62b0b8f 100644
80283--- a/include/asm-generic/local.h
80284+++ b/include/asm-generic/local.h
80285@@ -23,24 +23,37 @@ typedef struct
80286 atomic_long_t a;
80287 } local_t;
80288
80289+typedef struct {
80290+ atomic_long_unchecked_t a;
80291+} local_unchecked_t;
80292+
80293 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
80294
80295 #define local_read(l) atomic_long_read(&(l)->a)
80296+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
80297 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
80298+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
80299 #define local_inc(l) atomic_long_inc(&(l)->a)
80300+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
80301 #define local_dec(l) atomic_long_dec(&(l)->a)
80302+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
80303 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
80304+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
80305 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
80306+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
80307
80308 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
80309 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
80310 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
80311 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
80312 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
80313+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
80314 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
80315 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
80316+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
80317
80318 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80319+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80320 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
80321 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
80322 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
80323diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
80324index 725612b..9cc513a 100644
80325--- a/include/asm-generic/pgtable-nopmd.h
80326+++ b/include/asm-generic/pgtable-nopmd.h
80327@@ -1,14 +1,19 @@
80328 #ifndef _PGTABLE_NOPMD_H
80329 #define _PGTABLE_NOPMD_H
80330
80331-#ifndef __ASSEMBLY__
80332-
80333 #include <asm-generic/pgtable-nopud.h>
80334
80335-struct mm_struct;
80336-
80337 #define __PAGETABLE_PMD_FOLDED
80338
80339+#define PMD_SHIFT PUD_SHIFT
80340+#define PTRS_PER_PMD 1
80341+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
80342+#define PMD_MASK (~(PMD_SIZE-1))
80343+
80344+#ifndef __ASSEMBLY__
80345+
80346+struct mm_struct;
80347+
80348 /*
80349 * Having the pmd type consist of a pud gets the size right, and allows
80350 * us to conceptually access the pud entry that this pmd is folded into
80351@@ -16,11 +21,6 @@ struct mm_struct;
80352 */
80353 typedef struct { pud_t pud; } pmd_t;
80354
80355-#define PMD_SHIFT PUD_SHIFT
80356-#define PTRS_PER_PMD 1
80357-#define PMD_SIZE (1UL << PMD_SHIFT)
80358-#define PMD_MASK (~(PMD_SIZE-1))
80359-
80360 /*
80361 * The "pud_xxx()" functions here are trivial for a folded two-level
80362 * setup: the pmd is never bad, and a pmd always exists (as it's folded
80363diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
80364index 810431d..0ec4804f 100644
80365--- a/include/asm-generic/pgtable-nopud.h
80366+++ b/include/asm-generic/pgtable-nopud.h
80367@@ -1,10 +1,15 @@
80368 #ifndef _PGTABLE_NOPUD_H
80369 #define _PGTABLE_NOPUD_H
80370
80371-#ifndef __ASSEMBLY__
80372-
80373 #define __PAGETABLE_PUD_FOLDED
80374
80375+#define PUD_SHIFT PGDIR_SHIFT
80376+#define PTRS_PER_PUD 1
80377+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
80378+#define PUD_MASK (~(PUD_SIZE-1))
80379+
80380+#ifndef __ASSEMBLY__
80381+
80382 /*
80383 * Having the pud type consist of a pgd gets the size right, and allows
80384 * us to conceptually access the pgd entry that this pud is folded into
80385@@ -12,11 +17,6 @@
80386 */
80387 typedef struct { pgd_t pgd; } pud_t;
80388
80389-#define PUD_SHIFT PGDIR_SHIFT
80390-#define PTRS_PER_PUD 1
80391-#define PUD_SIZE (1UL << PUD_SHIFT)
80392-#define PUD_MASK (~(PUD_SIZE-1))
80393-
80394 /*
80395 * The "pgd_xxx()" functions here are trivial for a folded two-level
80396 * setup: the pud is never bad, and a pud always exists (as it's folded
80397@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
80398 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
80399
80400 #define pgd_populate(mm, pgd, pud) do { } while (0)
80401+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
80402 /*
80403 * (puds are folded into pgds so this doesn't get actually called,
80404 * but the define is needed for a generic inline function.)
80405diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
80406index 177d597..2826237 100644
80407--- a/include/asm-generic/pgtable.h
80408+++ b/include/asm-generic/pgtable.h
80409@@ -839,6 +839,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
80410 }
80411 #endif /* CONFIG_NUMA_BALANCING */
80412
80413+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
80414+#ifdef CONFIG_PAX_KERNEXEC
80415+#error KERNEXEC requires pax_open_kernel
80416+#else
80417+static inline unsigned long pax_open_kernel(void) { return 0; }
80418+#endif
80419+#endif
80420+
80421+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
80422+#ifdef CONFIG_PAX_KERNEXEC
80423+#error KERNEXEC requires pax_close_kernel
80424+#else
80425+static inline unsigned long pax_close_kernel(void) { return 0; }
80426+#endif
80427+#endif
80428+
80429 #endif /* CONFIG_MMU */
80430
80431 #endif /* !__ASSEMBLY__ */
80432diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
80433index 72d8803..cb9749c 100644
80434--- a/include/asm-generic/uaccess.h
80435+++ b/include/asm-generic/uaccess.h
80436@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
80437 return __clear_user(to, n);
80438 }
80439
80440+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
80441+#ifdef CONFIG_PAX_MEMORY_UDEREF
80442+#error UDEREF requires pax_open_userland
80443+#else
80444+static inline unsigned long pax_open_userland(void) { return 0; }
80445+#endif
80446+#endif
80447+
80448+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
80449+#ifdef CONFIG_PAX_MEMORY_UDEREF
80450+#error UDEREF requires pax_close_userland
80451+#else
80452+static inline unsigned long pax_close_userland(void) { return 0; }
80453+#endif
80454+#endif
80455+
80456 #endif /* __ASM_GENERIC_UACCESS_H */
80457diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
80458index bee5d68..8d362d1 100644
80459--- a/include/asm-generic/vmlinux.lds.h
80460+++ b/include/asm-generic/vmlinux.lds.h
80461@@ -234,6 +234,7 @@
80462 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
80463 VMLINUX_SYMBOL(__start_rodata) = .; \
80464 *(.rodata) *(.rodata.*) \
80465+ *(.data..read_only) \
80466 *(__vermagic) /* Kernel version magic */ \
80467 . = ALIGN(8); \
80468 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
80469@@ -726,17 +727,18 @@
80470 * section in the linker script will go there too. @phdr should have
80471 * a leading colon.
80472 *
80473- * Note that this macros defines __per_cpu_load as an absolute symbol.
80474+ * Note that this macros defines per_cpu_load as an absolute symbol.
80475 * If there is no need to put the percpu section at a predetermined
80476 * address, use PERCPU_SECTION.
80477 */
80478 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
80479- VMLINUX_SYMBOL(__per_cpu_load) = .; \
80480- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
80481+ per_cpu_load = .; \
80482+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
80483 - LOAD_OFFSET) { \
80484+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
80485 PERCPU_INPUT(cacheline) \
80486 } phdr \
80487- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
80488+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
80489
80490 /**
80491 * PERCPU_SECTION - define output section for percpu area, simple version
80492diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
80493index 623a59c..1e79ab9 100644
80494--- a/include/crypto/algapi.h
80495+++ b/include/crypto/algapi.h
80496@@ -34,7 +34,7 @@ struct crypto_type {
80497 unsigned int maskclear;
80498 unsigned int maskset;
80499 unsigned int tfmsize;
80500-};
80501+} __do_const;
80502
80503 struct crypto_instance {
80504 struct crypto_alg alg;
80505diff --git a/include/drm/drmP.h b/include/drm/drmP.h
80506index e1b2e8b..2697bd2 100644
80507--- a/include/drm/drmP.h
80508+++ b/include/drm/drmP.h
80509@@ -59,6 +59,7 @@
80510
80511 #include <asm/mman.h>
80512 #include <asm/pgalloc.h>
80513+#include <asm/local.h>
80514 #include <asm/uaccess.h>
80515
80516 #include <uapi/drm/drm.h>
80517@@ -223,10 +224,12 @@ void drm_err(const char *format, ...);
80518 * \param cmd command.
80519 * \param arg argument.
80520 */
80521-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
80522+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
80523+ struct drm_file *file_priv);
80524+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
80525 struct drm_file *file_priv);
80526
80527-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80528+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
80529 unsigned long arg);
80530
80531 #define DRM_IOCTL_NR(n) _IOC_NR(n)
80532@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80533 struct drm_ioctl_desc {
80534 unsigned int cmd;
80535 int flags;
80536- drm_ioctl_t *func;
80537+ drm_ioctl_t func;
80538 unsigned int cmd_drv;
80539 const char *name;
80540-};
80541+} __do_const;
80542
80543 /**
80544 * Creates a driver or general drm_ioctl_desc array entry for the given
80545@@ -629,7 +632,8 @@ struct drm_info_list {
80546 int (*show)(struct seq_file*, void*); /** show callback */
80547 u32 driver_features; /**< Required driver features for this entry */
80548 void *data;
80549-};
80550+} __do_const;
80551+typedef struct drm_info_list __no_const drm_info_list_no_const;
80552
80553 /**
80554 * debugfs node structure. This structure represents a debugfs file.
80555@@ -713,7 +717,7 @@ struct drm_device {
80556
80557 /** \name Usage Counters */
80558 /*@{ */
80559- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80560+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80561 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
80562 int buf_use; /**< Buffers in use -- cannot alloc */
80563 atomic_t buf_alloc; /**< Buffer allocation in progress */
80564diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
80565index 7adbb65..2a1eb1f 100644
80566--- a/include/drm/drm_crtc_helper.h
80567+++ b/include/drm/drm_crtc_helper.h
80568@@ -116,7 +116,7 @@ struct drm_encoder_helper_funcs {
80569 struct drm_connector *connector);
80570 /* disable encoder when not in use - more explicit than dpms off */
80571 void (*disable)(struct drm_encoder *encoder);
80572-};
80573+} __no_const;
80574
80575 /**
80576 * drm_connector_helper_funcs - helper operations for connectors
80577diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
80578index d016dc5..3951fe0 100644
80579--- a/include/drm/i915_pciids.h
80580+++ b/include/drm/i915_pciids.h
80581@@ -37,7 +37,7 @@
80582 */
80583 #define INTEL_VGA_DEVICE(id, info) { \
80584 0x8086, id, \
80585- ~0, ~0, \
80586+ PCI_ANY_ID, PCI_ANY_ID, \
80587 0x030000, 0xff0000, \
80588 (unsigned long) info }
80589
80590diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
80591index 72dcbe8..8db58d7 100644
80592--- a/include/drm/ttm/ttm_memory.h
80593+++ b/include/drm/ttm/ttm_memory.h
80594@@ -48,7 +48,7 @@
80595
80596 struct ttm_mem_shrink {
80597 int (*do_shrink) (struct ttm_mem_shrink *);
80598-};
80599+} __no_const;
80600
80601 /**
80602 * struct ttm_mem_global - Global memory accounting structure.
80603diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
80604index 49a8284..9643967 100644
80605--- a/include/drm/ttm/ttm_page_alloc.h
80606+++ b/include/drm/ttm/ttm_page_alloc.h
80607@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
80608 */
80609 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
80610
80611+struct device;
80612 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80613 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80614
80615diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
80616index 4b840e8..155d235 100644
80617--- a/include/keys/asymmetric-subtype.h
80618+++ b/include/keys/asymmetric-subtype.h
80619@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
80620 /* Verify the signature on a key of this subtype (optional) */
80621 int (*verify_signature)(const struct key *key,
80622 const struct public_key_signature *sig);
80623-};
80624+} __do_const;
80625
80626 /**
80627 * asymmetric_key_subtype - Get the subtype from an asymmetric key
80628diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
80629index c1da539..1dcec55 100644
80630--- a/include/linux/atmdev.h
80631+++ b/include/linux/atmdev.h
80632@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
80633 #endif
80634
80635 struct k_atm_aal_stats {
80636-#define __HANDLE_ITEM(i) atomic_t i
80637+#define __HANDLE_ITEM(i) atomic_unchecked_t i
80638 __AAL_STAT_ITEMS
80639 #undef __HANDLE_ITEM
80640 };
80641@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
80642 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
80643 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
80644 struct module *owner;
80645-};
80646+} __do_const ;
80647
80648 struct atmphy_ops {
80649 int (*start)(struct atm_dev *dev);
80650diff --git a/include/linux/atomic.h b/include/linux/atomic.h
80651index 5b08a85..60922fb 100644
80652--- a/include/linux/atomic.h
80653+++ b/include/linux/atomic.h
80654@@ -12,7 +12,7 @@
80655 * Atomically adds @a to @v, so long as @v was not already @u.
80656 * Returns non-zero if @v was not @u, and zero otherwise.
80657 */
80658-static inline int atomic_add_unless(atomic_t *v, int a, int u)
80659+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
80660 {
80661 return __atomic_add_unless(v, a, u) != u;
80662 }
80663diff --git a/include/linux/audit.h b/include/linux/audit.h
80664index af84234..4177a40 100644
80665--- a/include/linux/audit.h
80666+++ b/include/linux/audit.h
80667@@ -225,7 +225,7 @@ static inline void audit_ptrace(struct task_struct *t)
80668 extern unsigned int audit_serial(void);
80669 extern int auditsc_get_stamp(struct audit_context *ctx,
80670 struct timespec *t, unsigned int *serial);
80671-extern int audit_set_loginuid(kuid_t loginuid);
80672+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
80673
80674 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
80675 {
80676diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
80677index 576e463..28fd926 100644
80678--- a/include/linux/binfmts.h
80679+++ b/include/linux/binfmts.h
80680@@ -44,7 +44,7 @@ struct linux_binprm {
80681 unsigned interp_flags;
80682 unsigned interp_data;
80683 unsigned long loader, exec;
80684-};
80685+} __randomize_layout;
80686
80687 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
80688 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
80689@@ -77,8 +77,10 @@ struct linux_binfmt {
80690 int (*load_binary)(struct linux_binprm *);
80691 int (*load_shlib)(struct file *);
80692 int (*core_dump)(struct coredump_params *cprm);
80693+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
80694+ void (*handle_mmap)(struct file *);
80695 unsigned long min_coredump; /* minimal dump size */
80696-};
80697+} __do_const __randomize_layout;
80698
80699 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
80700
80701diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
80702index 202e403..16e6617 100644
80703--- a/include/linux/bitmap.h
80704+++ b/include/linux/bitmap.h
80705@@ -302,7 +302,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
80706 return __bitmap_full(src, nbits);
80707 }
80708
80709-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
80710+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
80711 {
80712 if (small_const_nbits(nbits))
80713 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
80714diff --git a/include/linux/bitops.h b/include/linux/bitops.h
80715index 5d858e0..336c1d9 100644
80716--- a/include/linux/bitops.h
80717+++ b/include/linux/bitops.h
80718@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
80719 * @word: value to rotate
80720 * @shift: bits to roll
80721 */
80722-static inline __u32 rol32(__u32 word, unsigned int shift)
80723+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
80724 {
80725 return (word << shift) | (word >> (32 - shift));
80726 }
80727@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
80728 * @word: value to rotate
80729 * @shift: bits to roll
80730 */
80731-static inline __u32 ror32(__u32 word, unsigned int shift)
80732+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
80733 {
80734 return (word >> shift) | (word << (32 - shift));
80735 }
80736@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
80737 return (__s32)(value << shift) >> shift;
80738 }
80739
80740-static inline unsigned fls_long(unsigned long l)
80741+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
80742 {
80743 if (sizeof(l) == 4)
80744 return fls(l);
80745diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
80746index 92f4b4b..483d537 100644
80747--- a/include/linux/blkdev.h
80748+++ b/include/linux/blkdev.h
80749@@ -1613,7 +1613,7 @@ struct block_device_operations {
80750 /* this callback is with swap_lock and sometimes page table lock held */
80751 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
80752 struct module *owner;
80753-};
80754+} __do_const;
80755
80756 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
80757 unsigned long);
80758diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
80759index afc1343..9735539 100644
80760--- a/include/linux/blktrace_api.h
80761+++ b/include/linux/blktrace_api.h
80762@@ -25,7 +25,7 @@ struct blk_trace {
80763 struct dentry *dropped_file;
80764 struct dentry *msg_file;
80765 struct list_head running_list;
80766- atomic_t dropped;
80767+ atomic_unchecked_t dropped;
80768 };
80769
80770 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
80771diff --git a/include/linux/cache.h b/include/linux/cache.h
80772index 17e7e82..1d7da26 100644
80773--- a/include/linux/cache.h
80774+++ b/include/linux/cache.h
80775@@ -16,6 +16,14 @@
80776 #define __read_mostly
80777 #endif
80778
80779+#ifndef __read_only
80780+#ifdef CONFIG_PAX_KERNEXEC
80781+#error KERNEXEC requires __read_only
80782+#else
80783+#define __read_only __read_mostly
80784+#endif
80785+#endif
80786+
80787 #ifndef ____cacheline_aligned
80788 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
80789 #endif
80790diff --git a/include/linux/capability.h b/include/linux/capability.h
80791index aa93e5e..985a1b0 100644
80792--- a/include/linux/capability.h
80793+++ b/include/linux/capability.h
80794@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
80795 extern bool capable(int cap);
80796 extern bool ns_capable(struct user_namespace *ns, int cap);
80797 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
80798+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
80799 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
80800+extern bool capable_nolog(int cap);
80801+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
80802
80803 /* audit system wants to get cap info from files as well */
80804 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
80805
80806+extern int is_privileged_binary(const struct dentry *dentry);
80807+
80808 #endif /* !_LINUX_CAPABILITY_H */
80809diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
80810index 8609d57..86e4d79 100644
80811--- a/include/linux/cdrom.h
80812+++ b/include/linux/cdrom.h
80813@@ -87,7 +87,6 @@ struct cdrom_device_ops {
80814
80815 /* driver specifications */
80816 const int capability; /* capability flags */
80817- int n_minors; /* number of active minor devices */
80818 /* handle uniform packets for scsi type devices (scsi,atapi) */
80819 int (*generic_packet) (struct cdrom_device_info *,
80820 struct packet_command *);
80821diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
80822index 4ce9056..86caac6 100644
80823--- a/include/linux/cleancache.h
80824+++ b/include/linux/cleancache.h
80825@@ -31,7 +31,7 @@ struct cleancache_ops {
80826 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
80827 void (*invalidate_inode)(int, struct cleancache_filekey);
80828 void (*invalidate_fs)(int);
80829-};
80830+} __no_const;
80831
80832 extern struct cleancache_ops *
80833 cleancache_register_ops(struct cleancache_ops *ops);
80834diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80835index d936409..ce9f842 100644
80836--- a/include/linux/clk-provider.h
80837+++ b/include/linux/clk-provider.h
80838@@ -191,6 +191,7 @@ struct clk_ops {
80839 void (*init)(struct clk_hw *hw);
80840 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80841 };
80842+typedef struct clk_ops __no_const clk_ops_no_const;
80843
80844 /**
80845 * struct clk_init_data - holds init data that's common to all clocks and is
80846diff --git a/include/linux/compat.h b/include/linux/compat.h
80847index 7450ca2..a824b81 100644
80848--- a/include/linux/compat.h
80849+++ b/include/linux/compat.h
80850@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80851 compat_size_t __user *len_ptr);
80852
80853 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80854-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80855+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80856 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80857 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80858 compat_ssize_t msgsz, int msgflg);
80859@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80860 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80861 compat_ulong_t addr, compat_ulong_t data);
80862 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80863- compat_long_t addr, compat_long_t data);
80864+ compat_ulong_t addr, compat_ulong_t data);
80865
80866 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80867 /*
80868diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80869index d1a5582..4424efa 100644
80870--- a/include/linux/compiler-gcc4.h
80871+++ b/include/linux/compiler-gcc4.h
80872@@ -39,9 +39,34 @@
80873 # define __compiletime_warning(message) __attribute__((warning(message)))
80874 # define __compiletime_error(message) __attribute__((error(message)))
80875 #endif /* __CHECKER__ */
80876+
80877+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80878+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80879+#define __bos0(ptr) __bos((ptr), 0)
80880+#define __bos1(ptr) __bos((ptr), 1)
80881 #endif /* GCC_VERSION >= 40300 */
80882
80883 #if GCC_VERSION >= 40500
80884+
80885+#ifdef RANDSTRUCT_PLUGIN
80886+#define __randomize_layout __attribute__((randomize_layout))
80887+#define __no_randomize_layout __attribute__((no_randomize_layout))
80888+#endif
80889+
80890+#ifdef CONSTIFY_PLUGIN
80891+#define __no_const __attribute__((no_const))
80892+#define __do_const __attribute__((do_const))
80893+#endif
80894+
80895+#ifdef SIZE_OVERFLOW_PLUGIN
80896+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80897+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80898+#endif
80899+
80900+#ifdef LATENT_ENTROPY_PLUGIN
80901+#define __latent_entropy __attribute__((latent_entropy))
80902+#endif
80903+
80904 /*
80905 * Mark a position in code as unreachable. This can be used to
80906 * suppress control flow warnings after asm blocks that transfer
80907diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
80908index c8c5659..9b20f4e 100644
80909--- a/include/linux/compiler-gcc5.h
80910+++ b/include/linux/compiler-gcc5.h
80911@@ -28,6 +28,25 @@
80912 # define __compiletime_error(message) __attribute__((error(message)))
80913 #endif /* __CHECKER__ */
80914
80915+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80916+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80917+#define __bos0(ptr) __bos((ptr), 0)
80918+#define __bos1(ptr) __bos((ptr), 1)
80919+
80920+#ifdef CONSTIFY_PLUGIN
80921+#define __no_const __attribute__((no_const))
80922+#define __do_const __attribute__((do_const))
80923+#endif
80924+
80925+#ifdef SIZE_OVERFLOW_PLUGIN
80926+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80927+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80928+#endif
80929+
80930+#ifdef LATENT_ENTROPY_PLUGIN
80931+#define __latent_entropy __attribute__((latent_entropy))
80932+#endif
80933+
80934 /*
80935 * Mark a position in code as unreachable. This can be used to
80936 * suppress control flow warnings after asm blocks that transfer
80937diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80938index fa6a314..a1b01ad 100644
80939--- a/include/linux/compiler.h
80940+++ b/include/linux/compiler.h
80941@@ -5,11 +5,14 @@
80942
80943 #ifdef __CHECKER__
80944 # define __user __attribute__((noderef, address_space(1)))
80945+# define __force_user __force __user
80946 # define __kernel __attribute__((address_space(0)))
80947+# define __force_kernel __force __kernel
80948 # define __safe __attribute__((safe))
80949 # define __force __attribute__((force))
80950 # define __nocast __attribute__((nocast))
80951 # define __iomem __attribute__((noderef, address_space(2)))
80952+# define __force_iomem __force __iomem
80953 # define __must_hold(x) __attribute__((context(x,1,1)))
80954 # define __acquires(x) __attribute__((context(x,0,1)))
80955 # define __releases(x) __attribute__((context(x,1,0)))
80956@@ -17,20 +20,37 @@
80957 # define __release(x) __context__(x,-1)
80958 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80959 # define __percpu __attribute__((noderef, address_space(3)))
80960+# define __force_percpu __force __percpu
80961 #ifdef CONFIG_SPARSE_RCU_POINTER
80962 # define __rcu __attribute__((noderef, address_space(4)))
80963+# define __force_rcu __force __rcu
80964 #else
80965 # define __rcu
80966+# define __force_rcu
80967 #endif
80968 extern void __chk_user_ptr(const volatile void __user *);
80969 extern void __chk_io_ptr(const volatile void __iomem *);
80970 #else
80971-# define __user
80972-# define __kernel
80973+# ifdef CHECKER_PLUGIN
80974+//# define __user
80975+//# define __force_user
80976+//# define __kernel
80977+//# define __force_kernel
80978+# else
80979+# ifdef STRUCTLEAK_PLUGIN
80980+# define __user __attribute__((user))
80981+# else
80982+# define __user
80983+# endif
80984+# define __force_user
80985+# define __kernel
80986+# define __force_kernel
80987+# endif
80988 # define __safe
80989 # define __force
80990 # define __nocast
80991 # define __iomem
80992+# define __force_iomem
80993 # define __chk_user_ptr(x) (void)0
80994 # define __chk_io_ptr(x) (void)0
80995 # define __builtin_warning(x, y...) (1)
80996@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80997 # define __release(x) (void)0
80998 # define __cond_lock(x,c) (c)
80999 # define __percpu
81000+# define __force_percpu
81001 # define __rcu
81002+# define __force_rcu
81003 #endif
81004
81005 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
81006@@ -201,32 +223,32 @@ static __always_inline void data_access_exceeds_word_size(void)
81007 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
81008 {
81009 switch (size) {
81010- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
81011- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
81012- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
81013+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
81014+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
81015+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
81016 #ifdef CONFIG_64BIT
81017- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
81018+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
81019 #endif
81020 default:
81021 barrier();
81022- __builtin_memcpy((void *)res, (const void *)p, size);
81023+ __builtin_memcpy(res, (const void *)p, size);
81024 data_access_exceeds_word_size();
81025 barrier();
81026 }
81027 }
81028
81029-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
81030+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
81031 {
81032 switch (size) {
81033- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
81034- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
81035- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
81036+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
81037+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
81038+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
81039 #ifdef CONFIG_64BIT
81040- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
81041+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
81042 #endif
81043 default:
81044 barrier();
81045- __builtin_memcpy((void *)p, (const void *)res, size);
81046+ __builtin_memcpy((void *)p, res, size);
81047 data_access_exceeds_word_size();
81048 barrier();
81049 }
81050@@ -360,6 +382,34 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81051 # define __attribute_const__ /* unimplemented */
81052 #endif
81053
81054+#ifndef __randomize_layout
81055+# define __randomize_layout
81056+#endif
81057+
81058+#ifndef __no_randomize_layout
81059+# define __no_randomize_layout
81060+#endif
81061+
81062+#ifndef __no_const
81063+# define __no_const
81064+#endif
81065+
81066+#ifndef __do_const
81067+# define __do_const
81068+#endif
81069+
81070+#ifndef __size_overflow
81071+# define __size_overflow(...)
81072+#endif
81073+
81074+#ifndef __intentional_overflow
81075+# define __intentional_overflow(...)
81076+#endif
81077+
81078+#ifndef __latent_entropy
81079+# define __latent_entropy
81080+#endif
81081+
81082 /*
81083 * Tell gcc if a function is cold. The compiler will assume any path
81084 * directly leading to the call is unlikely.
81085@@ -369,6 +419,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81086 #define __cold
81087 #endif
81088
81089+#ifndef __alloc_size
81090+#define __alloc_size(...)
81091+#endif
81092+
81093+#ifndef __bos
81094+#define __bos(ptr, arg)
81095+#endif
81096+
81097+#ifndef __bos0
81098+#define __bos0(ptr)
81099+#endif
81100+
81101+#ifndef __bos1
81102+#define __bos1(ptr)
81103+#endif
81104+
81105 /* Simple shorthand for a section definition */
81106 #ifndef __section
81107 # define __section(S) __attribute__ ((__section__(#S)))
81108@@ -383,6 +449,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81109 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
81110 #endif
81111
81112+#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))
81113+
81114 /* Is this type a native word size -- useful for atomic operations */
81115 #ifndef __native_word
81116 # define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
81117@@ -462,8 +530,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81118 */
81119 #define __ACCESS_ONCE(x) ({ \
81120 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
81121- (volatile typeof(x) *)&(x); })
81122+ (volatile const typeof(x) *)&(x); })
81123 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
81124+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
81125
81126 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
81127 #ifdef CONFIG_KPROBES
81128diff --git a/include/linux/completion.h b/include/linux/completion.h
81129index 5d5aaae..0ea9b84 100644
81130--- a/include/linux/completion.h
81131+++ b/include/linux/completion.h
81132@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
81133
81134 extern void wait_for_completion(struct completion *);
81135 extern void wait_for_completion_io(struct completion *);
81136-extern int wait_for_completion_interruptible(struct completion *x);
81137-extern int wait_for_completion_killable(struct completion *x);
81138+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
81139+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
81140 extern unsigned long wait_for_completion_timeout(struct completion *x,
81141- unsigned long timeout);
81142+ unsigned long timeout) __intentional_overflow(-1);
81143 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
81144- unsigned long timeout);
81145+ unsigned long timeout) __intentional_overflow(-1);
81146 extern long wait_for_completion_interruptible_timeout(
81147- struct completion *x, unsigned long timeout);
81148+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81149 extern long wait_for_completion_killable_timeout(
81150- struct completion *x, unsigned long timeout);
81151+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81152 extern bool try_wait_for_completion(struct completion *x);
81153 extern bool completion_done(struct completion *x);
81154
81155diff --git a/include/linux/configfs.h b/include/linux/configfs.h
81156index 34025df..d94bbbc 100644
81157--- a/include/linux/configfs.h
81158+++ b/include/linux/configfs.h
81159@@ -125,7 +125,7 @@ struct configfs_attribute {
81160 const char *ca_name;
81161 struct module *ca_owner;
81162 umode_t ca_mode;
81163-};
81164+} __do_const;
81165
81166 /*
81167 * Users often need to create attribute structures for their configurable
81168diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
81169index 4d078ce..c970f4d 100644
81170--- a/include/linux/cpufreq.h
81171+++ b/include/linux/cpufreq.h
81172@@ -206,6 +206,7 @@ struct global_attr {
81173 ssize_t (*store)(struct kobject *a, struct attribute *b,
81174 const char *c, size_t count);
81175 };
81176+typedef struct global_attr __no_const global_attr_no_const;
81177
81178 #define define_one_global_ro(_name) \
81179 static struct global_attr _name = \
81180@@ -277,7 +278,7 @@ struct cpufreq_driver {
81181 bool boost_supported;
81182 bool boost_enabled;
81183 int (*set_boost)(int state);
81184-};
81185+} __do_const;
81186
81187 /* flags */
81188 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
81189diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
81190index 948df62..4602717 100644
81191--- a/include/linux/cpuidle.h
81192+++ b/include/linux/cpuidle.h
81193@@ -50,7 +50,8 @@ struct cpuidle_state {
81194 int index);
81195
81196 int (*enter_dead) (struct cpuidle_device *dev, int index);
81197-};
81198+} __do_const;
81199+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
81200
81201 /* Idle State Flags */
81202 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
81203@@ -205,7 +206,7 @@ struct cpuidle_governor {
81204 void (*reflect) (struct cpuidle_device *dev, int index);
81205
81206 struct module *owner;
81207-};
81208+} __do_const;
81209
81210 #ifdef CONFIG_CPU_IDLE
81211 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
81212diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
81213index b950e9d..63810aa 100644
81214--- a/include/linux/cpumask.h
81215+++ b/include/linux/cpumask.h
81216@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81217 }
81218
81219 /* Valid inputs for n are -1 and 0. */
81220-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81221+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81222 {
81223 return n+1;
81224 }
81225
81226-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81227+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81228 {
81229 return n+1;
81230 }
81231
81232-static inline unsigned int cpumask_next_and(int n,
81233+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
81234 const struct cpumask *srcp,
81235 const struct cpumask *andp)
81236 {
81237@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81238 *
81239 * Returns >= nr_cpu_ids if no further cpus set.
81240 */
81241-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81242+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81243 {
81244 /* -1 is a legal arg here. */
81245 if (n != -1)
81246@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81247 *
81248 * Returns >= nr_cpu_ids if no further cpus unset.
81249 */
81250-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81251+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81252 {
81253 /* -1 is a legal arg here. */
81254 if (n != -1)
81255@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81256 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
81257 }
81258
81259-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
81260+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
81261 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
81262 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
81263
81264@@ -464,7 +464,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
81265 * cpumask_weight - Count of bits in *srcp
81266 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
81267 */
81268-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
81269+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
81270 {
81271 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
81272 }
81273diff --git a/include/linux/cred.h b/include/linux/cred.h
81274index 2fb2ca2..d6a3340 100644
81275--- a/include/linux/cred.h
81276+++ b/include/linux/cred.h
81277@@ -35,7 +35,7 @@ struct group_info {
81278 int nblocks;
81279 kgid_t small_block[NGROUPS_SMALL];
81280 kgid_t *blocks[0];
81281-};
81282+} __randomize_layout;
81283
81284 /**
81285 * get_group_info - Get a reference to a group info structure
81286@@ -137,7 +137,7 @@ struct cred {
81287 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
81288 struct group_info *group_info; /* supplementary groups for euid/fsgid */
81289 struct rcu_head rcu; /* RCU deletion hook */
81290-};
81291+} __randomize_layout;
81292
81293 extern void __put_cred(struct cred *);
81294 extern void exit_creds(struct task_struct *);
81295@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
81296 static inline void validate_process_creds(void)
81297 {
81298 }
81299+static inline void validate_task_creds(struct task_struct *task)
81300+{
81301+}
81302 #endif
81303
81304 /**
81305@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
81306
81307 #define task_uid(task) (task_cred_xxx((task), uid))
81308 #define task_euid(task) (task_cred_xxx((task), euid))
81309+#define task_securebits(task) (task_cred_xxx((task), securebits))
81310
81311 #define current_cred_xxx(xxx) \
81312 ({ \
81313diff --git a/include/linux/crypto.h b/include/linux/crypto.h
81314index 9c8776d..8c526c2 100644
81315--- a/include/linux/crypto.h
81316+++ b/include/linux/crypto.h
81317@@ -626,7 +626,7 @@ struct cipher_tfm {
81318 const u8 *key, unsigned int keylen);
81319 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81320 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81321-};
81322+} __no_const;
81323
81324 struct hash_tfm {
81325 int (*init)(struct hash_desc *desc);
81326@@ -647,13 +647,13 @@ struct compress_tfm {
81327 int (*cot_decompress)(struct crypto_tfm *tfm,
81328 const u8 *src, unsigned int slen,
81329 u8 *dst, unsigned int *dlen);
81330-};
81331+} __no_const;
81332
81333 struct rng_tfm {
81334 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
81335 unsigned int dlen);
81336 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
81337-};
81338+} __no_const;
81339
81340 #define crt_ablkcipher crt_u.ablkcipher
81341 #define crt_aead crt_u.aead
81342diff --git a/include/linux/ctype.h b/include/linux/ctype.h
81343index 653589e..4ef254a 100644
81344--- a/include/linux/ctype.h
81345+++ b/include/linux/ctype.h
81346@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
81347 * Fast implementation of tolower() for internal usage. Do not use in your
81348 * code.
81349 */
81350-static inline char _tolower(const char c)
81351+static inline unsigned char _tolower(const unsigned char c)
81352 {
81353 return c | 0x20;
81354 }
81355diff --git a/include/linux/dcache.h b/include/linux/dcache.h
81356index 5a81398..6bbee30 100644
81357--- a/include/linux/dcache.h
81358+++ b/include/linux/dcache.h
81359@@ -123,6 +123,9 @@ struct dentry {
81360 unsigned long d_time; /* used by d_revalidate */
81361 void *d_fsdata; /* fs-specific data */
81362
81363+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
81364+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
81365+#endif
81366 struct list_head d_lru; /* LRU list */
81367 struct list_head d_child; /* child of parent list */
81368 struct list_head d_subdirs; /* our children */
81369@@ -133,7 +136,7 @@ struct dentry {
81370 struct hlist_node d_alias; /* inode alias list */
81371 struct rcu_head d_rcu;
81372 } d_u;
81373-};
81374+} __randomize_layout;
81375
81376 /*
81377 * dentry->d_lock spinlock nesting subclasses:
81378diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
81379index 7925bf0..d5143d2 100644
81380--- a/include/linux/decompress/mm.h
81381+++ b/include/linux/decompress/mm.h
81382@@ -77,7 +77,7 @@ static void free(void *where)
81383 * warnings when not needed (indeed large_malloc / large_free are not
81384 * needed by inflate */
81385
81386-#define malloc(a) kmalloc(a, GFP_KERNEL)
81387+#define malloc(a) kmalloc((a), GFP_KERNEL)
81388 #define free(a) kfree(a)
81389
81390 #define large_malloc(a) vmalloc(a)
81391diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
81392index ce447f0..83c66bd 100644
81393--- a/include/linux/devfreq.h
81394+++ b/include/linux/devfreq.h
81395@@ -114,7 +114,7 @@ struct devfreq_governor {
81396 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
81397 int (*event_handler)(struct devfreq *devfreq,
81398 unsigned int event, void *data);
81399-};
81400+} __do_const;
81401
81402 /**
81403 * struct devfreq - Device devfreq structure
81404diff --git a/include/linux/device.h b/include/linux/device.h
81405index fb50673..ec0b35b 100644
81406--- a/include/linux/device.h
81407+++ b/include/linux/device.h
81408@@ -311,7 +311,7 @@ struct subsys_interface {
81409 struct list_head node;
81410 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
81411 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
81412-};
81413+} __do_const;
81414
81415 int subsys_interface_register(struct subsys_interface *sif);
81416 void subsys_interface_unregister(struct subsys_interface *sif);
81417@@ -507,7 +507,7 @@ struct device_type {
81418 void (*release)(struct device *dev);
81419
81420 const struct dev_pm_ops *pm;
81421-};
81422+} __do_const;
81423
81424 /* interface for exporting device attributes */
81425 struct device_attribute {
81426@@ -517,11 +517,12 @@ struct device_attribute {
81427 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
81428 const char *buf, size_t count);
81429 };
81430+typedef struct device_attribute __no_const device_attribute_no_const;
81431
81432 struct dev_ext_attribute {
81433 struct device_attribute attr;
81434 void *var;
81435-};
81436+} __do_const;
81437
81438 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
81439 char *buf);
81440diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
81441index c3007cb..43efc8c 100644
81442--- a/include/linux/dma-mapping.h
81443+++ b/include/linux/dma-mapping.h
81444@@ -60,7 +60,7 @@ struct dma_map_ops {
81445 u64 (*get_required_mask)(struct device *dev);
81446 #endif
81447 int is_phys;
81448-};
81449+} __do_const;
81450
81451 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
81452
81453diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
81454index 40cd75e..38572a9 100644
81455--- a/include/linux/dmaengine.h
81456+++ b/include/linux/dmaengine.h
81457@@ -1137,9 +1137,9 @@ struct dma_pinned_list {
81458 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
81459 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
81460
81461-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
81462+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
81463 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
81464-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
81465+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
81466 struct dma_pinned_list *pinned_list, struct page *page,
81467 unsigned int offset, size_t len);
81468
81469diff --git a/include/linux/efi.h b/include/linux/efi.h
81470index 0238d61..34a758f 100644
81471--- a/include/linux/efi.h
81472+++ b/include/linux/efi.h
81473@@ -1054,6 +1054,7 @@ struct efivar_operations {
81474 efi_set_variable_nonblocking_t *set_variable_nonblocking;
81475 efi_query_variable_store_t *query_variable_store;
81476 };
81477+typedef struct efivar_operations __no_const efivar_operations_no_const;
81478
81479 struct efivars {
81480 /*
81481diff --git a/include/linux/elf.h b/include/linux/elf.h
81482index 20fa8d8..3d0dd18 100644
81483--- a/include/linux/elf.h
81484+++ b/include/linux/elf.h
81485@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
81486 #define elf_note elf32_note
81487 #define elf_addr_t Elf32_Off
81488 #define Elf_Half Elf32_Half
81489+#define elf_dyn Elf32_Dyn
81490
81491 #else
81492
81493@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
81494 #define elf_note elf64_note
81495 #define elf_addr_t Elf64_Off
81496 #define Elf_Half Elf64_Half
81497+#define elf_dyn Elf64_Dyn
81498
81499 #endif
81500
81501diff --git a/include/linux/err.h b/include/linux/err.h
81502index a729120..6ede2c9 100644
81503--- a/include/linux/err.h
81504+++ b/include/linux/err.h
81505@@ -20,12 +20,12 @@
81506
81507 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
81508
81509-static inline void * __must_check ERR_PTR(long error)
81510+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
81511 {
81512 return (void *) error;
81513 }
81514
81515-static inline long __must_check PTR_ERR(__force const void *ptr)
81516+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
81517 {
81518 return (long) ptr;
81519 }
81520diff --git a/include/linux/extcon.h b/include/linux/extcon.h
81521index 36f49c4..a2a1f4c 100644
81522--- a/include/linux/extcon.h
81523+++ b/include/linux/extcon.h
81524@@ -135,7 +135,7 @@ struct extcon_dev {
81525 /* /sys/class/extcon/.../mutually_exclusive/... */
81526 struct attribute_group attr_g_muex;
81527 struct attribute **attrs_muex;
81528- struct device_attribute *d_attrs_muex;
81529+ device_attribute_no_const *d_attrs_muex;
81530 };
81531
81532 /**
81533diff --git a/include/linux/fb.h b/include/linux/fb.h
81534index 09bb7a1..d98870a 100644
81535--- a/include/linux/fb.h
81536+++ b/include/linux/fb.h
81537@@ -305,7 +305,7 @@ struct fb_ops {
81538 /* called at KDB enter and leave time to prepare the console */
81539 int (*fb_debug_enter)(struct fb_info *info);
81540 int (*fb_debug_leave)(struct fb_info *info);
81541-};
81542+} __do_const;
81543
81544 #ifdef CONFIG_FB_TILEBLITTING
81545 #define FB_TILE_CURSOR_NONE 0
81546diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
81547index 230f87b..1fd0485 100644
81548--- a/include/linux/fdtable.h
81549+++ b/include/linux/fdtable.h
81550@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
81551 void put_files_struct(struct files_struct *fs);
81552 void reset_files_struct(struct files_struct *);
81553 int unshare_files(struct files_struct **);
81554-struct files_struct *dup_fd(struct files_struct *, int *);
81555+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
81556 void do_close_on_exec(struct files_struct *);
81557 int iterate_fd(struct files_struct *, unsigned,
81558 int (*)(const void *, struct file *, unsigned),
81559diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
81560index 8293262..2b3b8bd 100644
81561--- a/include/linux/frontswap.h
81562+++ b/include/linux/frontswap.h
81563@@ -11,7 +11,7 @@ struct frontswap_ops {
81564 int (*load)(unsigned, pgoff_t, struct page *);
81565 void (*invalidate_page)(unsigned, pgoff_t);
81566 void (*invalidate_area)(unsigned);
81567-};
81568+} __no_const;
81569
81570 extern bool frontswap_enabled;
81571 extern struct frontswap_ops *
81572diff --git a/include/linux/fs.h b/include/linux/fs.h
81573index 42efe13..72d42ee 100644
81574--- a/include/linux/fs.h
81575+++ b/include/linux/fs.h
81576@@ -413,7 +413,7 @@ struct address_space {
81577 spinlock_t private_lock; /* for use by the address_space */
81578 struct list_head private_list; /* ditto */
81579 void *private_data; /* ditto */
81580-} __attribute__((aligned(sizeof(long))));
81581+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
81582 /*
81583 * On most architectures that alignment is already the case; but
81584 * must be enforced here for CRIS, to let the least significant bit
81585@@ -456,7 +456,7 @@ struct block_device {
81586 int bd_fsfreeze_count;
81587 /* Mutex for freeze */
81588 struct mutex bd_fsfreeze_mutex;
81589-};
81590+} __randomize_layout;
81591
81592 /*
81593 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
81594@@ -642,7 +642,7 @@ struct inode {
81595 #endif
81596
81597 void *i_private; /* fs or device private pointer */
81598-};
81599+} __randomize_layout;
81600
81601 static inline int inode_unhashed(struct inode *inode)
81602 {
81603@@ -837,7 +837,7 @@ struct file {
81604 struct list_head f_tfile_llink;
81605 #endif /* #ifdef CONFIG_EPOLL */
81606 struct address_space *f_mapping;
81607-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
81608+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
81609
81610 struct file_handle {
81611 __u32 handle_bytes;
81612@@ -962,7 +962,7 @@ struct file_lock {
81613 int state; /* state of grant or error if -ve */
81614 } afs;
81615 } fl_u;
81616-};
81617+} __randomize_layout;
81618
81619 /* The following constant reflects the upper bound of the file/locking space */
81620 #ifndef OFFSET_MAX
81621@@ -1305,7 +1305,7 @@ struct super_block {
81622 * Indicates how deep in a filesystem stack this SB is
81623 */
81624 int s_stack_depth;
81625-};
81626+} __randomize_layout;
81627
81628 extern struct timespec current_fs_time(struct super_block *sb);
81629
81630@@ -1536,7 +1536,8 @@ struct file_operations {
81631 long (*fallocate)(struct file *file, int mode, loff_t offset,
81632 loff_t len);
81633 void (*show_fdinfo)(struct seq_file *m, struct file *f);
81634-};
81635+} __do_const __randomize_layout;
81636+typedef struct file_operations __no_const file_operations_no_const;
81637
81638 struct inode_operations {
81639 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
81640@@ -2854,4 +2855,14 @@ static inline bool dir_relax(struct inode *inode)
81641 return !IS_DEADDIR(inode);
81642 }
81643
81644+static inline bool is_sidechannel_device(const struct inode *inode)
81645+{
81646+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
81647+ umode_t mode = inode->i_mode;
81648+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
81649+#else
81650+ return false;
81651+#endif
81652+}
81653+
81654 #endif /* _LINUX_FS_H */
81655diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
81656index 0efc3e6..fd23610 100644
81657--- a/include/linux/fs_struct.h
81658+++ b/include/linux/fs_struct.h
81659@@ -6,13 +6,13 @@
81660 #include <linux/seqlock.h>
81661
81662 struct fs_struct {
81663- int users;
81664+ atomic_t users;
81665 spinlock_t lock;
81666 seqcount_t seq;
81667 int umask;
81668 int in_exec;
81669 struct path root, pwd;
81670-};
81671+} __randomize_layout;
81672
81673 extern struct kmem_cache *fs_cachep;
81674
81675diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
81676index 7714849..a4a5c7a 100644
81677--- a/include/linux/fscache-cache.h
81678+++ b/include/linux/fscache-cache.h
81679@@ -113,7 +113,7 @@ struct fscache_operation {
81680 fscache_operation_release_t release;
81681 };
81682
81683-extern atomic_t fscache_op_debug_id;
81684+extern atomic_unchecked_t fscache_op_debug_id;
81685 extern void fscache_op_work_func(struct work_struct *work);
81686
81687 extern void fscache_enqueue_operation(struct fscache_operation *);
81688@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
81689 INIT_WORK(&op->work, fscache_op_work_func);
81690 atomic_set(&op->usage, 1);
81691 op->state = FSCACHE_OP_ST_INITIALISED;
81692- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
81693+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
81694 op->processor = processor;
81695 op->release = release;
81696 INIT_LIST_HEAD(&op->pend_link);
81697diff --git a/include/linux/fscache.h b/include/linux/fscache.h
81698index 115bb81..e7b812b 100644
81699--- a/include/linux/fscache.h
81700+++ b/include/linux/fscache.h
81701@@ -152,7 +152,7 @@ struct fscache_cookie_def {
81702 * - this is mandatory for any object that may have data
81703 */
81704 void (*now_uncached)(void *cookie_netfs_data);
81705-};
81706+} __do_const;
81707
81708 /*
81709 * fscache cached network filesystem type
81710diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
81711index 7ee1774..72505b8 100644
81712--- a/include/linux/fsnotify.h
81713+++ b/include/linux/fsnotify.h
81714@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
81715 struct inode *inode = file_inode(file);
81716 __u32 mask = FS_ACCESS;
81717
81718+ if (is_sidechannel_device(inode))
81719+ return;
81720+
81721 if (S_ISDIR(inode->i_mode))
81722 mask |= FS_ISDIR;
81723
81724@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
81725 struct inode *inode = file_inode(file);
81726 __u32 mask = FS_MODIFY;
81727
81728+ if (is_sidechannel_device(inode))
81729+ return;
81730+
81731 if (S_ISDIR(inode->i_mode))
81732 mask |= FS_ISDIR;
81733
81734@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
81735 */
81736 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
81737 {
81738- return kstrdup(name, GFP_KERNEL);
81739+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
81740 }
81741
81742 /*
81743diff --git a/include/linux/genhd.h b/include/linux/genhd.h
81744index ec274e0..e678159 100644
81745--- a/include/linux/genhd.h
81746+++ b/include/linux/genhd.h
81747@@ -194,7 +194,7 @@ struct gendisk {
81748 struct kobject *slave_dir;
81749
81750 struct timer_rand_state *random;
81751- atomic_t sync_io; /* RAID */
81752+ atomic_unchecked_t sync_io; /* RAID */
81753 struct disk_events *ev;
81754 #ifdef CONFIG_BLK_DEV_INTEGRITY
81755 struct blk_integrity *integrity;
81756@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
81757 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
81758
81759 /* drivers/char/random.c */
81760-extern void add_disk_randomness(struct gendisk *disk);
81761+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
81762 extern void rand_initialize_disk(struct gendisk *disk);
81763
81764 static inline sector_t get_start_sect(struct block_device *bdev)
81765diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
81766index 667c311..abac2a7 100644
81767--- a/include/linux/genl_magic_func.h
81768+++ b/include/linux/genl_magic_func.h
81769@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
81770 },
81771
81772 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
81773-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
81774+static struct genl_ops ZZZ_genl_ops[] = {
81775 #include GENL_MAGIC_INCLUDE_FILE
81776 };
81777
81778diff --git a/include/linux/gfp.h b/include/linux/gfp.h
81779index b840e3b..aeaeef9 100644
81780--- a/include/linux/gfp.h
81781+++ b/include/linux/gfp.h
81782@@ -34,6 +34,13 @@ struct vm_area_struct;
81783 #define ___GFP_NO_KSWAPD 0x400000u
81784 #define ___GFP_OTHER_NODE 0x800000u
81785 #define ___GFP_WRITE 0x1000000u
81786+
81787+#ifdef CONFIG_PAX_USERCOPY_SLABS
81788+#define ___GFP_USERCOPY 0x2000000u
81789+#else
81790+#define ___GFP_USERCOPY 0
81791+#endif
81792+
81793 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
81794
81795 /*
81796@@ -90,6 +97,7 @@ struct vm_area_struct;
81797 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
81798 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
81799 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
81800+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
81801
81802 /*
81803 * This may seem redundant, but it's a way of annotating false positives vs.
81804@@ -97,7 +105,7 @@ struct vm_area_struct;
81805 */
81806 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
81807
81808-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
81809+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
81810 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
81811
81812 /* This equals 0, but use constants in case they ever change */
81813@@ -152,6 +160,8 @@ struct vm_area_struct;
81814 /* 4GB DMA on some platforms */
81815 #define GFP_DMA32 __GFP_DMA32
81816
81817+#define GFP_USERCOPY __GFP_USERCOPY
81818+
81819 /* Convert GFP flags to their corresponding migrate type */
81820 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
81821 {
81822diff --git a/include/linux/gracl.h b/include/linux/gracl.h
81823new file mode 100644
81824index 0000000..91858e4
81825--- /dev/null
81826+++ b/include/linux/gracl.h
81827@@ -0,0 +1,342 @@
81828+#ifndef GR_ACL_H
81829+#define GR_ACL_H
81830+
81831+#include <linux/grdefs.h>
81832+#include <linux/resource.h>
81833+#include <linux/capability.h>
81834+#include <linux/dcache.h>
81835+#include <asm/resource.h>
81836+
81837+/* Major status information */
81838+
81839+#define GR_VERSION "grsecurity 3.1"
81840+#define GRSECURITY_VERSION 0x3100
81841+
81842+enum {
81843+ GR_SHUTDOWN = 0,
81844+ GR_ENABLE = 1,
81845+ GR_SPROLE = 2,
81846+ GR_OLDRELOAD = 3,
81847+ GR_SEGVMOD = 4,
81848+ GR_STATUS = 5,
81849+ GR_UNSPROLE = 6,
81850+ GR_PASSSET = 7,
81851+ GR_SPROLEPAM = 8,
81852+ GR_RELOAD = 9,
81853+};
81854+
81855+/* Password setup definitions
81856+ * kernel/grhash.c */
81857+enum {
81858+ GR_PW_LEN = 128,
81859+ GR_SALT_LEN = 16,
81860+ GR_SHA_LEN = 32,
81861+};
81862+
81863+enum {
81864+ GR_SPROLE_LEN = 64,
81865+};
81866+
81867+enum {
81868+ GR_NO_GLOB = 0,
81869+ GR_REG_GLOB,
81870+ GR_CREATE_GLOB
81871+};
81872+
81873+#define GR_NLIMITS 32
81874+
81875+/* Begin Data Structures */
81876+
81877+struct sprole_pw {
81878+ unsigned char *rolename;
81879+ unsigned char salt[GR_SALT_LEN];
81880+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
81881+};
81882+
81883+struct name_entry {
81884+ __u32 key;
81885+ u64 inode;
81886+ dev_t device;
81887+ char *name;
81888+ __u16 len;
81889+ __u8 deleted;
81890+ struct name_entry *prev;
81891+ struct name_entry *next;
81892+};
81893+
81894+struct inodev_entry {
81895+ struct name_entry *nentry;
81896+ struct inodev_entry *prev;
81897+ struct inodev_entry *next;
81898+};
81899+
81900+struct acl_role_db {
81901+ struct acl_role_label **r_hash;
81902+ __u32 r_size;
81903+};
81904+
81905+struct inodev_db {
81906+ struct inodev_entry **i_hash;
81907+ __u32 i_size;
81908+};
81909+
81910+struct name_db {
81911+ struct name_entry **n_hash;
81912+ __u32 n_size;
81913+};
81914+
81915+struct crash_uid {
81916+ uid_t uid;
81917+ unsigned long expires;
81918+};
81919+
81920+struct gr_hash_struct {
81921+ void **table;
81922+ void **nametable;
81923+ void *first;
81924+ __u32 table_size;
81925+ __u32 used_size;
81926+ int type;
81927+};
81928+
81929+/* Userspace Grsecurity ACL data structures */
81930+
81931+struct acl_subject_label {
81932+ char *filename;
81933+ u64 inode;
81934+ dev_t device;
81935+ __u32 mode;
81936+ kernel_cap_t cap_mask;
81937+ kernel_cap_t cap_lower;
81938+ kernel_cap_t cap_invert_audit;
81939+
81940+ struct rlimit res[GR_NLIMITS];
81941+ __u32 resmask;
81942+
81943+ __u8 user_trans_type;
81944+ __u8 group_trans_type;
81945+ uid_t *user_transitions;
81946+ gid_t *group_transitions;
81947+ __u16 user_trans_num;
81948+ __u16 group_trans_num;
81949+
81950+ __u32 sock_families[2];
81951+ __u32 ip_proto[8];
81952+ __u32 ip_type;
81953+ struct acl_ip_label **ips;
81954+ __u32 ip_num;
81955+ __u32 inaddr_any_override;
81956+
81957+ __u32 crashes;
81958+ unsigned long expires;
81959+
81960+ struct acl_subject_label *parent_subject;
81961+ struct gr_hash_struct *hash;
81962+ struct acl_subject_label *prev;
81963+ struct acl_subject_label *next;
81964+
81965+ struct acl_object_label **obj_hash;
81966+ __u32 obj_hash_size;
81967+ __u16 pax_flags;
81968+};
81969+
81970+struct role_allowed_ip {
81971+ __u32 addr;
81972+ __u32 netmask;
81973+
81974+ struct role_allowed_ip *prev;
81975+ struct role_allowed_ip *next;
81976+};
81977+
81978+struct role_transition {
81979+ char *rolename;
81980+
81981+ struct role_transition *prev;
81982+ struct role_transition *next;
81983+};
81984+
81985+struct acl_role_label {
81986+ char *rolename;
81987+ uid_t uidgid;
81988+ __u16 roletype;
81989+
81990+ __u16 auth_attempts;
81991+ unsigned long expires;
81992+
81993+ struct acl_subject_label *root_label;
81994+ struct gr_hash_struct *hash;
81995+
81996+ struct acl_role_label *prev;
81997+ struct acl_role_label *next;
81998+
81999+ struct role_transition *transitions;
82000+ struct role_allowed_ip *allowed_ips;
82001+ uid_t *domain_children;
82002+ __u16 domain_child_num;
82003+
82004+ umode_t umask;
82005+
82006+ struct acl_subject_label **subj_hash;
82007+ __u32 subj_hash_size;
82008+};
82009+
82010+struct user_acl_role_db {
82011+ struct acl_role_label **r_table;
82012+ __u32 num_pointers; /* Number of allocations to track */
82013+ __u32 num_roles; /* Number of roles */
82014+ __u32 num_domain_children; /* Number of domain children */
82015+ __u32 num_subjects; /* Number of subjects */
82016+ __u32 num_objects; /* Number of objects */
82017+};
82018+
82019+struct acl_object_label {
82020+ char *filename;
82021+ u64 inode;
82022+ dev_t device;
82023+ __u32 mode;
82024+
82025+ struct acl_subject_label *nested;
82026+ struct acl_object_label *globbed;
82027+
82028+ /* next two structures not used */
82029+
82030+ struct acl_object_label *prev;
82031+ struct acl_object_label *next;
82032+};
82033+
82034+struct acl_ip_label {
82035+ char *iface;
82036+ __u32 addr;
82037+ __u32 netmask;
82038+ __u16 low, high;
82039+ __u8 mode;
82040+ __u32 type;
82041+ __u32 proto[8];
82042+
82043+ /* next two structures not used */
82044+
82045+ struct acl_ip_label *prev;
82046+ struct acl_ip_label *next;
82047+};
82048+
82049+struct gr_arg {
82050+ struct user_acl_role_db role_db;
82051+ unsigned char pw[GR_PW_LEN];
82052+ unsigned char salt[GR_SALT_LEN];
82053+ unsigned char sum[GR_SHA_LEN];
82054+ unsigned char sp_role[GR_SPROLE_LEN];
82055+ struct sprole_pw *sprole_pws;
82056+ dev_t segv_device;
82057+ u64 segv_inode;
82058+ uid_t segv_uid;
82059+ __u16 num_sprole_pws;
82060+ __u16 mode;
82061+};
82062+
82063+struct gr_arg_wrapper {
82064+ struct gr_arg *arg;
82065+ __u32 version;
82066+ __u32 size;
82067+};
82068+
82069+struct subject_map {
82070+ struct acl_subject_label *user;
82071+ struct acl_subject_label *kernel;
82072+ struct subject_map *prev;
82073+ struct subject_map *next;
82074+};
82075+
82076+struct acl_subj_map_db {
82077+ struct subject_map **s_hash;
82078+ __u32 s_size;
82079+};
82080+
82081+struct gr_policy_state {
82082+ struct sprole_pw **acl_special_roles;
82083+ __u16 num_sprole_pws;
82084+ struct acl_role_label *kernel_role;
82085+ struct acl_role_label *role_list;
82086+ struct acl_role_label *default_role;
82087+ struct acl_role_db acl_role_set;
82088+ struct acl_subj_map_db subj_map_set;
82089+ struct name_db name_set;
82090+ struct inodev_db inodev_set;
82091+};
82092+
82093+struct gr_alloc_state {
82094+ unsigned long alloc_stack_next;
82095+ unsigned long alloc_stack_size;
82096+ void **alloc_stack;
82097+};
82098+
82099+struct gr_reload_state {
82100+ struct gr_policy_state oldpolicy;
82101+ struct gr_alloc_state oldalloc;
82102+ struct gr_policy_state newpolicy;
82103+ struct gr_alloc_state newalloc;
82104+ struct gr_policy_state *oldpolicy_ptr;
82105+ struct gr_alloc_state *oldalloc_ptr;
82106+ unsigned char oldmode;
82107+};
82108+
82109+/* End Data Structures Section */
82110+
82111+/* Hash functions generated by empirical testing by Brad Spengler
82112+ Makes good use of the low bits of the inode. Generally 0-1 times
82113+ in loop for successful match. 0-3 for unsuccessful match.
82114+ Shift/add algorithm with modulus of table size and an XOR*/
82115+
82116+static __inline__ unsigned int
82117+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
82118+{
82119+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
82120+}
82121+
82122+ static __inline__ unsigned int
82123+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
82124+{
82125+ return ((const unsigned long)userp % sz);
82126+}
82127+
82128+static __inline__ unsigned int
82129+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
82130+{
82131+ unsigned int rem;
82132+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
82133+ return rem;
82134+}
82135+
82136+static __inline__ unsigned int
82137+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
82138+{
82139+ return full_name_hash((const unsigned char *)name, len) % sz;
82140+}
82141+
82142+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
82143+ subj = NULL; \
82144+ iter = 0; \
82145+ while (iter < role->subj_hash_size) { \
82146+ if (subj == NULL) \
82147+ subj = role->subj_hash[iter]; \
82148+ if (subj == NULL) { \
82149+ iter++; \
82150+ continue; \
82151+ }
82152+
82153+#define FOR_EACH_SUBJECT_END(subj,iter) \
82154+ subj = subj->next; \
82155+ if (subj == NULL) \
82156+ iter++; \
82157+ }
82158+
82159+
82160+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
82161+ subj = role->hash->first; \
82162+ while (subj != NULL) {
82163+
82164+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
82165+ subj = subj->next; \
82166+ }
82167+
82168+#endif
82169+
82170diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
82171new file mode 100644
82172index 0000000..af64092
82173--- /dev/null
82174+++ b/include/linux/gracl_compat.h
82175@@ -0,0 +1,156 @@
82176+#ifndef GR_ACL_COMPAT_H
82177+#define GR_ACL_COMPAT_H
82178+
82179+#include <linux/resource.h>
82180+#include <asm/resource.h>
82181+
82182+struct sprole_pw_compat {
82183+ compat_uptr_t rolename;
82184+ unsigned char salt[GR_SALT_LEN];
82185+ unsigned char sum[GR_SHA_LEN];
82186+};
82187+
82188+struct gr_hash_struct_compat {
82189+ compat_uptr_t table;
82190+ compat_uptr_t nametable;
82191+ compat_uptr_t first;
82192+ __u32 table_size;
82193+ __u32 used_size;
82194+ int type;
82195+};
82196+
82197+struct acl_subject_label_compat {
82198+ compat_uptr_t filename;
82199+ compat_u64 inode;
82200+ __u32 device;
82201+ __u32 mode;
82202+ kernel_cap_t cap_mask;
82203+ kernel_cap_t cap_lower;
82204+ kernel_cap_t cap_invert_audit;
82205+
82206+ struct compat_rlimit res[GR_NLIMITS];
82207+ __u32 resmask;
82208+
82209+ __u8 user_trans_type;
82210+ __u8 group_trans_type;
82211+ compat_uptr_t user_transitions;
82212+ compat_uptr_t group_transitions;
82213+ __u16 user_trans_num;
82214+ __u16 group_trans_num;
82215+
82216+ __u32 sock_families[2];
82217+ __u32 ip_proto[8];
82218+ __u32 ip_type;
82219+ compat_uptr_t ips;
82220+ __u32 ip_num;
82221+ __u32 inaddr_any_override;
82222+
82223+ __u32 crashes;
82224+ compat_ulong_t expires;
82225+
82226+ compat_uptr_t parent_subject;
82227+ compat_uptr_t hash;
82228+ compat_uptr_t prev;
82229+ compat_uptr_t next;
82230+
82231+ compat_uptr_t obj_hash;
82232+ __u32 obj_hash_size;
82233+ __u16 pax_flags;
82234+};
82235+
82236+struct role_allowed_ip_compat {
82237+ __u32 addr;
82238+ __u32 netmask;
82239+
82240+ compat_uptr_t prev;
82241+ compat_uptr_t next;
82242+};
82243+
82244+struct role_transition_compat {
82245+ compat_uptr_t rolename;
82246+
82247+ compat_uptr_t prev;
82248+ compat_uptr_t next;
82249+};
82250+
82251+struct acl_role_label_compat {
82252+ compat_uptr_t rolename;
82253+ uid_t uidgid;
82254+ __u16 roletype;
82255+
82256+ __u16 auth_attempts;
82257+ compat_ulong_t expires;
82258+
82259+ compat_uptr_t root_label;
82260+ compat_uptr_t hash;
82261+
82262+ compat_uptr_t prev;
82263+ compat_uptr_t next;
82264+
82265+ compat_uptr_t transitions;
82266+ compat_uptr_t allowed_ips;
82267+ compat_uptr_t domain_children;
82268+ __u16 domain_child_num;
82269+
82270+ umode_t umask;
82271+
82272+ compat_uptr_t subj_hash;
82273+ __u32 subj_hash_size;
82274+};
82275+
82276+struct user_acl_role_db_compat {
82277+ compat_uptr_t r_table;
82278+ __u32 num_pointers;
82279+ __u32 num_roles;
82280+ __u32 num_domain_children;
82281+ __u32 num_subjects;
82282+ __u32 num_objects;
82283+};
82284+
82285+struct acl_object_label_compat {
82286+ compat_uptr_t filename;
82287+ compat_u64 inode;
82288+ __u32 device;
82289+ __u32 mode;
82290+
82291+ compat_uptr_t nested;
82292+ compat_uptr_t globbed;
82293+
82294+ compat_uptr_t prev;
82295+ compat_uptr_t next;
82296+};
82297+
82298+struct acl_ip_label_compat {
82299+ compat_uptr_t iface;
82300+ __u32 addr;
82301+ __u32 netmask;
82302+ __u16 low, high;
82303+ __u8 mode;
82304+ __u32 type;
82305+ __u32 proto[8];
82306+
82307+ compat_uptr_t prev;
82308+ compat_uptr_t next;
82309+};
82310+
82311+struct gr_arg_compat {
82312+ struct user_acl_role_db_compat role_db;
82313+ unsigned char pw[GR_PW_LEN];
82314+ unsigned char salt[GR_SALT_LEN];
82315+ unsigned char sum[GR_SHA_LEN];
82316+ unsigned char sp_role[GR_SPROLE_LEN];
82317+ compat_uptr_t sprole_pws;
82318+ __u32 segv_device;
82319+ compat_u64 segv_inode;
82320+ uid_t segv_uid;
82321+ __u16 num_sprole_pws;
82322+ __u16 mode;
82323+};
82324+
82325+struct gr_arg_wrapper_compat {
82326+ compat_uptr_t arg;
82327+ __u32 version;
82328+ __u32 size;
82329+};
82330+
82331+#endif
82332diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
82333new file mode 100644
82334index 0000000..323ecf2
82335--- /dev/null
82336+++ b/include/linux/gralloc.h
82337@@ -0,0 +1,9 @@
82338+#ifndef __GRALLOC_H
82339+#define __GRALLOC_H
82340+
82341+void acl_free_all(void);
82342+int acl_alloc_stack_init(unsigned long size);
82343+void *acl_alloc(unsigned long len);
82344+void *acl_alloc_num(unsigned long num, unsigned long len);
82345+
82346+#endif
82347diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
82348new file mode 100644
82349index 0000000..be66033
82350--- /dev/null
82351+++ b/include/linux/grdefs.h
82352@@ -0,0 +1,140 @@
82353+#ifndef GRDEFS_H
82354+#define GRDEFS_H
82355+
82356+/* Begin grsecurity status declarations */
82357+
82358+enum {
82359+ GR_READY = 0x01,
82360+ GR_STATUS_INIT = 0x00 // disabled state
82361+};
82362+
82363+/* Begin ACL declarations */
82364+
82365+/* Role flags */
82366+
82367+enum {
82368+ GR_ROLE_USER = 0x0001,
82369+ GR_ROLE_GROUP = 0x0002,
82370+ GR_ROLE_DEFAULT = 0x0004,
82371+ GR_ROLE_SPECIAL = 0x0008,
82372+ GR_ROLE_AUTH = 0x0010,
82373+ GR_ROLE_NOPW = 0x0020,
82374+ GR_ROLE_GOD = 0x0040,
82375+ GR_ROLE_LEARN = 0x0080,
82376+ GR_ROLE_TPE = 0x0100,
82377+ GR_ROLE_DOMAIN = 0x0200,
82378+ GR_ROLE_PAM = 0x0400,
82379+ GR_ROLE_PERSIST = 0x0800
82380+};
82381+
82382+/* ACL Subject and Object mode flags */
82383+enum {
82384+ GR_DELETED = 0x80000000
82385+};
82386+
82387+/* ACL Object-only mode flags */
82388+enum {
82389+ GR_READ = 0x00000001,
82390+ GR_APPEND = 0x00000002,
82391+ GR_WRITE = 0x00000004,
82392+ GR_EXEC = 0x00000008,
82393+ GR_FIND = 0x00000010,
82394+ GR_INHERIT = 0x00000020,
82395+ GR_SETID = 0x00000040,
82396+ GR_CREATE = 0x00000080,
82397+ GR_DELETE = 0x00000100,
82398+ GR_LINK = 0x00000200,
82399+ GR_AUDIT_READ = 0x00000400,
82400+ GR_AUDIT_APPEND = 0x00000800,
82401+ GR_AUDIT_WRITE = 0x00001000,
82402+ GR_AUDIT_EXEC = 0x00002000,
82403+ GR_AUDIT_FIND = 0x00004000,
82404+ GR_AUDIT_INHERIT= 0x00008000,
82405+ GR_AUDIT_SETID = 0x00010000,
82406+ GR_AUDIT_CREATE = 0x00020000,
82407+ GR_AUDIT_DELETE = 0x00040000,
82408+ GR_AUDIT_LINK = 0x00080000,
82409+ GR_PTRACERD = 0x00100000,
82410+ GR_NOPTRACE = 0x00200000,
82411+ GR_SUPPRESS = 0x00400000,
82412+ GR_NOLEARN = 0x00800000,
82413+ GR_INIT_TRANSFER= 0x01000000
82414+};
82415+
82416+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
82417+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
82418+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
82419+
82420+/* ACL subject-only mode flags */
82421+enum {
82422+ GR_KILL = 0x00000001,
82423+ GR_VIEW = 0x00000002,
82424+ GR_PROTECTED = 0x00000004,
82425+ GR_LEARN = 0x00000008,
82426+ GR_OVERRIDE = 0x00000010,
82427+ /* just a placeholder, this mode is only used in userspace */
82428+ GR_DUMMY = 0x00000020,
82429+ GR_PROTSHM = 0x00000040,
82430+ GR_KILLPROC = 0x00000080,
82431+ GR_KILLIPPROC = 0x00000100,
82432+ /* just a placeholder, this mode is only used in userspace */
82433+ GR_NOTROJAN = 0x00000200,
82434+ GR_PROTPROCFD = 0x00000400,
82435+ GR_PROCACCT = 0x00000800,
82436+ GR_RELAXPTRACE = 0x00001000,
82437+ //GR_NESTED = 0x00002000,
82438+ GR_INHERITLEARN = 0x00004000,
82439+ GR_PROCFIND = 0x00008000,
82440+ GR_POVERRIDE = 0x00010000,
82441+ GR_KERNELAUTH = 0x00020000,
82442+ GR_ATSECURE = 0x00040000,
82443+ GR_SHMEXEC = 0x00080000
82444+};
82445+
82446+enum {
82447+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
82448+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
82449+ GR_PAX_ENABLE_MPROTECT = 0x0004,
82450+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
82451+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
82452+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
82453+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
82454+ GR_PAX_DISABLE_MPROTECT = 0x0400,
82455+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
82456+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
82457+};
82458+
82459+enum {
82460+ GR_ID_USER = 0x01,
82461+ GR_ID_GROUP = 0x02,
82462+};
82463+
82464+enum {
82465+ GR_ID_ALLOW = 0x01,
82466+ GR_ID_DENY = 0x02,
82467+};
82468+
82469+#define GR_CRASH_RES 31
82470+#define GR_UIDTABLE_MAX 500
82471+
82472+/* begin resource learning section */
82473+enum {
82474+ GR_RLIM_CPU_BUMP = 60,
82475+ GR_RLIM_FSIZE_BUMP = 50000,
82476+ GR_RLIM_DATA_BUMP = 10000,
82477+ GR_RLIM_STACK_BUMP = 1000,
82478+ GR_RLIM_CORE_BUMP = 10000,
82479+ GR_RLIM_RSS_BUMP = 500000,
82480+ GR_RLIM_NPROC_BUMP = 1,
82481+ GR_RLIM_NOFILE_BUMP = 5,
82482+ GR_RLIM_MEMLOCK_BUMP = 50000,
82483+ GR_RLIM_AS_BUMP = 500000,
82484+ GR_RLIM_LOCKS_BUMP = 2,
82485+ GR_RLIM_SIGPENDING_BUMP = 5,
82486+ GR_RLIM_MSGQUEUE_BUMP = 10000,
82487+ GR_RLIM_NICE_BUMP = 1,
82488+ GR_RLIM_RTPRIO_BUMP = 1,
82489+ GR_RLIM_RTTIME_BUMP = 1000000
82490+};
82491+
82492+#endif
82493diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
82494new file mode 100644
82495index 0000000..fb1de5d
82496--- /dev/null
82497+++ b/include/linux/grinternal.h
82498@@ -0,0 +1,230 @@
82499+#ifndef __GRINTERNAL_H
82500+#define __GRINTERNAL_H
82501+
82502+#ifdef CONFIG_GRKERNSEC
82503+
82504+#include <linux/fs.h>
82505+#include <linux/mnt_namespace.h>
82506+#include <linux/nsproxy.h>
82507+#include <linux/gracl.h>
82508+#include <linux/grdefs.h>
82509+#include <linux/grmsg.h>
82510+
82511+void gr_add_learn_entry(const char *fmt, ...)
82512+ __attribute__ ((format (printf, 1, 2)));
82513+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
82514+ const struct vfsmount *mnt);
82515+__u32 gr_check_create(const struct dentry *new_dentry,
82516+ const struct dentry *parent,
82517+ const struct vfsmount *mnt, const __u32 mode);
82518+int gr_check_protected_task(const struct task_struct *task);
82519+__u32 to_gr_audit(const __u32 reqmode);
82520+int gr_set_acls(const int type);
82521+int gr_acl_is_enabled(void);
82522+char gr_roletype_to_char(void);
82523+
82524+void gr_handle_alertkill(struct task_struct *task);
82525+char *gr_to_filename(const struct dentry *dentry,
82526+ const struct vfsmount *mnt);
82527+char *gr_to_filename1(const struct dentry *dentry,
82528+ const struct vfsmount *mnt);
82529+char *gr_to_filename2(const struct dentry *dentry,
82530+ const struct vfsmount *mnt);
82531+char *gr_to_filename3(const struct dentry *dentry,
82532+ const struct vfsmount *mnt);
82533+
82534+extern int grsec_enable_ptrace_readexec;
82535+extern int grsec_enable_harden_ptrace;
82536+extern int grsec_enable_link;
82537+extern int grsec_enable_fifo;
82538+extern int grsec_enable_execve;
82539+extern int grsec_enable_shm;
82540+extern int grsec_enable_execlog;
82541+extern int grsec_enable_signal;
82542+extern int grsec_enable_audit_ptrace;
82543+extern int grsec_enable_forkfail;
82544+extern int grsec_enable_time;
82545+extern int grsec_enable_rofs;
82546+extern int grsec_deny_new_usb;
82547+extern int grsec_enable_chroot_shmat;
82548+extern int grsec_enable_chroot_mount;
82549+extern int grsec_enable_chroot_double;
82550+extern int grsec_enable_chroot_pivot;
82551+extern int grsec_enable_chroot_chdir;
82552+extern int grsec_enable_chroot_chmod;
82553+extern int grsec_enable_chroot_mknod;
82554+extern int grsec_enable_chroot_fchdir;
82555+extern int grsec_enable_chroot_nice;
82556+extern int grsec_enable_chroot_execlog;
82557+extern int grsec_enable_chroot_caps;
82558+extern int grsec_enable_chroot_rename;
82559+extern int grsec_enable_chroot_sysctl;
82560+extern int grsec_enable_chroot_unix;
82561+extern int grsec_enable_symlinkown;
82562+extern kgid_t grsec_symlinkown_gid;
82563+extern int grsec_enable_tpe;
82564+extern kgid_t grsec_tpe_gid;
82565+extern int grsec_enable_tpe_all;
82566+extern int grsec_enable_tpe_invert;
82567+extern int grsec_enable_socket_all;
82568+extern kgid_t grsec_socket_all_gid;
82569+extern int grsec_enable_socket_client;
82570+extern kgid_t grsec_socket_client_gid;
82571+extern int grsec_enable_socket_server;
82572+extern kgid_t grsec_socket_server_gid;
82573+extern kgid_t grsec_audit_gid;
82574+extern int grsec_enable_group;
82575+extern int grsec_enable_log_rwxmaps;
82576+extern int grsec_enable_mount;
82577+extern int grsec_enable_chdir;
82578+extern int grsec_resource_logging;
82579+extern int grsec_enable_blackhole;
82580+extern int grsec_lastack_retries;
82581+extern int grsec_enable_brute;
82582+extern int grsec_enable_harden_ipc;
82583+extern int grsec_lock;
82584+
82585+extern spinlock_t grsec_alert_lock;
82586+extern unsigned long grsec_alert_wtime;
82587+extern unsigned long grsec_alert_fyet;
82588+
82589+extern spinlock_t grsec_audit_lock;
82590+
82591+extern rwlock_t grsec_exec_file_lock;
82592+
82593+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
82594+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
82595+ (tsk)->exec_file->f_path.mnt) : "/")
82596+
82597+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
82598+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
82599+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
82600+
82601+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
82602+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
82603+ (tsk)->exec_file->f_path.mnt) : "/")
82604+
82605+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
82606+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
82607+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
82608+
82609+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
82610+
82611+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
82612+
82613+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
82614+{
82615+ if (file1 && file2) {
82616+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
82617+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
82618+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
82619+ return true;
82620+ }
82621+
82622+ return false;
82623+}
82624+
82625+#define GR_CHROOT_CAPS {{ \
82626+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
82627+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
82628+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
82629+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
82630+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
82631+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
82632+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
82633+
82634+#define security_learn(normal_msg,args...) \
82635+({ \
82636+ read_lock(&grsec_exec_file_lock); \
82637+ gr_add_learn_entry(normal_msg "\n", ## args); \
82638+ read_unlock(&grsec_exec_file_lock); \
82639+})
82640+
82641+enum {
82642+ GR_DO_AUDIT,
82643+ GR_DONT_AUDIT,
82644+ /* used for non-audit messages that we shouldn't kill the task on */
82645+ GR_DONT_AUDIT_GOOD
82646+};
82647+
82648+enum {
82649+ GR_TTYSNIFF,
82650+ GR_RBAC,
82651+ GR_RBAC_STR,
82652+ GR_STR_RBAC,
82653+ GR_RBAC_MODE2,
82654+ GR_RBAC_MODE3,
82655+ GR_FILENAME,
82656+ GR_SYSCTL_HIDDEN,
82657+ GR_NOARGS,
82658+ GR_ONE_INT,
82659+ GR_ONE_INT_TWO_STR,
82660+ GR_ONE_STR,
82661+ GR_STR_INT,
82662+ GR_TWO_STR_INT,
82663+ GR_TWO_INT,
82664+ GR_TWO_U64,
82665+ GR_THREE_INT,
82666+ GR_FIVE_INT_TWO_STR,
82667+ GR_TWO_STR,
82668+ GR_THREE_STR,
82669+ GR_FOUR_STR,
82670+ GR_STR_FILENAME,
82671+ GR_FILENAME_STR,
82672+ GR_FILENAME_TWO_INT,
82673+ GR_FILENAME_TWO_INT_STR,
82674+ GR_TEXTREL,
82675+ GR_PTRACE,
82676+ GR_RESOURCE,
82677+ GR_CAP,
82678+ GR_SIG,
82679+ GR_SIG2,
82680+ GR_CRASH1,
82681+ GR_CRASH2,
82682+ GR_PSACCT,
82683+ GR_RWXMAP,
82684+ GR_RWXMAPVMA
82685+};
82686+
82687+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
82688+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
82689+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
82690+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
82691+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
82692+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
82693+#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)
82694+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
82695+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
82696+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
82697+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
82698+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
82699+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
82700+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
82701+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
82702+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
82703+#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)
82704+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
82705+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
82706+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
82707+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
82708+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
82709+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
82710+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
82711+#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)
82712+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
82713+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
82714+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
82715+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
82716+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
82717+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
82718+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
82719+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
82720+#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)
82721+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
82722+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
82723+
82724+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
82725+
82726+#endif
82727+
82728+#endif
82729diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
82730new file mode 100644
82731index 0000000..26ef560
82732--- /dev/null
82733+++ b/include/linux/grmsg.h
82734@@ -0,0 +1,118 @@
82735+#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"
82736+#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"
82737+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
82738+#define GR_STOPMOD_MSG "denied modification of module state by "
82739+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
82740+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
82741+#define GR_IOPERM_MSG "denied use of ioperm() by "
82742+#define GR_IOPL_MSG "denied use of iopl() by "
82743+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
82744+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
82745+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
82746+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
82747+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
82748+#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"
82749+#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"
82750+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
82751+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
82752+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
82753+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
82754+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
82755+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
82756+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
82757+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
82758+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
82759+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
82760+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
82761+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
82762+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
82763+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
82764+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
82765+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
82766+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
82767+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
82768+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
82769+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
82770+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
82771+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
82772+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
82773+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
82774+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
82775+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
82776+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
82777+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
82778+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
82779+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
82780+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
82781+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
82782+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
82783+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
82784+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
82785+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
82786+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
82787+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
82788+#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"
82789+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
82790+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
82791+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
82792+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
82793+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
82794+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
82795+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
82796+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
82797+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
82798+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
82799+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
82800+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
82801+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
82802+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
82803+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
82804+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
82805+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
82806+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
82807+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
82808+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
82809+#define GR_FAILFORK_MSG "failed fork with errno %s by "
82810+#define GR_NICE_CHROOT_MSG "denied priority change by "
82811+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
82812+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
82813+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
82814+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
82815+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
82816+#define GR_TIME_MSG "time set by "
82817+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
82818+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
82819+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
82820+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
82821+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
82822+#define GR_BIND_MSG "denied bind() by "
82823+#define GR_CONNECT_MSG "denied connect() by "
82824+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
82825+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
82826+#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"
82827+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
82828+#define GR_CAP_ACL_MSG "use of %s denied for "
82829+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
82830+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
82831+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
82832+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
82833+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
82834+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
82835+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
82836+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
82837+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
82838+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
82839+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
82840+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
82841+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
82842+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
82843+#define GR_VM86_MSG "denied use of vm86 by "
82844+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
82845+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
82846+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
82847+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
82848+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
82849+#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 "
82850+#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 "
82851+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
82852+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
82853diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
82854new file mode 100644
82855index 0000000..63c1850
82856--- /dev/null
82857+++ b/include/linux/grsecurity.h
82858@@ -0,0 +1,250 @@
82859+#ifndef GR_SECURITY_H
82860+#define GR_SECURITY_H
82861+#include <linux/fs.h>
82862+#include <linux/fs_struct.h>
82863+#include <linux/binfmts.h>
82864+#include <linux/gracl.h>
82865+
82866+/* notify of brain-dead configs */
82867+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82868+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
82869+#endif
82870+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82871+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
82872+#endif
82873+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
82874+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
82875+#endif
82876+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
82877+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
82878+#endif
82879+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
82880+#error "CONFIG_PAX enabled, but no PaX options are enabled."
82881+#endif
82882+
82883+int gr_handle_new_usb(void);
82884+
82885+void gr_handle_brute_attach(int dumpable);
82886+void gr_handle_brute_check(void);
82887+void gr_handle_kernel_exploit(void);
82888+
82889+char gr_roletype_to_char(void);
82890+
82891+int gr_proc_is_restricted(void);
82892+
82893+int gr_acl_enable_at_secure(void);
82894+
82895+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
82896+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
82897+
82898+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
82899+
82900+void gr_del_task_from_ip_table(struct task_struct *p);
82901+
82902+int gr_pid_is_chrooted(struct task_struct *p);
82903+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
82904+int gr_handle_chroot_nice(void);
82905+int gr_handle_chroot_sysctl(const int op);
82906+int gr_handle_chroot_setpriority(struct task_struct *p,
82907+ const int niceval);
82908+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
82909+int gr_chroot_fhandle(void);
82910+int gr_handle_chroot_chroot(const struct dentry *dentry,
82911+ const struct vfsmount *mnt);
82912+void gr_handle_chroot_chdir(const struct path *path);
82913+int gr_handle_chroot_chmod(const struct dentry *dentry,
82914+ const struct vfsmount *mnt, const int mode);
82915+int gr_handle_chroot_mknod(const struct dentry *dentry,
82916+ const struct vfsmount *mnt, const int mode);
82917+int gr_handle_chroot_mount(const struct dentry *dentry,
82918+ const struct vfsmount *mnt,
82919+ const char *dev_name);
82920+int gr_handle_chroot_pivot(void);
82921+int gr_handle_chroot_unix(const pid_t pid);
82922+
82923+int gr_handle_rawio(const struct inode *inode);
82924+
82925+void gr_handle_ioperm(void);
82926+void gr_handle_iopl(void);
82927+void gr_handle_msr_write(void);
82928+
82929+umode_t gr_acl_umask(void);
82930+
82931+int gr_tpe_allow(const struct file *file);
82932+
82933+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
82934+void gr_clear_chroot_entries(struct task_struct *task);
82935+
82936+void gr_log_forkfail(const int retval);
82937+void gr_log_timechange(void);
82938+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
82939+void gr_log_chdir(const struct dentry *dentry,
82940+ const struct vfsmount *mnt);
82941+void gr_log_chroot_exec(const struct dentry *dentry,
82942+ const struct vfsmount *mnt);
82943+void gr_log_remount(const char *devname, const int retval);
82944+void gr_log_unmount(const char *devname, const int retval);
82945+void gr_log_mount(const char *from, struct path *to, const int retval);
82946+void gr_log_textrel(struct vm_area_struct *vma);
82947+void gr_log_ptgnustack(struct file *file);
82948+void gr_log_rwxmmap(struct file *file);
82949+void gr_log_rwxmprotect(struct vm_area_struct *vma);
82950+
82951+int gr_handle_follow_link(const struct inode *parent,
82952+ const struct inode *inode,
82953+ const struct dentry *dentry,
82954+ const struct vfsmount *mnt);
82955+int gr_handle_fifo(const struct dentry *dentry,
82956+ const struct vfsmount *mnt,
82957+ const struct dentry *dir, const int flag,
82958+ const int acc_mode);
82959+int gr_handle_hardlink(const struct dentry *dentry,
82960+ const struct vfsmount *mnt,
82961+ struct inode *inode,
82962+ const int mode, const struct filename *to);
82963+
82964+int gr_is_capable(const int cap);
82965+int gr_is_capable_nolog(const int cap);
82966+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82967+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82968+
82969+void gr_copy_label(struct task_struct *tsk);
82970+void gr_handle_crash(struct task_struct *task, const int sig);
82971+int gr_handle_signal(const struct task_struct *p, const int sig);
82972+int gr_check_crash_uid(const kuid_t uid);
82973+int gr_check_protected_task(const struct task_struct *task);
82974+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82975+int gr_acl_handle_mmap(const struct file *file,
82976+ const unsigned long prot);
82977+int gr_acl_handle_mprotect(const struct file *file,
82978+ const unsigned long prot);
82979+int gr_check_hidden_task(const struct task_struct *tsk);
82980+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82981+ const struct vfsmount *mnt);
82982+__u32 gr_acl_handle_utime(const struct dentry *dentry,
82983+ const struct vfsmount *mnt);
82984+__u32 gr_acl_handle_access(const struct dentry *dentry,
82985+ const struct vfsmount *mnt, const int fmode);
82986+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82987+ const struct vfsmount *mnt, umode_t *mode);
82988+__u32 gr_acl_handle_chown(const struct dentry *dentry,
82989+ const struct vfsmount *mnt);
82990+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82991+ const struct vfsmount *mnt);
82992+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82993+ const struct vfsmount *mnt);
82994+int gr_handle_ptrace(struct task_struct *task, const long request);
82995+int gr_handle_proc_ptrace(struct task_struct *task);
82996+__u32 gr_acl_handle_execve(const struct dentry *dentry,
82997+ const struct vfsmount *mnt);
82998+int gr_check_crash_exec(const struct file *filp);
82999+int gr_acl_is_enabled(void);
83000+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
83001+ const kgid_t gid);
83002+int gr_set_proc_label(const struct dentry *dentry,
83003+ const struct vfsmount *mnt,
83004+ const int unsafe_flags);
83005+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
83006+ const struct vfsmount *mnt);
83007+__u32 gr_acl_handle_open(const struct dentry *dentry,
83008+ const struct vfsmount *mnt, int acc_mode);
83009+__u32 gr_acl_handle_creat(const struct dentry *dentry,
83010+ const struct dentry *p_dentry,
83011+ const struct vfsmount *p_mnt,
83012+ int open_flags, int acc_mode, const int imode);
83013+void gr_handle_create(const struct dentry *dentry,
83014+ const struct vfsmount *mnt);
83015+void gr_handle_proc_create(const struct dentry *dentry,
83016+ const struct inode *inode);
83017+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
83018+ const struct dentry *parent_dentry,
83019+ const struct vfsmount *parent_mnt,
83020+ const int mode);
83021+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
83022+ const struct dentry *parent_dentry,
83023+ const struct vfsmount *parent_mnt);
83024+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
83025+ const struct vfsmount *mnt);
83026+void gr_handle_delete(const u64 ino, const dev_t dev);
83027+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
83028+ const struct vfsmount *mnt);
83029+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
83030+ const struct dentry *parent_dentry,
83031+ const struct vfsmount *parent_mnt,
83032+ const struct filename *from);
83033+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
83034+ const struct dentry *parent_dentry,
83035+ const struct vfsmount *parent_mnt,
83036+ const struct dentry *old_dentry,
83037+ const struct vfsmount *old_mnt, const struct filename *to);
83038+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
83039+int gr_acl_handle_rename(struct dentry *new_dentry,
83040+ struct dentry *parent_dentry,
83041+ const struct vfsmount *parent_mnt,
83042+ struct dentry *old_dentry,
83043+ struct inode *old_parent_inode,
83044+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
83045+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
83046+ struct dentry *old_dentry,
83047+ struct dentry *new_dentry,
83048+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
83049+__u32 gr_check_link(const struct dentry *new_dentry,
83050+ const struct dentry *parent_dentry,
83051+ const struct vfsmount *parent_mnt,
83052+ const struct dentry *old_dentry,
83053+ const struct vfsmount *old_mnt);
83054+int gr_acl_handle_filldir(const struct file *file, const char *name,
83055+ const unsigned int namelen, const u64 ino);
83056+
83057+__u32 gr_acl_handle_unix(const struct dentry *dentry,
83058+ const struct vfsmount *mnt);
83059+void gr_acl_handle_exit(void);
83060+void gr_acl_handle_psacct(struct task_struct *task, const long code);
83061+int gr_acl_handle_procpidmem(const struct task_struct *task);
83062+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
83063+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
83064+void gr_audit_ptrace(struct task_struct *task);
83065+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
83066+u64 gr_get_ino_from_dentry(struct dentry *dentry);
83067+void gr_put_exec_file(struct task_struct *task);
83068+
83069+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
83070+
83071+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83072+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83073+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
83074+ struct dentry *newdentry, struct vfsmount *newmnt);
83075+
83076+#ifdef CONFIG_GRKERNSEC_RESLOG
83077+extern void gr_log_resource(const struct task_struct *task, const int res,
83078+ const unsigned long wanted, const int gt);
83079+#else
83080+static inline void gr_log_resource(const struct task_struct *task, const int res,
83081+ const unsigned long wanted, const int gt)
83082+{
83083+}
83084+#endif
83085+
83086+#ifdef CONFIG_GRKERNSEC
83087+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
83088+void gr_handle_vm86(void);
83089+void gr_handle_mem_readwrite(u64 from, u64 to);
83090+
83091+void gr_log_badprocpid(const char *entry);
83092+
83093+extern int grsec_enable_dmesg;
83094+extern int grsec_disable_privio;
83095+
83096+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
83097+extern kgid_t grsec_proc_gid;
83098+#endif
83099+
83100+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
83101+extern int grsec_enable_chroot_findtask;
83102+#endif
83103+#ifdef CONFIG_GRKERNSEC_SETXID
83104+extern int grsec_enable_setxid;
83105+#endif
83106+#endif
83107+
83108+#endif
83109diff --git a/include/linux/grsock.h b/include/linux/grsock.h
83110new file mode 100644
83111index 0000000..e7ffaaf
83112--- /dev/null
83113+++ b/include/linux/grsock.h
83114@@ -0,0 +1,19 @@
83115+#ifndef __GRSOCK_H
83116+#define __GRSOCK_H
83117+
83118+extern void gr_attach_curr_ip(const struct sock *sk);
83119+extern int gr_handle_sock_all(const int family, const int type,
83120+ const int protocol);
83121+extern int gr_handle_sock_server(const struct sockaddr *sck);
83122+extern int gr_handle_sock_server_other(const struct sock *sck);
83123+extern int gr_handle_sock_client(const struct sockaddr *sck);
83124+extern int gr_search_connect(struct socket * sock,
83125+ struct sockaddr_in * addr);
83126+extern int gr_search_bind(struct socket * sock,
83127+ struct sockaddr_in * addr);
83128+extern int gr_search_listen(struct socket * sock);
83129+extern int gr_search_accept(struct socket * sock);
83130+extern int gr_search_socket(const int domain, const int type,
83131+ const int protocol);
83132+
83133+#endif
83134diff --git a/include/linux/highmem.h b/include/linux/highmem.h
83135index 9286a46..373f27f 100644
83136--- a/include/linux/highmem.h
83137+++ b/include/linux/highmem.h
83138@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
83139 kunmap_atomic(kaddr);
83140 }
83141
83142+static inline void sanitize_highpage(struct page *page)
83143+{
83144+ void *kaddr;
83145+ unsigned long flags;
83146+
83147+ local_irq_save(flags);
83148+ kaddr = kmap_atomic(page);
83149+ clear_page(kaddr);
83150+ kunmap_atomic(kaddr);
83151+ local_irq_restore(flags);
83152+}
83153+
83154 static inline void zero_user_segments(struct page *page,
83155 unsigned start1, unsigned end1,
83156 unsigned start2, unsigned end2)
83157diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
83158index 1c7b89a..7dda400 100644
83159--- a/include/linux/hwmon-sysfs.h
83160+++ b/include/linux/hwmon-sysfs.h
83161@@ -25,7 +25,8 @@
83162 struct sensor_device_attribute{
83163 struct device_attribute dev_attr;
83164 int index;
83165-};
83166+} __do_const;
83167+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
83168 #define to_sensor_dev_attr(_dev_attr) \
83169 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
83170
83171@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
83172 struct device_attribute dev_attr;
83173 u8 index;
83174 u8 nr;
83175-};
83176+} __do_const;
83177+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
83178 #define to_sensor_dev_attr_2(_dev_attr) \
83179 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
83180
83181diff --git a/include/linux/i2c.h b/include/linux/i2c.h
83182index 7c76959..153e597 100644
83183--- a/include/linux/i2c.h
83184+++ b/include/linux/i2c.h
83185@@ -413,6 +413,7 @@ struct i2c_algorithm {
83186 int (*unreg_slave)(struct i2c_client *client);
83187 #endif
83188 };
83189+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
83190
83191 /**
83192 * struct i2c_bus_recovery_info - I2C bus recovery information
83193diff --git a/include/linux/i2o.h b/include/linux/i2o.h
83194index d23c3c2..eb63c81 100644
83195--- a/include/linux/i2o.h
83196+++ b/include/linux/i2o.h
83197@@ -565,7 +565,7 @@ struct i2o_controller {
83198 struct i2o_device *exec; /* Executive */
83199 #if BITS_PER_LONG == 64
83200 spinlock_t context_list_lock; /* lock for context_list */
83201- atomic_t context_list_counter; /* needed for unique contexts */
83202+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
83203 struct list_head context_list; /* list of context id's
83204 and pointers */
83205 #endif
83206diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
83207index aff7ad8..3942bbd 100644
83208--- a/include/linux/if_pppox.h
83209+++ b/include/linux/if_pppox.h
83210@@ -76,7 +76,7 @@ struct pppox_proto {
83211 int (*ioctl)(struct socket *sock, unsigned int cmd,
83212 unsigned long arg);
83213 struct module *owner;
83214-};
83215+} __do_const;
83216
83217 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
83218 extern void unregister_pppox_proto(int proto_num);
83219diff --git a/include/linux/init.h b/include/linux/init.h
83220index 2df8e8d..3e1280d 100644
83221--- a/include/linux/init.h
83222+++ b/include/linux/init.h
83223@@ -37,9 +37,17 @@
83224 * section.
83225 */
83226
83227+#define add_init_latent_entropy __latent_entropy
83228+
83229+#ifdef CONFIG_MEMORY_HOTPLUG
83230+#define add_meminit_latent_entropy
83231+#else
83232+#define add_meminit_latent_entropy __latent_entropy
83233+#endif
83234+
83235 /* These are for everybody (although not all archs will actually
83236 discard it in modules) */
83237-#define __init __section(.init.text) __cold notrace
83238+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
83239 #define __initdata __section(.init.data)
83240 #define __initconst __constsection(.init.rodata)
83241 #define __exitdata __section(.exit.data)
83242@@ -100,7 +108,7 @@
83243 #define __cpuexitconst
83244
83245 /* Used for MEMORY_HOTPLUG */
83246-#define __meminit __section(.meminit.text) __cold notrace
83247+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
83248 #define __meminitdata __section(.meminit.data)
83249 #define __meminitconst __constsection(.meminit.rodata)
83250 #define __memexit __section(.memexit.text) __exitused __cold notrace
83251diff --git a/include/linux/init_task.h b/include/linux/init_task.h
83252index 3037fc0..c6527ce 100644
83253--- a/include/linux/init_task.h
83254+++ b/include/linux/init_task.h
83255@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
83256
83257 #define INIT_TASK_COMM "swapper"
83258
83259+#ifdef CONFIG_X86
83260+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
83261+#else
83262+#define INIT_TASK_THREAD_INFO
83263+#endif
83264+
83265 #ifdef CONFIG_RT_MUTEXES
83266 # define INIT_RT_MUTEXES(tsk) \
83267 .pi_waiters = RB_ROOT, \
83268@@ -214,6 +220,7 @@ extern struct task_group root_task_group;
83269 RCU_POINTER_INITIALIZER(cred, &init_cred), \
83270 .comm = INIT_TASK_COMM, \
83271 .thread = INIT_THREAD, \
83272+ INIT_TASK_THREAD_INFO \
83273 .fs = &init_fs, \
83274 .files = &init_files, \
83275 .signal = &init_signals, \
83276diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
83277index d9b05b5..e5f5b7b 100644
83278--- a/include/linux/interrupt.h
83279+++ b/include/linux/interrupt.h
83280@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
83281
83282 struct softirq_action
83283 {
83284- void (*action)(struct softirq_action *);
83285-};
83286+ void (*action)(void);
83287+} __no_const;
83288
83289 asmlinkage void do_softirq(void);
83290 asmlinkage void __do_softirq(void);
83291@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
83292 }
83293 #endif
83294
83295-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
83296+extern void open_softirq(int nr, void (*action)(void));
83297 extern void softirq_init(void);
83298 extern void __raise_softirq_irqoff(unsigned int nr);
83299
83300diff --git a/include/linux/iommu.h b/include/linux/iommu.h
83301index 38daa45..4de4317 100644
83302--- a/include/linux/iommu.h
83303+++ b/include/linux/iommu.h
83304@@ -147,7 +147,7 @@ struct iommu_ops {
83305
83306 unsigned long pgsize_bitmap;
83307 void *priv;
83308-};
83309+} __do_const;
83310
83311 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
83312 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
83313diff --git a/include/linux/ioport.h b/include/linux/ioport.h
83314index 2c525022..345b106 100644
83315--- a/include/linux/ioport.h
83316+++ b/include/linux/ioport.h
83317@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
83318 int adjust_resource(struct resource *res, resource_size_t start,
83319 resource_size_t size);
83320 resource_size_t resource_alignment(struct resource *res);
83321-static inline resource_size_t resource_size(const struct resource *res)
83322+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
83323 {
83324 return res->end - res->start + 1;
83325 }
83326diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
83327index 1eee6bc..9cf4912 100644
83328--- a/include/linux/ipc_namespace.h
83329+++ b/include/linux/ipc_namespace.h
83330@@ -60,7 +60,7 @@ struct ipc_namespace {
83331 struct user_namespace *user_ns;
83332
83333 struct ns_common ns;
83334-};
83335+} __randomize_layout;
83336
83337 extern struct ipc_namespace init_ipc_ns;
83338 extern atomic_t nr_ipc_ns;
83339diff --git a/include/linux/irq.h b/include/linux/irq.h
83340index d09ec7a..f373eb5 100644
83341--- a/include/linux/irq.h
83342+++ b/include/linux/irq.h
83343@@ -364,7 +364,8 @@ struct irq_chip {
83344 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
83345
83346 unsigned long flags;
83347-};
83348+} __do_const;
83349+typedef struct irq_chip __no_const irq_chip_no_const;
83350
83351 /*
83352 * irq_chip specific flags
83353diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
83354index 71d706d..817cdec 100644
83355--- a/include/linux/irqchip/arm-gic.h
83356+++ b/include/linux/irqchip/arm-gic.h
83357@@ -95,7 +95,7 @@
83358
83359 struct device_node;
83360
83361-extern struct irq_chip gic_arch_extn;
83362+extern irq_chip_no_const gic_arch_extn;
83363
83364 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
83365 u32 offset, struct device_node *);
83366diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
83367index faf433a..7dcb186 100644
83368--- a/include/linux/irqdesc.h
83369+++ b/include/linux/irqdesc.h
83370@@ -61,7 +61,7 @@ struct irq_desc {
83371 unsigned int irq_count; /* For detecting broken IRQs */
83372 unsigned long last_unhandled; /* Aging timer for unhandled count */
83373 unsigned int irqs_unhandled;
83374- atomic_t threads_handled;
83375+ atomic_unchecked_t threads_handled;
83376 int threads_handled_last;
83377 raw_spinlock_t lock;
83378 struct cpumask *percpu_enabled;
83379diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
83380index c367cbd..c9b79e6 100644
83381--- a/include/linux/jiffies.h
83382+++ b/include/linux/jiffies.h
83383@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
83384 /*
83385 * Convert various time units to each other:
83386 */
83387-extern unsigned int jiffies_to_msecs(const unsigned long j);
83388-extern unsigned int jiffies_to_usecs(const unsigned long j);
83389+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
83390+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
83391
83392-static inline u64 jiffies_to_nsecs(const unsigned long j)
83393+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
83394 {
83395 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
83396 }
83397
83398-extern unsigned long msecs_to_jiffies(const unsigned int m);
83399-extern unsigned long usecs_to_jiffies(const unsigned int u);
83400+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
83401+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
83402 extern unsigned long timespec_to_jiffies(const struct timespec *value);
83403 extern void jiffies_to_timespec(const unsigned long jiffies,
83404- struct timespec *value);
83405-extern unsigned long timeval_to_jiffies(const struct timeval *value);
83406+ struct timespec *value) __intentional_overflow(-1);
83407+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
83408 extern void jiffies_to_timeval(const unsigned long jiffies,
83409 struct timeval *value);
83410
83411diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
83412index 6883e19..e854fcb 100644
83413--- a/include/linux/kallsyms.h
83414+++ b/include/linux/kallsyms.h
83415@@ -15,7 +15,8 @@
83416
83417 struct module;
83418
83419-#ifdef CONFIG_KALLSYMS
83420+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
83421+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
83422 /* Lookup the address for a symbol. Returns 0 if not found. */
83423 unsigned long kallsyms_lookup_name(const char *name);
83424
83425@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
83426 /* Stupid that this does nothing, but I didn't create this mess. */
83427 #define __print_symbol(fmt, addr)
83428 #endif /*CONFIG_KALLSYMS*/
83429+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
83430+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
83431+extern unsigned long kallsyms_lookup_name(const char *name);
83432+extern void __print_symbol(const char *fmt, unsigned long address);
83433+extern int sprint_backtrace(char *buffer, unsigned long address);
83434+extern int sprint_symbol(char *buffer, unsigned long address);
83435+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
83436+const char *kallsyms_lookup(unsigned long addr,
83437+ unsigned long *symbolsize,
83438+ unsigned long *offset,
83439+ char **modname, char *namebuf);
83440+extern int kallsyms_lookup_size_offset(unsigned long addr,
83441+ unsigned long *symbolsize,
83442+ unsigned long *offset);
83443+#endif
83444
83445 /* This macro allows us to keep printk typechecking */
83446 static __printf(1, 2)
83447diff --git a/include/linux/kernel.h b/include/linux/kernel.h
83448index 64ce58b..6bcdbfa 100644
83449--- a/include/linux/kernel.h
83450+++ b/include/linux/kernel.h
83451@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
83452 /* Obsolete, do not use. Use kstrto<foo> instead */
83453
83454 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
83455-extern long simple_strtol(const char *,char **,unsigned int);
83456+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
83457 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
83458 extern long long simple_strtoll(const char *,char **,unsigned int);
83459
83460diff --git a/include/linux/key-type.h b/include/linux/key-type.h
83461index ff9f1d3..6712be5 100644
83462--- a/include/linux/key-type.h
83463+++ b/include/linux/key-type.h
83464@@ -152,7 +152,7 @@ struct key_type {
83465 /* internal fields */
83466 struct list_head link; /* link in types list */
83467 struct lock_class_key lock_class; /* key->sem lock class */
83468-};
83469+} __do_const;
83470
83471 extern struct key_type key_type_keyring;
83472
83473diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
83474index e465bb1..19f605fd 100644
83475--- a/include/linux/kgdb.h
83476+++ b/include/linux/kgdb.h
83477@@ -52,7 +52,7 @@ extern int kgdb_connected;
83478 extern int kgdb_io_module_registered;
83479
83480 extern atomic_t kgdb_setting_breakpoint;
83481-extern atomic_t kgdb_cpu_doing_single_step;
83482+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
83483
83484 extern struct task_struct *kgdb_usethread;
83485 extern struct task_struct *kgdb_contthread;
83486@@ -254,7 +254,7 @@ struct kgdb_arch {
83487 void (*correct_hw_break)(void);
83488
83489 void (*enable_nmi)(bool on);
83490-};
83491+} __do_const;
83492
83493 /**
83494 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
83495@@ -279,7 +279,7 @@ struct kgdb_io {
83496 void (*pre_exception) (void);
83497 void (*post_exception) (void);
83498 int is_console;
83499-};
83500+} __do_const;
83501
83502 extern struct kgdb_arch arch_kgdb_ops;
83503
83504diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
83505index e705467..a92471d 100644
83506--- a/include/linux/kmemleak.h
83507+++ b/include/linux/kmemleak.h
83508@@ -27,7 +27,7 @@
83509
83510 extern void kmemleak_init(void) __ref;
83511 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
83512- gfp_t gfp) __ref;
83513+ gfp_t gfp) __ref __size_overflow(2);
83514 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
83515 extern void kmemleak_free(const void *ptr) __ref;
83516 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
83517@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
83518 static inline void kmemleak_init(void)
83519 {
83520 }
83521-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
83522+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
83523 gfp_t gfp)
83524 {
83525 }
83526diff --git a/include/linux/kmod.h b/include/linux/kmod.h
83527index 0555cc6..40116ce 100644
83528--- a/include/linux/kmod.h
83529+++ b/include/linux/kmod.h
83530@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
83531 * usually useless though. */
83532 extern __printf(2, 3)
83533 int __request_module(bool wait, const char *name, ...);
83534+extern __printf(3, 4)
83535+int ___request_module(bool wait, char *param_name, const char *name, ...);
83536 #define request_module(mod...) __request_module(true, mod)
83537 #define request_module_nowait(mod...) __request_module(false, mod)
83538 #define try_then_request_module(x, mod...) \
83539@@ -57,6 +59,9 @@ struct subprocess_info {
83540 struct work_struct work;
83541 struct completion *complete;
83542 char *path;
83543+#ifdef CONFIG_GRKERNSEC
83544+ char *origpath;
83545+#endif
83546 char **argv;
83547 char **envp;
83548 int wait;
83549diff --git a/include/linux/kobject.h b/include/linux/kobject.h
83550index 2d61b90..a1d0a13 100644
83551--- a/include/linux/kobject.h
83552+++ b/include/linux/kobject.h
83553@@ -118,7 +118,7 @@ struct kobj_type {
83554 struct attribute **default_attrs;
83555 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
83556 const void *(*namespace)(struct kobject *kobj);
83557-};
83558+} __do_const;
83559
83560 struct kobj_uevent_env {
83561 char *argv[3];
83562@@ -142,6 +142,7 @@ struct kobj_attribute {
83563 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
83564 const char *buf, size_t count);
83565 };
83566+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
83567
83568 extern const struct sysfs_ops kobj_sysfs_ops;
83569
83570@@ -169,7 +170,7 @@ struct kset {
83571 spinlock_t list_lock;
83572 struct kobject kobj;
83573 const struct kset_uevent_ops *uevent_ops;
83574-};
83575+} __randomize_layout;
83576
83577 extern void kset_init(struct kset *kset);
83578 extern int __must_check kset_register(struct kset *kset);
83579diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
83580index df32d25..fb52e27 100644
83581--- a/include/linux/kobject_ns.h
83582+++ b/include/linux/kobject_ns.h
83583@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
83584 const void *(*netlink_ns)(struct sock *sk);
83585 const void *(*initial_ns)(void);
83586 void (*drop_ns)(void *);
83587-};
83588+} __do_const;
83589
83590 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
83591 int kobj_ns_type_registered(enum kobj_ns_type type);
83592diff --git a/include/linux/kref.h b/include/linux/kref.h
83593index 484604d..0f6c5b6 100644
83594--- a/include/linux/kref.h
83595+++ b/include/linux/kref.h
83596@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
83597 static inline int kref_sub(struct kref *kref, unsigned int count,
83598 void (*release)(struct kref *kref))
83599 {
83600- WARN_ON(release == NULL);
83601+ BUG_ON(release == NULL);
83602
83603 if (atomic_sub_and_test((int) count, &kref->refcount)) {
83604 release(kref);
83605diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
83606index 26f1060..bafc04a 100644
83607--- a/include/linux/kvm_host.h
83608+++ b/include/linux/kvm_host.h
83609@@ -470,7 +470,7 @@ static inline void kvm_irqfd_exit(void)
83610 {
83611 }
83612 #endif
83613-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
83614+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
83615 struct module *module);
83616 void kvm_exit(void);
83617
83618@@ -639,7 +639,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
83619 struct kvm_guest_debug *dbg);
83620 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
83621
83622-int kvm_arch_init(void *opaque);
83623+int kvm_arch_init(const void *opaque);
83624 void kvm_arch_exit(void);
83625
83626 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
83627diff --git a/include/linux/libata.h b/include/linux/libata.h
83628index 91f705d..24be831 100644
83629--- a/include/linux/libata.h
83630+++ b/include/linux/libata.h
83631@@ -979,7 +979,7 @@ struct ata_port_operations {
83632 * fields must be pointers.
83633 */
83634 const struct ata_port_operations *inherits;
83635-};
83636+} __do_const;
83637
83638 struct ata_port_info {
83639 unsigned long flags;
83640diff --git a/include/linux/linkage.h b/include/linux/linkage.h
83641index a6a42dd..6c5ebce 100644
83642--- a/include/linux/linkage.h
83643+++ b/include/linux/linkage.h
83644@@ -36,6 +36,7 @@
83645 #endif
83646
83647 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
83648+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
83649 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
83650
83651 /*
83652diff --git a/include/linux/list.h b/include/linux/list.h
83653index feb773c..98f3075 100644
83654--- a/include/linux/list.h
83655+++ b/include/linux/list.h
83656@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
83657 extern void list_del(struct list_head *entry);
83658 #endif
83659
83660+extern void __pax_list_add(struct list_head *new,
83661+ struct list_head *prev,
83662+ struct list_head *next);
83663+static inline void pax_list_add(struct list_head *new, struct list_head *head)
83664+{
83665+ __pax_list_add(new, head, head->next);
83666+}
83667+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
83668+{
83669+ __pax_list_add(new, head->prev, head);
83670+}
83671+extern void pax_list_del(struct list_head *entry);
83672+
83673 /**
83674 * list_replace - replace old entry by new one
83675 * @old : the element to be replaced
83676@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
83677 INIT_LIST_HEAD(entry);
83678 }
83679
83680+extern void pax_list_del_init(struct list_head *entry);
83681+
83682 /**
83683 * list_move - delete from one list and add as another's head
83684 * @list: the entry to move
83685diff --git a/include/linux/lockref.h b/include/linux/lockref.h
83686index 4bfde0e..d6e2e09 100644
83687--- a/include/linux/lockref.h
83688+++ b/include/linux/lockref.h
83689@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
83690 return ((int)l->count < 0);
83691 }
83692
83693+static inline unsigned int __lockref_read(struct lockref *lockref)
83694+{
83695+ return lockref->count;
83696+}
83697+
83698+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
83699+{
83700+ lockref->count = count;
83701+}
83702+
83703+static inline void __lockref_inc(struct lockref *lockref)
83704+{
83705+
83706+#ifdef CONFIG_PAX_REFCOUNT
83707+ atomic_inc((atomic_t *)&lockref->count);
83708+#else
83709+ lockref->count++;
83710+#endif
83711+
83712+}
83713+
83714+static inline void __lockref_dec(struct lockref *lockref)
83715+{
83716+
83717+#ifdef CONFIG_PAX_REFCOUNT
83718+ atomic_dec((atomic_t *)&lockref->count);
83719+#else
83720+ lockref->count--;
83721+#endif
83722+
83723+}
83724+
83725 #endif /* __LINUX_LOCKREF_H */
83726diff --git a/include/linux/math64.h b/include/linux/math64.h
83727index c45c089..298841c 100644
83728--- a/include/linux/math64.h
83729+++ b/include/linux/math64.h
83730@@ -15,7 +15,7 @@
83731 * This is commonly provided by 32bit archs to provide an optimized 64bit
83732 * divide.
83733 */
83734-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83735+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83736 {
83737 *remainder = dividend % divisor;
83738 return dividend / divisor;
83739@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
83740 /**
83741 * div64_u64 - unsigned 64bit divide with 64bit divisor
83742 */
83743-static inline u64 div64_u64(u64 dividend, u64 divisor)
83744+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
83745 {
83746 return dividend / divisor;
83747 }
83748@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
83749 #define div64_ul(x, y) div_u64((x), (y))
83750
83751 #ifndef div_u64_rem
83752-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83753+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83754 {
83755 *remainder = do_div(dividend, divisor);
83756 return dividend;
83757@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
83758 #endif
83759
83760 #ifndef div64_u64
83761-extern u64 div64_u64(u64 dividend, u64 divisor);
83762+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
83763 #endif
83764
83765 #ifndef div64_s64
83766@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
83767 * divide.
83768 */
83769 #ifndef div_u64
83770-static inline u64 div_u64(u64 dividend, u32 divisor)
83771+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
83772 {
83773 u32 remainder;
83774 return div_u64_rem(dividend, divisor, &remainder);
83775diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
83776index 3d385c8..deacb6a 100644
83777--- a/include/linux/mempolicy.h
83778+++ b/include/linux/mempolicy.h
83779@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
83780 }
83781
83782 #define vma_policy(vma) ((vma)->vm_policy)
83783+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83784+{
83785+ vma->vm_policy = pol;
83786+}
83787
83788 static inline void mpol_get(struct mempolicy *pol)
83789 {
83790@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
83791 }
83792
83793 #define vma_policy(vma) NULL
83794+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83795+{
83796+}
83797
83798 static inline int
83799 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
83800diff --git a/include/linux/mm.h b/include/linux/mm.h
83801index dd5ea30..cf81cd1 100644
83802--- a/include/linux/mm.h
83803+++ b/include/linux/mm.h
83804@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
83805
83806 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
83807 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
83808+
83809+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
83810+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
83811+#endif
83812+
83813 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
83814 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
83815 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
83816@@ -256,8 +261,8 @@ struct vm_operations_struct {
83817 /* called by access_process_vm when get_user_pages() fails, typically
83818 * for use by special VMAs that can switch between memory and hardware
83819 */
83820- int (*access)(struct vm_area_struct *vma, unsigned long addr,
83821- void *buf, int len, int write);
83822+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
83823+ void *buf, size_t len, int write);
83824
83825 /* Called by the /proc/PID/maps code to ask the vma whether it
83826 * has a special name. Returning non-NULL will also cause this
83827@@ -291,6 +296,7 @@ struct vm_operations_struct {
83828 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
83829 unsigned long size, pgoff_t pgoff);
83830 };
83831+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
83832
83833 struct mmu_gather;
83834 struct inode;
83835@@ -1183,8 +1189,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
83836 unsigned long *pfn);
83837 int follow_phys(struct vm_area_struct *vma, unsigned long address,
83838 unsigned int flags, unsigned long *prot, resource_size_t *phys);
83839-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83840- void *buf, int len, int write);
83841+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83842+ void *buf, size_t len, int write);
83843
83844 static inline void unmap_shared_mapping_range(struct address_space *mapping,
83845 loff_t const holebegin, loff_t const holelen)
83846@@ -1224,9 +1230,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
83847 }
83848 #endif
83849
83850-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
83851-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
83852- void *buf, int len, int write);
83853+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
83854+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
83855+ void *buf, size_t len, int write);
83856
83857 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
83858 unsigned long start, unsigned long nr_pages,
83859@@ -1258,34 +1264,6 @@ int set_page_dirty_lock(struct page *page);
83860 int clear_page_dirty_for_io(struct page *page);
83861 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
83862
83863-/* Is the vma a continuation of the stack vma above it? */
83864-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
83865-{
83866- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
83867-}
83868-
83869-static inline int stack_guard_page_start(struct vm_area_struct *vma,
83870- unsigned long addr)
83871-{
83872- return (vma->vm_flags & VM_GROWSDOWN) &&
83873- (vma->vm_start == addr) &&
83874- !vma_growsdown(vma->vm_prev, addr);
83875-}
83876-
83877-/* Is the vma a continuation of the stack vma below it? */
83878-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
83879-{
83880- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
83881-}
83882-
83883-static inline int stack_guard_page_end(struct vm_area_struct *vma,
83884- unsigned long addr)
83885-{
83886- return (vma->vm_flags & VM_GROWSUP) &&
83887- (vma->vm_end == addr) &&
83888- !vma_growsup(vma->vm_next, addr);
83889-}
83890-
83891 extern struct task_struct *task_of_stack(struct task_struct *task,
83892 struct vm_area_struct *vma, bool in_group);
83893
83894@@ -1403,8 +1381,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
83895 {
83896 return 0;
83897 }
83898+
83899+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
83900+ unsigned long address)
83901+{
83902+ return 0;
83903+}
83904 #else
83905 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83906+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83907 #endif
83908
83909 #ifdef __PAGETABLE_PMD_FOLDED
83910@@ -1413,8 +1398,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
83911 {
83912 return 0;
83913 }
83914+
83915+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
83916+ unsigned long address)
83917+{
83918+ return 0;
83919+}
83920 #else
83921 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
83922+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
83923 #endif
83924
83925 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
83926@@ -1432,11 +1424,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
83927 NULL: pud_offset(pgd, address);
83928 }
83929
83930+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
83931+{
83932+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
83933+ NULL: pud_offset(pgd, address);
83934+}
83935+
83936 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
83937 {
83938 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
83939 NULL: pmd_offset(pud, address);
83940 }
83941+
83942+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
83943+{
83944+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
83945+ NULL: pmd_offset(pud, address);
83946+}
83947 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
83948
83949 #if USE_SPLIT_PTE_PTLOCKS
83950@@ -1819,12 +1823,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
83951 bool *need_rmap_locks);
83952 extern void exit_mmap(struct mm_struct *);
83953
83954+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
83955+extern void gr_learn_resource(const struct task_struct *task, const int res,
83956+ const unsigned long wanted, const int gt);
83957+#else
83958+static inline void gr_learn_resource(const struct task_struct *task, const int res,
83959+ const unsigned long wanted, const int gt)
83960+{
83961+}
83962+#endif
83963+
83964 static inline int check_data_rlimit(unsigned long rlim,
83965 unsigned long new,
83966 unsigned long start,
83967 unsigned long end_data,
83968 unsigned long start_data)
83969 {
83970+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
83971 if (rlim < RLIM_INFINITY) {
83972 if (((new - start) + (end_data - start_data)) > rlim)
83973 return -ENOSPC;
83974@@ -1849,7 +1864,7 @@ extern int install_special_mapping(struct mm_struct *mm,
83975 unsigned long addr, unsigned long len,
83976 unsigned long flags, struct page **pages);
83977
83978-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83979+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83980
83981 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83982 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83983@@ -1857,6 +1872,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83984 unsigned long len, unsigned long prot, unsigned long flags,
83985 unsigned long pgoff, unsigned long *populate);
83986 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83987+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83988
83989 #ifdef CONFIG_MMU
83990 extern int __mm_populate(unsigned long addr, unsigned long len,
83991@@ -1885,10 +1901,11 @@ struct vm_unmapped_area_info {
83992 unsigned long high_limit;
83993 unsigned long align_mask;
83994 unsigned long align_offset;
83995+ unsigned long threadstack_offset;
83996 };
83997
83998-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83999-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
84000+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
84001+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
84002
84003 /*
84004 * Search for an unmapped address range.
84005@@ -1900,7 +1917,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
84006 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
84007 */
84008 static inline unsigned long
84009-vm_unmapped_area(struct vm_unmapped_area_info *info)
84010+vm_unmapped_area(const struct vm_unmapped_area_info *info)
84011 {
84012 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
84013 return unmapped_area(info);
84014@@ -1962,6 +1979,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
84015 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
84016 struct vm_area_struct **pprev);
84017
84018+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
84019+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
84020+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
84021+
84022 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
84023 NULL if none. Assume start_addr < end_addr. */
84024 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
84025@@ -1991,10 +2012,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
84026 }
84027
84028 #ifdef CONFIG_MMU
84029-pgprot_t vm_get_page_prot(unsigned long vm_flags);
84030+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
84031 void vma_set_page_prot(struct vm_area_struct *vma);
84032 #else
84033-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
84034+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
84035 {
84036 return __pgprot(0);
84037 }
84038@@ -2056,6 +2077,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
84039 static inline void vm_stat_account(struct mm_struct *mm,
84040 unsigned long flags, struct file *file, long pages)
84041 {
84042+
84043+#ifdef CONFIG_PAX_RANDMMAP
84044+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
84045+#endif
84046+
84047 mm->total_vm += pages;
84048 }
84049 #endif /* CONFIG_PROC_FS */
84050@@ -2159,7 +2185,7 @@ extern int unpoison_memory(unsigned long pfn);
84051 extern int sysctl_memory_failure_early_kill;
84052 extern int sysctl_memory_failure_recovery;
84053 extern void shake_page(struct page *p, int access);
84054-extern atomic_long_t num_poisoned_pages;
84055+extern atomic_long_unchecked_t num_poisoned_pages;
84056 extern int soft_offline_page(struct page *page, int flags);
84057
84058 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
84059@@ -2210,5 +2236,11 @@ void __init setup_nr_node_ids(void);
84060 static inline void setup_nr_node_ids(void) {}
84061 #endif
84062
84063+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
84064+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
84065+#else
84066+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
84067+#endif
84068+
84069 #endif /* __KERNEL__ */
84070 #endif /* _LINUX_MM_H */
84071diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
84072index 6d34aa2..d73d848 100644
84073--- a/include/linux/mm_types.h
84074+++ b/include/linux/mm_types.h
84075@@ -309,7 +309,9 @@ struct vm_area_struct {
84076 #ifdef CONFIG_NUMA
84077 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
84078 #endif
84079-};
84080+
84081+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
84082+} __randomize_layout;
84083
84084 struct core_thread {
84085 struct task_struct *task;
84086@@ -459,7 +461,25 @@ struct mm_struct {
84087 /* address of the bounds directory */
84088 void __user *bd_addr;
84089 #endif
84090-};
84091+
84092+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84093+ unsigned long pax_flags;
84094+#endif
84095+
84096+#ifdef CONFIG_PAX_DLRESOLVE
84097+ unsigned long call_dl_resolve;
84098+#endif
84099+
84100+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
84101+ unsigned long call_syscall;
84102+#endif
84103+
84104+#ifdef CONFIG_PAX_ASLR
84105+ unsigned long delta_mmap; /* randomized offset */
84106+ unsigned long delta_stack; /* randomized offset */
84107+#endif
84108+
84109+} __randomize_layout;
84110
84111 static inline void mm_init_cpumask(struct mm_struct *mm)
84112 {
84113diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
84114index cb2b040..f3c9f5c 100644
84115--- a/include/linux/mmc/core.h
84116+++ b/include/linux/mmc/core.h
84117@@ -79,7 +79,7 @@ struct mmc_command {
84118 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
84119
84120 unsigned int retries; /* max number of retries */
84121- unsigned int error; /* command error */
84122+ int error; /* command error */
84123
84124 /*
84125 * Standard errno values are used for errors, but some have specific
84126diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
84127index c5d5278..f0b68c8 100644
84128--- a/include/linux/mmiotrace.h
84129+++ b/include/linux/mmiotrace.h
84130@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
84131 /* Called from ioremap.c */
84132 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
84133 void __iomem *addr);
84134-extern void mmiotrace_iounmap(volatile void __iomem *addr);
84135+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
84136
84137 /* For anyone to insert markers. Remember trailing newline. */
84138 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
84139@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
84140 {
84141 }
84142
84143-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
84144+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
84145 {
84146 }
84147
84148diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
84149index 2f0856d..5a4bc1e 100644
84150--- a/include/linux/mmzone.h
84151+++ b/include/linux/mmzone.h
84152@@ -527,7 +527,7 @@ struct zone {
84153
84154 ZONE_PADDING(_pad3_)
84155 /* Zone statistics */
84156- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84157+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84158 } ____cacheline_internodealigned_in_smp;
84159
84160 enum zone_flags {
84161diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
84162index 745def8..08a820b 100644
84163--- a/include/linux/mod_devicetable.h
84164+++ b/include/linux/mod_devicetable.h
84165@@ -139,7 +139,7 @@ struct usb_device_id {
84166 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
84167 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
84168
84169-#define HID_ANY_ID (~0)
84170+#define HID_ANY_ID (~0U)
84171 #define HID_BUS_ANY 0xffff
84172 #define HID_GROUP_ANY 0x0000
84173
84174@@ -475,7 +475,7 @@ struct dmi_system_id {
84175 const char *ident;
84176 struct dmi_strmatch matches[4];
84177 void *driver_data;
84178-};
84179+} __do_const;
84180 /*
84181 * struct dmi_device_id appears during expansion of
84182 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
84183diff --git a/include/linux/module.h b/include/linux/module.h
84184index b653d7c..22a238f 100644
84185--- a/include/linux/module.h
84186+++ b/include/linux/module.h
84187@@ -17,9 +17,11 @@
84188 #include <linux/moduleparam.h>
84189 #include <linux/jump_label.h>
84190 #include <linux/export.h>
84191+#include <linux/fs.h>
84192
84193 #include <linux/percpu.h>
84194 #include <asm/module.h>
84195+#include <asm/pgtable.h>
84196
84197 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
84198 #define MODULE_SIG_STRING "~Module signature appended~\n"
84199@@ -42,7 +44,7 @@ struct module_kobject {
84200 struct kobject *drivers_dir;
84201 struct module_param_attrs *mp;
84202 struct completion *kobj_completion;
84203-};
84204+} __randomize_layout;
84205
84206 struct module_attribute {
84207 struct attribute attr;
84208@@ -54,12 +56,13 @@ struct module_attribute {
84209 int (*test)(struct module *);
84210 void (*free)(struct module *);
84211 };
84212+typedef struct module_attribute __no_const module_attribute_no_const;
84213
84214 struct module_version_attribute {
84215 struct module_attribute mattr;
84216 const char *module_name;
84217 const char *version;
84218-} __attribute__ ((__aligned__(sizeof(void *))));
84219+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
84220
84221 extern ssize_t __modver_version_show(struct module_attribute *,
84222 struct module_kobject *, char *);
84223@@ -221,7 +224,7 @@ struct module {
84224
84225 /* Sysfs stuff. */
84226 struct module_kobject mkobj;
84227- struct module_attribute *modinfo_attrs;
84228+ module_attribute_no_const *modinfo_attrs;
84229 const char *version;
84230 const char *srcversion;
84231 struct kobject *holders_dir;
84232@@ -270,19 +273,16 @@ struct module {
84233 int (*init)(void);
84234
84235 /* If this is non-NULL, vfree after init() returns */
84236- void *module_init;
84237+ void *module_init_rx, *module_init_rw;
84238
84239 /* Here is the actual code + data, vfree'd on unload. */
84240- void *module_core;
84241+ void *module_core_rx, *module_core_rw;
84242
84243 /* Here are the sizes of the init and core sections */
84244- unsigned int init_size, core_size;
84245+ unsigned int init_size_rw, core_size_rw;
84246
84247 /* The size of the executable code in each section. */
84248- unsigned int init_text_size, core_text_size;
84249-
84250- /* Size of RO sections of the module (text+rodata) */
84251- unsigned int init_ro_size, core_ro_size;
84252+ unsigned int init_size_rx, core_size_rx;
84253
84254 /* Arch-specific module values */
84255 struct mod_arch_specific arch;
84256@@ -338,6 +338,10 @@ struct module {
84257 #ifdef CONFIG_EVENT_TRACING
84258 struct ftrace_event_call **trace_events;
84259 unsigned int num_trace_events;
84260+ struct file_operations trace_id;
84261+ struct file_operations trace_enable;
84262+ struct file_operations trace_format;
84263+ struct file_operations trace_filter;
84264 #endif
84265 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
84266 unsigned int num_ftrace_callsites;
84267@@ -361,7 +365,7 @@ struct module {
84268 ctor_fn_t *ctors;
84269 unsigned int num_ctors;
84270 #endif
84271-};
84272+} __randomize_layout;
84273 #ifndef MODULE_ARCH_INIT
84274 #define MODULE_ARCH_INIT {}
84275 #endif
84276@@ -382,18 +386,48 @@ bool is_module_address(unsigned long addr);
84277 bool is_module_percpu_address(unsigned long addr);
84278 bool is_module_text_address(unsigned long addr);
84279
84280+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
84281+{
84282+
84283+#ifdef CONFIG_PAX_KERNEXEC
84284+ if (ktla_ktva(addr) >= (unsigned long)start &&
84285+ ktla_ktva(addr) < (unsigned long)start + size)
84286+ return 1;
84287+#endif
84288+
84289+ return ((void *)addr >= start && (void *)addr < start + size);
84290+}
84291+
84292+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
84293+{
84294+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
84295+}
84296+
84297+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
84298+{
84299+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
84300+}
84301+
84302+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
84303+{
84304+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
84305+}
84306+
84307+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
84308+{
84309+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
84310+}
84311+
84312 static inline bool within_module_core(unsigned long addr,
84313 const struct module *mod)
84314 {
84315- return (unsigned long)mod->module_core <= addr &&
84316- addr < (unsigned long)mod->module_core + mod->core_size;
84317+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
84318 }
84319
84320 static inline bool within_module_init(unsigned long addr,
84321 const struct module *mod)
84322 {
84323- return (unsigned long)mod->module_init <= addr &&
84324- addr < (unsigned long)mod->module_init + mod->init_size;
84325+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
84326 }
84327
84328 static inline bool within_module(unsigned long addr, const struct module *mod)
84329diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
84330index f755626..641f822 100644
84331--- a/include/linux/moduleloader.h
84332+++ b/include/linux/moduleloader.h
84333@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
84334 sections. Returns NULL on failure. */
84335 void *module_alloc(unsigned long size);
84336
84337+#ifdef CONFIG_PAX_KERNEXEC
84338+void *module_alloc_exec(unsigned long size);
84339+#else
84340+#define module_alloc_exec(x) module_alloc(x)
84341+#endif
84342+
84343 /* Free memory returned from module_alloc. */
84344 void module_memfree(void *module_region);
84345
84346+#ifdef CONFIG_PAX_KERNEXEC
84347+void module_memfree_exec(void *module_region);
84348+#else
84349+#define module_memfree_exec(x) module_memfree((x))
84350+#endif
84351+
84352 /*
84353 * Apply the given relocation to the (simplified) ELF. Return -error
84354 * or 0.
84355@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
84356 unsigned int relsec,
84357 struct module *me)
84358 {
84359+#ifdef CONFIG_MODULES
84360 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84361 module_name(me));
84362+#endif
84363 return -ENOEXEC;
84364 }
84365 #endif
84366@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
84367 unsigned int relsec,
84368 struct module *me)
84369 {
84370+#ifdef CONFIG_MODULES
84371 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84372 module_name(me));
84373+#endif
84374 return -ENOEXEC;
84375 }
84376 #endif
84377diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
84378index 1c9effa..1160bdd 100644
84379--- a/include/linux/moduleparam.h
84380+++ b/include/linux/moduleparam.h
84381@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
84382 * @len is usually just sizeof(string).
84383 */
84384 #define module_param_string(name, string, len, perm) \
84385- static const struct kparam_string __param_string_##name \
84386+ static const struct kparam_string __param_string_##name __used \
84387 = { len, string }; \
84388 __module_param_call(MODULE_PARAM_PREFIX, name, \
84389 &param_ops_string, \
84390@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
84391 */
84392 #define module_param_array_named(name, array, type, nump, perm) \
84393 param_check_##type(name, &(array)[0]); \
84394- static const struct kparam_array __param_arr_##name \
84395+ static const struct kparam_array __param_arr_##name __used \
84396 = { .max = ARRAY_SIZE(array), .num = nump, \
84397 .ops = &param_ops_##type, \
84398 .elemsize = sizeof(array[0]), .elem = array }; \
84399diff --git a/include/linux/mount.h b/include/linux/mount.h
84400index c2c561d..a5f2a8c 100644
84401--- a/include/linux/mount.h
84402+++ b/include/linux/mount.h
84403@@ -66,7 +66,7 @@ struct vfsmount {
84404 struct dentry *mnt_root; /* root of the mounted tree */
84405 struct super_block *mnt_sb; /* pointer to superblock */
84406 int mnt_flags;
84407-};
84408+} __randomize_layout;
84409
84410 struct file; /* forward dec */
84411 struct path;
84412diff --git a/include/linux/namei.h b/include/linux/namei.h
84413index c899077..b9a2010 100644
84414--- a/include/linux/namei.h
84415+++ b/include/linux/namei.h
84416@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
84417 extern void unlock_rename(struct dentry *, struct dentry *);
84418
84419 extern void nd_jump_link(struct nameidata *nd, struct path *path);
84420-extern void nd_set_link(struct nameidata *nd, char *path);
84421-extern char *nd_get_link(struct nameidata *nd);
84422+extern void nd_set_link(struct nameidata *nd, const char *path);
84423+extern const char *nd_get_link(const struct nameidata *nd);
84424
84425 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
84426 {
84427diff --git a/include/linux/net.h b/include/linux/net.h
84428index 17d8339..81656c0 100644
84429--- a/include/linux/net.h
84430+++ b/include/linux/net.h
84431@@ -192,7 +192,7 @@ struct net_proto_family {
84432 int (*create)(struct net *net, struct socket *sock,
84433 int protocol, int kern);
84434 struct module *owner;
84435-};
84436+} __do_const;
84437
84438 struct iovec;
84439 struct kvec;
84440diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
84441index 840fb7f..547ad02 100644
84442--- a/include/linux/netdevice.h
84443+++ b/include/linux/netdevice.h
84444@@ -1191,6 +1191,7 @@ struct net_device_ops {
84445 u8 state);
84446 #endif
84447 };
84448+typedef struct net_device_ops __no_const net_device_ops_no_const;
84449
84450 /**
84451 * enum net_device_priv_flags - &struct net_device priv_flags
84452@@ -1537,10 +1538,10 @@ struct net_device {
84453
84454 struct net_device_stats stats;
84455
84456- atomic_long_t rx_dropped;
84457- atomic_long_t tx_dropped;
84458+ atomic_long_unchecked_t rx_dropped;
84459+ atomic_long_unchecked_t tx_dropped;
84460
84461- atomic_t carrier_changes;
84462+ atomic_unchecked_t carrier_changes;
84463
84464 #ifdef CONFIG_WIRELESS_EXT
84465 const struct iw_handler_def * wireless_handlers;
84466diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
84467index 2517ece..0bbfcfb 100644
84468--- a/include/linux/netfilter.h
84469+++ b/include/linux/netfilter.h
84470@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
84471 #endif
84472 /* Use the module struct to lock set/get code in place */
84473 struct module *owner;
84474-};
84475+} __do_const;
84476
84477 /* Function to register/unregister hook points. */
84478 int nf_register_hook(struct nf_hook_ops *reg);
84479diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
84480index e955d47..04a5338 100644
84481--- a/include/linux/netfilter/nfnetlink.h
84482+++ b/include/linux/netfilter/nfnetlink.h
84483@@ -19,7 +19,7 @@ struct nfnl_callback {
84484 const struct nlattr * const cda[]);
84485 const struct nla_policy *policy; /* netlink attribute policy */
84486 const u_int16_t attr_count; /* number of nlattr's */
84487-};
84488+} __do_const;
84489
84490 struct nfnetlink_subsystem {
84491 const char *name;
84492diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
84493new file mode 100644
84494index 0000000..33f4af8
84495--- /dev/null
84496+++ b/include/linux/netfilter/xt_gradm.h
84497@@ -0,0 +1,9 @@
84498+#ifndef _LINUX_NETFILTER_XT_GRADM_H
84499+#define _LINUX_NETFILTER_XT_GRADM_H 1
84500+
84501+struct xt_gradm_mtinfo {
84502+ __u16 flags;
84503+ __u16 invflags;
84504+};
84505+
84506+#endif
84507diff --git a/include/linux/nls.h b/include/linux/nls.h
84508index 520681b..2b7fabb 100644
84509--- a/include/linux/nls.h
84510+++ b/include/linux/nls.h
84511@@ -31,7 +31,7 @@ struct nls_table {
84512 const unsigned char *charset2upper;
84513 struct module *owner;
84514 struct nls_table *next;
84515-};
84516+} __do_const;
84517
84518 /* this value hold the maximum octet of charset */
84519 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
84520@@ -46,7 +46,7 @@ enum utf16_endian {
84521 /* nls_base.c */
84522 extern int __register_nls(struct nls_table *, struct module *);
84523 extern int unregister_nls(struct nls_table *);
84524-extern struct nls_table *load_nls(char *);
84525+extern struct nls_table *load_nls(const char *);
84526 extern void unload_nls(struct nls_table *);
84527 extern struct nls_table *load_nls_default(void);
84528 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
84529diff --git a/include/linux/notifier.h b/include/linux/notifier.h
84530index d14a4c3..a078786 100644
84531--- a/include/linux/notifier.h
84532+++ b/include/linux/notifier.h
84533@@ -54,7 +54,8 @@ struct notifier_block {
84534 notifier_fn_t notifier_call;
84535 struct notifier_block __rcu *next;
84536 int priority;
84537-};
84538+} __do_const;
84539+typedef struct notifier_block __no_const notifier_block_no_const;
84540
84541 struct atomic_notifier_head {
84542 spinlock_t lock;
84543diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
84544index b2a0f15..4d7da32 100644
84545--- a/include/linux/oprofile.h
84546+++ b/include/linux/oprofile.h
84547@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
84548 int oprofilefs_create_ro_ulong(struct dentry * root,
84549 char const * name, ulong * val);
84550
84551-/** Create a file for read-only access to an atomic_t. */
84552+/** Create a file for read-only access to an atomic_unchecked_t. */
84553 int oprofilefs_create_ro_atomic(struct dentry * root,
84554- char const * name, atomic_t * val);
84555+ char const * name, atomic_unchecked_t * val);
84556
84557 /** create a directory */
84558 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
84559diff --git a/include/linux/padata.h b/include/linux/padata.h
84560index 4386946..f50c615 100644
84561--- a/include/linux/padata.h
84562+++ b/include/linux/padata.h
84563@@ -129,7 +129,7 @@ struct parallel_data {
84564 struct padata_serial_queue __percpu *squeue;
84565 atomic_t reorder_objects;
84566 atomic_t refcnt;
84567- atomic_t seq_nr;
84568+ atomic_unchecked_t seq_nr;
84569 struct padata_cpumask cpumask;
84570 spinlock_t lock ____cacheline_aligned;
84571 unsigned int processed;
84572diff --git a/include/linux/path.h b/include/linux/path.h
84573index d137218..be0c176 100644
84574--- a/include/linux/path.h
84575+++ b/include/linux/path.h
84576@@ -1,13 +1,15 @@
84577 #ifndef _LINUX_PATH_H
84578 #define _LINUX_PATH_H
84579
84580+#include <linux/compiler.h>
84581+
84582 struct dentry;
84583 struct vfsmount;
84584
84585 struct path {
84586 struct vfsmount *mnt;
84587 struct dentry *dentry;
84588-};
84589+} __randomize_layout;
84590
84591 extern void path_get(const struct path *);
84592 extern void path_put(const struct path *);
84593diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
84594index 8c78950..0d74ed9 100644
84595--- a/include/linux/pci_hotplug.h
84596+++ b/include/linux/pci_hotplug.h
84597@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
84598 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
84599 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
84600 int (*reset_slot) (struct hotplug_slot *slot, int probe);
84601-};
84602+} __do_const;
84603+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
84604
84605 /**
84606 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
84607diff --git a/include/linux/percpu.h b/include/linux/percpu.h
84608index caebf2a..4c3ae9d 100644
84609--- a/include/linux/percpu.h
84610+++ b/include/linux/percpu.h
84611@@ -34,7 +34,7 @@
84612 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
84613 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
84614 */
84615-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
84616+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
84617 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
84618
84619 /*
84620diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
84621index 664de5a..b3e1bf4 100644
84622--- a/include/linux/perf_event.h
84623+++ b/include/linux/perf_event.h
84624@@ -336,8 +336,8 @@ struct perf_event {
84625
84626 enum perf_event_active_state state;
84627 unsigned int attach_state;
84628- local64_t count;
84629- atomic64_t child_count;
84630+ local64_t count; /* PaX: fix it one day */
84631+ atomic64_unchecked_t child_count;
84632
84633 /*
84634 * These are the total time in nanoseconds that the event
84635@@ -388,8 +388,8 @@ struct perf_event {
84636 * These accumulate total time (in nanoseconds) that children
84637 * events have been enabled and running, respectively.
84638 */
84639- atomic64_t child_total_time_enabled;
84640- atomic64_t child_total_time_running;
84641+ atomic64_unchecked_t child_total_time_enabled;
84642+ atomic64_unchecked_t child_total_time_running;
84643
84644 /*
84645 * Protect attach/detach and child_list:
84646@@ -733,7 +733,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
84647 entry->ip[entry->nr++] = ip;
84648 }
84649
84650-extern int sysctl_perf_event_paranoid;
84651+extern int sysctl_perf_event_legitimately_concerned;
84652 extern int sysctl_perf_event_mlock;
84653 extern int sysctl_perf_event_sample_rate;
84654 extern int sysctl_perf_cpu_time_max_percent;
84655@@ -748,19 +748,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
84656 loff_t *ppos);
84657
84658
84659+static inline bool perf_paranoid_any(void)
84660+{
84661+ return sysctl_perf_event_legitimately_concerned > 2;
84662+}
84663+
84664 static inline bool perf_paranoid_tracepoint_raw(void)
84665 {
84666- return sysctl_perf_event_paranoid > -1;
84667+ return sysctl_perf_event_legitimately_concerned > -1;
84668 }
84669
84670 static inline bool perf_paranoid_cpu(void)
84671 {
84672- return sysctl_perf_event_paranoid > 0;
84673+ return sysctl_perf_event_legitimately_concerned > 0;
84674 }
84675
84676 static inline bool perf_paranoid_kernel(void)
84677 {
84678- return sysctl_perf_event_paranoid > 1;
84679+ return sysctl_perf_event_legitimately_concerned > 1;
84680 }
84681
84682 extern void perf_event_init(void);
84683@@ -891,7 +896,7 @@ struct perf_pmu_events_attr {
84684 struct device_attribute attr;
84685 u64 id;
84686 const char *event_str;
84687-};
84688+} __do_const;
84689
84690 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
84691 static struct perf_pmu_events_attr _var = { \
84692diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
84693index b9cf6c5..5462472 100644
84694--- a/include/linux/pid_namespace.h
84695+++ b/include/linux/pid_namespace.h
84696@@ -45,7 +45,7 @@ struct pid_namespace {
84697 int hide_pid;
84698 int reboot; /* group exit code if this pidns was rebooted */
84699 struct ns_common ns;
84700-};
84701+} __randomize_layout;
84702
84703 extern struct pid_namespace init_pid_ns;
84704
84705diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
84706index eb8b8ac..62649e1 100644
84707--- a/include/linux/pipe_fs_i.h
84708+++ b/include/linux/pipe_fs_i.h
84709@@ -47,10 +47,10 @@ struct pipe_inode_info {
84710 struct mutex mutex;
84711 wait_queue_head_t wait;
84712 unsigned int nrbufs, curbuf, buffers;
84713- unsigned int readers;
84714- unsigned int writers;
84715- unsigned int files;
84716- unsigned int waiting_writers;
84717+ atomic_t readers;
84718+ atomic_t writers;
84719+ atomic_t files;
84720+ atomic_t waiting_writers;
84721 unsigned int r_counter;
84722 unsigned int w_counter;
84723 struct page *tmp_page;
84724diff --git a/include/linux/pm.h b/include/linux/pm.h
84725index 8b59763..8a05939 100644
84726--- a/include/linux/pm.h
84727+++ b/include/linux/pm.h
84728@@ -608,6 +608,7 @@ struct dev_pm_domain {
84729 struct dev_pm_ops ops;
84730 void (*detach)(struct device *dev, bool power_off);
84731 };
84732+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
84733
84734 /*
84735 * The PM_EVENT_ messages are also used by drivers implementing the legacy
84736diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
84737index a9edab2..8bada56 100644
84738--- a/include/linux/pm_domain.h
84739+++ b/include/linux/pm_domain.h
84740@@ -39,11 +39,11 @@ struct gpd_dev_ops {
84741 int (*save_state)(struct device *dev);
84742 int (*restore_state)(struct device *dev);
84743 bool (*active_wakeup)(struct device *dev);
84744-};
84745+} __no_const;
84746
84747 struct gpd_cpuidle_data {
84748 unsigned int saved_exit_latency;
84749- struct cpuidle_state *idle_state;
84750+ cpuidle_state_no_const *idle_state;
84751 };
84752
84753 struct generic_pm_domain {
84754diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
84755index 30e84d4..22278b4 100644
84756--- a/include/linux/pm_runtime.h
84757+++ b/include/linux/pm_runtime.h
84758@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
84759
84760 static inline void pm_runtime_mark_last_busy(struct device *dev)
84761 {
84762- ACCESS_ONCE(dev->power.last_busy) = jiffies;
84763+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
84764 }
84765
84766 static inline bool pm_runtime_is_irq_safe(struct device *dev)
84767diff --git a/include/linux/pnp.h b/include/linux/pnp.h
84768index 195aafc..49a7bc2 100644
84769--- a/include/linux/pnp.h
84770+++ b/include/linux/pnp.h
84771@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
84772 struct pnp_fixup {
84773 char id[7];
84774 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
84775-};
84776+} __do_const;
84777
84778 /* config parameters */
84779 #define PNP_CONFIG_NORMAL 0x0001
84780diff --git a/include/linux/poison.h b/include/linux/poison.h
84781index 2110a81..13a11bb 100644
84782--- a/include/linux/poison.h
84783+++ b/include/linux/poison.h
84784@@ -19,8 +19,8 @@
84785 * under normal circumstances, used to verify that nobody uses
84786 * non-initialized list entries.
84787 */
84788-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
84789-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
84790+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
84791+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
84792
84793 /********** include/linux/timer.h **********/
84794 /*
84795diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
84796index d8b187c3..9a9257a 100644
84797--- a/include/linux/power/smartreflex.h
84798+++ b/include/linux/power/smartreflex.h
84799@@ -238,7 +238,7 @@ struct omap_sr_class_data {
84800 int (*notify)(struct omap_sr *sr, u32 status);
84801 u8 notify_flags;
84802 u8 class_type;
84803-};
84804+} __do_const;
84805
84806 /**
84807 * struct omap_sr_nvalue_table - Smartreflex n-target value info
84808diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
84809index 4ea1d37..80f4b33 100644
84810--- a/include/linux/ppp-comp.h
84811+++ b/include/linux/ppp-comp.h
84812@@ -84,7 +84,7 @@ struct compressor {
84813 struct module *owner;
84814 /* Extra skb space needed by the compressor algorithm */
84815 unsigned int comp_extra;
84816-};
84817+} __do_const;
84818
84819 /*
84820 * The return value from decompress routine is the length of the
84821diff --git a/include/linux/preempt.h b/include/linux/preempt.h
84822index de83b4e..c4b997d 100644
84823--- a/include/linux/preempt.h
84824+++ b/include/linux/preempt.h
84825@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
84826 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
84827 #endif
84828
84829+#define raw_preempt_count_add(val) __preempt_count_add(val)
84830+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
84831+
84832 #define __preempt_count_inc() __preempt_count_add(1)
84833 #define __preempt_count_dec() __preempt_count_sub(1)
84834
84835 #define preempt_count_inc() preempt_count_add(1)
84836+#define raw_preempt_count_inc() raw_preempt_count_add(1)
84837 #define preempt_count_dec() preempt_count_sub(1)
84838+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
84839
84840 #ifdef CONFIG_PREEMPT_COUNT
84841
84842@@ -41,6 +46,12 @@ do { \
84843 barrier(); \
84844 } while (0)
84845
84846+#define raw_preempt_disable() \
84847+do { \
84848+ raw_preempt_count_inc(); \
84849+ barrier(); \
84850+} while (0)
84851+
84852 #define sched_preempt_enable_no_resched() \
84853 do { \
84854 barrier(); \
84855@@ -49,6 +60,12 @@ do { \
84856
84857 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
84858
84859+#define raw_preempt_enable_no_resched() \
84860+do { \
84861+ barrier(); \
84862+ raw_preempt_count_dec(); \
84863+} while (0)
84864+
84865 #ifdef CONFIG_PREEMPT
84866 #define preempt_enable() \
84867 do { \
84868@@ -113,8 +130,10 @@ do { \
84869 * region.
84870 */
84871 #define preempt_disable() barrier()
84872+#define raw_preempt_disable() barrier()
84873 #define sched_preempt_enable_no_resched() barrier()
84874 #define preempt_enable_no_resched() barrier()
84875+#define raw_preempt_enable_no_resched() barrier()
84876 #define preempt_enable() barrier()
84877 #define preempt_check_resched() do { } while (0)
84878
84879@@ -128,11 +147,13 @@ do { \
84880 /*
84881 * Modules have no business playing preemption tricks.
84882 */
84883+#ifndef CONFIG_PAX_KERNEXEC
84884 #undef sched_preempt_enable_no_resched
84885 #undef preempt_enable_no_resched
84886 #undef preempt_enable_no_resched_notrace
84887 #undef preempt_check_resched
84888 #endif
84889+#endif
84890
84891 #define preempt_set_need_resched() \
84892 do { \
84893diff --git a/include/linux/printk.h b/include/linux/printk.h
84894index 4d5bf57..d94eccf 100644
84895--- a/include/linux/printk.h
84896+++ b/include/linux/printk.h
84897@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
84898 #endif
84899
84900 typedef int(*printk_func_t)(const char *fmt, va_list args);
84901+extern int kptr_restrict;
84902
84903 #ifdef CONFIG_PRINTK
84904 asmlinkage __printf(5, 0)
84905@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
84906
84907 extern int printk_delay_msec;
84908 extern int dmesg_restrict;
84909-extern int kptr_restrict;
84910
84911 extern void wake_up_klogd(void);
84912
84913diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
84914index b97bf2e..f14c92d4 100644
84915--- a/include/linux/proc_fs.h
84916+++ b/include/linux/proc_fs.h
84917@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
84918 extern struct proc_dir_entry *proc_symlink(const char *,
84919 struct proc_dir_entry *, const char *);
84920 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
84921+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
84922 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
84923 struct proc_dir_entry *, void *);
84924+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
84925+ struct proc_dir_entry *, void *);
84926 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
84927 struct proc_dir_entry *);
84928
84929@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
84930 return proc_create_data(name, mode, parent, proc_fops, NULL);
84931 }
84932
84933+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
84934+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
84935+{
84936+#ifdef CONFIG_GRKERNSEC_PROC_USER
84937+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
84938+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84939+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
84940+#else
84941+ return proc_create_data(name, mode, parent, proc_fops, NULL);
84942+#endif
84943+}
84944+
84945+
84946 extern void proc_set_size(struct proc_dir_entry *, loff_t);
84947 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
84948 extern void *PDE_DATA(const struct inode *);
84949@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
84950 struct proc_dir_entry *parent,const char *dest) { return NULL;}
84951 static inline struct proc_dir_entry *proc_mkdir(const char *name,
84952 struct proc_dir_entry *parent) {return NULL;}
84953+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
84954+ struct proc_dir_entry *parent) { return NULL; }
84955 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
84956 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84957+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
84958+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84959 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
84960 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
84961 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
84962@@ -79,7 +99,7 @@ struct net;
84963 static inline struct proc_dir_entry *proc_net_mkdir(
84964 struct net *net, const char *name, struct proc_dir_entry *parent)
84965 {
84966- return proc_mkdir_data(name, 0, parent, net);
84967+ return proc_mkdir_data_restrict(name, 0, parent, net);
84968 }
84969
84970 #endif /* _LINUX_PROC_FS_H */
84971diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
84972index 42dfc61..8113a99 100644
84973--- a/include/linux/proc_ns.h
84974+++ b/include/linux/proc_ns.h
84975@@ -16,7 +16,7 @@ struct proc_ns_operations {
84976 struct ns_common *(*get)(struct task_struct *task);
84977 void (*put)(struct ns_common *ns);
84978 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
84979-};
84980+} __do_const __randomize_layout;
84981
84982 extern const struct proc_ns_operations netns_operations;
84983 extern const struct proc_ns_operations utsns_operations;
84984diff --git a/include/linux/quota.h b/include/linux/quota.h
84985index b86df49..8002997 100644
84986--- a/include/linux/quota.h
84987+++ b/include/linux/quota.h
84988@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
84989
84990 extern bool qid_eq(struct kqid left, struct kqid right);
84991 extern bool qid_lt(struct kqid left, struct kqid right);
84992-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84993+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84994 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84995 extern bool qid_valid(struct kqid qid);
84996
84997diff --git a/include/linux/random.h b/include/linux/random.h
84998index b05856e..0a9f14e 100644
84999--- a/include/linux/random.h
85000+++ b/include/linux/random.h
85001@@ -9,9 +9,19 @@
85002 #include <uapi/linux/random.h>
85003
85004 extern void add_device_randomness(const void *, unsigned int);
85005+
85006+static inline void add_latent_entropy(void)
85007+{
85008+
85009+#ifdef LATENT_ENTROPY_PLUGIN
85010+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
85011+#endif
85012+
85013+}
85014+
85015 extern void add_input_randomness(unsigned int type, unsigned int code,
85016- unsigned int value);
85017-extern void add_interrupt_randomness(int irq, int irq_flags);
85018+ unsigned int value) __latent_entropy;
85019+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
85020
85021 extern void get_random_bytes(void *buf, int nbytes);
85022 extern void get_random_bytes_arch(void *buf, int nbytes);
85023@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
85024 extern const struct file_operations random_fops, urandom_fops;
85025 #endif
85026
85027-unsigned int get_random_int(void);
85028+unsigned int __intentional_overflow(-1) get_random_int(void);
85029 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
85030
85031-u32 prandom_u32(void);
85032+u32 prandom_u32(void) __intentional_overflow(-1);
85033 void prandom_bytes(void *buf, size_t nbytes);
85034 void prandom_seed(u32 seed);
85035 void prandom_reseed_late(void);
85036@@ -37,6 +47,11 @@ struct rnd_state {
85037 u32 prandom_u32_state(struct rnd_state *state);
85038 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85039
85040+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
85041+{
85042+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
85043+}
85044+
85045 /**
85046 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
85047 * @ep_ro: right open interval endpoint
85048@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85049 *
85050 * Returns: pseudo-random number in interval [0, ep_ro)
85051 */
85052-static inline u32 prandom_u32_max(u32 ep_ro)
85053+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
85054 {
85055 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
85056 }
85057diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
85058index 378c5ee..aa84a47 100644
85059--- a/include/linux/rbtree_augmented.h
85060+++ b/include/linux/rbtree_augmented.h
85061@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
85062 old->rbaugmented = rbcompute(old); \
85063 } \
85064 rbstatic const struct rb_augment_callbacks rbname = { \
85065- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
85066+ .propagate = rbname ## _propagate, \
85067+ .copy = rbname ## _copy, \
85068+ .rotate = rbname ## _rotate \
85069 };
85070
85071
85072diff --git a/include/linux/rculist.h b/include/linux/rculist.h
85073index 529bc94..82ce778 100644
85074--- a/include/linux/rculist.h
85075+++ b/include/linux/rculist.h
85076@@ -29,8 +29,8 @@
85077 */
85078 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
85079 {
85080- ACCESS_ONCE(list->next) = list;
85081- ACCESS_ONCE(list->prev) = list;
85082+ ACCESS_ONCE_RW(list->next) = list;
85083+ ACCESS_ONCE_RW(list->prev) = list;
85084 }
85085
85086 /*
85087@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
85088 struct list_head *prev, struct list_head *next);
85089 #endif
85090
85091+void __pax_list_add_rcu(struct list_head *new,
85092+ struct list_head *prev, struct list_head *next);
85093+
85094 /**
85095 * list_add_rcu - add a new entry to rcu-protected list
85096 * @new: new entry to be added
85097@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
85098 __list_add_rcu(new, head, head->next);
85099 }
85100
85101+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
85102+{
85103+ __pax_list_add_rcu(new, head, head->next);
85104+}
85105+
85106 /**
85107 * list_add_tail_rcu - add a new entry to rcu-protected list
85108 * @new: new entry to be added
85109@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
85110 __list_add_rcu(new, head->prev, head);
85111 }
85112
85113+static inline void pax_list_add_tail_rcu(struct list_head *new,
85114+ struct list_head *head)
85115+{
85116+ __pax_list_add_rcu(new, head->prev, head);
85117+}
85118+
85119 /**
85120 * list_del_rcu - deletes entry from list without re-initialization
85121 * @entry: the element to delete from the list.
85122@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
85123 entry->prev = LIST_POISON2;
85124 }
85125
85126+extern void pax_list_del_rcu(struct list_head *entry);
85127+
85128 /**
85129 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
85130 * @n: the element to delete from the hash list.
85131diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
85132index ed4f593..8a51501 100644
85133--- a/include/linux/rcupdate.h
85134+++ b/include/linux/rcupdate.h
85135@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
85136 #define rcu_note_voluntary_context_switch(t) \
85137 do { \
85138 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
85139- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
85140+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
85141 } while (0)
85142 #else /* #ifdef CONFIG_TASKS_RCU */
85143 #define TASKS_RCU(x) do { } while (0)
85144diff --git a/include/linux/reboot.h b/include/linux/reboot.h
85145index 67fc8fc..a90f7d8 100644
85146--- a/include/linux/reboot.h
85147+++ b/include/linux/reboot.h
85148@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
85149 */
85150
85151 extern void migrate_to_reboot_cpu(void);
85152-extern void machine_restart(char *cmd);
85153-extern void machine_halt(void);
85154-extern void machine_power_off(void);
85155+extern void machine_restart(char *cmd) __noreturn;
85156+extern void machine_halt(void) __noreturn;
85157+extern void machine_power_off(void) __noreturn;
85158
85159 extern void machine_shutdown(void);
85160 struct pt_regs;
85161@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
85162 */
85163
85164 extern void kernel_restart_prepare(char *cmd);
85165-extern void kernel_restart(char *cmd);
85166-extern void kernel_halt(void);
85167-extern void kernel_power_off(void);
85168+extern void kernel_restart(char *cmd) __noreturn;
85169+extern void kernel_halt(void) __noreturn;
85170+extern void kernel_power_off(void) __noreturn;
85171
85172 extern int C_A_D; /* for sysctl */
85173 void ctrl_alt_del(void);
85174@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
85175 * Emergency restart, callable from an interrupt handler.
85176 */
85177
85178-extern void emergency_restart(void);
85179+extern void emergency_restart(void) __noreturn;
85180 #include <asm/emergency-restart.h>
85181
85182 #endif /* _LINUX_REBOOT_H */
85183diff --git a/include/linux/regset.h b/include/linux/regset.h
85184index 8e0c9fe..ac4d221 100644
85185--- a/include/linux/regset.h
85186+++ b/include/linux/regset.h
85187@@ -161,7 +161,8 @@ struct user_regset {
85188 unsigned int align;
85189 unsigned int bias;
85190 unsigned int core_note_type;
85191-};
85192+} __do_const;
85193+typedef struct user_regset __no_const user_regset_no_const;
85194
85195 /**
85196 * struct user_regset_view - available regsets
85197diff --git a/include/linux/relay.h b/include/linux/relay.h
85198index d7c8359..818daf5 100644
85199--- a/include/linux/relay.h
85200+++ b/include/linux/relay.h
85201@@ -157,7 +157,7 @@ struct rchan_callbacks
85202 * The callback should return 0 if successful, negative if not.
85203 */
85204 int (*remove_buf_file)(struct dentry *dentry);
85205-};
85206+} __no_const;
85207
85208 /*
85209 * CONFIG_RELAY kernel API, kernel/relay.c
85210diff --git a/include/linux/rio.h b/include/linux/rio.h
85211index 6bda06f..bf39a9b 100644
85212--- a/include/linux/rio.h
85213+++ b/include/linux/rio.h
85214@@ -358,7 +358,7 @@ struct rio_ops {
85215 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
85216 u64 rstart, u32 size, u32 flags);
85217 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
85218-};
85219+} __no_const;
85220
85221 #define RIO_RESOURCE_MEM 0x00000100
85222 #define RIO_RESOURCE_DOORBELL 0x00000200
85223diff --git a/include/linux/rmap.h b/include/linux/rmap.h
85224index d9d7e7e..86f47ac 100644
85225--- a/include/linux/rmap.h
85226+++ b/include/linux/rmap.h
85227@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
85228 void anon_vma_init(void); /* create anon_vma_cachep */
85229 int anon_vma_prepare(struct vm_area_struct *);
85230 void unlink_anon_vmas(struct vm_area_struct *);
85231-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
85232-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
85233+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
85234+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
85235
85236 static inline void anon_vma_merge(struct vm_area_struct *vma,
85237 struct vm_area_struct *next)
85238diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
85239index ed8f9e7..999bc96 100644
85240--- a/include/linux/scatterlist.h
85241+++ b/include/linux/scatterlist.h
85242@@ -1,6 +1,7 @@
85243 #ifndef _LINUX_SCATTERLIST_H
85244 #define _LINUX_SCATTERLIST_H
85245
85246+#include <linux/sched.h>
85247 #include <linux/string.h>
85248 #include <linux/bug.h>
85249 #include <linux/mm.h>
85250@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
85251 #ifdef CONFIG_DEBUG_SG
85252 BUG_ON(!virt_addr_valid(buf));
85253 #endif
85254+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85255+ if (object_starts_on_stack(buf)) {
85256+ void *adjbuf = buf - current->stack + current->lowmem_stack;
85257+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
85258+ } else
85259+#endif
85260 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
85261 }
85262
85263diff --git a/include/linux/sched.h b/include/linux/sched.h
85264index 8db31ef..0af1f81 100644
85265--- a/include/linux/sched.h
85266+++ b/include/linux/sched.h
85267@@ -133,6 +133,7 @@ struct fs_struct;
85268 struct perf_event_context;
85269 struct blk_plug;
85270 struct filename;
85271+struct linux_binprm;
85272
85273 #define VMACACHE_BITS 2
85274 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
85275@@ -415,7 +416,7 @@ extern char __sched_text_start[], __sched_text_end[];
85276 extern int in_sched_functions(unsigned long addr);
85277
85278 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
85279-extern signed long schedule_timeout(signed long timeout);
85280+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
85281 extern signed long schedule_timeout_interruptible(signed long timeout);
85282 extern signed long schedule_timeout_killable(signed long timeout);
85283 extern signed long schedule_timeout_uninterruptible(signed long timeout);
85284@@ -426,6 +427,19 @@ struct nsproxy;
85285 struct user_namespace;
85286
85287 #ifdef CONFIG_MMU
85288+
85289+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
85290+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
85291+#else
85292+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
85293+{
85294+ return 0;
85295+}
85296+#endif
85297+
85298+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
85299+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
85300+
85301 extern void arch_pick_mmap_layout(struct mm_struct *mm);
85302 extern unsigned long
85303 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
85304@@ -724,6 +738,17 @@ struct signal_struct {
85305 #ifdef CONFIG_TASKSTATS
85306 struct taskstats *stats;
85307 #endif
85308+
85309+#ifdef CONFIG_GRKERNSEC
85310+ u32 curr_ip;
85311+ u32 saved_ip;
85312+ u32 gr_saddr;
85313+ u32 gr_daddr;
85314+ u16 gr_sport;
85315+ u16 gr_dport;
85316+ u8 used_accept:1;
85317+#endif
85318+
85319 #ifdef CONFIG_AUDIT
85320 unsigned audit_tty;
85321 unsigned audit_tty_log_passwd;
85322@@ -750,7 +775,7 @@ struct signal_struct {
85323 struct mutex cred_guard_mutex; /* guard against foreign influences on
85324 * credential calculations
85325 * (notably. ptrace) */
85326-};
85327+} __randomize_layout;
85328
85329 /*
85330 * Bits in flags field of signal_struct.
85331@@ -803,6 +828,14 @@ struct user_struct {
85332 struct key *session_keyring; /* UID's default session keyring */
85333 #endif
85334
85335+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
85336+ unsigned char kernel_banned;
85337+#endif
85338+#ifdef CONFIG_GRKERNSEC_BRUTE
85339+ unsigned char suid_banned;
85340+ unsigned long suid_ban_expires;
85341+#endif
85342+
85343 /* Hash table maintenance information */
85344 struct hlist_node uidhash_node;
85345 kuid_t uid;
85346@@ -810,7 +843,7 @@ struct user_struct {
85347 #ifdef CONFIG_PERF_EVENTS
85348 atomic_long_t locked_vm;
85349 #endif
85350-};
85351+} __randomize_layout;
85352
85353 extern int uids_sysfs_init(void);
85354
85355@@ -1274,6 +1307,9 @@ enum perf_event_task_context {
85356 struct task_struct {
85357 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
85358 void *stack;
85359+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85360+ void *lowmem_stack;
85361+#endif
85362 atomic_t usage;
85363 unsigned int flags; /* per process flags, defined below */
85364 unsigned int ptrace;
85365@@ -1405,8 +1441,8 @@ struct task_struct {
85366 struct list_head thread_node;
85367
85368 struct completion *vfork_done; /* for vfork() */
85369- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
85370- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85371+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
85372+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85373
85374 cputime_t utime, stime, utimescaled, stimescaled;
85375 cputime_t gtime;
85376@@ -1431,11 +1467,6 @@ struct task_struct {
85377 struct task_cputime cputime_expires;
85378 struct list_head cpu_timers[3];
85379
85380-/* process credentials */
85381- const struct cred __rcu *real_cred; /* objective and real subjective task
85382- * credentials (COW) */
85383- const struct cred __rcu *cred; /* effective (overridable) subjective task
85384- * credentials (COW) */
85385 char comm[TASK_COMM_LEN]; /* executable name excluding path
85386 - access with [gs]et_task_comm (which lock
85387 it with task_lock())
85388@@ -1453,6 +1484,10 @@ struct task_struct {
85389 #endif
85390 /* CPU-specific state of this task */
85391 struct thread_struct thread;
85392+/* thread_info moved to task_struct */
85393+#ifdef CONFIG_X86
85394+ struct thread_info tinfo;
85395+#endif
85396 /* filesystem information */
85397 struct fs_struct *fs;
85398 /* open file information */
85399@@ -1527,6 +1562,10 @@ struct task_struct {
85400 gfp_t lockdep_reclaim_gfp;
85401 #endif
85402
85403+/* process credentials */
85404+ const struct cred __rcu *real_cred; /* objective and real subjective task
85405+ * credentials (COW) */
85406+
85407 /* journalling filesystem info */
85408 void *journal_info;
85409
85410@@ -1565,6 +1604,10 @@ struct task_struct {
85411 /* cg_list protected by css_set_lock and tsk->alloc_lock */
85412 struct list_head cg_list;
85413 #endif
85414+
85415+ const struct cred __rcu *cred; /* effective (overridable) subjective task
85416+ * credentials (COW) */
85417+
85418 #ifdef CONFIG_FUTEX
85419 struct robust_list_head __user *robust_list;
85420 #ifdef CONFIG_COMPAT
85421@@ -1673,7 +1716,7 @@ struct task_struct {
85422 * Number of functions that haven't been traced
85423 * because of depth overrun.
85424 */
85425- atomic_t trace_overrun;
85426+ atomic_unchecked_t trace_overrun;
85427 /* Pause for the tracing */
85428 atomic_t tracing_graph_pause;
85429 #endif
85430@@ -1701,7 +1744,78 @@ struct task_struct {
85431 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
85432 unsigned long task_state_change;
85433 #endif
85434-};
85435+
85436+#ifdef CONFIG_GRKERNSEC
85437+ /* grsecurity */
85438+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
85439+ u64 exec_id;
85440+#endif
85441+#ifdef CONFIG_GRKERNSEC_SETXID
85442+ const struct cred *delayed_cred;
85443+#endif
85444+ struct dentry *gr_chroot_dentry;
85445+ struct acl_subject_label *acl;
85446+ struct acl_subject_label *tmpacl;
85447+ struct acl_role_label *role;
85448+ struct file *exec_file;
85449+ unsigned long brute_expires;
85450+ u16 acl_role_id;
85451+ u8 inherited;
85452+ /* is this the task that authenticated to the special role */
85453+ u8 acl_sp_role;
85454+ u8 is_writable;
85455+ u8 brute;
85456+ u8 gr_is_chrooted;
85457+#endif
85458+
85459+} __randomize_layout;
85460+
85461+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
85462+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
85463+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
85464+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
85465+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
85466+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
85467+
85468+#ifdef CONFIG_PAX_SOFTMODE
85469+extern int pax_softmode;
85470+#endif
85471+
85472+extern int pax_check_flags(unsigned long *);
85473+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
85474+
85475+/* if tsk != current then task_lock must be held on it */
85476+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
85477+static inline unsigned long pax_get_flags(struct task_struct *tsk)
85478+{
85479+ if (likely(tsk->mm))
85480+ return tsk->mm->pax_flags;
85481+ else
85482+ return 0UL;
85483+}
85484+
85485+/* if tsk != current then task_lock must be held on it */
85486+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
85487+{
85488+ if (likely(tsk->mm)) {
85489+ tsk->mm->pax_flags = flags;
85490+ return 0;
85491+ }
85492+ return -EINVAL;
85493+}
85494+#endif
85495+
85496+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
85497+extern void pax_set_initial_flags(struct linux_binprm *bprm);
85498+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
85499+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
85500+#endif
85501+
85502+struct path;
85503+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
85504+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
85505+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
85506+extern void pax_report_refcount_overflow(struct pt_regs *regs);
85507
85508 /* Future-safe accessor for struct task_struct's cpus_allowed. */
85509 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
85510@@ -1783,7 +1897,7 @@ struct pid_namespace;
85511 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
85512 struct pid_namespace *ns);
85513
85514-static inline pid_t task_pid_nr(struct task_struct *tsk)
85515+static inline pid_t task_pid_nr(const struct task_struct *tsk)
85516 {
85517 return tsk->pid;
85518 }
85519@@ -2150,6 +2264,25 @@ extern u64 sched_clock_cpu(int cpu);
85520
85521 extern void sched_clock_init(void);
85522
85523+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85524+static inline void populate_stack(void)
85525+{
85526+ struct task_struct *curtask = current;
85527+ int c;
85528+ int *ptr = curtask->stack;
85529+ int *end = curtask->stack + THREAD_SIZE;
85530+
85531+ while (ptr < end) {
85532+ c = *(volatile int *)ptr;
85533+ ptr += PAGE_SIZE/sizeof(int);
85534+ }
85535+}
85536+#else
85537+static inline void populate_stack(void)
85538+{
85539+}
85540+#endif
85541+
85542 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
85543 static inline void sched_clock_tick(void)
85544 {
85545@@ -2283,7 +2416,9 @@ void yield(void);
85546 extern struct exec_domain default_exec_domain;
85547
85548 union thread_union {
85549+#ifndef CONFIG_X86
85550 struct thread_info thread_info;
85551+#endif
85552 unsigned long stack[THREAD_SIZE/sizeof(long)];
85553 };
85554
85555@@ -2316,6 +2451,7 @@ extern struct pid_namespace init_pid_ns;
85556 */
85557
85558 extern struct task_struct *find_task_by_vpid(pid_t nr);
85559+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
85560 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
85561 struct pid_namespace *ns);
85562
85563@@ -2480,7 +2616,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
85564 extern void exit_itimers(struct signal_struct *);
85565 extern void flush_itimer_signals(void);
85566
85567-extern void do_group_exit(int);
85568+extern __noreturn void do_group_exit(int);
85569
85570 extern int do_execve(struct filename *,
85571 const char __user * const __user *,
85572@@ -2701,9 +2837,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
85573 #define task_stack_end_corrupted(task) \
85574 (*(end_of_stack(task)) != STACK_END_MAGIC)
85575
85576-static inline int object_is_on_stack(void *obj)
85577+static inline int object_starts_on_stack(const void *obj)
85578 {
85579- void *stack = task_stack_page(current);
85580+ const void *stack = task_stack_page(current);
85581
85582 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
85583 }
85584diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
85585index 596a0e0..bea77ec 100644
85586--- a/include/linux/sched/sysctl.h
85587+++ b/include/linux/sched/sysctl.h
85588@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
85589 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
85590
85591 extern int sysctl_max_map_count;
85592+extern unsigned long sysctl_heap_stack_gap;
85593
85594 extern unsigned int sysctl_sched_latency;
85595 extern unsigned int sysctl_sched_min_granularity;
85596diff --git a/include/linux/security.h b/include/linux/security.h
85597index ba96471..74fb3f6 100644
85598--- a/include/linux/security.h
85599+++ b/include/linux/security.h
85600@@ -27,6 +27,7 @@
85601 #include <linux/slab.h>
85602 #include <linux/err.h>
85603 #include <linux/string.h>
85604+#include <linux/grsecurity.h>
85605
85606 struct linux_binprm;
85607 struct cred;
85608@@ -116,8 +117,6 @@ struct seq_file;
85609
85610 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
85611
85612-void reset_security_ops(void);
85613-
85614 #ifdef CONFIG_MMU
85615 extern unsigned long mmap_min_addr;
85616 extern unsigned long dac_mmap_min_addr;
85617@@ -1729,7 +1728,7 @@ struct security_operations {
85618 struct audit_context *actx);
85619 void (*audit_rule_free) (void *lsmrule);
85620 #endif /* CONFIG_AUDIT */
85621-};
85622+} __randomize_layout;
85623
85624 /* prototypes */
85625 extern int security_init(void);
85626diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
85627index dc368b8..e895209 100644
85628--- a/include/linux/semaphore.h
85629+++ b/include/linux/semaphore.h
85630@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
85631 }
85632
85633 extern void down(struct semaphore *sem);
85634-extern int __must_check down_interruptible(struct semaphore *sem);
85635+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
85636 extern int __must_check down_killable(struct semaphore *sem);
85637 extern int __must_check down_trylock(struct semaphore *sem);
85638 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
85639diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
85640index cf6a9da..bd86b1f 100644
85641--- a/include/linux/seq_file.h
85642+++ b/include/linux/seq_file.h
85643@@ -27,6 +27,9 @@ struct seq_file {
85644 struct mutex lock;
85645 const struct seq_operations *op;
85646 int poll_event;
85647+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
85648+ u64 exec_id;
85649+#endif
85650 #ifdef CONFIG_USER_NS
85651 struct user_namespace *user_ns;
85652 #endif
85653@@ -39,6 +42,7 @@ struct seq_operations {
85654 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
85655 int (*show) (struct seq_file *m, void *v);
85656 };
85657+typedef struct seq_operations __no_const seq_operations_no_const;
85658
85659 #define SEQ_SKIP 1
85660
85661@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
85662
85663 char *mangle_path(char *s, const char *p, const char *esc);
85664 int seq_open(struct file *, const struct seq_operations *);
85665+int seq_open_restrict(struct file *, const struct seq_operations *);
85666 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
85667 loff_t seq_lseek(struct file *, loff_t, int);
85668 int seq_release(struct inode *, struct file *);
85669@@ -153,6 +158,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
85670 }
85671
85672 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
85673+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
85674 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
85675 int single_release(struct inode *, struct file *);
85676 void *__seq_open_private(struct file *, const struct seq_operations *, int);
85677diff --git a/include/linux/shm.h b/include/linux/shm.h
85678index 6fb8016..ab4465e 100644
85679--- a/include/linux/shm.h
85680+++ b/include/linux/shm.h
85681@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
85682 /* The task created the shm object. NULL if the task is dead. */
85683 struct task_struct *shm_creator;
85684 struct list_head shm_clist; /* list by creator */
85685+#ifdef CONFIG_GRKERNSEC
85686+ u64 shm_createtime;
85687+ pid_t shm_lapid;
85688+#endif
85689 };
85690
85691 /* shm_mode upper byte flags */
85692diff --git a/include/linux/signal.h b/include/linux/signal.h
85693index ab1e039..ad4229e 100644
85694--- a/include/linux/signal.h
85695+++ b/include/linux/signal.h
85696@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
85697 * know it'll be handled, so that they don't get converted to
85698 * SIGKILL or just silently dropped.
85699 */
85700- kernel_sigaction(sig, (__force __sighandler_t)2);
85701+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
85702 }
85703
85704 static inline void disallow_signal(int sig)
85705diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
85706index 85ab7d7..eb1585a 100644
85707--- a/include/linux/skbuff.h
85708+++ b/include/linux/skbuff.h
85709@@ -763,7 +763,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
85710 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
85711 int node);
85712 struct sk_buff *build_skb(void *data, unsigned int frag_size);
85713-static inline struct sk_buff *alloc_skb(unsigned int size,
85714+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
85715 gfp_t priority)
85716 {
85717 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
85718@@ -1952,7 +1952,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
85719 return skb->inner_transport_header - skb->inner_network_header;
85720 }
85721
85722-static inline int skb_network_offset(const struct sk_buff *skb)
85723+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
85724 {
85725 return skb_network_header(skb) - skb->data;
85726 }
85727@@ -2012,7 +2012,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
85728 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
85729 */
85730 #ifndef NET_SKB_PAD
85731-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
85732+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
85733 #endif
85734
85735 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
85736@@ -2655,9 +2655,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
85737 int *err);
85738 unsigned int datagram_poll(struct file *file, struct socket *sock,
85739 struct poll_table_struct *wait);
85740-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
85741+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
85742 struct iov_iter *to, int size);
85743-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
85744+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
85745 struct msghdr *msg, int size)
85746 {
85747 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
85748@@ -3131,6 +3131,9 @@ static inline void nf_reset(struct sk_buff *skb)
85749 nf_bridge_put(skb->nf_bridge);
85750 skb->nf_bridge = NULL;
85751 #endif
85752+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
85753+ skb->nf_trace = 0;
85754+#endif
85755 }
85756
85757 static inline void nf_reset_trace(struct sk_buff *skb)
85758diff --git a/include/linux/slab.h b/include/linux/slab.h
85759index 9a139b6..aab37b4 100644
85760--- a/include/linux/slab.h
85761+++ b/include/linux/slab.h
85762@@ -14,15 +14,29 @@
85763 #include <linux/gfp.h>
85764 #include <linux/types.h>
85765 #include <linux/workqueue.h>
85766-
85767+#include <linux/err.h>
85768
85769 /*
85770 * Flags to pass to kmem_cache_create().
85771 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
85772 */
85773 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
85774+
85775+#ifdef CONFIG_PAX_USERCOPY_SLABS
85776+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
85777+#else
85778+#define SLAB_USERCOPY 0x00000000UL
85779+#endif
85780+
85781 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
85782 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
85783+
85784+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85785+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
85786+#else
85787+#define SLAB_NO_SANITIZE 0x00000000UL
85788+#endif
85789+
85790 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
85791 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
85792 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
85793@@ -98,10 +112,13 @@
85794 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
85795 * Both make kfree a no-op.
85796 */
85797-#define ZERO_SIZE_PTR ((void *)16)
85798+#define ZERO_SIZE_PTR \
85799+({ \
85800+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
85801+ (void *)(-MAX_ERRNO-1L); \
85802+})
85803
85804-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
85805- (unsigned long)ZERO_SIZE_PTR)
85806+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
85807
85808 #include <linux/kmemleak.h>
85809
85810@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
85811 void kfree(const void *);
85812 void kzfree(const void *);
85813 size_t ksize(const void *);
85814+const char *check_heap_object(const void *ptr, unsigned long n);
85815+bool is_usercopy_object(const void *ptr);
85816
85817 /*
85818 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
85819@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
85820 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85821 #endif
85822
85823+#ifdef CONFIG_PAX_USERCOPY_SLABS
85824+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
85825+#endif
85826+
85827 /*
85828 * Figure out which kmalloc slab an allocation of a certain size
85829 * belongs to.
85830@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85831 * 2 = 120 .. 192 bytes
85832 * n = 2^(n-1) .. 2^n -1
85833 */
85834-static __always_inline int kmalloc_index(size_t size)
85835+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
85836 {
85837 if (!size)
85838 return 0;
85839@@ -287,14 +310,14 @@ static __always_inline int kmalloc_index(size_t size)
85840 }
85841 #endif /* !CONFIG_SLOB */
85842
85843-void *__kmalloc(size_t size, gfp_t flags);
85844+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
85845 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
85846
85847 #ifdef CONFIG_NUMA
85848-void *__kmalloc_node(size_t size, gfp_t flags, int node);
85849+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
85850 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
85851 #else
85852-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
85853+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
85854 {
85855 return __kmalloc(size, flags);
85856 }
85857diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
85858index b869d16..1453c73 100644
85859--- a/include/linux/slab_def.h
85860+++ b/include/linux/slab_def.h
85861@@ -40,7 +40,7 @@ struct kmem_cache {
85862 /* 4) cache creation/removal */
85863 const char *name;
85864 struct list_head list;
85865- int refcount;
85866+ atomic_t refcount;
85867 int object_size;
85868 int align;
85869
85870@@ -56,10 +56,14 @@ struct kmem_cache {
85871 unsigned long node_allocs;
85872 unsigned long node_frees;
85873 unsigned long node_overflow;
85874- atomic_t allochit;
85875- atomic_t allocmiss;
85876- atomic_t freehit;
85877- atomic_t freemiss;
85878+ atomic_unchecked_t allochit;
85879+ atomic_unchecked_t allocmiss;
85880+ atomic_unchecked_t freehit;
85881+ atomic_unchecked_t freemiss;
85882+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85883+ atomic_unchecked_t sanitized;
85884+ atomic_unchecked_t not_sanitized;
85885+#endif
85886
85887 /*
85888 * If debugging is enabled, then the allocator can add additional
85889diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
85890index d82abd4..408c3a0 100644
85891--- a/include/linux/slub_def.h
85892+++ b/include/linux/slub_def.h
85893@@ -74,7 +74,7 @@ struct kmem_cache {
85894 struct kmem_cache_order_objects max;
85895 struct kmem_cache_order_objects min;
85896 gfp_t allocflags; /* gfp flags to use on each alloc */
85897- int refcount; /* Refcount for slab cache destroy */
85898+ atomic_t refcount; /* Refcount for slab cache destroy */
85899 void (*ctor)(void *);
85900 int inuse; /* Offset to metadata */
85901 int align; /* Alignment */
85902diff --git a/include/linux/smp.h b/include/linux/smp.h
85903index 93dff5f..933c561 100644
85904--- a/include/linux/smp.h
85905+++ b/include/linux/smp.h
85906@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
85907 #endif
85908
85909 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
85910+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
85911 #define put_cpu() preempt_enable()
85912+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
85913
85914 /*
85915 * Callback to arch code if there's nosmp or maxcpus=0 on the
85916diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
85917index 46cca4c..3323536 100644
85918--- a/include/linux/sock_diag.h
85919+++ b/include/linux/sock_diag.h
85920@@ -11,7 +11,7 @@ struct sock;
85921 struct sock_diag_handler {
85922 __u8 family;
85923 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
85924-};
85925+} __do_const;
85926
85927 int sock_diag_register(const struct sock_diag_handler *h);
85928 void sock_diag_unregister(const struct sock_diag_handler *h);
85929diff --git a/include/linux/sonet.h b/include/linux/sonet.h
85930index 680f9a3..f13aeb0 100644
85931--- a/include/linux/sonet.h
85932+++ b/include/linux/sonet.h
85933@@ -7,7 +7,7 @@
85934 #include <uapi/linux/sonet.h>
85935
85936 struct k_sonet_stats {
85937-#define __HANDLE_ITEM(i) atomic_t i
85938+#define __HANDLE_ITEM(i) atomic_unchecked_t i
85939 __SONET_ITEMS
85940 #undef __HANDLE_ITEM
85941 };
85942diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
85943index 07d8e53..dc934c9 100644
85944--- a/include/linux/sunrpc/addr.h
85945+++ b/include/linux/sunrpc/addr.h
85946@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
85947 {
85948 switch (sap->sa_family) {
85949 case AF_INET:
85950- return ntohs(((struct sockaddr_in *)sap)->sin_port);
85951+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
85952 case AF_INET6:
85953- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
85954+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
85955 }
85956 return 0;
85957 }
85958@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
85959 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
85960 const struct sockaddr *src)
85961 {
85962- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
85963+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
85964 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
85965
85966 dsin->sin_family = ssin->sin_family;
85967@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
85968 if (sa->sa_family != AF_INET6)
85969 return 0;
85970
85971- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
85972+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
85973 }
85974
85975 #endif /* _LINUX_SUNRPC_ADDR_H */
85976diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
85977index 598ba80..d90cba6 100644
85978--- a/include/linux/sunrpc/clnt.h
85979+++ b/include/linux/sunrpc/clnt.h
85980@@ -100,7 +100,7 @@ struct rpc_procinfo {
85981 unsigned int p_timer; /* Which RTT timer to use */
85982 u32 p_statidx; /* Which procedure to account */
85983 const char * p_name; /* name of procedure */
85984-};
85985+} __do_const;
85986
85987 #ifdef __KERNEL__
85988
85989diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
85990index 6f22cfe..9fd0909 100644
85991--- a/include/linux/sunrpc/svc.h
85992+++ b/include/linux/sunrpc/svc.h
85993@@ -420,7 +420,7 @@ struct svc_procedure {
85994 unsigned int pc_count; /* call count */
85995 unsigned int pc_cachetype; /* cache info (NFS) */
85996 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85997-};
85998+} __do_const;
85999
86000 /*
86001 * Function prototypes.
86002diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
86003index 975da75..318c083 100644
86004--- a/include/linux/sunrpc/svc_rdma.h
86005+++ b/include/linux/sunrpc/svc_rdma.h
86006@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
86007 extern unsigned int svcrdma_max_requests;
86008 extern unsigned int svcrdma_max_req_size;
86009
86010-extern atomic_t rdma_stat_recv;
86011-extern atomic_t rdma_stat_read;
86012-extern atomic_t rdma_stat_write;
86013-extern atomic_t rdma_stat_sq_starve;
86014-extern atomic_t rdma_stat_rq_starve;
86015-extern atomic_t rdma_stat_rq_poll;
86016-extern atomic_t rdma_stat_rq_prod;
86017-extern atomic_t rdma_stat_sq_poll;
86018-extern atomic_t rdma_stat_sq_prod;
86019+extern atomic_unchecked_t rdma_stat_recv;
86020+extern atomic_unchecked_t rdma_stat_read;
86021+extern atomic_unchecked_t rdma_stat_write;
86022+extern atomic_unchecked_t rdma_stat_sq_starve;
86023+extern atomic_unchecked_t rdma_stat_rq_starve;
86024+extern atomic_unchecked_t rdma_stat_rq_poll;
86025+extern atomic_unchecked_t rdma_stat_rq_prod;
86026+extern atomic_unchecked_t rdma_stat_sq_poll;
86027+extern atomic_unchecked_t rdma_stat_sq_prod;
86028
86029 #define RPCRDMA_VERSION 1
86030
86031diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
86032index 8d71d65..f79586e 100644
86033--- a/include/linux/sunrpc/svcauth.h
86034+++ b/include/linux/sunrpc/svcauth.h
86035@@ -120,7 +120,7 @@ struct auth_ops {
86036 int (*release)(struct svc_rqst *rq);
86037 void (*domain_release)(struct auth_domain *);
86038 int (*set_client)(struct svc_rqst *rq);
86039-};
86040+} __do_const;
86041
86042 #define SVC_GARBAGE 1
86043 #define SVC_SYSERR 2
86044diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
86045index e7a018e..49f8b17 100644
86046--- a/include/linux/swiotlb.h
86047+++ b/include/linux/swiotlb.h
86048@@ -60,7 +60,8 @@ extern void
86049
86050 extern void
86051 swiotlb_free_coherent(struct device *hwdev, size_t size,
86052- void *vaddr, dma_addr_t dma_handle);
86053+ void *vaddr, dma_addr_t dma_handle,
86054+ struct dma_attrs *attrs);
86055
86056 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
86057 unsigned long offset, size_t size,
86058diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
86059index 85893d7..e78c660 100644
86060--- a/include/linux/syscalls.h
86061+++ b/include/linux/syscalls.h
86062@@ -102,7 +102,12 @@ union bpf_attr;
86063 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
86064 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
86065 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
86066-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
86067+#define __SC_LONG(t, a) __typeof__( \
86068+ __builtin_choose_expr( \
86069+ sizeof(t) > sizeof(int), \
86070+ (t) 0, \
86071+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
86072+ )) a
86073 #define __SC_CAST(t, a) (t) a
86074 #define __SC_ARGS(t, a) a
86075 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
86076@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
86077 asmlinkage long sys_fsync(unsigned int fd);
86078 asmlinkage long sys_fdatasync(unsigned int fd);
86079 asmlinkage long sys_bdflush(int func, long data);
86080-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
86081- char __user *type, unsigned long flags,
86082+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
86083+ const char __user *type, unsigned long flags,
86084 void __user *data);
86085-asmlinkage long sys_umount(char __user *name, int flags);
86086-asmlinkage long sys_oldumount(char __user *name);
86087+asmlinkage long sys_umount(const char __user *name, int flags);
86088+asmlinkage long sys_oldumount(const char __user *name);
86089 asmlinkage long sys_truncate(const char __user *path, long length);
86090 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
86091 asmlinkage long sys_stat(const char __user *filename,
86092@@ -600,7 +605,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
86093 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
86094 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
86095 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
86096- struct sockaddr __user *, int);
86097+ struct sockaddr __user *, int) __intentional_overflow(0);
86098 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
86099 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
86100 unsigned int vlen, unsigned flags);
86101diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
86102index 27b3b0b..e093dd9 100644
86103--- a/include/linux/syscore_ops.h
86104+++ b/include/linux/syscore_ops.h
86105@@ -16,7 +16,7 @@ struct syscore_ops {
86106 int (*suspend)(void);
86107 void (*resume)(void);
86108 void (*shutdown)(void);
86109-};
86110+} __do_const;
86111
86112 extern void register_syscore_ops(struct syscore_ops *ops);
86113 extern void unregister_syscore_ops(struct syscore_ops *ops);
86114diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
86115index b7361f8..341a15a 100644
86116--- a/include/linux/sysctl.h
86117+++ b/include/linux/sysctl.h
86118@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
86119
86120 extern int proc_dostring(struct ctl_table *, int,
86121 void __user *, size_t *, loff_t *);
86122+extern int proc_dostring_modpriv(struct ctl_table *, int,
86123+ void __user *, size_t *, loff_t *);
86124 extern int proc_dointvec(struct ctl_table *, int,
86125 void __user *, size_t *, loff_t *);
86126 extern int proc_dointvec_minmax(struct ctl_table *, int,
86127@@ -113,7 +115,8 @@ struct ctl_table
86128 struct ctl_table_poll *poll;
86129 void *extra1;
86130 void *extra2;
86131-};
86132+} __do_const __randomize_layout;
86133+typedef struct ctl_table __no_const ctl_table_no_const;
86134
86135 struct ctl_node {
86136 struct rb_node node;
86137diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
86138index ddad161..a3efd26 100644
86139--- a/include/linux/sysfs.h
86140+++ b/include/linux/sysfs.h
86141@@ -34,7 +34,8 @@ struct attribute {
86142 struct lock_class_key *key;
86143 struct lock_class_key skey;
86144 #endif
86145-};
86146+} __do_const;
86147+typedef struct attribute __no_const attribute_no_const;
86148
86149 /**
86150 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
86151@@ -63,7 +64,8 @@ struct attribute_group {
86152 struct attribute *, int);
86153 struct attribute **attrs;
86154 struct bin_attribute **bin_attrs;
86155-};
86156+} __do_const;
86157+typedef struct attribute_group __no_const attribute_group_no_const;
86158
86159 /**
86160 * Use these macros to make defining attributes easier. See include/linux/device.h
86161@@ -137,7 +139,8 @@ struct bin_attribute {
86162 char *, loff_t, size_t);
86163 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
86164 struct vm_area_struct *vma);
86165-};
86166+} __do_const;
86167+typedef struct bin_attribute __no_const bin_attribute_no_const;
86168
86169 /**
86170 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
86171diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
86172index 387fa7d..3fcde6b 100644
86173--- a/include/linux/sysrq.h
86174+++ b/include/linux/sysrq.h
86175@@ -16,6 +16,7 @@
86176
86177 #include <linux/errno.h>
86178 #include <linux/types.h>
86179+#include <linux/compiler.h>
86180
86181 /* Possible values of bitmask for enabling sysrq functions */
86182 /* 0x0001 is reserved for enable everything */
86183@@ -33,7 +34,7 @@ struct sysrq_key_op {
86184 char *help_msg;
86185 char *action_msg;
86186 int enable_mask;
86187-};
86188+} __do_const;
86189
86190 #ifdef CONFIG_MAGIC_SYSRQ
86191
86192diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
86193index ff307b5..f1a4468 100644
86194--- a/include/linux/thread_info.h
86195+++ b/include/linux/thread_info.h
86196@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
86197 #error "no set_restore_sigmask() provided and default one won't work"
86198 #endif
86199
86200+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
86201+
86202+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
86203+{
86204+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
86205+}
86206+
86207 #endif /* __KERNEL__ */
86208
86209 #endif /* _LINUX_THREAD_INFO_H */
86210diff --git a/include/linux/tty.h b/include/linux/tty.h
86211index 7d66ae5..0327149 100644
86212--- a/include/linux/tty.h
86213+++ b/include/linux/tty.h
86214@@ -202,7 +202,7 @@ struct tty_port {
86215 const struct tty_port_operations *ops; /* Port operations */
86216 spinlock_t lock; /* Lock protecting tty field */
86217 int blocked_open; /* Waiting to open */
86218- int count; /* Usage count */
86219+ atomic_t count; /* Usage count */
86220 wait_queue_head_t open_wait; /* Open waiters */
86221 wait_queue_head_t close_wait; /* Close waiters */
86222 wait_queue_head_t delta_msr_wait; /* Modem status change */
86223@@ -290,7 +290,7 @@ struct tty_struct {
86224 /* If the tty has a pending do_SAK, queue it here - akpm */
86225 struct work_struct SAK_work;
86226 struct tty_port *port;
86227-};
86228+} __randomize_layout;
86229
86230 /* Each of a tty's open files has private_data pointing to tty_file_private */
86231 struct tty_file_private {
86232@@ -549,7 +549,7 @@ extern int tty_port_open(struct tty_port *port,
86233 struct tty_struct *tty, struct file *filp);
86234 static inline int tty_port_users(struct tty_port *port)
86235 {
86236- return port->count + port->blocked_open;
86237+ return atomic_read(&port->count) + port->blocked_open;
86238 }
86239
86240 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
86241diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
86242index 92e337c..f46757b 100644
86243--- a/include/linux/tty_driver.h
86244+++ b/include/linux/tty_driver.h
86245@@ -291,7 +291,7 @@ struct tty_operations {
86246 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
86247 #endif
86248 const struct file_operations *proc_fops;
86249-};
86250+} __do_const __randomize_layout;
86251
86252 struct tty_driver {
86253 int magic; /* magic number for this structure */
86254@@ -325,7 +325,7 @@ struct tty_driver {
86255
86256 const struct tty_operations *ops;
86257 struct list_head tty_drivers;
86258-};
86259+} __randomize_layout;
86260
86261 extern struct list_head tty_drivers;
86262
86263diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
86264index 00c9d68..bc0188b 100644
86265--- a/include/linux/tty_ldisc.h
86266+++ b/include/linux/tty_ldisc.h
86267@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
86268
86269 struct module *owner;
86270
86271- int refcount;
86272+ atomic_t refcount;
86273 };
86274
86275 struct tty_ldisc {
86276diff --git a/include/linux/types.h b/include/linux/types.h
86277index a0bb704..f511c77 100644
86278--- a/include/linux/types.h
86279+++ b/include/linux/types.h
86280@@ -177,10 +177,26 @@ typedef struct {
86281 int counter;
86282 } atomic_t;
86283
86284+#ifdef CONFIG_PAX_REFCOUNT
86285+typedef struct {
86286+ int counter;
86287+} atomic_unchecked_t;
86288+#else
86289+typedef atomic_t atomic_unchecked_t;
86290+#endif
86291+
86292 #ifdef CONFIG_64BIT
86293 typedef struct {
86294 long counter;
86295 } atomic64_t;
86296+
86297+#ifdef CONFIG_PAX_REFCOUNT
86298+typedef struct {
86299+ long counter;
86300+} atomic64_unchecked_t;
86301+#else
86302+typedef atomic64_t atomic64_unchecked_t;
86303+#endif
86304 #endif
86305
86306 struct list_head {
86307diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
86308index ecd3319..8a36ded 100644
86309--- a/include/linux/uaccess.h
86310+++ b/include/linux/uaccess.h
86311@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
86312 long ret; \
86313 mm_segment_t old_fs = get_fs(); \
86314 \
86315- set_fs(KERNEL_DS); \
86316 pagefault_disable(); \
86317- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
86318- pagefault_enable(); \
86319+ set_fs(KERNEL_DS); \
86320+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
86321 set_fs(old_fs); \
86322+ pagefault_enable(); \
86323 ret; \
86324 })
86325
86326diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
86327index 2d1f9b6..d7a9fce 100644
86328--- a/include/linux/uidgid.h
86329+++ b/include/linux/uidgid.h
86330@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
86331
86332 #endif /* CONFIG_USER_NS */
86333
86334+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
86335+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
86336+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
86337+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
86338+
86339 #endif /* _LINUX_UIDGID_H */
86340diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
86341index 32c0e83..671eb35 100644
86342--- a/include/linux/uio_driver.h
86343+++ b/include/linux/uio_driver.h
86344@@ -67,7 +67,7 @@ struct uio_device {
86345 struct module *owner;
86346 struct device *dev;
86347 int minor;
86348- atomic_t event;
86349+ atomic_unchecked_t event;
86350 struct fasync_struct *async_queue;
86351 wait_queue_head_t wait;
86352 struct uio_info *info;
86353diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
86354index 99c1b4d..562e6f3 100644
86355--- a/include/linux/unaligned/access_ok.h
86356+++ b/include/linux/unaligned/access_ok.h
86357@@ -4,34 +4,34 @@
86358 #include <linux/kernel.h>
86359 #include <asm/byteorder.h>
86360
86361-static inline u16 get_unaligned_le16(const void *p)
86362+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
86363 {
86364- return le16_to_cpup((__le16 *)p);
86365+ return le16_to_cpup((const __le16 *)p);
86366 }
86367
86368-static inline u32 get_unaligned_le32(const void *p)
86369+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
86370 {
86371- return le32_to_cpup((__le32 *)p);
86372+ return le32_to_cpup((const __le32 *)p);
86373 }
86374
86375-static inline u64 get_unaligned_le64(const void *p)
86376+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
86377 {
86378- return le64_to_cpup((__le64 *)p);
86379+ return le64_to_cpup((const __le64 *)p);
86380 }
86381
86382-static inline u16 get_unaligned_be16(const void *p)
86383+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
86384 {
86385- return be16_to_cpup((__be16 *)p);
86386+ return be16_to_cpup((const __be16 *)p);
86387 }
86388
86389-static inline u32 get_unaligned_be32(const void *p)
86390+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
86391 {
86392- return be32_to_cpup((__be32 *)p);
86393+ return be32_to_cpup((const __be32 *)p);
86394 }
86395
86396-static inline u64 get_unaligned_be64(const void *p)
86397+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
86398 {
86399- return be64_to_cpup((__be64 *)p);
86400+ return be64_to_cpup((const __be64 *)p);
86401 }
86402
86403 static inline void put_unaligned_le16(u16 val, void *p)
86404diff --git a/include/linux/usb.h b/include/linux/usb.h
86405index 058a769..c17a1c2c 100644
86406--- a/include/linux/usb.h
86407+++ b/include/linux/usb.h
86408@@ -566,7 +566,7 @@ struct usb_device {
86409 int maxchild;
86410
86411 u32 quirks;
86412- atomic_t urbnum;
86413+ atomic_unchecked_t urbnum;
86414
86415 unsigned long active_duration;
86416
86417@@ -1650,7 +1650,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
86418
86419 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
86420 __u8 request, __u8 requesttype, __u16 value, __u16 index,
86421- void *data, __u16 size, int timeout);
86422+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
86423 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
86424 void *data, int len, int *actual_length, int timeout);
86425 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
86426diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
86427index 9fd9e48..e2c5f35 100644
86428--- a/include/linux/usb/renesas_usbhs.h
86429+++ b/include/linux/usb/renesas_usbhs.h
86430@@ -39,7 +39,7 @@ enum {
86431 */
86432 struct renesas_usbhs_driver_callback {
86433 int (*notify_hotplug)(struct platform_device *pdev);
86434-};
86435+} __no_const;
86436
86437 /*
86438 * callback functions for platform
86439diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
86440index 8297e5b..0dfae27 100644
86441--- a/include/linux/user_namespace.h
86442+++ b/include/linux/user_namespace.h
86443@@ -39,7 +39,7 @@ struct user_namespace {
86444 struct key *persistent_keyring_register;
86445 struct rw_semaphore persistent_keyring_register_sem;
86446 #endif
86447-};
86448+} __randomize_layout;
86449
86450 extern struct user_namespace init_user_ns;
86451
86452diff --git a/include/linux/utsname.h b/include/linux/utsname.h
86453index 5093f58..c103e58 100644
86454--- a/include/linux/utsname.h
86455+++ b/include/linux/utsname.h
86456@@ -25,7 +25,7 @@ struct uts_namespace {
86457 struct new_utsname name;
86458 struct user_namespace *user_ns;
86459 struct ns_common ns;
86460-};
86461+} __randomize_layout;
86462 extern struct uts_namespace init_uts_ns;
86463
86464 #ifdef CONFIG_UTS_NS
86465diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
86466index 6f8fbcf..4efc177 100644
86467--- a/include/linux/vermagic.h
86468+++ b/include/linux/vermagic.h
86469@@ -25,9 +25,42 @@
86470 #define MODULE_ARCH_VERMAGIC ""
86471 #endif
86472
86473+#ifdef CONFIG_PAX_REFCOUNT
86474+#define MODULE_PAX_REFCOUNT "REFCOUNT "
86475+#else
86476+#define MODULE_PAX_REFCOUNT ""
86477+#endif
86478+
86479+#ifdef CONSTIFY_PLUGIN
86480+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
86481+#else
86482+#define MODULE_CONSTIFY_PLUGIN ""
86483+#endif
86484+
86485+#ifdef STACKLEAK_PLUGIN
86486+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
86487+#else
86488+#define MODULE_STACKLEAK_PLUGIN ""
86489+#endif
86490+
86491+#ifdef RANDSTRUCT_PLUGIN
86492+#include <generated/randomize_layout_hash.h>
86493+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
86494+#else
86495+#define MODULE_RANDSTRUCT_PLUGIN
86496+#endif
86497+
86498+#ifdef CONFIG_GRKERNSEC
86499+#define MODULE_GRSEC "GRSEC "
86500+#else
86501+#define MODULE_GRSEC ""
86502+#endif
86503+
86504 #define VERMAGIC_STRING \
86505 UTS_RELEASE " " \
86506 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
86507 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
86508- MODULE_ARCH_VERMAGIC
86509+ MODULE_ARCH_VERMAGIC \
86510+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
86511+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
86512
86513diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
86514index b483abd..af305ad 100644
86515--- a/include/linux/vga_switcheroo.h
86516+++ b/include/linux/vga_switcheroo.h
86517@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
86518
86519 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
86520
86521-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
86522+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
86523 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
86524-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
86525+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
86526 #else
86527
86528 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
86529@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
86530
86531 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
86532
86533-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86534+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
86535 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
86536-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86537+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
86538
86539 #endif
86540 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
86541diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
86542index b87696f..1d11de7 100644
86543--- a/include/linux/vmalloc.h
86544+++ b/include/linux/vmalloc.h
86545@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
86546 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
86547 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
86548 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
86549+
86550+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
86551+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
86552+#endif
86553+
86554 /* bits [20..32] reserved for arch specific ioremap internals */
86555
86556 /*
86557@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
86558 unsigned long flags, pgprot_t prot);
86559 extern void vunmap(const void *addr);
86560
86561+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86562+extern void unmap_process_stacks(struct task_struct *task);
86563+#endif
86564+
86565 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
86566 unsigned long uaddr, void *kaddr,
86567 unsigned long size);
86568@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
86569
86570 /* for /dev/kmem */
86571 extern long vread(char *buf, char *addr, unsigned long count);
86572-extern long vwrite(char *buf, char *addr, unsigned long count);
86573+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
86574
86575 /*
86576 * Internals. Dont't use..
86577diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
86578index 82e7db7..f8ce3d0 100644
86579--- a/include/linux/vmstat.h
86580+++ b/include/linux/vmstat.h
86581@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
86582 /*
86583 * Zone based page accounting with per cpu differentials.
86584 */
86585-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
86586+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
86587
86588 static inline void zone_page_state_add(long x, struct zone *zone,
86589 enum zone_stat_item item)
86590 {
86591- atomic_long_add(x, &zone->vm_stat[item]);
86592- atomic_long_add(x, &vm_stat[item]);
86593+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
86594+ atomic_long_add_unchecked(x, &vm_stat[item]);
86595 }
86596
86597-static inline unsigned long global_page_state(enum zone_stat_item item)
86598+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
86599 {
86600- long x = atomic_long_read(&vm_stat[item]);
86601+ long x = atomic_long_read_unchecked(&vm_stat[item]);
86602 #ifdef CONFIG_SMP
86603 if (x < 0)
86604 x = 0;
86605@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
86606 return x;
86607 }
86608
86609-static inline unsigned long zone_page_state(struct zone *zone,
86610+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
86611 enum zone_stat_item item)
86612 {
86613- long x = atomic_long_read(&zone->vm_stat[item]);
86614+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
86615 #ifdef CONFIG_SMP
86616 if (x < 0)
86617 x = 0;
86618@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
86619 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
86620 enum zone_stat_item item)
86621 {
86622- long x = atomic_long_read(&zone->vm_stat[item]);
86623+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
86624
86625 #ifdef CONFIG_SMP
86626 int cpu;
86627@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
86628
86629 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
86630 {
86631- atomic_long_inc(&zone->vm_stat[item]);
86632- atomic_long_inc(&vm_stat[item]);
86633+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
86634+ atomic_long_inc_unchecked(&vm_stat[item]);
86635 }
86636
86637 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
86638 {
86639- atomic_long_dec(&zone->vm_stat[item]);
86640- atomic_long_dec(&vm_stat[item]);
86641+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
86642+ atomic_long_dec_unchecked(&vm_stat[item]);
86643 }
86644
86645 static inline void __inc_zone_page_state(struct page *page,
86646diff --git a/include/linux/xattr.h b/include/linux/xattr.h
86647index 91b0a68..0e9adf6 100644
86648--- a/include/linux/xattr.h
86649+++ b/include/linux/xattr.h
86650@@ -28,7 +28,7 @@ struct xattr_handler {
86651 size_t size, int handler_flags);
86652 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
86653 size_t size, int flags, int handler_flags);
86654-};
86655+} __do_const;
86656
86657 struct xattr {
86658 const char *name;
86659@@ -37,6 +37,9 @@ struct xattr {
86660 };
86661
86662 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
86663+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
86664+ssize_t pax_getxattr(struct dentry *, void *, size_t);
86665+#endif
86666 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
86667 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
86668 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
86669diff --git a/include/linux/zlib.h b/include/linux/zlib.h
86670index 92dbbd3..13ab0b3 100644
86671--- a/include/linux/zlib.h
86672+++ b/include/linux/zlib.h
86673@@ -31,6 +31,7 @@
86674 #define _ZLIB_H
86675
86676 #include <linux/zconf.h>
86677+#include <linux/compiler.h>
86678
86679 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
86680 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
86681@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
86682
86683 /* basic functions */
86684
86685-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
86686+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
86687 /*
86688 Returns the number of bytes that needs to be allocated for a per-
86689 stream workspace with the specified parameters. A pointer to this
86690diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
86691index eb76cfd..9fd0e7c 100644
86692--- a/include/media/v4l2-dev.h
86693+++ b/include/media/v4l2-dev.h
86694@@ -75,7 +75,7 @@ struct v4l2_file_operations {
86695 int (*mmap) (struct file *, struct vm_area_struct *);
86696 int (*open) (struct file *);
86697 int (*release) (struct file *);
86698-};
86699+} __do_const;
86700
86701 /*
86702 * Newer version of video_device, handled by videodev2.c
86703diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
86704index ffb69da..040393e 100644
86705--- a/include/media/v4l2-device.h
86706+++ b/include/media/v4l2-device.h
86707@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
86708 this function returns 0. If the name ends with a digit (e.g. cx18),
86709 then the name will be set to cx18-0 since cx180 looks really odd. */
86710 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
86711- atomic_t *instance);
86712+ atomic_unchecked_t *instance);
86713
86714 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
86715 Since the parent disappears this ensures that v4l2_dev doesn't have an
86716diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
86717index 2a25dec..bf6dd8a 100644
86718--- a/include/net/9p/transport.h
86719+++ b/include/net/9p/transport.h
86720@@ -62,7 +62,7 @@ struct p9_trans_module {
86721 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
86722 int (*zc_request)(struct p9_client *, struct p9_req_t *,
86723 char *, char *, int , int, int, int);
86724-};
86725+} __do_const;
86726
86727 void v9fs_register_trans(struct p9_trans_module *m);
86728 void v9fs_unregister_trans(struct p9_trans_module *m);
86729diff --git a/include/net/af_unix.h b/include/net/af_unix.h
86730index a175ba4..196eb8242 100644
86731--- a/include/net/af_unix.h
86732+++ b/include/net/af_unix.h
86733@@ -36,7 +36,7 @@ struct unix_skb_parms {
86734 u32 secid; /* Security ID */
86735 #endif
86736 u32 consumed;
86737-};
86738+} __randomize_layout;
86739
86740 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
86741 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
86742diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
86743index d1bb342..e12f7d2 100644
86744--- a/include/net/bluetooth/l2cap.h
86745+++ b/include/net/bluetooth/l2cap.h
86746@@ -608,7 +608,7 @@ struct l2cap_ops {
86747 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
86748 unsigned long hdr_len,
86749 unsigned long len, int nb);
86750-};
86751+} __do_const;
86752
86753 struct l2cap_conn {
86754 struct hci_conn *hcon;
86755diff --git a/include/net/bonding.h b/include/net/bonding.h
86756index 983a94b..7aa9b16 100644
86757--- a/include/net/bonding.h
86758+++ b/include/net/bonding.h
86759@@ -647,7 +647,7 @@ extern struct rtnl_link_ops bond_link_ops;
86760
86761 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
86762 {
86763- atomic_long_inc(&dev->tx_dropped);
86764+ atomic_long_inc_unchecked(&dev->tx_dropped);
86765 dev_kfree_skb_any(skb);
86766 }
86767
86768diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
86769index f2ae33d..c457cf0 100644
86770--- a/include/net/caif/cfctrl.h
86771+++ b/include/net/caif/cfctrl.h
86772@@ -52,7 +52,7 @@ struct cfctrl_rsp {
86773 void (*radioset_rsp)(void);
86774 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
86775 struct cflayer *client_layer);
86776-};
86777+} __no_const;
86778
86779 /* Link Setup Parameters for CAIF-Links. */
86780 struct cfctrl_link_param {
86781@@ -101,8 +101,8 @@ struct cfctrl_request_info {
86782 struct cfctrl {
86783 struct cfsrvl serv;
86784 struct cfctrl_rsp res;
86785- atomic_t req_seq_no;
86786- atomic_t rsp_seq_no;
86787+ atomic_unchecked_t req_seq_no;
86788+ atomic_unchecked_t rsp_seq_no;
86789 struct list_head list;
86790 /* Protects from simultaneous access to first_req list */
86791 spinlock_t info_list_lock;
86792diff --git a/include/net/flow.h b/include/net/flow.h
86793index 8109a15..504466d 100644
86794--- a/include/net/flow.h
86795+++ b/include/net/flow.h
86796@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
86797
86798 void flow_cache_flush(struct net *net);
86799 void flow_cache_flush_deferred(struct net *net);
86800-extern atomic_t flow_cache_genid;
86801+extern atomic_unchecked_t flow_cache_genid;
86802
86803 #endif
86804diff --git a/include/net/genetlink.h b/include/net/genetlink.h
86805index 6c92415..3a352d8 100644
86806--- a/include/net/genetlink.h
86807+++ b/include/net/genetlink.h
86808@@ -130,7 +130,7 @@ struct genl_ops {
86809 u8 cmd;
86810 u8 internal_flags;
86811 u8 flags;
86812-};
86813+} __do_const;
86814
86815 int __genl_register_family(struct genl_family *family);
86816
86817diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
86818index 734d9b5..48a9a4b 100644
86819--- a/include/net/gro_cells.h
86820+++ b/include/net/gro_cells.h
86821@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
86822 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
86823
86824 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
86825- atomic_long_inc(&dev->rx_dropped);
86826+ atomic_long_inc_unchecked(&dev->rx_dropped);
86827 kfree_skb(skb);
86828 return;
86829 }
86830diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
86831index 848e85c..051c7de 100644
86832--- a/include/net/inet_connection_sock.h
86833+++ b/include/net/inet_connection_sock.h
86834@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
86835 int (*bind_conflict)(const struct sock *sk,
86836 const struct inet_bind_bucket *tb, bool relax);
86837 void (*mtu_reduced)(struct sock *sk);
86838-};
86839+} __do_const;
86840
86841 /** inet_connection_sock - INET connection oriented sock
86842 *
86843diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
86844index 80479ab..0c3f647 100644
86845--- a/include/net/inetpeer.h
86846+++ b/include/net/inetpeer.h
86847@@ -47,7 +47,7 @@ struct inet_peer {
86848 */
86849 union {
86850 struct {
86851- atomic_t rid; /* Frag reception counter */
86852+ atomic_unchecked_t rid; /* Frag reception counter */
86853 };
86854 struct rcu_head rcu;
86855 struct inet_peer *gc_next;
86856diff --git a/include/net/ip.h b/include/net/ip.h
86857index c0c26c3..29f0420 100644
86858--- a/include/net/ip.h
86859+++ b/include/net/ip.h
86860@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
86861 }
86862 }
86863
86864-u32 ip_idents_reserve(u32 hash, int segs);
86865+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
86866 void __ip_select_ident(struct iphdr *iph, int segs);
86867
86868 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
86869diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
86870index 09a819e..3ab9e14 100644
86871--- a/include/net/ip_fib.h
86872+++ b/include/net/ip_fib.h
86873@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
86874
86875 #define FIB_RES_SADDR(net, res) \
86876 ((FIB_RES_NH(res).nh_saddr_genid == \
86877- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
86878+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
86879 FIB_RES_NH(res).nh_saddr : \
86880 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
86881 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
86882diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
86883index 615b20b..fd4cbd8 100644
86884--- a/include/net/ip_vs.h
86885+++ b/include/net/ip_vs.h
86886@@ -534,7 +534,7 @@ struct ip_vs_conn {
86887 struct ip_vs_conn *control; /* Master control connection */
86888 atomic_t n_control; /* Number of controlled ones */
86889 struct ip_vs_dest *dest; /* real server */
86890- atomic_t in_pkts; /* incoming packet counter */
86891+ atomic_unchecked_t in_pkts; /* incoming packet counter */
86892
86893 /* Packet transmitter for different forwarding methods. If it
86894 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
86895@@ -682,7 +682,7 @@ struct ip_vs_dest {
86896 __be16 port; /* port number of the server */
86897 union nf_inet_addr addr; /* IP address of the server */
86898 volatile unsigned int flags; /* dest status flags */
86899- atomic_t conn_flags; /* flags to copy to conn */
86900+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
86901 atomic_t weight; /* server weight */
86902
86903 atomic_t refcnt; /* reference counter */
86904@@ -928,11 +928,11 @@ struct netns_ipvs {
86905 /* ip_vs_lblc */
86906 int sysctl_lblc_expiration;
86907 struct ctl_table_header *lblc_ctl_header;
86908- struct ctl_table *lblc_ctl_table;
86909+ ctl_table_no_const *lblc_ctl_table;
86910 /* ip_vs_lblcr */
86911 int sysctl_lblcr_expiration;
86912 struct ctl_table_header *lblcr_ctl_header;
86913- struct ctl_table *lblcr_ctl_table;
86914+ ctl_table_no_const *lblcr_ctl_table;
86915 /* ip_vs_est */
86916 struct list_head est_list; /* estimator list */
86917 spinlock_t est_lock;
86918diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
86919index 8d4f588..2e37ad2 100644
86920--- a/include/net/irda/ircomm_tty.h
86921+++ b/include/net/irda/ircomm_tty.h
86922@@ -33,6 +33,7 @@
86923 #include <linux/termios.h>
86924 #include <linux/timer.h>
86925 #include <linux/tty.h> /* struct tty_struct */
86926+#include <asm/local.h>
86927
86928 #include <net/irda/irias_object.h>
86929 #include <net/irda/ircomm_core.h>
86930diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
86931index 714cc9a..ea05f3e 100644
86932--- a/include/net/iucv/af_iucv.h
86933+++ b/include/net/iucv/af_iucv.h
86934@@ -149,7 +149,7 @@ struct iucv_skb_cb {
86935 struct iucv_sock_list {
86936 struct hlist_head head;
86937 rwlock_t lock;
86938- atomic_t autobind_name;
86939+ atomic_unchecked_t autobind_name;
86940 };
86941
86942 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
86943diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
86944index f3be818..bf46196 100644
86945--- a/include/net/llc_c_ac.h
86946+++ b/include/net/llc_c_ac.h
86947@@ -87,7 +87,7 @@
86948 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
86949 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
86950
86951-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86952+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86953
86954 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
86955 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
86956diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
86957index 3948cf1..83b28c4 100644
86958--- a/include/net/llc_c_ev.h
86959+++ b/include/net/llc_c_ev.h
86960@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
86961 return (struct llc_conn_state_ev *)skb->cb;
86962 }
86963
86964-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86965-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86966+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86967+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86968
86969 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
86970 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
86971diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
86972index 48f3f89..0e92c50 100644
86973--- a/include/net/llc_c_st.h
86974+++ b/include/net/llc_c_st.h
86975@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
86976 u8 next_state;
86977 const llc_conn_ev_qfyr_t *ev_qualifiers;
86978 const llc_conn_action_t *ev_actions;
86979-};
86980+} __do_const;
86981
86982 struct llc_conn_state {
86983 u8 current_state;
86984diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
86985index a61b98c..aade1eb 100644
86986--- a/include/net/llc_s_ac.h
86987+++ b/include/net/llc_s_ac.h
86988@@ -23,7 +23,7 @@
86989 #define SAP_ACT_TEST_IND 9
86990
86991 /* All action functions must look like this */
86992-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86993+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86994
86995 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
86996 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
86997diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
86998index c4359e2..76dbc4a 100644
86999--- a/include/net/llc_s_st.h
87000+++ b/include/net/llc_s_st.h
87001@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
87002 llc_sap_ev_t ev;
87003 u8 next_state;
87004 const llc_sap_action_t *ev_actions;
87005-};
87006+} __do_const;
87007
87008 struct llc_sap_state {
87009 u8 curr_state;
87010diff --git a/include/net/mac80211.h b/include/net/mac80211.h
87011index 29c7be8..746bd73 100644
87012--- a/include/net/mac80211.h
87013+++ b/include/net/mac80211.h
87014@@ -4869,7 +4869,7 @@ struct rate_control_ops {
87015 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
87016
87017 u32 (*get_expected_throughput)(void *priv_sta);
87018-};
87019+} __do_const;
87020
87021 static inline int rate_supported(struct ieee80211_sta *sta,
87022 enum ieee80211_band band,
87023diff --git a/include/net/neighbour.h b/include/net/neighbour.h
87024index 76f7084..8f36e39 100644
87025--- a/include/net/neighbour.h
87026+++ b/include/net/neighbour.h
87027@@ -163,7 +163,7 @@ struct neigh_ops {
87028 void (*error_report)(struct neighbour *, struct sk_buff *);
87029 int (*output)(struct neighbour *, struct sk_buff *);
87030 int (*connected_output)(struct neighbour *, struct sk_buff *);
87031-};
87032+} __do_const;
87033
87034 struct pneigh_entry {
87035 struct pneigh_entry *next;
87036@@ -217,7 +217,7 @@ struct neigh_table {
87037 struct neigh_statistics __percpu *stats;
87038 struct neigh_hash_table __rcu *nht;
87039 struct pneigh_entry **phash_buckets;
87040-};
87041+} __randomize_layout;
87042
87043 enum {
87044 NEIGH_ARP_TABLE = 0,
87045diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
87046index 2e8756b8..0bd0083 100644
87047--- a/include/net/net_namespace.h
87048+++ b/include/net/net_namespace.h
87049@@ -130,8 +130,8 @@ struct net {
87050 struct netns_ipvs *ipvs;
87051 #endif
87052 struct sock *diag_nlsk;
87053- atomic_t fnhe_genid;
87054-};
87055+ atomic_unchecked_t fnhe_genid;
87056+} __randomize_layout;
87057
87058 #include <linux/seq_file_net.h>
87059
87060@@ -287,7 +287,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
87061 #define __net_init __init
87062 #define __net_exit __exit_refok
87063 #define __net_initdata __initdata
87064+#ifdef CONSTIFY_PLUGIN
87065 #define __net_initconst __initconst
87066+#else
87067+#define __net_initconst __initdata
87068+#endif
87069 #endif
87070
87071 struct pernet_operations {
87072@@ -297,7 +301,7 @@ struct pernet_operations {
87073 void (*exit_batch)(struct list_head *net_exit_list);
87074 int *id;
87075 size_t size;
87076-};
87077+} __do_const;
87078
87079 /*
87080 * Use these carefully. If you implement a network device and it
87081@@ -345,12 +349,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
87082
87083 static inline int rt_genid_ipv4(struct net *net)
87084 {
87085- return atomic_read(&net->ipv4.rt_genid);
87086+ return atomic_read_unchecked(&net->ipv4.rt_genid);
87087 }
87088
87089 static inline void rt_genid_bump_ipv4(struct net *net)
87090 {
87091- atomic_inc(&net->ipv4.rt_genid);
87092+ atomic_inc_unchecked(&net->ipv4.rt_genid);
87093 }
87094
87095 extern void (*__fib6_flush_trees)(struct net *net);
87096@@ -377,12 +381,12 @@ static inline void rt_genid_bump_all(struct net *net)
87097
87098 static inline int fnhe_genid(struct net *net)
87099 {
87100- return atomic_read(&net->fnhe_genid);
87101+ return atomic_read_unchecked(&net->fnhe_genid);
87102 }
87103
87104 static inline void fnhe_genid_bump(struct net *net)
87105 {
87106- atomic_inc(&net->fnhe_genid);
87107+ atomic_inc_unchecked(&net->fnhe_genid);
87108 }
87109
87110 #endif /* __NET_NET_NAMESPACE_H */
87111diff --git a/include/net/netlink.h b/include/net/netlink.h
87112index 6415835..ab96d87 100644
87113--- a/include/net/netlink.h
87114+++ b/include/net/netlink.h
87115@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
87116 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
87117 {
87118 if (mark)
87119- skb_trim(skb, (unsigned char *) mark - skb->data);
87120+ skb_trim(skb, (const unsigned char *) mark - skb->data);
87121 }
87122
87123 /**
87124diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
87125index 29d6a94..235d3d84 100644
87126--- a/include/net/netns/conntrack.h
87127+++ b/include/net/netns/conntrack.h
87128@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
87129 struct nf_proto_net {
87130 #ifdef CONFIG_SYSCTL
87131 struct ctl_table_header *ctl_table_header;
87132- struct ctl_table *ctl_table;
87133+ ctl_table_no_const *ctl_table;
87134 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
87135 struct ctl_table_header *ctl_compat_header;
87136- struct ctl_table *ctl_compat_table;
87137+ ctl_table_no_const *ctl_compat_table;
87138 #endif
87139 #endif
87140 unsigned int users;
87141@@ -60,7 +60,7 @@ struct nf_ip_net {
87142 struct nf_icmp_net icmpv6;
87143 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
87144 struct ctl_table_header *ctl_table_header;
87145- struct ctl_table *ctl_table;
87146+ ctl_table_no_const *ctl_table;
87147 #endif
87148 };
87149
87150diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
87151index 0ffef1a..2ce1ceb 100644
87152--- a/include/net/netns/ipv4.h
87153+++ b/include/net/netns/ipv4.h
87154@@ -84,7 +84,7 @@ struct netns_ipv4 {
87155
87156 struct ping_group_range ping_group_range;
87157
87158- atomic_t dev_addr_genid;
87159+ atomic_unchecked_t dev_addr_genid;
87160
87161 #ifdef CONFIG_SYSCTL
87162 unsigned long *sysctl_local_reserved_ports;
87163@@ -98,6 +98,6 @@ struct netns_ipv4 {
87164 struct fib_rules_ops *mr_rules_ops;
87165 #endif
87166 #endif
87167- atomic_t rt_genid;
87168+ atomic_unchecked_t rt_genid;
87169 };
87170 #endif
87171diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
87172index 69ae41f..4f94868 100644
87173--- a/include/net/netns/ipv6.h
87174+++ b/include/net/netns/ipv6.h
87175@@ -75,8 +75,8 @@ struct netns_ipv6 {
87176 struct fib_rules_ops *mr6_rules_ops;
87177 #endif
87178 #endif
87179- atomic_t dev_addr_genid;
87180- atomic_t fib6_sernum;
87181+ atomic_unchecked_t dev_addr_genid;
87182+ atomic_unchecked_t fib6_sernum;
87183 };
87184
87185 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
87186diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
87187index 730d82a..045f2c4 100644
87188--- a/include/net/netns/xfrm.h
87189+++ b/include/net/netns/xfrm.h
87190@@ -78,7 +78,7 @@ struct netns_xfrm {
87191
87192 /* flow cache part */
87193 struct flow_cache flow_cache_global;
87194- atomic_t flow_cache_genid;
87195+ atomic_unchecked_t flow_cache_genid;
87196 struct list_head flow_cache_gc_list;
87197 spinlock_t flow_cache_gc_lock;
87198 struct work_struct flow_cache_gc_work;
87199diff --git a/include/net/ping.h b/include/net/ping.h
87200index f074060..830fba0 100644
87201--- a/include/net/ping.h
87202+++ b/include/net/ping.h
87203@@ -54,7 +54,7 @@ struct ping_iter_state {
87204
87205 extern struct proto ping_prot;
87206 #if IS_ENABLED(CONFIG_IPV6)
87207-extern struct pingv6_ops pingv6_ops;
87208+extern struct pingv6_ops *pingv6_ops;
87209 #endif
87210
87211 struct pingfakehdr {
87212diff --git a/include/net/protocol.h b/include/net/protocol.h
87213index d6fcc1f..ca277058 100644
87214--- a/include/net/protocol.h
87215+++ b/include/net/protocol.h
87216@@ -49,7 +49,7 @@ struct net_protocol {
87217 * socket lookup?
87218 */
87219 icmp_strict_tag_validation:1;
87220-};
87221+} __do_const;
87222
87223 #if IS_ENABLED(CONFIG_IPV6)
87224 struct inet6_protocol {
87225@@ -62,7 +62,7 @@ struct inet6_protocol {
87226 u8 type, u8 code, int offset,
87227 __be32 info);
87228 unsigned int flags; /* INET6_PROTO_xxx */
87229-};
87230+} __do_const;
87231
87232 #define INET6_PROTO_NOPOLICY 0x1
87233 #define INET6_PROTO_FINAL 0x2
87234diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
87235index e21b9f9..0191ef0 100644
87236--- a/include/net/rtnetlink.h
87237+++ b/include/net/rtnetlink.h
87238@@ -93,7 +93,7 @@ struct rtnl_link_ops {
87239 int (*fill_slave_info)(struct sk_buff *skb,
87240 const struct net_device *dev,
87241 const struct net_device *slave_dev);
87242-};
87243+} __do_const;
87244
87245 int __rtnl_link_register(struct rtnl_link_ops *ops);
87246 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
87247diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
87248index 4a5b9a3..ca27d73 100644
87249--- a/include/net/sctp/checksum.h
87250+++ b/include/net/sctp/checksum.h
87251@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
87252 unsigned int offset)
87253 {
87254 struct sctphdr *sh = sctp_hdr(skb);
87255- __le32 ret, old = sh->checksum;
87256- const struct skb_checksum_ops ops = {
87257+ __le32 ret, old = sh->checksum;
87258+ static const struct skb_checksum_ops ops = {
87259 .update = sctp_csum_update,
87260 .combine = sctp_csum_combine,
87261 };
87262diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
87263index 487ef34..d457f98 100644
87264--- a/include/net/sctp/sm.h
87265+++ b/include/net/sctp/sm.h
87266@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
87267 typedef struct {
87268 sctp_state_fn_t *fn;
87269 const char *name;
87270-} sctp_sm_table_entry_t;
87271+} __do_const sctp_sm_table_entry_t;
87272
87273 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
87274 * currently in use.
87275@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
87276 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
87277
87278 /* Extern declarations for major data structures. */
87279-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87280+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87281
87282
87283 /* Get the size of a DATA chunk payload. */
87284diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
87285index 2bb2fcf..d17c291 100644
87286--- a/include/net/sctp/structs.h
87287+++ b/include/net/sctp/structs.h
87288@@ -509,7 +509,7 @@ struct sctp_pf {
87289 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
87290 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
87291 struct sctp_af *af;
87292-};
87293+} __do_const;
87294
87295
87296 /* Structure to track chunk fragments that have been acked, but peer
87297diff --git a/include/net/sock.h b/include/net/sock.h
87298index 45b54d3..10efeac 100644
87299--- a/include/net/sock.h
87300+++ b/include/net/sock.h
87301@@ -362,7 +362,7 @@ struct sock {
87302 unsigned int sk_napi_id;
87303 unsigned int sk_ll_usec;
87304 #endif
87305- atomic_t sk_drops;
87306+ atomic_unchecked_t sk_drops;
87307 int sk_rcvbuf;
87308
87309 struct sk_filter __rcu *sk_filter;
87310@@ -1061,7 +1061,7 @@ struct proto {
87311 void (*destroy_cgroup)(struct mem_cgroup *memcg);
87312 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
87313 #endif
87314-};
87315+} __randomize_layout;
87316
87317 /*
87318 * Bits in struct cg_proto.flags
87319@@ -1239,7 +1239,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
87320 page_counter_uncharge(&prot->memory_allocated, amt);
87321 }
87322
87323-static inline long
87324+static inline long __intentional_overflow(-1)
87325 sk_memory_allocated(const struct sock *sk)
87326 {
87327 struct proto *prot = sk->sk_prot;
87328@@ -1385,7 +1385,7 @@ struct sock_iocb {
87329 struct scm_cookie *scm;
87330 struct msghdr *msg, async_msg;
87331 struct kiocb *kiocb;
87332-};
87333+} __randomize_layout;
87334
87335 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
87336 {
87337@@ -1828,7 +1828,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
87338 }
87339
87340 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
87341- char __user *from, char *to,
87342+ char __user *from, unsigned char *to,
87343 int copy, int offset)
87344 {
87345 if (skb->ip_summed == CHECKSUM_NONE) {
87346@@ -2077,7 +2077,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
87347 }
87348 }
87349
87350-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87351+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87352
87353 /**
87354 * sk_page_frag - return an appropriate page_frag
87355diff --git a/include/net/tcp.h b/include/net/tcp.h
87356index 9d9111e..349c847 100644
87357--- a/include/net/tcp.h
87358+++ b/include/net/tcp.h
87359@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
87360 void tcp_xmit_retransmit_queue(struct sock *);
87361 void tcp_simple_retransmit(struct sock *);
87362 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
87363-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87364+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87365
87366 void tcp_send_probe0(struct sock *);
87367 void tcp_send_partial(struct sock *);
87368@@ -689,8 +689,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
87369 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
87370 */
87371 struct tcp_skb_cb {
87372- __u32 seq; /* Starting sequence number */
87373- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
87374+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
87375+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
87376 union {
87377 /* Note : tcp_tw_isn is used in input path only
87378 * (isn chosen by tcp_timewait_state_process())
87379@@ -715,7 +715,7 @@ struct tcp_skb_cb {
87380
87381 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
87382 /* 1 byte hole */
87383- __u32 ack_seq; /* Sequence number ACK'd */
87384+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
87385 union {
87386 struct inet_skb_parm h4;
87387 #if IS_ENABLED(CONFIG_IPV6)
87388diff --git a/include/net/xfrm.h b/include/net/xfrm.h
87389index dc4865e..152ee4c 100644
87390--- a/include/net/xfrm.h
87391+++ b/include/net/xfrm.h
87392@@ -285,7 +285,6 @@ struct xfrm_dst;
87393 struct xfrm_policy_afinfo {
87394 unsigned short family;
87395 struct dst_ops *dst_ops;
87396- void (*garbage_collect)(struct net *net);
87397 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
87398 const xfrm_address_t *saddr,
87399 const xfrm_address_t *daddr);
87400@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
87401 struct net_device *dev,
87402 const struct flowi *fl);
87403 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
87404-};
87405+} __do_const;
87406
87407 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
87408 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
87409@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
87410 int (*transport_finish)(struct sk_buff *skb,
87411 int async);
87412 void (*local_error)(struct sk_buff *skb, u32 mtu);
87413-};
87414+} __do_const;
87415
87416 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
87417 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
87418@@ -437,7 +436,7 @@ struct xfrm_mode {
87419 struct module *owner;
87420 unsigned int encap;
87421 int flags;
87422-};
87423+} __do_const;
87424
87425 /* Flags for xfrm_mode. */
87426 enum {
87427@@ -534,7 +533,7 @@ struct xfrm_policy {
87428 struct timer_list timer;
87429
87430 struct flow_cache_object flo;
87431- atomic_t genid;
87432+ atomic_unchecked_t genid;
87433 u32 priority;
87434 u32 index;
87435 struct xfrm_mark mark;
87436@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
87437 }
87438
87439 void xfrm_garbage_collect(struct net *net);
87440+void xfrm_garbage_collect_deferred(struct net *net);
87441
87442 #else
87443
87444@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
87445 static inline void xfrm_garbage_collect(struct net *net)
87446 {
87447 }
87448+static inline void xfrm_garbage_collect_deferred(struct net *net)
87449+{
87450+}
87451 #endif
87452
87453 static __inline__
87454diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
87455index 1017e0b..227aa4d 100644
87456--- a/include/rdma/iw_cm.h
87457+++ b/include/rdma/iw_cm.h
87458@@ -122,7 +122,7 @@ struct iw_cm_verbs {
87459 int backlog);
87460
87461 int (*destroy_listen)(struct iw_cm_id *cm_id);
87462-};
87463+} __no_const;
87464
87465 /**
87466 * iw_create_cm_id - Create an IW CM identifier.
87467diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
87468index 93d14da..734b3d8 100644
87469--- a/include/scsi/libfc.h
87470+++ b/include/scsi/libfc.h
87471@@ -771,6 +771,7 @@ struct libfc_function_template {
87472 */
87473 void (*disc_stop_final) (struct fc_lport *);
87474 };
87475+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
87476
87477 /**
87478 * struct fc_disc - Discovery context
87479@@ -875,7 +876,7 @@ struct fc_lport {
87480 struct fc_vport *vport;
87481
87482 /* Operational Information */
87483- struct libfc_function_template tt;
87484+ libfc_function_template_no_const tt;
87485 u8 link_up;
87486 u8 qfull;
87487 enum fc_lport_state state;
87488diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
87489index 3a4edd1..feb2e3e 100644
87490--- a/include/scsi/scsi_device.h
87491+++ b/include/scsi/scsi_device.h
87492@@ -185,9 +185,9 @@ struct scsi_device {
87493 unsigned int max_device_blocked; /* what device_blocked counts down from */
87494 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
87495
87496- atomic_t iorequest_cnt;
87497- atomic_t iodone_cnt;
87498- atomic_t ioerr_cnt;
87499+ atomic_unchecked_t iorequest_cnt;
87500+ atomic_unchecked_t iodone_cnt;
87501+ atomic_unchecked_t ioerr_cnt;
87502
87503 struct device sdev_gendev,
87504 sdev_dev;
87505diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
87506index 007a0bc..7188db8 100644
87507--- a/include/scsi/scsi_transport_fc.h
87508+++ b/include/scsi/scsi_transport_fc.h
87509@@ -756,7 +756,8 @@ struct fc_function_template {
87510 unsigned long show_host_system_hostname:1;
87511
87512 unsigned long disable_target_scan:1;
87513-};
87514+} __do_const;
87515+typedef struct fc_function_template __no_const fc_function_template_no_const;
87516
87517
87518 /**
87519diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
87520index 396e8f7..b037e89 100644
87521--- a/include/sound/compress_driver.h
87522+++ b/include/sound/compress_driver.h
87523@@ -129,7 +129,7 @@ struct snd_compr_ops {
87524 struct snd_compr_caps *caps);
87525 int (*get_codec_caps) (struct snd_compr_stream *stream,
87526 struct snd_compr_codec_caps *codec);
87527-};
87528+} __no_const;
87529
87530 /**
87531 * struct snd_compr: Compressed device
87532diff --git a/include/sound/soc.h b/include/sound/soc.h
87533index ac8b333..59c3692 100644
87534--- a/include/sound/soc.h
87535+++ b/include/sound/soc.h
87536@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
87537 enum snd_soc_dapm_type, int);
87538
87539 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
87540-};
87541+} __do_const;
87542
87543 /* SoC platform interface */
87544 struct snd_soc_platform_driver {
87545@@ -880,7 +880,7 @@ struct snd_soc_platform_driver {
87546 const struct snd_compr_ops *compr_ops;
87547
87548 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
87549-};
87550+} __do_const;
87551
87552 struct snd_soc_dai_link_component {
87553 const char *name;
87554diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
87555index 672150b..9d4bec4 100644
87556--- a/include/target/target_core_base.h
87557+++ b/include/target/target_core_base.h
87558@@ -767,7 +767,7 @@ struct se_device {
87559 atomic_long_t write_bytes;
87560 /* Active commands on this virtual SE device */
87561 atomic_t simple_cmds;
87562- atomic_t dev_ordered_id;
87563+ atomic_unchecked_t dev_ordered_id;
87564 atomic_t dev_ordered_sync;
87565 atomic_t dev_qf_count;
87566 int export_count;
87567diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
87568new file mode 100644
87569index 0000000..fb634b7
87570--- /dev/null
87571+++ b/include/trace/events/fs.h
87572@@ -0,0 +1,53 @@
87573+#undef TRACE_SYSTEM
87574+#define TRACE_SYSTEM fs
87575+
87576+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
87577+#define _TRACE_FS_H
87578+
87579+#include <linux/fs.h>
87580+#include <linux/tracepoint.h>
87581+
87582+TRACE_EVENT(do_sys_open,
87583+
87584+ TP_PROTO(const char *filename, int flags, int mode),
87585+
87586+ TP_ARGS(filename, flags, mode),
87587+
87588+ TP_STRUCT__entry(
87589+ __string( filename, filename )
87590+ __field( int, flags )
87591+ __field( int, mode )
87592+ ),
87593+
87594+ TP_fast_assign(
87595+ __assign_str(filename, filename);
87596+ __entry->flags = flags;
87597+ __entry->mode = mode;
87598+ ),
87599+
87600+ TP_printk("\"%s\" %x %o",
87601+ __get_str(filename), __entry->flags, __entry->mode)
87602+);
87603+
87604+TRACE_EVENT(open_exec,
87605+
87606+ TP_PROTO(const char *filename),
87607+
87608+ TP_ARGS(filename),
87609+
87610+ TP_STRUCT__entry(
87611+ __string( filename, filename )
87612+ ),
87613+
87614+ TP_fast_assign(
87615+ __assign_str(filename, filename);
87616+ ),
87617+
87618+ TP_printk("\"%s\"",
87619+ __get_str(filename))
87620+);
87621+
87622+#endif /* _TRACE_FS_H */
87623+
87624+/* This part must be outside protection */
87625+#include <trace/define_trace.h>
87626diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
87627index 3608beb..df39d8a 100644
87628--- a/include/trace/events/irq.h
87629+++ b/include/trace/events/irq.h
87630@@ -36,7 +36,7 @@ struct softirq_action;
87631 */
87632 TRACE_EVENT(irq_handler_entry,
87633
87634- TP_PROTO(int irq, struct irqaction *action),
87635+ TP_PROTO(int irq, const struct irqaction *action),
87636
87637 TP_ARGS(irq, action),
87638
87639@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
87640 */
87641 TRACE_EVENT(irq_handler_exit,
87642
87643- TP_PROTO(int irq, struct irqaction *action, int ret),
87644+ TP_PROTO(int irq, const struct irqaction *action, int ret),
87645
87646 TP_ARGS(irq, action, ret),
87647
87648diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
87649index 7caf44c..23c6f27 100644
87650--- a/include/uapi/linux/a.out.h
87651+++ b/include/uapi/linux/a.out.h
87652@@ -39,6 +39,14 @@ enum machine_type {
87653 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
87654 };
87655
87656+/* Constants for the N_FLAGS field */
87657+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87658+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
87659+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
87660+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
87661+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87662+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87663+
87664 #if !defined (N_MAGIC)
87665 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
87666 #endif
87667diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
87668index 22b6ad3..aeba37e 100644
87669--- a/include/uapi/linux/bcache.h
87670+++ b/include/uapi/linux/bcache.h
87671@@ -5,6 +5,7 @@
87672 * Bcache on disk data structures
87673 */
87674
87675+#include <linux/compiler.h>
87676 #include <asm/types.h>
87677
87678 #define BITMASK(name, type, field, offset, size) \
87679@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
87680 /* Btree keys - all units are in sectors */
87681
87682 struct bkey {
87683- __u64 high;
87684- __u64 low;
87685+ __u64 high __intentional_overflow(-1);
87686+ __u64 low __intentional_overflow(-1);
87687 __u64 ptr[];
87688 };
87689
87690diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
87691index d876736..ccce5c0 100644
87692--- a/include/uapi/linux/byteorder/little_endian.h
87693+++ b/include/uapi/linux/byteorder/little_endian.h
87694@@ -42,51 +42,51 @@
87695
87696 static inline __le64 __cpu_to_le64p(const __u64 *p)
87697 {
87698- return (__force __le64)*p;
87699+ return (__force const __le64)*p;
87700 }
87701-static inline __u64 __le64_to_cpup(const __le64 *p)
87702+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
87703 {
87704- return (__force __u64)*p;
87705+ return (__force const __u64)*p;
87706 }
87707 static inline __le32 __cpu_to_le32p(const __u32 *p)
87708 {
87709- return (__force __le32)*p;
87710+ return (__force const __le32)*p;
87711 }
87712 static inline __u32 __le32_to_cpup(const __le32 *p)
87713 {
87714- return (__force __u32)*p;
87715+ return (__force const __u32)*p;
87716 }
87717 static inline __le16 __cpu_to_le16p(const __u16 *p)
87718 {
87719- return (__force __le16)*p;
87720+ return (__force const __le16)*p;
87721 }
87722 static inline __u16 __le16_to_cpup(const __le16 *p)
87723 {
87724- return (__force __u16)*p;
87725+ return (__force const __u16)*p;
87726 }
87727 static inline __be64 __cpu_to_be64p(const __u64 *p)
87728 {
87729- return (__force __be64)__swab64p(p);
87730+ return (__force const __be64)__swab64p(p);
87731 }
87732 static inline __u64 __be64_to_cpup(const __be64 *p)
87733 {
87734- return __swab64p((__u64 *)p);
87735+ return __swab64p((const __u64 *)p);
87736 }
87737 static inline __be32 __cpu_to_be32p(const __u32 *p)
87738 {
87739- return (__force __be32)__swab32p(p);
87740+ return (__force const __be32)__swab32p(p);
87741 }
87742-static inline __u32 __be32_to_cpup(const __be32 *p)
87743+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
87744 {
87745- return __swab32p((__u32 *)p);
87746+ return __swab32p((const __u32 *)p);
87747 }
87748 static inline __be16 __cpu_to_be16p(const __u16 *p)
87749 {
87750- return (__force __be16)__swab16p(p);
87751+ return (__force const __be16)__swab16p(p);
87752 }
87753 static inline __u16 __be16_to_cpup(const __be16 *p)
87754 {
87755- return __swab16p((__u16 *)p);
87756+ return __swab16p((const __u16 *)p);
87757 }
87758 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
87759 #define __le64_to_cpus(x) do { (void)(x); } while (0)
87760diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
87761index 71e1d0e..6cc9caf 100644
87762--- a/include/uapi/linux/elf.h
87763+++ b/include/uapi/linux/elf.h
87764@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
87765 #define PT_GNU_EH_FRAME 0x6474e550
87766
87767 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
87768+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
87769+
87770+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
87771+
87772+/* Constants for the e_flags field */
87773+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87774+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
87775+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
87776+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
87777+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87778+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87779
87780 /*
87781 * Extended Numbering
87782@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
87783 #define DT_DEBUG 21
87784 #define DT_TEXTREL 22
87785 #define DT_JMPREL 23
87786+#define DT_FLAGS 30
87787+ #define DF_TEXTREL 0x00000004
87788 #define DT_ENCODING 32
87789 #define OLD_DT_LOOS 0x60000000
87790 #define DT_LOOS 0x6000000d
87791@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
87792 #define PF_W 0x2
87793 #define PF_X 0x1
87794
87795+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
87796+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
87797+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
87798+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
87799+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
87800+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
87801+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
87802+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
87803+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
87804+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
87805+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
87806+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
87807+
87808 typedef struct elf32_phdr{
87809 Elf32_Word p_type;
87810 Elf32_Off p_offset;
87811@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
87812 #define EI_OSABI 7
87813 #define EI_PAD 8
87814
87815+#define EI_PAX 14
87816+
87817 #define ELFMAG0 0x7f /* EI_MAG */
87818 #define ELFMAG1 'E'
87819 #define ELFMAG2 'L'
87820diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
87821index aa169c4..6a2771d 100644
87822--- a/include/uapi/linux/personality.h
87823+++ b/include/uapi/linux/personality.h
87824@@ -30,6 +30,7 @@ enum {
87825 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
87826 ADDR_NO_RANDOMIZE | \
87827 ADDR_COMPAT_LAYOUT | \
87828+ ADDR_LIMIT_3GB | \
87829 MMAP_PAGE_ZERO)
87830
87831 /*
87832diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
87833index 7530e74..e714828 100644
87834--- a/include/uapi/linux/screen_info.h
87835+++ b/include/uapi/linux/screen_info.h
87836@@ -43,7 +43,8 @@ struct screen_info {
87837 __u16 pages; /* 0x32 */
87838 __u16 vesa_attributes; /* 0x34 */
87839 __u32 capabilities; /* 0x36 */
87840- __u8 _reserved[6]; /* 0x3a */
87841+ __u16 vesapm_size; /* 0x3a */
87842+ __u8 _reserved[4]; /* 0x3c */
87843 } __attribute__((packed));
87844
87845 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
87846diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
87847index 0e011eb..82681b1 100644
87848--- a/include/uapi/linux/swab.h
87849+++ b/include/uapi/linux/swab.h
87850@@ -43,7 +43,7 @@
87851 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
87852 */
87853
87854-static inline __attribute_const__ __u16 __fswab16(__u16 val)
87855+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
87856 {
87857 #ifdef __HAVE_BUILTIN_BSWAP16__
87858 return __builtin_bswap16(val);
87859@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
87860 #endif
87861 }
87862
87863-static inline __attribute_const__ __u32 __fswab32(__u32 val)
87864+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
87865 {
87866 #ifdef __HAVE_BUILTIN_BSWAP32__
87867 return __builtin_bswap32(val);
87868@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
87869 #endif
87870 }
87871
87872-static inline __attribute_const__ __u64 __fswab64(__u64 val)
87873+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
87874 {
87875 #ifdef __HAVE_BUILTIN_BSWAP64__
87876 return __builtin_bswap64(val);
87877diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
87878index 1590c49..5eab462 100644
87879--- a/include/uapi/linux/xattr.h
87880+++ b/include/uapi/linux/xattr.h
87881@@ -73,5 +73,9 @@
87882 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
87883 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
87884
87885+/* User namespace */
87886+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
87887+#define XATTR_PAX_FLAGS_SUFFIX "flags"
87888+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
87889
87890 #endif /* _UAPI_LINUX_XATTR_H */
87891diff --git a/include/video/udlfb.h b/include/video/udlfb.h
87892index f9466fa..f4e2b81 100644
87893--- a/include/video/udlfb.h
87894+++ b/include/video/udlfb.h
87895@@ -53,10 +53,10 @@ struct dlfb_data {
87896 u32 pseudo_palette[256];
87897 int blank_mode; /*one of FB_BLANK_ */
87898 /* blit-only rendering path metrics, exposed through sysfs */
87899- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87900- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
87901- atomic_t bytes_sent; /* to usb, after compression including overhead */
87902- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
87903+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87904+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
87905+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
87906+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
87907 };
87908
87909 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
87910diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
87911index 30f5362..8ed8ac9 100644
87912--- a/include/video/uvesafb.h
87913+++ b/include/video/uvesafb.h
87914@@ -122,6 +122,7 @@ struct uvesafb_par {
87915 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
87916 u8 pmi_setpal; /* PMI for palette changes */
87917 u16 *pmi_base; /* protected mode interface location */
87918+ u8 *pmi_code; /* protected mode code location */
87919 void *pmi_start;
87920 void *pmi_pal;
87921 u8 *vbe_state_orig; /*
87922diff --git a/init/Kconfig b/init/Kconfig
87923index 9afb971..27d6fca 100644
87924--- a/init/Kconfig
87925+++ b/init/Kconfig
87926@@ -1129,6 +1129,7 @@ endif # CGROUPS
87927
87928 config CHECKPOINT_RESTORE
87929 bool "Checkpoint/restore support" if EXPERT
87930+ depends on !GRKERNSEC
87931 default n
87932 help
87933 Enables additional kernel features in a sake of checkpoint/restore.
87934@@ -1654,7 +1655,7 @@ config SLUB_DEBUG
87935
87936 config COMPAT_BRK
87937 bool "Disable heap randomization"
87938- default y
87939+ default n
87940 help
87941 Randomizing heap placement makes heap exploits harder, but it
87942 also breaks ancient binaries (including anything libc5 based).
87943@@ -1985,7 +1986,7 @@ config INIT_ALL_POSSIBLE
87944 config STOP_MACHINE
87945 bool
87946 default y
87947- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
87948+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
87949 help
87950 Need stop_machine() primitive.
87951
87952diff --git a/init/Makefile b/init/Makefile
87953index 7bc47ee..6da2dc7 100644
87954--- a/init/Makefile
87955+++ b/init/Makefile
87956@@ -2,6 +2,9 @@
87957 # Makefile for the linux kernel.
87958 #
87959
87960+ccflags-y := $(GCC_PLUGINS_CFLAGS)
87961+asflags-y := $(GCC_PLUGINS_AFLAGS)
87962+
87963 obj-y := main.o version.o mounts.o
87964 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
87965 obj-y += noinitramfs.o
87966diff --git a/init/do_mounts.c b/init/do_mounts.c
87967index eb41008..f5dbbf9 100644
87968--- a/init/do_mounts.c
87969+++ b/init/do_mounts.c
87970@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
87971 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
87972 {
87973 struct super_block *s;
87974- int err = sys_mount(name, "/root", fs, flags, data);
87975+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
87976 if (err)
87977 return err;
87978
87979- sys_chdir("/root");
87980+ sys_chdir((const char __force_user *)"/root");
87981 s = current->fs->pwd.dentry->d_sb;
87982 ROOT_DEV = s->s_dev;
87983 printk(KERN_INFO
87984@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
87985 va_start(args, fmt);
87986 vsprintf(buf, fmt, args);
87987 va_end(args);
87988- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
87989+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
87990 if (fd >= 0) {
87991 sys_ioctl(fd, FDEJECT, 0);
87992 sys_close(fd);
87993 }
87994 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87995- fd = sys_open("/dev/console", O_RDWR, 0);
87996+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87997 if (fd >= 0) {
87998 sys_ioctl(fd, TCGETS, (long)&termios);
87999 termios.c_lflag &= ~ICANON;
88000 sys_ioctl(fd, TCSETSF, (long)&termios);
88001- sys_read(fd, &c, 1);
88002+ sys_read(fd, (char __user *)&c, 1);
88003 termios.c_lflag |= ICANON;
88004 sys_ioctl(fd, TCSETSF, (long)&termios);
88005 sys_close(fd);
88006@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
88007 mount_root();
88008 out:
88009 devtmpfs_mount("dev");
88010- sys_mount(".", "/", NULL, MS_MOVE, NULL);
88011- sys_chroot(".");
88012+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
88013+ sys_chroot((const char __force_user *)".");
88014 }
88015
88016 static bool is_tmpfs;
88017diff --git a/init/do_mounts.h b/init/do_mounts.h
88018index f5b978a..69dbfe8 100644
88019--- a/init/do_mounts.h
88020+++ b/init/do_mounts.h
88021@@ -15,15 +15,15 @@ extern int root_mountflags;
88022
88023 static inline int create_dev(char *name, dev_t dev)
88024 {
88025- sys_unlink(name);
88026- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
88027+ sys_unlink((char __force_user *)name);
88028+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
88029 }
88030
88031 #if BITS_PER_LONG == 32
88032 static inline u32 bstat(char *name)
88033 {
88034 struct stat64 stat;
88035- if (sys_stat64(name, &stat) != 0)
88036+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
88037 return 0;
88038 if (!S_ISBLK(stat.st_mode))
88039 return 0;
88040@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
88041 static inline u32 bstat(char *name)
88042 {
88043 struct stat stat;
88044- if (sys_newstat(name, &stat) != 0)
88045+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
88046 return 0;
88047 if (!S_ISBLK(stat.st_mode))
88048 return 0;
88049diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
88050index 3e0878e..8a9d7a0 100644
88051--- a/init/do_mounts_initrd.c
88052+++ b/init/do_mounts_initrd.c
88053@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
88054 {
88055 sys_unshare(CLONE_FS | CLONE_FILES);
88056 /* stdin/stdout/stderr for /linuxrc */
88057- sys_open("/dev/console", O_RDWR, 0);
88058+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
88059 sys_dup(0);
88060 sys_dup(0);
88061 /* move initrd over / and chdir/chroot in initrd root */
88062- sys_chdir("/root");
88063- sys_mount(".", "/", NULL, MS_MOVE, NULL);
88064- sys_chroot(".");
88065+ sys_chdir((const char __force_user *)"/root");
88066+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
88067+ sys_chroot((const char __force_user *)".");
88068 sys_setsid();
88069 return 0;
88070 }
88071@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
88072 create_dev("/dev/root.old", Root_RAM0);
88073 /* mount initrd on rootfs' /root */
88074 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
88075- sys_mkdir("/old", 0700);
88076- sys_chdir("/old");
88077+ sys_mkdir((const char __force_user *)"/old", 0700);
88078+ sys_chdir((const char __force_user *)"/old");
88079
88080 /* try loading default modules from initrd */
88081 load_default_modules();
88082@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
88083 current->flags &= ~PF_FREEZER_SKIP;
88084
88085 /* move initrd to rootfs' /old */
88086- sys_mount("..", ".", NULL, MS_MOVE, NULL);
88087+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
88088 /* switch root and cwd back to / of rootfs */
88089- sys_chroot("..");
88090+ sys_chroot((const char __force_user *)"..");
88091
88092 if (new_decode_dev(real_root_dev) == Root_RAM0) {
88093- sys_chdir("/old");
88094+ sys_chdir((const char __force_user *)"/old");
88095 return;
88096 }
88097
88098- sys_chdir("/");
88099+ sys_chdir((const char __force_user *)"/");
88100 ROOT_DEV = new_decode_dev(real_root_dev);
88101 mount_root();
88102
88103 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
88104- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
88105+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
88106 if (!error)
88107 printk("okay\n");
88108 else {
88109- int fd = sys_open("/dev/root.old", O_RDWR, 0);
88110+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
88111 if (error == -ENOENT)
88112 printk("/initrd does not exist. Ignored.\n");
88113 else
88114 printk("failed\n");
88115 printk(KERN_NOTICE "Unmounting old root\n");
88116- sys_umount("/old", MNT_DETACH);
88117+ sys_umount((char __force_user *)"/old", MNT_DETACH);
88118 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
88119 if (fd < 0) {
88120 error = fd;
88121@@ -127,11 +127,11 @@ int __init initrd_load(void)
88122 * mounted in the normal path.
88123 */
88124 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
88125- sys_unlink("/initrd.image");
88126+ sys_unlink((const char __force_user *)"/initrd.image");
88127 handle_initrd();
88128 return 1;
88129 }
88130 }
88131- sys_unlink("/initrd.image");
88132+ sys_unlink((const char __force_user *)"/initrd.image");
88133 return 0;
88134 }
88135diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
88136index 8cb6db5..d729f50 100644
88137--- a/init/do_mounts_md.c
88138+++ b/init/do_mounts_md.c
88139@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
88140 partitioned ? "_d" : "", minor,
88141 md_setup_args[ent].device_names);
88142
88143- fd = sys_open(name, 0, 0);
88144+ fd = sys_open((char __force_user *)name, 0, 0);
88145 if (fd < 0) {
88146 printk(KERN_ERR "md: open failed - cannot start "
88147 "array %s\n", name);
88148@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
88149 * array without it
88150 */
88151 sys_close(fd);
88152- fd = sys_open(name, 0, 0);
88153+ fd = sys_open((char __force_user *)name, 0, 0);
88154 sys_ioctl(fd, BLKRRPART, 0);
88155 }
88156 sys_close(fd);
88157@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
88158
88159 wait_for_device_probe();
88160
88161- fd = sys_open("/dev/md0", 0, 0);
88162+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
88163 if (fd >= 0) {
88164 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
88165 sys_close(fd);
88166diff --git a/init/init_task.c b/init/init_task.c
88167index ba0a7f36..2bcf1d5 100644
88168--- a/init/init_task.c
88169+++ b/init/init_task.c
88170@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
88171 * Initial thread structure. Alignment of this is handled by a special
88172 * linker map entry.
88173 */
88174+#ifdef CONFIG_X86
88175+union thread_union init_thread_union __init_task_data;
88176+#else
88177 union thread_union init_thread_union __init_task_data =
88178 { INIT_THREAD_INFO(init_task) };
88179+#endif
88180diff --git a/init/initramfs.c b/init/initramfs.c
88181index ad1bd77..dca2c1b 100644
88182--- a/init/initramfs.c
88183+++ b/init/initramfs.c
88184@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
88185
88186 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
88187 while (count) {
88188- ssize_t rv = sys_write(fd, p, count);
88189+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
88190
88191 if (rv < 0) {
88192 if (rv == -EINTR || rv == -EAGAIN)
88193@@ -107,7 +107,7 @@ static void __init free_hash(void)
88194 }
88195 }
88196
88197-static long __init do_utime(char *filename, time_t mtime)
88198+static long __init do_utime(char __force_user *filename, time_t mtime)
88199 {
88200 struct timespec t[2];
88201
88202@@ -142,7 +142,7 @@ static void __init dir_utime(void)
88203 struct dir_entry *de, *tmp;
88204 list_for_each_entry_safe(de, tmp, &dir_list, list) {
88205 list_del(&de->list);
88206- do_utime(de->name, de->mtime);
88207+ do_utime((char __force_user *)de->name, de->mtime);
88208 kfree(de->name);
88209 kfree(de);
88210 }
88211@@ -304,7 +304,7 @@ static int __init maybe_link(void)
88212 if (nlink >= 2) {
88213 char *old = find_link(major, minor, ino, mode, collected);
88214 if (old)
88215- return (sys_link(old, collected) < 0) ? -1 : 1;
88216+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
88217 }
88218 return 0;
88219 }
88220@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
88221 {
88222 struct stat st;
88223
88224- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
88225+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
88226 if (S_ISDIR(st.st_mode))
88227- sys_rmdir(path);
88228+ sys_rmdir((char __force_user *)path);
88229 else
88230- sys_unlink(path);
88231+ sys_unlink((char __force_user *)path);
88232 }
88233 }
88234
88235@@ -338,7 +338,7 @@ static int __init do_name(void)
88236 int openflags = O_WRONLY|O_CREAT;
88237 if (ml != 1)
88238 openflags |= O_TRUNC;
88239- wfd = sys_open(collected, openflags, mode);
88240+ wfd = sys_open((char __force_user *)collected, openflags, mode);
88241
88242 if (wfd >= 0) {
88243 sys_fchown(wfd, uid, gid);
88244@@ -350,17 +350,17 @@ static int __init do_name(void)
88245 }
88246 }
88247 } else if (S_ISDIR(mode)) {
88248- sys_mkdir(collected, mode);
88249- sys_chown(collected, uid, gid);
88250- sys_chmod(collected, mode);
88251+ sys_mkdir((char __force_user *)collected, mode);
88252+ sys_chown((char __force_user *)collected, uid, gid);
88253+ sys_chmod((char __force_user *)collected, mode);
88254 dir_add(collected, mtime);
88255 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
88256 S_ISFIFO(mode) || S_ISSOCK(mode)) {
88257 if (maybe_link() == 0) {
88258- sys_mknod(collected, mode, rdev);
88259- sys_chown(collected, uid, gid);
88260- sys_chmod(collected, mode);
88261- do_utime(collected, mtime);
88262+ sys_mknod((char __force_user *)collected, mode, rdev);
88263+ sys_chown((char __force_user *)collected, uid, gid);
88264+ sys_chmod((char __force_user *)collected, mode);
88265+ do_utime((char __force_user *)collected, mtime);
88266 }
88267 }
88268 return 0;
88269@@ -372,7 +372,7 @@ static int __init do_copy(void)
88270 if (xwrite(wfd, victim, body_len) != body_len)
88271 error("write error");
88272 sys_close(wfd);
88273- do_utime(vcollected, mtime);
88274+ do_utime((char __force_user *)vcollected, mtime);
88275 kfree(vcollected);
88276 eat(body_len);
88277 state = SkipIt;
88278@@ -390,9 +390,9 @@ static int __init do_symlink(void)
88279 {
88280 collected[N_ALIGN(name_len) + body_len] = '\0';
88281 clean_path(collected, 0);
88282- sys_symlink(collected + N_ALIGN(name_len), collected);
88283- sys_lchown(collected, uid, gid);
88284- do_utime(collected, mtime);
88285+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
88286+ sys_lchown((char __force_user *)collected, uid, gid);
88287+ do_utime((char __force_user *)collected, mtime);
88288 state = SkipIt;
88289 next_state = Reset;
88290 return 0;
88291diff --git a/init/main.c b/init/main.c
88292index 61b99376..1e346cb 100644
88293--- a/init/main.c
88294+++ b/init/main.c
88295@@ -100,6 +100,8 @@ extern void radix_tree_init(void);
88296 static inline void mark_rodata_ro(void) { }
88297 #endif
88298
88299+extern void grsecurity_init(void);
88300+
88301 /*
88302 * Debug helper: via this flag we know that we are in 'early bootup code'
88303 * where only the boot processor is running with IRQ disabled. This means
88304@@ -161,6 +163,85 @@ static int __init set_reset_devices(char *str)
88305
88306 __setup("reset_devices", set_reset_devices);
88307
88308+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
88309+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
88310+static int __init setup_grsec_proc_gid(char *str)
88311+{
88312+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
88313+ return 1;
88314+}
88315+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
88316+#endif
88317+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
88318+int grsec_enable_sysfs_restrict = 1;
88319+static int __init setup_grsec_sysfs_restrict(char *str)
88320+{
88321+ if (!simple_strtol(str, NULL, 0))
88322+ grsec_enable_sysfs_restrict = 0;
88323+ return 1;
88324+}
88325+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
88326+#endif
88327+
88328+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
88329+unsigned long pax_user_shadow_base __read_only;
88330+EXPORT_SYMBOL(pax_user_shadow_base);
88331+extern char pax_enter_kernel_user[];
88332+extern char pax_exit_kernel_user[];
88333+#endif
88334+
88335+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
88336+static int __init setup_pax_nouderef(char *str)
88337+{
88338+#ifdef CONFIG_X86_32
88339+ unsigned int cpu;
88340+ struct desc_struct *gdt;
88341+
88342+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
88343+ gdt = get_cpu_gdt_table(cpu);
88344+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
88345+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
88346+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
88347+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
88348+ }
88349+ loadsegment(ds, __KERNEL_DS);
88350+ loadsegment(es, __KERNEL_DS);
88351+ loadsegment(ss, __KERNEL_DS);
88352+#else
88353+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
88354+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
88355+ clone_pgd_mask = ~(pgdval_t)0UL;
88356+ pax_user_shadow_base = 0UL;
88357+ setup_clear_cpu_cap(X86_FEATURE_PCID);
88358+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
88359+#endif
88360+
88361+ return 0;
88362+}
88363+early_param("pax_nouderef", setup_pax_nouderef);
88364+
88365+#ifdef CONFIG_X86_64
88366+static int __init setup_pax_weakuderef(char *str)
88367+{
88368+ if (clone_pgd_mask != ~(pgdval_t)0UL)
88369+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
88370+ return 1;
88371+}
88372+__setup("pax_weakuderef", setup_pax_weakuderef);
88373+#endif
88374+#endif
88375+
88376+#ifdef CONFIG_PAX_SOFTMODE
88377+int pax_softmode;
88378+
88379+static int __init setup_pax_softmode(char *str)
88380+{
88381+ get_option(&str, &pax_softmode);
88382+ return 1;
88383+}
88384+__setup("pax_softmode=", setup_pax_softmode);
88385+#endif
88386+
88387 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
88388 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
88389 static const char *panic_later, *panic_param;
88390@@ -735,7 +816,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
88391 struct blacklist_entry *entry;
88392 char *fn_name;
88393
88394- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
88395+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
88396 if (!fn_name)
88397 return false;
88398
88399@@ -787,7 +868,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
88400 {
88401 int count = preempt_count();
88402 int ret;
88403- char msgbuf[64];
88404+ const char *msg1 = "", *msg2 = "";
88405
88406 if (initcall_blacklisted(fn))
88407 return -EPERM;
88408@@ -797,18 +878,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
88409 else
88410 ret = fn();
88411
88412- msgbuf[0] = 0;
88413-
88414 if (preempt_count() != count) {
88415- sprintf(msgbuf, "preemption imbalance ");
88416+ msg1 = " preemption imbalance";
88417 preempt_count_set(count);
88418 }
88419 if (irqs_disabled()) {
88420- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
88421+ msg2 = " disabled interrupts";
88422 local_irq_enable();
88423 }
88424- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
88425+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
88426
88427+ add_latent_entropy();
88428 return ret;
88429 }
88430
88431@@ -914,8 +994,8 @@ static int run_init_process(const char *init_filename)
88432 {
88433 argv_init[0] = init_filename;
88434 return do_execve(getname_kernel(init_filename),
88435- (const char __user *const __user *)argv_init,
88436- (const char __user *const __user *)envp_init);
88437+ (const char __user *const __force_user *)argv_init,
88438+ (const char __user *const __force_user *)envp_init);
88439 }
88440
88441 static int try_to_run_init_process(const char *init_filename)
88442@@ -932,6 +1012,10 @@ static int try_to_run_init_process(const char *init_filename)
88443 return ret;
88444 }
88445
88446+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
88447+extern int gr_init_ran;
88448+#endif
88449+
88450 static noinline void __init kernel_init_freeable(void);
88451
88452 static int __ref kernel_init(void *unused)
88453@@ -956,6 +1040,11 @@ static int __ref kernel_init(void *unused)
88454 ramdisk_execute_command, ret);
88455 }
88456
88457+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
88458+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
88459+ gr_init_ran = 1;
88460+#endif
88461+
88462 /*
88463 * We try each of these until one succeeds.
88464 *
88465@@ -1016,7 +1105,7 @@ static noinline void __init kernel_init_freeable(void)
88466 do_basic_setup();
88467
88468 /* Open the /dev/console on the rootfs, this should never fail */
88469- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
88470+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
88471 pr_err("Warning: unable to open an initial console.\n");
88472
88473 (void) sys_dup(0);
88474@@ -1029,11 +1118,13 @@ static noinline void __init kernel_init_freeable(void)
88475 if (!ramdisk_execute_command)
88476 ramdisk_execute_command = "/init";
88477
88478- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
88479+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
88480 ramdisk_execute_command = NULL;
88481 prepare_namespace();
88482 }
88483
88484+ grsecurity_init();
88485+
88486 /*
88487 * Ok, we have completed the initial bootup, and
88488 * we're essentially up and running. Get rid of the
88489diff --git a/ipc/compat.c b/ipc/compat.c
88490index 9b3c85f..1c4d897 100644
88491--- a/ipc/compat.c
88492+++ b/ipc/compat.c
88493@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
88494 COMPAT_SHMLBA);
88495 if (err < 0)
88496 return err;
88497- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
88498+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
88499 }
88500 case SHMDT:
88501 return sys_shmdt(compat_ptr(ptr));
88502diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
88503index 8ad93c2..efd80f8 100644
88504--- a/ipc/ipc_sysctl.c
88505+++ b/ipc/ipc_sysctl.c
88506@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
88507 static int proc_ipc_dointvec(struct ctl_table *table, int write,
88508 void __user *buffer, size_t *lenp, loff_t *ppos)
88509 {
88510- struct ctl_table ipc_table;
88511+ ctl_table_no_const ipc_table;
88512
88513 memcpy(&ipc_table, table, sizeof(ipc_table));
88514 ipc_table.data = get_ipc(table);
88515@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
88516 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
88517 void __user *buffer, size_t *lenp, loff_t *ppos)
88518 {
88519- struct ctl_table ipc_table;
88520+ ctl_table_no_const ipc_table;
88521
88522 memcpy(&ipc_table, table, sizeof(ipc_table));
88523 ipc_table.data = get_ipc(table);
88524@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
88525 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
88526 void __user *buffer, size_t *lenp, loff_t *ppos)
88527 {
88528- struct ctl_table ipc_table;
88529+ ctl_table_no_const ipc_table;
88530 memcpy(&ipc_table, table, sizeof(ipc_table));
88531 ipc_table.data = get_ipc(table);
88532
88533@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
88534 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
88535 void __user *buffer, size_t *lenp, loff_t *ppos)
88536 {
88537- struct ctl_table ipc_table;
88538+ ctl_table_no_const ipc_table;
88539 int dummy = 0;
88540
88541 memcpy(&ipc_table, table, sizeof(ipc_table));
88542diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
88543index 68d4e95..1477ded 100644
88544--- a/ipc/mq_sysctl.c
88545+++ b/ipc/mq_sysctl.c
88546@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
88547 static int proc_mq_dointvec(struct ctl_table *table, int write,
88548 void __user *buffer, size_t *lenp, loff_t *ppos)
88549 {
88550- struct ctl_table mq_table;
88551+ ctl_table_no_const mq_table;
88552 memcpy(&mq_table, table, sizeof(mq_table));
88553 mq_table.data = get_mq(table);
88554
88555@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
88556 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
88557 void __user *buffer, size_t *lenp, loff_t *ppos)
88558 {
88559- struct ctl_table mq_table;
88560+ ctl_table_no_const mq_table;
88561 memcpy(&mq_table, table, sizeof(mq_table));
88562 mq_table.data = get_mq(table);
88563
88564diff --git a/ipc/mqueue.c b/ipc/mqueue.c
88565index 7635a1c..7432cb6 100644
88566--- a/ipc/mqueue.c
88567+++ b/ipc/mqueue.c
88568@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
88569 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
88570 info->attr.mq_msgsize);
88571
88572+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
88573 spin_lock(&mq_lock);
88574 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
88575 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
88576diff --git a/ipc/shm.c b/ipc/shm.c
88577index 19633b4..d454904 100644
88578--- a/ipc/shm.c
88579+++ b/ipc/shm.c
88580@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
88581 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
88582 #endif
88583
88584+#ifdef CONFIG_GRKERNSEC
88585+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
88586+ const u64 shm_createtime, const kuid_t cuid,
88587+ const int shmid);
88588+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
88589+ const u64 shm_createtime);
88590+#endif
88591+
88592 void shm_init_ns(struct ipc_namespace *ns)
88593 {
88594 ns->shm_ctlmax = SHMMAX;
88595@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
88596 shp->shm_lprid = 0;
88597 shp->shm_atim = shp->shm_dtim = 0;
88598 shp->shm_ctim = get_seconds();
88599+#ifdef CONFIG_GRKERNSEC
88600+ shp->shm_createtime = ktime_get_ns();
88601+#endif
88602 shp->shm_segsz = size;
88603 shp->shm_nattch = 0;
88604 shp->shm_file = file;
88605@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88606 f_mode = FMODE_READ | FMODE_WRITE;
88607 }
88608 if (shmflg & SHM_EXEC) {
88609+
88610+#ifdef CONFIG_PAX_MPROTECT
88611+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
88612+ goto out;
88613+#endif
88614+
88615 prot |= PROT_EXEC;
88616 acc_mode |= S_IXUGO;
88617 }
88618@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88619 if (err)
88620 goto out_unlock;
88621
88622+#ifdef CONFIG_GRKERNSEC
88623+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
88624+ shp->shm_perm.cuid, shmid) ||
88625+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
88626+ err = -EACCES;
88627+ goto out_unlock;
88628+ }
88629+#endif
88630+
88631 ipc_lock_object(&shp->shm_perm);
88632
88633 /* check if shm_destroy() is tearing down shp */
88634@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88635 path = shp->shm_file->f_path;
88636 path_get(&path);
88637 shp->shm_nattch++;
88638+#ifdef CONFIG_GRKERNSEC
88639+ shp->shm_lapid = current->pid;
88640+#endif
88641 size = i_size_read(path.dentry->d_inode);
88642 ipc_unlock_object(&shp->shm_perm);
88643 rcu_read_unlock();
88644diff --git a/ipc/util.c b/ipc/util.c
88645index 106bed0..f851429 100644
88646--- a/ipc/util.c
88647+++ b/ipc/util.c
88648@@ -71,6 +71,8 @@ struct ipc_proc_iface {
88649 int (*show)(struct seq_file *, void *);
88650 };
88651
88652+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
88653+
88654 /**
88655 * ipc_init - initialise ipc subsystem
88656 *
88657@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
88658 granted_mode >>= 6;
88659 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
88660 granted_mode >>= 3;
88661+
88662+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
88663+ return -1;
88664+
88665 /* is there some bit set in requested_mode but not in granted_mode? */
88666 if ((requested_mode & ~granted_mode & 0007) &&
88667 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
88668diff --git a/kernel/audit.c b/kernel/audit.c
88669index 72ab759..757deba 100644
88670--- a/kernel/audit.c
88671+++ b/kernel/audit.c
88672@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
88673 3) suppressed due to audit_rate_limit
88674 4) suppressed due to audit_backlog_limit
88675 */
88676-static atomic_t audit_lost = ATOMIC_INIT(0);
88677+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
88678
88679 /* The netlink socket. */
88680 static struct sock *audit_sock;
88681@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
88682 unsigned long now;
88683 int print;
88684
88685- atomic_inc(&audit_lost);
88686+ atomic_inc_unchecked(&audit_lost);
88687
88688 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
88689
88690@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
88691 if (print) {
88692 if (printk_ratelimit())
88693 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
88694- atomic_read(&audit_lost),
88695+ atomic_read_unchecked(&audit_lost),
88696 audit_rate_limit,
88697 audit_backlog_limit);
88698 audit_panic(message);
88699@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
88700 s.pid = audit_pid;
88701 s.rate_limit = audit_rate_limit;
88702 s.backlog_limit = audit_backlog_limit;
88703- s.lost = atomic_read(&audit_lost);
88704+ s.lost = atomic_read_unchecked(&audit_lost);
88705 s.backlog = skb_queue_len(&audit_skb_queue);
88706 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
88707 s.backlog_wait_time = audit_backlog_wait_time;
88708diff --git a/kernel/auditsc.c b/kernel/auditsc.c
88709index 072566d..1190489 100644
88710--- a/kernel/auditsc.c
88711+++ b/kernel/auditsc.c
88712@@ -2056,7 +2056,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
88713 }
88714
88715 /* global counter which is incremented every time something logs in */
88716-static atomic_t session_id = ATOMIC_INIT(0);
88717+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
88718
88719 static int audit_set_loginuid_perm(kuid_t loginuid)
88720 {
88721@@ -2123,7 +2123,7 @@ int audit_set_loginuid(kuid_t loginuid)
88722
88723 /* are we setting or clearing? */
88724 if (uid_valid(loginuid))
88725- sessionid = (unsigned int)atomic_inc_return(&session_id);
88726+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
88727
88728 task->sessionid = sessionid;
88729 task->loginuid = loginuid;
88730diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
88731index a64e7a2..2e69448 100644
88732--- a/kernel/bpf/core.c
88733+++ b/kernel/bpf/core.c
88734@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88735 * random section of illegal instructions.
88736 */
88737 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
88738- hdr = module_alloc(size);
88739+ hdr = module_alloc_exec(size);
88740 if (hdr == NULL)
88741 return NULL;
88742
88743 /* Fill space with illegal/arch-dep instructions. */
88744 bpf_fill_ill_insns(hdr, size);
88745
88746+ pax_open_kernel();
88747 hdr->pages = size / PAGE_SIZE;
88748+ pax_close_kernel();
88749+
88750 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
88751 PAGE_SIZE - sizeof(*hdr));
88752 start = (prandom_u32() % hole) & ~(alignment - 1);
88753@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88754
88755 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
88756 {
88757- module_memfree(hdr);
88758+ module_memfree_exec(hdr);
88759 }
88760 #endif /* CONFIG_BPF_JIT */
88761
88762diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
88763index 536edc2..d28c85d 100644
88764--- a/kernel/bpf/syscall.c
88765+++ b/kernel/bpf/syscall.c
88766@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
88767 int err;
88768
88769 /* the syscall is limited to root temporarily. This restriction will be
88770- * lifted when security audit is clean. Note that eBPF+tracing must have
88771- * this restriction, since it may pass kernel data to user space
88772+ * lifted by upstream when a half-assed security audit is clean. Note
88773+ * that eBPF+tracing must have this restriction, since it may pass
88774+ * kernel data to user space
88775 */
88776 if (!capable(CAP_SYS_ADMIN))
88777 return -EPERM;
88778+#ifdef CONFIG_GRKERNSEC
88779+ return -EPERM;
88780+#endif
88781
88782 if (!access_ok(VERIFY_READ, uattr, 1))
88783 return -EFAULT;
88784diff --git a/kernel/capability.c b/kernel/capability.c
88785index 989f5bf..d317ca0 100644
88786--- a/kernel/capability.c
88787+++ b/kernel/capability.c
88788@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
88789 * before modification is attempted and the application
88790 * fails.
88791 */
88792+ if (tocopy > ARRAY_SIZE(kdata))
88793+ return -EFAULT;
88794+
88795 if (copy_to_user(dataptr, kdata, tocopy
88796 * sizeof(struct __user_cap_data_struct))) {
88797 return -EFAULT;
88798@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
88799 int ret;
88800
88801 rcu_read_lock();
88802- ret = security_capable(__task_cred(t), ns, cap);
88803+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
88804+ gr_task_is_capable(t, __task_cred(t), cap);
88805 rcu_read_unlock();
88806
88807- return (ret == 0);
88808+ return ret;
88809 }
88810
88811 /**
88812@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
88813 int ret;
88814
88815 rcu_read_lock();
88816- ret = security_capable_noaudit(__task_cred(t), ns, cap);
88817+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
88818 rcu_read_unlock();
88819
88820- return (ret == 0);
88821+ return ret;
88822 }
88823
88824 /**
88825@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
88826 BUG();
88827 }
88828
88829- if (security_capable(current_cred(), ns, cap) == 0) {
88830+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
88831 current->flags |= PF_SUPERPRIV;
88832 return true;
88833 }
88834@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
88835 }
88836 EXPORT_SYMBOL(ns_capable);
88837
88838+bool ns_capable_nolog(struct user_namespace *ns, int cap)
88839+{
88840+ if (unlikely(!cap_valid(cap))) {
88841+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
88842+ BUG();
88843+ }
88844+
88845+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
88846+ current->flags |= PF_SUPERPRIV;
88847+ return true;
88848+ }
88849+ return false;
88850+}
88851+EXPORT_SYMBOL(ns_capable_nolog);
88852+
88853 /**
88854 * file_ns_capable - Determine if the file's opener had a capability in effect
88855 * @file: The file we want to check
88856@@ -427,6 +446,12 @@ bool capable(int cap)
88857 }
88858 EXPORT_SYMBOL(capable);
88859
88860+bool capable_nolog(int cap)
88861+{
88862+ return ns_capable_nolog(&init_user_ns, cap);
88863+}
88864+EXPORT_SYMBOL(capable_nolog);
88865+
88866 /**
88867 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
88868 * @inode: The inode in question
88869@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
88870 kgid_has_mapping(ns, inode->i_gid);
88871 }
88872 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
88873+
88874+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
88875+{
88876+ struct user_namespace *ns = current_user_ns();
88877+
88878+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
88879+ kgid_has_mapping(ns, inode->i_gid);
88880+}
88881+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
88882diff --git a/kernel/cgroup.c b/kernel/cgroup.c
88883index 04cfe8a..adadcc0 100644
88884--- a/kernel/cgroup.c
88885+++ b/kernel/cgroup.c
88886@@ -5343,6 +5343,9 @@ static void cgroup_release_agent(struct work_struct *work)
88887 if (!pathbuf || !agentbuf)
88888 goto out;
88889
88890+ if (agentbuf[0] == '\0')
88891+ goto out;
88892+
88893 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
88894 if (!path)
88895 goto out;
88896@@ -5528,7 +5531,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
88897 struct task_struct *task;
88898 int count = 0;
88899
88900- seq_printf(seq, "css_set %p\n", cset);
88901+ seq_printf(seq, "css_set %pK\n", cset);
88902
88903 list_for_each_entry(task, &cset->tasks, cg_list) {
88904 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
88905diff --git a/kernel/compat.c b/kernel/compat.c
88906index ebb3c36..1df606e 100644
88907--- a/kernel/compat.c
88908+++ b/kernel/compat.c
88909@@ -13,6 +13,7 @@
88910
88911 #include <linux/linkage.h>
88912 #include <linux/compat.h>
88913+#include <linux/module.h>
88914 #include <linux/errno.h>
88915 #include <linux/time.h>
88916 #include <linux/signal.h>
88917@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
88918 mm_segment_t oldfs;
88919 long ret;
88920
88921- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
88922+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
88923 oldfs = get_fs();
88924 set_fs(KERNEL_DS);
88925 ret = hrtimer_nanosleep_restart(restart);
88926@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
88927 oldfs = get_fs();
88928 set_fs(KERNEL_DS);
88929 ret = hrtimer_nanosleep(&tu,
88930- rmtp ? (struct timespec __user *)&rmt : NULL,
88931+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
88932 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
88933 set_fs(oldfs);
88934
88935@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
88936 mm_segment_t old_fs = get_fs();
88937
88938 set_fs(KERNEL_DS);
88939- ret = sys_sigpending((old_sigset_t __user *) &s);
88940+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
88941 set_fs(old_fs);
88942 if (ret == 0)
88943 ret = put_user(s, set);
88944@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
88945 mm_segment_t old_fs = get_fs();
88946
88947 set_fs(KERNEL_DS);
88948- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
88949+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
88950 set_fs(old_fs);
88951
88952 if (!ret) {
88953@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
88954 set_fs (KERNEL_DS);
88955 ret = sys_wait4(pid,
88956 (stat_addr ?
88957- (unsigned int __user *) &status : NULL),
88958- options, (struct rusage __user *) &r);
88959+ (unsigned int __force_user *) &status : NULL),
88960+ options, (struct rusage __force_user *) &r);
88961 set_fs (old_fs);
88962
88963 if (ret > 0) {
88964@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
88965 memset(&info, 0, sizeof(info));
88966
88967 set_fs(KERNEL_DS);
88968- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
88969- uru ? (struct rusage __user *)&ru : NULL);
88970+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
88971+ uru ? (struct rusage __force_user *)&ru : NULL);
88972 set_fs(old_fs);
88973
88974 if ((ret < 0) || (info.si_signo == 0))
88975@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
88976 oldfs = get_fs();
88977 set_fs(KERNEL_DS);
88978 err = sys_timer_settime(timer_id, flags,
88979- (struct itimerspec __user *) &newts,
88980- (struct itimerspec __user *) &oldts);
88981+ (struct itimerspec __force_user *) &newts,
88982+ (struct itimerspec __force_user *) &oldts);
88983 set_fs(oldfs);
88984 if (!err && old && put_compat_itimerspec(old, &oldts))
88985 return -EFAULT;
88986@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
88987 oldfs = get_fs();
88988 set_fs(KERNEL_DS);
88989 err = sys_timer_gettime(timer_id,
88990- (struct itimerspec __user *) &ts);
88991+ (struct itimerspec __force_user *) &ts);
88992 set_fs(oldfs);
88993 if (!err && put_compat_itimerspec(setting, &ts))
88994 return -EFAULT;
88995@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88996 oldfs = get_fs();
88997 set_fs(KERNEL_DS);
88998 err = sys_clock_settime(which_clock,
88999- (struct timespec __user *) &ts);
89000+ (struct timespec __force_user *) &ts);
89001 set_fs(oldfs);
89002 return err;
89003 }
89004@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
89005 oldfs = get_fs();
89006 set_fs(KERNEL_DS);
89007 err = sys_clock_gettime(which_clock,
89008- (struct timespec __user *) &ts);
89009+ (struct timespec __force_user *) &ts);
89010 set_fs(oldfs);
89011 if (!err && compat_put_timespec(&ts, tp))
89012 return -EFAULT;
89013@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
89014
89015 oldfs = get_fs();
89016 set_fs(KERNEL_DS);
89017- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
89018+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
89019 set_fs(oldfs);
89020
89021 err = compat_put_timex(utp, &txc);
89022@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
89023 oldfs = get_fs();
89024 set_fs(KERNEL_DS);
89025 err = sys_clock_getres(which_clock,
89026- (struct timespec __user *) &ts);
89027+ (struct timespec __force_user *) &ts);
89028 set_fs(oldfs);
89029 if (!err && tp && compat_put_timespec(&ts, tp))
89030 return -EFAULT;
89031@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
89032 struct timespec tu;
89033 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
89034
89035- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
89036+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
89037 oldfs = get_fs();
89038 set_fs(KERNEL_DS);
89039 err = clock_nanosleep_restart(restart);
89040@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
89041 oldfs = get_fs();
89042 set_fs(KERNEL_DS);
89043 err = sys_clock_nanosleep(which_clock, flags,
89044- (struct timespec __user *) &in,
89045- (struct timespec __user *) &out);
89046+ (struct timespec __force_user *) &in,
89047+ (struct timespec __force_user *) &out);
89048 set_fs(oldfs);
89049
89050 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
89051@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
89052 mm_segment_t old_fs = get_fs();
89053
89054 set_fs(KERNEL_DS);
89055- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
89056+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
89057 set_fs(old_fs);
89058 if (compat_put_timespec(&t, interval))
89059 return -EFAULT;
89060diff --git a/kernel/configs.c b/kernel/configs.c
89061index c18b1f1..b9a0132 100644
89062--- a/kernel/configs.c
89063+++ b/kernel/configs.c
89064@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
89065 struct proc_dir_entry *entry;
89066
89067 /* create the current config file */
89068+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
89069+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
89070+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
89071+ &ikconfig_file_ops);
89072+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89073+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
89074+ &ikconfig_file_ops);
89075+#endif
89076+#else
89077 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
89078 &ikconfig_file_ops);
89079+#endif
89080+
89081 if (!entry)
89082 return -ENOMEM;
89083
89084diff --git a/kernel/cred.c b/kernel/cred.c
89085index e0573a4..26c0fd3 100644
89086--- a/kernel/cred.c
89087+++ b/kernel/cred.c
89088@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
89089 validate_creds(cred);
89090 alter_cred_subscribers(cred, -1);
89091 put_cred(cred);
89092+
89093+#ifdef CONFIG_GRKERNSEC_SETXID
89094+ cred = (struct cred *) tsk->delayed_cred;
89095+ if (cred != NULL) {
89096+ tsk->delayed_cred = NULL;
89097+ validate_creds(cred);
89098+ alter_cred_subscribers(cred, -1);
89099+ put_cred(cred);
89100+ }
89101+#endif
89102 }
89103
89104 /**
89105@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
89106 * Always returns 0 thus allowing this function to be tail-called at the end
89107 * of, say, sys_setgid().
89108 */
89109-int commit_creds(struct cred *new)
89110+static int __commit_creds(struct cred *new)
89111 {
89112 struct task_struct *task = current;
89113 const struct cred *old = task->real_cred;
89114@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
89115
89116 get_cred(new); /* we will require a ref for the subj creds too */
89117
89118+ gr_set_role_label(task, new->uid, new->gid);
89119+
89120 /* dumpability changes */
89121 if (!uid_eq(old->euid, new->euid) ||
89122 !gid_eq(old->egid, new->egid) ||
89123@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
89124 put_cred(old);
89125 return 0;
89126 }
89127+#ifdef CONFIG_GRKERNSEC_SETXID
89128+extern int set_user(struct cred *new);
89129+
89130+void gr_delayed_cred_worker(void)
89131+{
89132+ const struct cred *new = current->delayed_cred;
89133+ struct cred *ncred;
89134+
89135+ current->delayed_cred = NULL;
89136+
89137+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
89138+ // from doing get_cred on it when queueing this
89139+ put_cred(new);
89140+ return;
89141+ } else if (new == NULL)
89142+ return;
89143+
89144+ ncred = prepare_creds();
89145+ if (!ncred)
89146+ goto die;
89147+ // uids
89148+ ncred->uid = new->uid;
89149+ ncred->euid = new->euid;
89150+ ncred->suid = new->suid;
89151+ ncred->fsuid = new->fsuid;
89152+ // gids
89153+ ncred->gid = new->gid;
89154+ ncred->egid = new->egid;
89155+ ncred->sgid = new->sgid;
89156+ ncred->fsgid = new->fsgid;
89157+ // groups
89158+ set_groups(ncred, new->group_info);
89159+ // caps
89160+ ncred->securebits = new->securebits;
89161+ ncred->cap_inheritable = new->cap_inheritable;
89162+ ncred->cap_permitted = new->cap_permitted;
89163+ ncred->cap_effective = new->cap_effective;
89164+ ncred->cap_bset = new->cap_bset;
89165+
89166+ if (set_user(ncred)) {
89167+ abort_creds(ncred);
89168+ goto die;
89169+ }
89170+
89171+ // from doing get_cred on it when queueing this
89172+ put_cred(new);
89173+
89174+ __commit_creds(ncred);
89175+ return;
89176+die:
89177+ // from doing get_cred on it when queueing this
89178+ put_cred(new);
89179+ do_group_exit(SIGKILL);
89180+}
89181+#endif
89182+
89183+int commit_creds(struct cred *new)
89184+{
89185+#ifdef CONFIG_GRKERNSEC_SETXID
89186+ int ret;
89187+ int schedule_it = 0;
89188+ struct task_struct *t;
89189+ unsigned oldsecurebits = current_cred()->securebits;
89190+
89191+ /* we won't get called with tasklist_lock held for writing
89192+ and interrupts disabled as the cred struct in that case is
89193+ init_cred
89194+ */
89195+ if (grsec_enable_setxid && !current_is_single_threaded() &&
89196+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
89197+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
89198+ schedule_it = 1;
89199+ }
89200+ ret = __commit_creds(new);
89201+ if (schedule_it) {
89202+ rcu_read_lock();
89203+ read_lock(&tasklist_lock);
89204+ for (t = next_thread(current); t != current;
89205+ t = next_thread(t)) {
89206+ /* we'll check if the thread has uid 0 in
89207+ * the delayed worker routine
89208+ */
89209+ if (task_securebits(t) == oldsecurebits &&
89210+ t->delayed_cred == NULL) {
89211+ t->delayed_cred = get_cred(new);
89212+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
89213+ set_tsk_need_resched(t);
89214+ }
89215+ }
89216+ read_unlock(&tasklist_lock);
89217+ rcu_read_unlock();
89218+ }
89219+
89220+ return ret;
89221+#else
89222+ return __commit_creds(new);
89223+#endif
89224+}
89225+
89226 EXPORT_SYMBOL(commit_creds);
89227
89228 /**
89229diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
89230index ac5c0f9..4b1c6c2 100644
89231--- a/kernel/debug/debug_core.c
89232+++ b/kernel/debug/debug_core.c
89233@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
89234 */
89235 static atomic_t masters_in_kgdb;
89236 static atomic_t slaves_in_kgdb;
89237-static atomic_t kgdb_break_tasklet_var;
89238+static atomic_unchecked_t kgdb_break_tasklet_var;
89239 atomic_t kgdb_setting_breakpoint;
89240
89241 struct task_struct *kgdb_usethread;
89242@@ -137,7 +137,7 @@ int kgdb_single_step;
89243 static pid_t kgdb_sstep_pid;
89244
89245 /* to keep track of the CPU which is doing the single stepping*/
89246-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89247+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89248
89249 /*
89250 * If you are debugging a problem where roundup (the collection of
89251@@ -552,7 +552,7 @@ return_normal:
89252 * kernel will only try for the value of sstep_tries before
89253 * giving up and continuing on.
89254 */
89255- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
89256+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
89257 (kgdb_info[cpu].task &&
89258 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
89259 atomic_set(&kgdb_active, -1);
89260@@ -654,8 +654,8 @@ cpu_master_loop:
89261 }
89262
89263 kgdb_restore:
89264- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
89265- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
89266+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
89267+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
89268 if (kgdb_info[sstep_cpu].task)
89269 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
89270 else
89271@@ -932,18 +932,18 @@ static void kgdb_unregister_callbacks(void)
89272 static void kgdb_tasklet_bpt(unsigned long ing)
89273 {
89274 kgdb_breakpoint();
89275- atomic_set(&kgdb_break_tasklet_var, 0);
89276+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
89277 }
89278
89279 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
89280
89281 void kgdb_schedule_breakpoint(void)
89282 {
89283- if (atomic_read(&kgdb_break_tasklet_var) ||
89284+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
89285 atomic_read(&kgdb_active) != -1 ||
89286 atomic_read(&kgdb_setting_breakpoint))
89287 return;
89288- atomic_inc(&kgdb_break_tasklet_var);
89289+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
89290 tasklet_schedule(&kgdb_tasklet_breakpoint);
89291 }
89292 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
89293diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
89294index 60f6bb8..104bb07 100644
89295--- a/kernel/debug/kdb/kdb_main.c
89296+++ b/kernel/debug/kdb/kdb_main.c
89297@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
89298 continue;
89299
89300 kdb_printf("%-20s%8u 0x%p ", mod->name,
89301- mod->core_size, (void *)mod);
89302+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
89303 #ifdef CONFIG_MODULE_UNLOAD
89304 kdb_printf("%4d ", module_refcount(mod));
89305 #endif
89306@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
89307 kdb_printf(" (Loading)");
89308 else
89309 kdb_printf(" (Live)");
89310- kdb_printf(" 0x%p", mod->module_core);
89311+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
89312
89313 #ifdef CONFIG_MODULE_UNLOAD
89314 {
89315diff --git a/kernel/events/core.c b/kernel/events/core.c
89316index 7959624..c01b886 100644
89317--- a/kernel/events/core.c
89318+++ b/kernel/events/core.c
89319@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
89320 * 0 - disallow raw tracepoint access for unpriv
89321 * 1 - disallow cpu events for unpriv
89322 * 2 - disallow kernel profiling for unpriv
89323+ * 3 - disallow all unpriv perf event use
89324 */
89325-int sysctl_perf_event_paranoid __read_mostly = 1;
89326+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89327+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
89328+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
89329+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
89330+#else
89331+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
89332+#endif
89333
89334 /* Minimum for 512 kiB + 1 user control page */
89335 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
89336@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
89337
89338 tmp *= sysctl_perf_cpu_time_max_percent;
89339 do_div(tmp, 100);
89340- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
89341+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
89342 }
89343
89344 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
89345@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
89346 }
89347 }
89348
89349-static atomic64_t perf_event_id;
89350+static atomic64_unchecked_t perf_event_id;
89351
89352 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
89353 enum event_type_t event_type);
89354@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
89355
89356 static inline u64 perf_event_count(struct perf_event *event)
89357 {
89358- return local64_read(&event->count) + atomic64_read(&event->child_count);
89359+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
89360 }
89361
89362 static u64 perf_event_read(struct perf_event *event)
89363@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
89364 mutex_lock(&event->child_mutex);
89365 total += perf_event_read(event);
89366 *enabled += event->total_time_enabled +
89367- atomic64_read(&event->child_total_time_enabled);
89368+ atomic64_read_unchecked(&event->child_total_time_enabled);
89369 *running += event->total_time_running +
89370- atomic64_read(&event->child_total_time_running);
89371+ atomic64_read_unchecked(&event->child_total_time_running);
89372
89373 list_for_each_entry(child, &event->child_list, child_list) {
89374 total += perf_event_read(child);
89375@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
89376 userpg->offset -= local64_read(&event->hw.prev_count);
89377
89378 userpg->time_enabled = enabled +
89379- atomic64_read(&event->child_total_time_enabled);
89380+ atomic64_read_unchecked(&event->child_total_time_enabled);
89381
89382 userpg->time_running = running +
89383- atomic64_read(&event->child_total_time_running);
89384+ atomic64_read_unchecked(&event->child_total_time_running);
89385
89386 arch_perf_update_userpage(userpg, now);
89387
89388@@ -4578,7 +4585,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
89389
89390 /* Data. */
89391 sp = perf_user_stack_pointer(regs);
89392- rem = __output_copy_user(handle, (void *) sp, dump_size);
89393+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
89394 dyn_size = dump_size - rem;
89395
89396 perf_output_skip(handle, rem);
89397@@ -4669,11 +4676,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
89398 values[n++] = perf_event_count(event);
89399 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
89400 values[n++] = enabled +
89401- atomic64_read(&event->child_total_time_enabled);
89402+ atomic64_read_unchecked(&event->child_total_time_enabled);
89403 }
89404 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
89405 values[n++] = running +
89406- atomic64_read(&event->child_total_time_running);
89407+ atomic64_read_unchecked(&event->child_total_time_running);
89408 }
89409 if (read_format & PERF_FORMAT_ID)
89410 values[n++] = primary_event_id(event);
89411@@ -7004,7 +7011,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
89412 event->parent = parent_event;
89413
89414 event->ns = get_pid_ns(task_active_pid_ns(current));
89415- event->id = atomic64_inc_return(&perf_event_id);
89416+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
89417
89418 event->state = PERF_EVENT_STATE_INACTIVE;
89419
89420@@ -7285,6 +7292,11 @@ SYSCALL_DEFINE5(perf_event_open,
89421 if (flags & ~PERF_FLAG_ALL)
89422 return -EINVAL;
89423
89424+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89425+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
89426+ return -EACCES;
89427+#endif
89428+
89429 err = perf_copy_attr(attr_uptr, &attr);
89430 if (err)
89431 return err;
89432@@ -7652,10 +7664,10 @@ static void sync_child_event(struct perf_event *child_event,
89433 /*
89434 * Add back the child's count to the parent's count:
89435 */
89436- atomic64_add(child_val, &parent_event->child_count);
89437- atomic64_add(child_event->total_time_enabled,
89438+ atomic64_add_unchecked(child_val, &parent_event->child_count);
89439+ atomic64_add_unchecked(child_event->total_time_enabled,
89440 &parent_event->child_total_time_enabled);
89441- atomic64_add(child_event->total_time_running,
89442+ atomic64_add_unchecked(child_event->total_time_running,
89443 &parent_event->child_total_time_running);
89444
89445 /*
89446diff --git a/kernel/events/internal.h b/kernel/events/internal.h
89447index 569b2187..19940d9 100644
89448--- a/kernel/events/internal.h
89449+++ b/kernel/events/internal.h
89450@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
89451 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
89452 }
89453
89454-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
89455+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
89456 static inline unsigned long \
89457 func_name(struct perf_output_handle *handle, \
89458- const void *buf, unsigned long len) \
89459+ const void user *buf, unsigned long len) \
89460 { \
89461 unsigned long size, written; \
89462 \
89463@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
89464 return 0;
89465 }
89466
89467-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
89468+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
89469
89470 static inline unsigned long
89471 memcpy_skip(void *dst, const void *src, unsigned long n)
89472@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
89473 return 0;
89474 }
89475
89476-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
89477+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
89478
89479 #ifndef arch_perf_out_copy_user
89480 #define arch_perf_out_copy_user arch_perf_out_copy_user
89481@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
89482 }
89483 #endif
89484
89485-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
89486+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
89487
89488 /* Callchain handling */
89489 extern struct perf_callchain_entry *
89490diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
89491index cb346f2..e4dc317 100644
89492--- a/kernel/events/uprobes.c
89493+++ b/kernel/events/uprobes.c
89494@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
89495 {
89496 struct page *page;
89497 uprobe_opcode_t opcode;
89498- int result;
89499+ long result;
89500
89501 pagefault_disable();
89502 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
89503diff --git a/kernel/exit.c b/kernel/exit.c
89504index 6806c55..a5fb128 100644
89505--- a/kernel/exit.c
89506+++ b/kernel/exit.c
89507@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
89508 struct task_struct *leader;
89509 int zap_leader;
89510 repeat:
89511+#ifdef CONFIG_NET
89512+ gr_del_task_from_ip_table(p);
89513+#endif
89514+
89515 /* don't need to get the RCU readlock here - the process is dead and
89516 * can't be modifying its own credentials. But shut RCU-lockdep up */
89517 rcu_read_lock();
89518@@ -655,6 +659,8 @@ void do_exit(long code)
89519 int group_dead;
89520 TASKS_RCU(int tasks_rcu_i);
89521
89522+ set_fs(USER_DS);
89523+
89524 profile_task_exit(tsk);
89525
89526 WARN_ON(blk_needs_flush_plug(tsk));
89527@@ -671,7 +677,6 @@ void do_exit(long code)
89528 * mm_release()->clear_child_tid() from writing to a user-controlled
89529 * kernel address.
89530 */
89531- set_fs(USER_DS);
89532
89533 ptrace_event(PTRACE_EVENT_EXIT, code);
89534
89535@@ -729,6 +734,9 @@ void do_exit(long code)
89536 tsk->exit_code = code;
89537 taskstats_exit(tsk, group_dead);
89538
89539+ gr_acl_handle_psacct(tsk, code);
89540+ gr_acl_handle_exit();
89541+
89542 exit_mm(tsk);
89543
89544 if (group_dead)
89545@@ -848,7 +856,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
89546 * Take down every thread in the group. This is called by fatal signals
89547 * as well as by sys_exit_group (below).
89548 */
89549-void
89550+__noreturn void
89551 do_group_exit(int exit_code)
89552 {
89553 struct signal_struct *sig = current->signal;
89554diff --git a/kernel/fork.c b/kernel/fork.c
89555index 4dc2dda..651add0 100644
89556--- a/kernel/fork.c
89557+++ b/kernel/fork.c
89558@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
89559 void thread_info_cache_init(void)
89560 {
89561 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
89562- THREAD_SIZE, 0, NULL);
89563+ THREAD_SIZE, SLAB_USERCOPY, NULL);
89564 BUG_ON(thread_info_cache == NULL);
89565 }
89566 # endif
89567 #endif
89568
89569+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89570+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
89571+ int node, void **lowmem_stack)
89572+{
89573+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
89574+ void *ret = NULL;
89575+ unsigned int i;
89576+
89577+ *lowmem_stack = alloc_thread_info_node(tsk, node);
89578+ if (*lowmem_stack == NULL)
89579+ goto out;
89580+
89581+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
89582+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
89583+
89584+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
89585+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
89586+ if (ret == NULL) {
89587+ free_thread_info(*lowmem_stack);
89588+ *lowmem_stack = NULL;
89589+ }
89590+
89591+out:
89592+ return ret;
89593+}
89594+
89595+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
89596+{
89597+ unmap_process_stacks(tsk);
89598+}
89599+#else
89600+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
89601+ int node, void **lowmem_stack)
89602+{
89603+ return alloc_thread_info_node(tsk, node);
89604+}
89605+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
89606+{
89607+ free_thread_info(ti);
89608+}
89609+#endif
89610+
89611 /* SLAB cache for signal_struct structures (tsk->signal) */
89612 static struct kmem_cache *signal_cachep;
89613
89614@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
89615 /* SLAB cache for mm_struct structures (tsk->mm) */
89616 static struct kmem_cache *mm_cachep;
89617
89618-static void account_kernel_stack(struct thread_info *ti, int account)
89619+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
89620 {
89621+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89622+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
89623+#else
89624 struct zone *zone = page_zone(virt_to_page(ti));
89625+#endif
89626
89627 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
89628 }
89629
89630 void free_task(struct task_struct *tsk)
89631 {
89632- account_kernel_stack(tsk->stack, -1);
89633+ account_kernel_stack(tsk, tsk->stack, -1);
89634 arch_release_thread_info(tsk->stack);
89635- free_thread_info(tsk->stack);
89636+ gr_free_thread_info(tsk, tsk->stack);
89637 rt_mutex_debug_task_free(tsk);
89638 ftrace_graph_exit_task(tsk);
89639 put_seccomp_filter(tsk);
89640@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89641 {
89642 struct task_struct *tsk;
89643 struct thread_info *ti;
89644+ void *lowmem_stack;
89645 int node = tsk_fork_get_node(orig);
89646 int err;
89647
89648@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89649 if (!tsk)
89650 return NULL;
89651
89652- ti = alloc_thread_info_node(tsk, node);
89653+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
89654 if (!ti)
89655 goto free_tsk;
89656
89657@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89658 goto free_ti;
89659
89660 tsk->stack = ti;
89661+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89662+ tsk->lowmem_stack = lowmem_stack;
89663+#endif
89664 #ifdef CONFIG_SECCOMP
89665 /*
89666 * We must handle setting up seccomp filters once we're under
89667@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89668 set_task_stack_end_magic(tsk);
89669
89670 #ifdef CONFIG_CC_STACKPROTECTOR
89671- tsk->stack_canary = get_random_int();
89672+ tsk->stack_canary = pax_get_random_long();
89673 #endif
89674
89675 /*
89676@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89677 tsk->splice_pipe = NULL;
89678 tsk->task_frag.page = NULL;
89679
89680- account_kernel_stack(ti, 1);
89681+ account_kernel_stack(tsk, ti, 1);
89682
89683 return tsk;
89684
89685 free_ti:
89686- free_thread_info(ti);
89687+ gr_free_thread_info(tsk, ti);
89688 free_tsk:
89689 free_task_struct(tsk);
89690 return NULL;
89691 }
89692
89693 #ifdef CONFIG_MMU
89694-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89695+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
89696+{
89697+ struct vm_area_struct *tmp;
89698+ unsigned long charge;
89699+ struct file *file;
89700+ int retval;
89701+
89702+ charge = 0;
89703+ if (mpnt->vm_flags & VM_ACCOUNT) {
89704+ unsigned long len = vma_pages(mpnt);
89705+
89706+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89707+ goto fail_nomem;
89708+ charge = len;
89709+ }
89710+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89711+ if (!tmp)
89712+ goto fail_nomem;
89713+ *tmp = *mpnt;
89714+ tmp->vm_mm = mm;
89715+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
89716+ retval = vma_dup_policy(mpnt, tmp);
89717+ if (retval)
89718+ goto fail_nomem_policy;
89719+ if (anon_vma_fork(tmp, mpnt))
89720+ goto fail_nomem_anon_vma_fork;
89721+ tmp->vm_flags &= ~VM_LOCKED;
89722+ tmp->vm_next = tmp->vm_prev = NULL;
89723+ tmp->vm_mirror = NULL;
89724+ file = tmp->vm_file;
89725+ if (file) {
89726+ struct inode *inode = file_inode(file);
89727+ struct address_space *mapping = file->f_mapping;
89728+
89729+ get_file(file);
89730+ if (tmp->vm_flags & VM_DENYWRITE)
89731+ atomic_dec(&inode->i_writecount);
89732+ i_mmap_lock_write(mapping);
89733+ if (tmp->vm_flags & VM_SHARED)
89734+ atomic_inc(&mapping->i_mmap_writable);
89735+ flush_dcache_mmap_lock(mapping);
89736+ /* insert tmp into the share list, just after mpnt */
89737+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89738+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
89739+ else
89740+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
89741+ flush_dcache_mmap_unlock(mapping);
89742+ i_mmap_unlock_write(mapping);
89743+ }
89744+
89745+ /*
89746+ * Clear hugetlb-related page reserves for children. This only
89747+ * affects MAP_PRIVATE mappings. Faults generated by the child
89748+ * are not guaranteed to succeed, even if read-only
89749+ */
89750+ if (is_vm_hugetlb_page(tmp))
89751+ reset_vma_resv_huge_pages(tmp);
89752+
89753+ return tmp;
89754+
89755+fail_nomem_anon_vma_fork:
89756+ mpol_put(vma_policy(tmp));
89757+fail_nomem_policy:
89758+ kmem_cache_free(vm_area_cachep, tmp);
89759+fail_nomem:
89760+ vm_unacct_memory(charge);
89761+ return NULL;
89762+}
89763+
89764+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89765 {
89766 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
89767 struct rb_node **rb_link, *rb_parent;
89768 int retval;
89769- unsigned long charge;
89770
89771 uprobe_start_dup_mmap();
89772 down_write(&oldmm->mmap_sem);
89773@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89774
89775 prev = NULL;
89776 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
89777- struct file *file;
89778-
89779 if (mpnt->vm_flags & VM_DONTCOPY) {
89780 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
89781 -vma_pages(mpnt));
89782 continue;
89783 }
89784- charge = 0;
89785- if (mpnt->vm_flags & VM_ACCOUNT) {
89786- unsigned long len = vma_pages(mpnt);
89787-
89788- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89789- goto fail_nomem;
89790- charge = len;
89791- }
89792- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89793- if (!tmp)
89794- goto fail_nomem;
89795- *tmp = *mpnt;
89796- INIT_LIST_HEAD(&tmp->anon_vma_chain);
89797- retval = vma_dup_policy(mpnt, tmp);
89798- if (retval)
89799- goto fail_nomem_policy;
89800- tmp->vm_mm = mm;
89801- if (anon_vma_fork(tmp, mpnt))
89802- goto fail_nomem_anon_vma_fork;
89803- tmp->vm_flags &= ~VM_LOCKED;
89804- tmp->vm_next = tmp->vm_prev = NULL;
89805- file = tmp->vm_file;
89806- if (file) {
89807- struct inode *inode = file_inode(file);
89808- struct address_space *mapping = file->f_mapping;
89809-
89810- get_file(file);
89811- if (tmp->vm_flags & VM_DENYWRITE)
89812- atomic_dec(&inode->i_writecount);
89813- i_mmap_lock_write(mapping);
89814- if (tmp->vm_flags & VM_SHARED)
89815- atomic_inc(&mapping->i_mmap_writable);
89816- flush_dcache_mmap_lock(mapping);
89817- /* insert tmp into the share list, just after mpnt */
89818- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89819- vma_nonlinear_insert(tmp,
89820- &mapping->i_mmap_nonlinear);
89821- else
89822- vma_interval_tree_insert_after(tmp, mpnt,
89823- &mapping->i_mmap);
89824- flush_dcache_mmap_unlock(mapping);
89825- i_mmap_unlock_write(mapping);
89826+ tmp = dup_vma(mm, oldmm, mpnt);
89827+ if (!tmp) {
89828+ retval = -ENOMEM;
89829+ goto out;
89830 }
89831
89832 /*
89833@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89834 if (retval)
89835 goto out;
89836 }
89837+
89838+#ifdef CONFIG_PAX_SEGMEXEC
89839+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
89840+ struct vm_area_struct *mpnt_m;
89841+
89842+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
89843+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
89844+
89845+ if (!mpnt->vm_mirror)
89846+ continue;
89847+
89848+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
89849+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
89850+ mpnt->vm_mirror = mpnt_m;
89851+ } else {
89852+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
89853+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
89854+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
89855+ mpnt->vm_mirror->vm_mirror = mpnt;
89856+ }
89857+ }
89858+ BUG_ON(mpnt_m);
89859+ }
89860+#endif
89861+
89862 /* a new mm has just been created */
89863 arch_dup_mmap(oldmm, mm);
89864 retval = 0;
89865@@ -486,14 +589,6 @@ out:
89866 up_write(&oldmm->mmap_sem);
89867 uprobe_end_dup_mmap();
89868 return retval;
89869-fail_nomem_anon_vma_fork:
89870- mpol_put(vma_policy(tmp));
89871-fail_nomem_policy:
89872- kmem_cache_free(vm_area_cachep, tmp);
89873-fail_nomem:
89874- retval = -ENOMEM;
89875- vm_unacct_memory(charge);
89876- goto out;
89877 }
89878
89879 static inline int mm_alloc_pgd(struct mm_struct *mm)
89880@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
89881 return ERR_PTR(err);
89882
89883 mm = get_task_mm(task);
89884- if (mm && mm != current->mm &&
89885- !ptrace_may_access(task, mode)) {
89886+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
89887+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
89888 mmput(mm);
89889 mm = ERR_PTR(-EACCES);
89890 }
89891@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
89892 spin_unlock(&fs->lock);
89893 return -EAGAIN;
89894 }
89895- fs->users++;
89896+ atomic_inc(&fs->users);
89897 spin_unlock(&fs->lock);
89898 return 0;
89899 }
89900 tsk->fs = copy_fs_struct(fs);
89901 if (!tsk->fs)
89902 return -ENOMEM;
89903+ /* Carry through gr_chroot_dentry and is_chrooted instead
89904+ of recomputing it here. Already copied when the task struct
89905+ is duplicated. This allows pivot_root to not be treated as
89906+ a chroot
89907+ */
89908+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
89909+
89910 return 0;
89911 }
89912
89913@@ -1182,7 +1284,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
89914 * parts of the process environment (as per the clone
89915 * flags). The actual kick-off is left to the caller.
89916 */
89917-static struct task_struct *copy_process(unsigned long clone_flags,
89918+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
89919 unsigned long stack_start,
89920 unsigned long stack_size,
89921 int __user *child_tidptr,
89922@@ -1253,6 +1355,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89923 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
89924 #endif
89925 retval = -EAGAIN;
89926+
89927+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
89928+
89929 if (atomic_read(&p->real_cred->user->processes) >=
89930 task_rlimit(p, RLIMIT_NPROC)) {
89931 if (p->real_cred->user != INIT_USER &&
89932@@ -1502,6 +1607,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89933 goto bad_fork_free_pid;
89934 }
89935
89936+ /* synchronizes with gr_set_acls()
89937+ we need to call this past the point of no return for fork()
89938+ */
89939+ gr_copy_label(p);
89940+
89941 if (likely(p->pid)) {
89942 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
89943
89944@@ -1592,6 +1702,8 @@ bad_fork_cleanup_count:
89945 bad_fork_free:
89946 free_task(p);
89947 fork_out:
89948+ gr_log_forkfail(retval);
89949+
89950 return ERR_PTR(retval);
89951 }
89952
89953@@ -1653,6 +1765,7 @@ long do_fork(unsigned long clone_flags,
89954
89955 p = copy_process(clone_flags, stack_start, stack_size,
89956 child_tidptr, NULL, trace);
89957+ add_latent_entropy();
89958 /*
89959 * Do this prior waking up the new thread - the thread pointer
89960 * might get invalid after that point, if the thread exits quickly.
89961@@ -1669,6 +1782,8 @@ long do_fork(unsigned long clone_flags,
89962 if (clone_flags & CLONE_PARENT_SETTID)
89963 put_user(nr, parent_tidptr);
89964
89965+ gr_handle_brute_check();
89966+
89967 if (clone_flags & CLONE_VFORK) {
89968 p->vfork_done = &vfork;
89969 init_completion(&vfork);
89970@@ -1787,7 +1902,7 @@ void __init proc_caches_init(void)
89971 mm_cachep = kmem_cache_create("mm_struct",
89972 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
89973 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
89974- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
89975+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
89976 mmap_init();
89977 nsproxy_cache_init();
89978 }
89979@@ -1827,7 +1942,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
89980 return 0;
89981
89982 /* don't need lock here; in the worst case we'll do useless copy */
89983- if (fs->users == 1)
89984+ if (atomic_read(&fs->users) == 1)
89985 return 0;
89986
89987 *new_fsp = copy_fs_struct(fs);
89988@@ -1939,7 +2054,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
89989 fs = current->fs;
89990 spin_lock(&fs->lock);
89991 current->fs = new_fs;
89992- if (--fs->users)
89993+ gr_set_chroot_entries(current, &current->fs->root);
89994+ if (atomic_dec_return(&fs->users))
89995 new_fs = NULL;
89996 else
89997 new_fs = fs;
89998diff --git a/kernel/futex.c b/kernel/futex.c
89999index 63678b5..512f9af 100644
90000--- a/kernel/futex.c
90001+++ b/kernel/futex.c
90002@@ -201,7 +201,7 @@ struct futex_pi_state {
90003 atomic_t refcount;
90004
90005 union futex_key key;
90006-};
90007+} __randomize_layout;
90008
90009 /**
90010 * struct futex_q - The hashed futex queue entry, one per waiting task
90011@@ -235,7 +235,7 @@ struct futex_q {
90012 struct rt_mutex_waiter *rt_waiter;
90013 union futex_key *requeue_pi_key;
90014 u32 bitset;
90015-};
90016+} __randomize_layout;
90017
90018 static const struct futex_q futex_q_init = {
90019 /* list gets initialized in queue_me()*/
90020@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
90021 struct page *page, *page_head;
90022 int err, ro = 0;
90023
90024+#ifdef CONFIG_PAX_SEGMEXEC
90025+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
90026+ return -EFAULT;
90027+#endif
90028+
90029 /*
90030 * The futex address must be "naturally" aligned.
90031 */
90032@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
90033
90034 static int get_futex_value_locked(u32 *dest, u32 __user *from)
90035 {
90036- int ret;
90037+ unsigned long ret;
90038
90039 pagefault_disable();
90040 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
90041@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
90042 {
90043 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
90044 u32 curval;
90045+ mm_segment_t oldfs;
90046
90047 /*
90048 * This will fail and we want it. Some arch implementations do
90049@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
90050 * implementation, the non-functional ones will return
90051 * -ENOSYS.
90052 */
90053+ oldfs = get_fs();
90054+ set_fs(USER_DS);
90055 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
90056 futex_cmpxchg_enabled = 1;
90057+ set_fs(oldfs);
90058 #endif
90059 }
90060
90061diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
90062index 55c8c93..9ba7ad6 100644
90063--- a/kernel/futex_compat.c
90064+++ b/kernel/futex_compat.c
90065@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
90066 return 0;
90067 }
90068
90069-static void __user *futex_uaddr(struct robust_list __user *entry,
90070+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
90071 compat_long_t futex_offset)
90072 {
90073 compat_uptr_t base = ptr_to_compat(entry);
90074diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
90075index b358a80..fc25240 100644
90076--- a/kernel/gcov/base.c
90077+++ b/kernel/gcov/base.c
90078@@ -114,11 +114,6 @@ void gcov_enable_events(void)
90079 }
90080
90081 #ifdef CONFIG_MODULES
90082-static inline int within(void *addr, void *start, unsigned long size)
90083-{
90084- return ((addr >= start) && (addr < start + size));
90085-}
90086-
90087 /* Update list and generate events when modules are unloaded. */
90088 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90089 void *data)
90090@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90091
90092 /* Remove entries located in module from linked list. */
90093 while ((info = gcov_info_next(info))) {
90094- if (within(info, mod->module_core, mod->core_size)) {
90095+ if (within_module_core_rw((unsigned long)info, mod)) {
90096 gcov_info_unlink(prev, info);
90097 if (gcov_events_enabled)
90098 gcov_event(GCOV_REMOVE, info);
90099diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
90100index 8069237..fe712d0 100644
90101--- a/kernel/irq/manage.c
90102+++ b/kernel/irq/manage.c
90103@@ -871,7 +871,7 @@ static int irq_thread(void *data)
90104
90105 action_ret = handler_fn(desc, action);
90106 if (action_ret == IRQ_HANDLED)
90107- atomic_inc(&desc->threads_handled);
90108+ atomic_inc_unchecked(&desc->threads_handled);
90109
90110 wake_threads_waitq(desc);
90111 }
90112diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
90113index e2514b0..de3dfe0 100644
90114--- a/kernel/irq/spurious.c
90115+++ b/kernel/irq/spurious.c
90116@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
90117 * count. We just care about the count being
90118 * different than the one we saw before.
90119 */
90120- handled = atomic_read(&desc->threads_handled);
90121+ handled = atomic_read_unchecked(&desc->threads_handled);
90122 handled |= SPURIOUS_DEFERRED;
90123 if (handled != desc->threads_handled_last) {
90124 action_ret = IRQ_HANDLED;
90125diff --git a/kernel/jump_label.c b/kernel/jump_label.c
90126index 9019f15..9a3c42e 100644
90127--- a/kernel/jump_label.c
90128+++ b/kernel/jump_label.c
90129@@ -14,6 +14,7 @@
90130 #include <linux/err.h>
90131 #include <linux/static_key.h>
90132 #include <linux/jump_label_ratelimit.h>
90133+#include <linux/mm.h>
90134
90135 #ifdef HAVE_JUMP_LABEL
90136
90137@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
90138
90139 size = (((unsigned long)stop - (unsigned long)start)
90140 / sizeof(struct jump_entry));
90141+ pax_open_kernel();
90142 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
90143+ pax_close_kernel();
90144 }
90145
90146 static void jump_label_update(struct static_key *key, int enable);
90147@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
90148 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
90149 struct jump_entry *iter;
90150
90151+ pax_open_kernel();
90152 for (iter = iter_start; iter < iter_stop; iter++) {
90153 if (within_module_init(iter->code, mod))
90154 iter->code = 0;
90155 }
90156+ pax_close_kernel();
90157 }
90158
90159 static int
90160diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
90161index 5c5987f..bc502b0 100644
90162--- a/kernel/kallsyms.c
90163+++ b/kernel/kallsyms.c
90164@@ -11,6 +11,9 @@
90165 * Changed the compression method from stem compression to "table lookup"
90166 * compression (see scripts/kallsyms.c for a more complete description)
90167 */
90168+#ifdef CONFIG_GRKERNSEC_HIDESYM
90169+#define __INCLUDED_BY_HIDESYM 1
90170+#endif
90171 #include <linux/kallsyms.h>
90172 #include <linux/module.h>
90173 #include <linux/init.h>
90174@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
90175
90176 static inline int is_kernel_inittext(unsigned long addr)
90177 {
90178+ if (system_state != SYSTEM_BOOTING)
90179+ return 0;
90180+
90181 if (addr >= (unsigned long)_sinittext
90182 && addr <= (unsigned long)_einittext)
90183 return 1;
90184 return 0;
90185 }
90186
90187+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90188+#ifdef CONFIG_MODULES
90189+static inline int is_module_text(unsigned long addr)
90190+{
90191+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
90192+ return 1;
90193+
90194+ addr = ktla_ktva(addr);
90195+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
90196+}
90197+#else
90198+static inline int is_module_text(unsigned long addr)
90199+{
90200+ return 0;
90201+}
90202+#endif
90203+#endif
90204+
90205 static inline int is_kernel_text(unsigned long addr)
90206 {
90207 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
90208@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
90209
90210 static inline int is_kernel(unsigned long addr)
90211 {
90212+
90213+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90214+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
90215+ return 1;
90216+
90217+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
90218+#else
90219 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
90220+#endif
90221+
90222 return 1;
90223 return in_gate_area_no_mm(addr);
90224 }
90225
90226 static int is_ksym_addr(unsigned long addr)
90227 {
90228+
90229+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90230+ if (is_module_text(addr))
90231+ return 0;
90232+#endif
90233+
90234 if (all_var)
90235 return is_kernel(addr);
90236
90237@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
90238
90239 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
90240 {
90241- iter->name[0] = '\0';
90242 iter->nameoff = get_symbol_offset(new_pos);
90243 iter->pos = new_pos;
90244 }
90245@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
90246 {
90247 struct kallsym_iter *iter = m->private;
90248
90249+#ifdef CONFIG_GRKERNSEC_HIDESYM
90250+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
90251+ return 0;
90252+#endif
90253+
90254 /* Some debugging symbols have no name. Ignore them. */
90255 if (!iter->name[0])
90256 return 0;
90257@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
90258 */
90259 type = iter->exported ? toupper(iter->type) :
90260 tolower(iter->type);
90261+
90262 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
90263 type, iter->name, iter->module_name);
90264 } else
90265diff --git a/kernel/kcmp.c b/kernel/kcmp.c
90266index 0aa69ea..a7fcafb 100644
90267--- a/kernel/kcmp.c
90268+++ b/kernel/kcmp.c
90269@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
90270 struct task_struct *task1, *task2;
90271 int ret;
90272
90273+#ifdef CONFIG_GRKERNSEC
90274+ return -ENOSYS;
90275+#endif
90276+
90277 rcu_read_lock();
90278
90279 /*
90280diff --git a/kernel/kexec.c b/kernel/kexec.c
90281index 9a8a01a..3c35dd6 100644
90282--- a/kernel/kexec.c
90283+++ b/kernel/kexec.c
90284@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
90285 compat_ulong_t, flags)
90286 {
90287 struct compat_kexec_segment in;
90288- struct kexec_segment out, __user *ksegments;
90289+ struct kexec_segment out;
90290+ struct kexec_segment __user *ksegments;
90291 unsigned long i, result;
90292
90293 /* Don't allow clients that don't understand the native
90294diff --git a/kernel/kmod.c b/kernel/kmod.c
90295index 2777f40..a689506 100644
90296--- a/kernel/kmod.c
90297+++ b/kernel/kmod.c
90298@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
90299 kfree(info->argv);
90300 }
90301
90302-static int call_modprobe(char *module_name, int wait)
90303+static int call_modprobe(char *module_name, char *module_param, int wait)
90304 {
90305 struct subprocess_info *info;
90306 static char *envp[] = {
90307@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
90308 NULL
90309 };
90310
90311- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
90312+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
90313 if (!argv)
90314 goto out;
90315
90316@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
90317 argv[1] = "-q";
90318 argv[2] = "--";
90319 argv[3] = module_name; /* check free_modprobe_argv() */
90320- argv[4] = NULL;
90321+ argv[4] = module_param;
90322+ argv[5] = NULL;
90323
90324 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
90325 NULL, free_modprobe_argv, NULL);
90326@@ -122,9 +123,8 @@ out:
90327 * If module auto-loading support is disabled then this function
90328 * becomes a no-operation.
90329 */
90330-int __request_module(bool wait, const char *fmt, ...)
90331+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
90332 {
90333- va_list args;
90334 char module_name[MODULE_NAME_LEN];
90335 unsigned int max_modprobes;
90336 int ret;
90337@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
90338 if (!modprobe_path[0])
90339 return 0;
90340
90341- va_start(args, fmt);
90342- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
90343- va_end(args);
90344+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
90345 if (ret >= MODULE_NAME_LEN)
90346 return -ENAMETOOLONG;
90347
90348@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
90349 if (ret)
90350 return ret;
90351
90352+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90353+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
90354+ /* hack to workaround consolekit/udisks stupidity */
90355+ read_lock(&tasklist_lock);
90356+ if (!strcmp(current->comm, "mount") &&
90357+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
90358+ read_unlock(&tasklist_lock);
90359+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
90360+ return -EPERM;
90361+ }
90362+ read_unlock(&tasklist_lock);
90363+ }
90364+#endif
90365+
90366 /* If modprobe needs a service that is in a module, we get a recursive
90367 * loop. Limit the number of running kmod threads to max_threads/2 or
90368 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
90369@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
90370
90371 trace_module_request(module_name, wait, _RET_IP_);
90372
90373- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
90374+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
90375
90376 atomic_dec(&kmod_concurrent);
90377 return ret;
90378 }
90379+
90380+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
90381+{
90382+ va_list args;
90383+ int ret;
90384+
90385+ va_start(args, fmt);
90386+ ret = ____request_module(wait, module_param, fmt, args);
90387+ va_end(args);
90388+
90389+ return ret;
90390+}
90391+
90392+int __request_module(bool wait, const char *fmt, ...)
90393+{
90394+ va_list args;
90395+ int ret;
90396+
90397+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90398+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
90399+ char module_param[MODULE_NAME_LEN];
90400+
90401+ memset(module_param, 0, sizeof(module_param));
90402+
90403+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
90404+
90405+ va_start(args, fmt);
90406+ ret = ____request_module(wait, module_param, fmt, args);
90407+ va_end(args);
90408+
90409+ return ret;
90410+ }
90411+#endif
90412+
90413+ va_start(args, fmt);
90414+ ret = ____request_module(wait, NULL, fmt, args);
90415+ va_end(args);
90416+
90417+ return ret;
90418+}
90419+
90420 EXPORT_SYMBOL(__request_module);
90421 #endif /* CONFIG_MODULES */
90422
90423 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
90424 {
90425+#ifdef CONFIG_GRKERNSEC
90426+ kfree(info->path);
90427+ info->path = info->origpath;
90428+#endif
90429 if (info->cleanup)
90430 (*info->cleanup)(info);
90431 kfree(info);
90432@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
90433 */
90434 set_user_nice(current, 0);
90435
90436+#ifdef CONFIG_GRKERNSEC
90437+ /* this is race-free as far as userland is concerned as we copied
90438+ out the path to be used prior to this point and are now operating
90439+ on that copy
90440+ */
90441+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
90442+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
90443+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
90444+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
90445+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
90446+ retval = -EPERM;
90447+ goto out;
90448+ }
90449+#endif
90450+
90451 retval = -ENOMEM;
90452 new = prepare_kernel_cred(current);
90453 if (!new)
90454@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
90455 commit_creds(new);
90456
90457 retval = do_execve(getname_kernel(sub_info->path),
90458- (const char __user *const __user *)sub_info->argv,
90459- (const char __user *const __user *)sub_info->envp);
90460+ (const char __user *const __force_user *)sub_info->argv,
90461+ (const char __user *const __force_user *)sub_info->envp);
90462 out:
90463 sub_info->retval = retval;
90464 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
90465@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
90466 *
90467 * Thus the __user pointer cast is valid here.
90468 */
90469- sys_wait4(pid, (int __user *)&ret, 0, NULL);
90470+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
90471
90472 /*
90473 * If ret is 0, either ____call_usermodehelper failed and the
90474@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
90475 goto out;
90476
90477 INIT_WORK(&sub_info->work, __call_usermodehelper);
90478+#ifdef CONFIG_GRKERNSEC
90479+ sub_info->origpath = path;
90480+ sub_info->path = kstrdup(path, gfp_mask);
90481+#else
90482 sub_info->path = path;
90483+#endif
90484 sub_info->argv = argv;
90485 sub_info->envp = envp;
90486
90487@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
90488 static int proc_cap_handler(struct ctl_table *table, int write,
90489 void __user *buffer, size_t *lenp, loff_t *ppos)
90490 {
90491- struct ctl_table t;
90492+ ctl_table_no_const t;
90493 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
90494 kernel_cap_t new_cap;
90495 int err, i;
90496diff --git a/kernel/kprobes.c b/kernel/kprobes.c
90497index ee61992..62142b1 100644
90498--- a/kernel/kprobes.c
90499+++ b/kernel/kprobes.c
90500@@ -31,6 +31,9 @@
90501 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
90502 * <prasanna@in.ibm.com> added function-return probes.
90503 */
90504+#ifdef CONFIG_GRKERNSEC_HIDESYM
90505+#define __INCLUDED_BY_HIDESYM 1
90506+#endif
90507 #include <linux/kprobes.h>
90508 #include <linux/hash.h>
90509 #include <linux/init.h>
90510@@ -122,12 +125,12 @@ enum kprobe_slot_state {
90511
90512 static void *alloc_insn_page(void)
90513 {
90514- return module_alloc(PAGE_SIZE);
90515+ return module_alloc_exec(PAGE_SIZE);
90516 }
90517
90518 static void free_insn_page(void *page)
90519 {
90520- module_memfree(page);
90521+ module_memfree_exec(page);
90522 }
90523
90524 struct kprobe_insn_cache kprobe_insn_slots = {
90525@@ -2191,11 +2194,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
90526 kprobe_type = "k";
90527
90528 if (sym)
90529- seq_printf(pi, "%p %s %s+0x%x %s ",
90530+ seq_printf(pi, "%pK %s %s+0x%x %s ",
90531 p->addr, kprobe_type, sym, offset,
90532 (modname ? modname : " "));
90533 else
90534- seq_printf(pi, "%p %s %p ",
90535+ seq_printf(pi, "%pK %s %pK ",
90536 p->addr, kprobe_type, p->addr);
90537
90538 if (!pp)
90539diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
90540index 6683cce..daf8999 100644
90541--- a/kernel/ksysfs.c
90542+++ b/kernel/ksysfs.c
90543@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
90544 {
90545 if (count+1 > UEVENT_HELPER_PATH_LEN)
90546 return -ENOENT;
90547+ if (!capable(CAP_SYS_ADMIN))
90548+ return -EPERM;
90549 memcpy(uevent_helper, buf, count);
90550 uevent_helper[count] = '\0';
90551 if (count && uevent_helper[count-1] == '\n')
90552@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
90553 return count;
90554 }
90555
90556-static struct bin_attribute notes_attr = {
90557+static bin_attribute_no_const notes_attr __read_only = {
90558 .attr = {
90559 .name = "notes",
90560 .mode = S_IRUGO,
90561diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
90562index 88d0d44..e9ce0ee 100644
90563--- a/kernel/locking/lockdep.c
90564+++ b/kernel/locking/lockdep.c
90565@@ -599,6 +599,10 @@ static int static_obj(void *obj)
90566 end = (unsigned long) &_end,
90567 addr = (unsigned long) obj;
90568
90569+#ifdef CONFIG_PAX_KERNEXEC
90570+ start = ktla_ktva(start);
90571+#endif
90572+
90573 /*
90574 * static variable?
90575 */
90576@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
90577 if (!static_obj(lock->key)) {
90578 debug_locks_off();
90579 printk("INFO: trying to register non-static key.\n");
90580+ printk("lock:%pS key:%pS.\n", lock, lock->key);
90581 printk("the code is fine but needs lockdep annotation.\n");
90582 printk("turning off the locking correctness validator.\n");
90583 dump_stack();
90584@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
90585 if (!class)
90586 return 0;
90587 }
90588- atomic_inc((atomic_t *)&class->ops);
90589+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
90590 if (very_verbose(class)) {
90591 printk("\nacquire class [%p] %s", class->key, class->name);
90592 if (class->name_version > 1)
90593diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
90594index ef43ac4..2720dfa 100644
90595--- a/kernel/locking/lockdep_proc.c
90596+++ b/kernel/locking/lockdep_proc.c
90597@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
90598 return 0;
90599 }
90600
90601- seq_printf(m, "%p", class->key);
90602+ seq_printf(m, "%pK", class->key);
90603 #ifdef CONFIG_DEBUG_LOCKDEP
90604 seq_printf(m, " OPS:%8ld", class->ops);
90605 #endif
90606@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
90607
90608 list_for_each_entry(entry, &class->locks_after, entry) {
90609 if (entry->distance == 1) {
90610- seq_printf(m, " -> [%p] ", entry->class->key);
90611+ seq_printf(m, " -> [%pK] ", entry->class->key);
90612 print_name(m, entry->class);
90613 seq_puts(m, "\n");
90614 }
90615@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
90616 if (!class->key)
90617 continue;
90618
90619- seq_printf(m, "[%p] ", class->key);
90620+ seq_printf(m, "[%pK] ", class->key);
90621 print_name(m, class);
90622 seq_puts(m, "\n");
90623 }
90624@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
90625 if (!i)
90626 seq_line(m, '-', 40-namelen, namelen);
90627
90628- snprintf(ip, sizeof(ip), "[<%p>]",
90629+ snprintf(ip, sizeof(ip), "[<%pK>]",
90630 (void *)class->contention_point[i]);
90631 seq_printf(m, "%40s %14lu %29s %pS\n",
90632 name, stats->contention_point[i],
90633@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
90634 if (!i)
90635 seq_line(m, '-', 40-namelen, namelen);
90636
90637- snprintf(ip, sizeof(ip), "[<%p>]",
90638+ snprintf(ip, sizeof(ip), "[<%pK>]",
90639 (void *)class->contending_point[i]);
90640 seq_printf(m, "%40s %14lu %29s %pS\n",
90641 name, stats->contending_point[i],
90642diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
90643index 9887a90..0cd2b1d 100644
90644--- a/kernel/locking/mcs_spinlock.c
90645+++ b/kernel/locking/mcs_spinlock.c
90646@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
90647
90648 prev = decode_cpu(old);
90649 node->prev = prev;
90650- ACCESS_ONCE(prev->next) = node;
90651+ ACCESS_ONCE_RW(prev->next) = node;
90652
90653 /*
90654 * Normally @prev is untouchable after the above store; because at that
90655@@ -172,8 +172,8 @@ unqueue:
90656 * it will wait in Step-A.
90657 */
90658
90659- ACCESS_ONCE(next->prev) = prev;
90660- ACCESS_ONCE(prev->next) = next;
90661+ ACCESS_ONCE_RW(next->prev) = prev;
90662+ ACCESS_ONCE_RW(prev->next) = next;
90663
90664 return false;
90665 }
90666@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
90667 node = this_cpu_ptr(&osq_node);
90668 next = xchg(&node->next, NULL);
90669 if (next) {
90670- ACCESS_ONCE(next->locked) = 1;
90671+ ACCESS_ONCE_RW(next->locked) = 1;
90672 return;
90673 }
90674
90675 next = osq_wait_next(lock, node, NULL);
90676 if (next)
90677- ACCESS_ONCE(next->locked) = 1;
90678+ ACCESS_ONCE_RW(next->locked) = 1;
90679 }
90680
90681 #endif
90682diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
90683index 4d60986..5d351c1 100644
90684--- a/kernel/locking/mcs_spinlock.h
90685+++ b/kernel/locking/mcs_spinlock.h
90686@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
90687 */
90688 return;
90689 }
90690- ACCESS_ONCE(prev->next) = node;
90691+ ACCESS_ONCE_RW(prev->next) = node;
90692
90693 /* Wait until the lock holder passes the lock down. */
90694 arch_mcs_spin_lock_contended(&node->locked);
90695diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
90696index 3ef3736..9c951fa 100644
90697--- a/kernel/locking/mutex-debug.c
90698+++ b/kernel/locking/mutex-debug.c
90699@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
90700 }
90701
90702 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90703- struct thread_info *ti)
90704+ struct task_struct *task)
90705 {
90706 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
90707
90708 /* Mark the current thread as blocked on the lock: */
90709- ti->task->blocked_on = waiter;
90710+ task->blocked_on = waiter;
90711 }
90712
90713 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90714- struct thread_info *ti)
90715+ struct task_struct *task)
90716 {
90717 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
90718- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
90719- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
90720- ti->task->blocked_on = NULL;
90721+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
90722+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
90723+ task->blocked_on = NULL;
90724
90725 list_del_init(&waiter->list);
90726 waiter->task = NULL;
90727diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
90728index 0799fd3..d06ae3b 100644
90729--- a/kernel/locking/mutex-debug.h
90730+++ b/kernel/locking/mutex-debug.h
90731@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
90732 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
90733 extern void debug_mutex_add_waiter(struct mutex *lock,
90734 struct mutex_waiter *waiter,
90735- struct thread_info *ti);
90736+ struct task_struct *task);
90737 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90738- struct thread_info *ti);
90739+ struct task_struct *task);
90740 extern void debug_mutex_unlock(struct mutex *lock);
90741 extern void debug_mutex_init(struct mutex *lock, const char *name,
90742 struct lock_class_key *key);
90743diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
90744index 4541951..39fe90a 100644
90745--- a/kernel/locking/mutex.c
90746+++ b/kernel/locking/mutex.c
90747@@ -524,7 +524,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90748 goto skip_wait;
90749
90750 debug_mutex_lock_common(lock, &waiter);
90751- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
90752+ debug_mutex_add_waiter(lock, &waiter, task);
90753
90754 /* add waiting tasks to the end of the waitqueue (FIFO): */
90755 list_add_tail(&waiter.list, &lock->wait_list);
90756@@ -569,7 +569,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90757 schedule_preempt_disabled();
90758 spin_lock_mutex(&lock->wait_lock, flags);
90759 }
90760- mutex_remove_waiter(lock, &waiter, current_thread_info());
90761+ mutex_remove_waiter(lock, &waiter, task);
90762 /* set it to 0 if there are no waiters left: */
90763 if (likely(list_empty(&lock->wait_list)))
90764 atomic_set(&lock->count, 0);
90765@@ -606,7 +606,7 @@ skip_wait:
90766 return 0;
90767
90768 err:
90769- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
90770+ mutex_remove_waiter(lock, &waiter, task);
90771 spin_unlock_mutex(&lock->wait_lock, flags);
90772 debug_mutex_free_waiter(&waiter);
90773 mutex_release(&lock->dep_map, 1, ip);
90774diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
90775index 1d96dd0..994ff19 100644
90776--- a/kernel/locking/rtmutex-tester.c
90777+++ b/kernel/locking/rtmutex-tester.c
90778@@ -22,7 +22,7 @@
90779 #define MAX_RT_TEST_MUTEXES 8
90780
90781 static spinlock_t rttest_lock;
90782-static atomic_t rttest_event;
90783+static atomic_unchecked_t rttest_event;
90784
90785 struct test_thread_data {
90786 int opcode;
90787@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90788
90789 case RTTEST_LOCKCONT:
90790 td->mutexes[td->opdata] = 1;
90791- td->event = atomic_add_return(1, &rttest_event);
90792+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90793 return 0;
90794
90795 case RTTEST_RESET:
90796@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90797 return 0;
90798
90799 case RTTEST_RESETEVENT:
90800- atomic_set(&rttest_event, 0);
90801+ atomic_set_unchecked(&rttest_event, 0);
90802 return 0;
90803
90804 default:
90805@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90806 return ret;
90807
90808 td->mutexes[id] = 1;
90809- td->event = atomic_add_return(1, &rttest_event);
90810+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90811 rt_mutex_lock(&mutexes[id]);
90812- td->event = atomic_add_return(1, &rttest_event);
90813+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90814 td->mutexes[id] = 4;
90815 return 0;
90816
90817@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90818 return ret;
90819
90820 td->mutexes[id] = 1;
90821- td->event = atomic_add_return(1, &rttest_event);
90822+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90823 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
90824- td->event = atomic_add_return(1, &rttest_event);
90825+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90826 td->mutexes[id] = ret ? 0 : 4;
90827 return ret ? -EINTR : 0;
90828
90829@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90830 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
90831 return ret;
90832
90833- td->event = atomic_add_return(1, &rttest_event);
90834+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90835 rt_mutex_unlock(&mutexes[id]);
90836- td->event = atomic_add_return(1, &rttest_event);
90837+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90838 td->mutexes[id] = 0;
90839 return 0;
90840
90841@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90842 break;
90843
90844 td->mutexes[dat] = 2;
90845- td->event = atomic_add_return(1, &rttest_event);
90846+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90847 break;
90848
90849 default:
90850@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90851 return;
90852
90853 td->mutexes[dat] = 3;
90854- td->event = atomic_add_return(1, &rttest_event);
90855+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90856 break;
90857
90858 case RTTEST_LOCKNOWAIT:
90859@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90860 return;
90861
90862 td->mutexes[dat] = 1;
90863- td->event = atomic_add_return(1, &rttest_event);
90864+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90865 return;
90866
90867 default:
90868diff --git a/kernel/module.c b/kernel/module.c
90869index d856e96..b82225c 100644
90870--- a/kernel/module.c
90871+++ b/kernel/module.c
90872@@ -59,6 +59,7 @@
90873 #include <linux/jump_label.h>
90874 #include <linux/pfn.h>
90875 #include <linux/bsearch.h>
90876+#include <linux/grsecurity.h>
90877 #include <uapi/linux/module.h>
90878 #include "module-internal.h"
90879
90880@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
90881
90882 /* Bounds of module allocation, for speeding __module_address.
90883 * Protected by module_mutex. */
90884-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
90885+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
90886+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
90887
90888 int register_module_notifier(struct notifier_block *nb)
90889 {
90890@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90891 return true;
90892
90893 list_for_each_entry_rcu(mod, &modules, list) {
90894- struct symsearch arr[] = {
90895+ struct symsearch modarr[] = {
90896 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
90897 NOT_GPL_ONLY, false },
90898 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
90899@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90900 if (mod->state == MODULE_STATE_UNFORMED)
90901 continue;
90902
90903- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
90904+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
90905 return true;
90906 }
90907 return false;
90908@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
90909 if (!pcpusec->sh_size)
90910 return 0;
90911
90912- if (align > PAGE_SIZE) {
90913+ if (align-1 >= PAGE_SIZE) {
90914 pr_warn("%s: per-cpu alignment %li > %li\n",
90915 mod->name, align, PAGE_SIZE);
90916 align = PAGE_SIZE;
90917@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
90918 static ssize_t show_coresize(struct module_attribute *mattr,
90919 struct module_kobject *mk, char *buffer)
90920 {
90921- return sprintf(buffer, "%u\n", mk->mod->core_size);
90922+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
90923 }
90924
90925 static struct module_attribute modinfo_coresize =
90926@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
90927 static ssize_t show_initsize(struct module_attribute *mattr,
90928 struct module_kobject *mk, char *buffer)
90929 {
90930- return sprintf(buffer, "%u\n", mk->mod->init_size);
90931+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
90932 }
90933
90934 static struct module_attribute modinfo_initsize =
90935@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
90936 goto bad_version;
90937 }
90938
90939+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90940+ /*
90941+ * avoid potentially printing jibberish on attempted load
90942+ * of a module randomized with a different seed
90943+ */
90944+ pr_warn("no symbol version for %s\n", symname);
90945+#else
90946 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
90947+#endif
90948 return 0;
90949
90950 bad_version:
90951+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90952+ /*
90953+ * avoid potentially printing jibberish on attempted load
90954+ * of a module randomized with a different seed
90955+ */
90956+ pr_warn("attempted module disagrees about version of symbol %s\n",
90957+ symname);
90958+#else
90959 pr_warn("%s: disagrees about version of symbol %s\n",
90960 mod->name, symname);
90961+#endif
90962 return 0;
90963 }
90964
90965@@ -1275,7 +1294,7 @@ resolve_symbol_wait(struct module *mod,
90966 */
90967 #ifdef CONFIG_SYSFS
90968
90969-#ifdef CONFIG_KALLSYMS
90970+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
90971 static inline bool sect_empty(const Elf_Shdr *sect)
90972 {
90973 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
90974@@ -1413,7 +1432,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
90975 {
90976 unsigned int notes, loaded, i;
90977 struct module_notes_attrs *notes_attrs;
90978- struct bin_attribute *nattr;
90979+ bin_attribute_no_const *nattr;
90980
90981 /* failed to create section attributes, so can't create notes */
90982 if (!mod->sect_attrs)
90983@@ -1525,7 +1544,7 @@ static void del_usage_links(struct module *mod)
90984 static int module_add_modinfo_attrs(struct module *mod)
90985 {
90986 struct module_attribute *attr;
90987- struct module_attribute *temp_attr;
90988+ module_attribute_no_const *temp_attr;
90989 int error = 0;
90990 int i;
90991
90992@@ -1735,21 +1754,21 @@ static void set_section_ro_nx(void *base,
90993
90994 static void unset_module_core_ro_nx(struct module *mod)
90995 {
90996- set_page_attributes(mod->module_core + mod->core_text_size,
90997- mod->module_core + mod->core_size,
90998+ set_page_attributes(mod->module_core_rw,
90999+ mod->module_core_rw + mod->core_size_rw,
91000 set_memory_x);
91001- set_page_attributes(mod->module_core,
91002- mod->module_core + mod->core_ro_size,
91003+ set_page_attributes(mod->module_core_rx,
91004+ mod->module_core_rx + mod->core_size_rx,
91005 set_memory_rw);
91006 }
91007
91008 static void unset_module_init_ro_nx(struct module *mod)
91009 {
91010- set_page_attributes(mod->module_init + mod->init_text_size,
91011- mod->module_init + mod->init_size,
91012+ set_page_attributes(mod->module_init_rw,
91013+ mod->module_init_rw + mod->init_size_rw,
91014 set_memory_x);
91015- set_page_attributes(mod->module_init,
91016- mod->module_init + mod->init_ro_size,
91017+ set_page_attributes(mod->module_init_rx,
91018+ mod->module_init_rx + mod->init_size_rx,
91019 set_memory_rw);
91020 }
91021
91022@@ -1762,14 +1781,14 @@ void set_all_modules_text_rw(void)
91023 list_for_each_entry_rcu(mod, &modules, list) {
91024 if (mod->state == MODULE_STATE_UNFORMED)
91025 continue;
91026- if ((mod->module_core) && (mod->core_text_size)) {
91027- set_page_attributes(mod->module_core,
91028- mod->module_core + mod->core_text_size,
91029+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91030+ set_page_attributes(mod->module_core_rx,
91031+ mod->module_core_rx + mod->core_size_rx,
91032 set_memory_rw);
91033 }
91034- if ((mod->module_init) && (mod->init_text_size)) {
91035- set_page_attributes(mod->module_init,
91036- mod->module_init + mod->init_text_size,
91037+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91038+ set_page_attributes(mod->module_init_rx,
91039+ mod->module_init_rx + mod->init_size_rx,
91040 set_memory_rw);
91041 }
91042 }
91043@@ -1785,14 +1804,14 @@ void set_all_modules_text_ro(void)
91044 list_for_each_entry_rcu(mod, &modules, list) {
91045 if (mod->state == MODULE_STATE_UNFORMED)
91046 continue;
91047- if ((mod->module_core) && (mod->core_text_size)) {
91048- set_page_attributes(mod->module_core,
91049- mod->module_core + mod->core_text_size,
91050+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91051+ set_page_attributes(mod->module_core_rx,
91052+ mod->module_core_rx + mod->core_size_rx,
91053 set_memory_ro);
91054 }
91055- if ((mod->module_init) && (mod->init_text_size)) {
91056- set_page_attributes(mod->module_init,
91057- mod->module_init + mod->init_text_size,
91058+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91059+ set_page_attributes(mod->module_init_rx,
91060+ mod->module_init_rx + mod->init_size_rx,
91061 set_memory_ro);
91062 }
91063 }
91064@@ -1801,7 +1820,15 @@ void set_all_modules_text_ro(void)
91065 #else
91066 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
91067 static void unset_module_core_ro_nx(struct module *mod) { }
91068-static void unset_module_init_ro_nx(struct module *mod) { }
91069+static void unset_module_init_ro_nx(struct module *mod)
91070+{
91071+
91072+#ifdef CONFIG_PAX_KERNEXEC
91073+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91074+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91075+#endif
91076+
91077+}
91078 #endif
91079
91080 void __weak module_memfree(void *module_region)
91081@@ -1855,16 +1882,19 @@ static void free_module(struct module *mod)
91082 /* This may be NULL, but that's OK */
91083 unset_module_init_ro_nx(mod);
91084 module_arch_freeing_init(mod);
91085- module_memfree(mod->module_init);
91086+ module_memfree(mod->module_init_rw);
91087+ module_memfree_exec(mod->module_init_rx);
91088 kfree(mod->args);
91089 percpu_modfree(mod);
91090
91091 /* Free lock-classes: */
91092- lockdep_free_key_range(mod->module_core, mod->core_size);
91093+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
91094+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
91095
91096 /* Finally, free the core (containing the module structure) */
91097 unset_module_core_ro_nx(mod);
91098- module_memfree(mod->module_core);
91099+ module_memfree_exec(mod->module_core_rx);
91100+ module_memfree(mod->module_core_rw);
91101
91102 #ifdef CONFIG_MPU
91103 update_protections(current->mm);
91104@@ -1933,9 +1963,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91105 int ret = 0;
91106 const struct kernel_symbol *ksym;
91107
91108+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91109+ int is_fs_load = 0;
91110+ int register_filesystem_found = 0;
91111+ char *p;
91112+
91113+ p = strstr(mod->args, "grsec_modharden_fs");
91114+ if (p) {
91115+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
91116+ /* copy \0 as well */
91117+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
91118+ is_fs_load = 1;
91119+ }
91120+#endif
91121+
91122 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
91123 const char *name = info->strtab + sym[i].st_name;
91124
91125+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91126+ /* it's a real shame this will never get ripped and copied
91127+ upstream! ;(
91128+ */
91129+ if (is_fs_load && !strcmp(name, "register_filesystem"))
91130+ register_filesystem_found = 1;
91131+#endif
91132+
91133 switch (sym[i].st_shndx) {
91134 case SHN_COMMON:
91135 /* Ignore common symbols */
91136@@ -1960,7 +2012,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91137 ksym = resolve_symbol_wait(mod, info, name);
91138 /* Ok if resolved. */
91139 if (ksym && !IS_ERR(ksym)) {
91140+ pax_open_kernel();
91141 sym[i].st_value = ksym->value;
91142+ pax_close_kernel();
91143 break;
91144 }
91145
91146@@ -1979,11 +2033,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91147 secbase = (unsigned long)mod_percpu(mod);
91148 else
91149 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
91150+ pax_open_kernel();
91151 sym[i].st_value += secbase;
91152+ pax_close_kernel();
91153 break;
91154 }
91155 }
91156
91157+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91158+ if (is_fs_load && !register_filesystem_found) {
91159+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
91160+ ret = -EPERM;
91161+ }
91162+#endif
91163+
91164 return ret;
91165 }
91166
91167@@ -2067,22 +2130,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
91168 || s->sh_entsize != ~0UL
91169 || strstarts(sname, ".init"))
91170 continue;
91171- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
91172+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91173+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
91174+ else
91175+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
91176 pr_debug("\t%s\n", sname);
91177 }
91178- switch (m) {
91179- case 0: /* executable */
91180- mod->core_size = debug_align(mod->core_size);
91181- mod->core_text_size = mod->core_size;
91182- break;
91183- case 1: /* RO: text and ro-data */
91184- mod->core_size = debug_align(mod->core_size);
91185- mod->core_ro_size = mod->core_size;
91186- break;
91187- case 3: /* whole core */
91188- mod->core_size = debug_align(mod->core_size);
91189- break;
91190- }
91191 }
91192
91193 pr_debug("Init section allocation order:\n");
91194@@ -2096,23 +2149,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
91195 || s->sh_entsize != ~0UL
91196 || !strstarts(sname, ".init"))
91197 continue;
91198- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
91199- | INIT_OFFSET_MASK);
91200+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91201+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
91202+ else
91203+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
91204+ s->sh_entsize |= INIT_OFFSET_MASK;
91205 pr_debug("\t%s\n", sname);
91206 }
91207- switch (m) {
91208- case 0: /* executable */
91209- mod->init_size = debug_align(mod->init_size);
91210- mod->init_text_size = mod->init_size;
91211- break;
91212- case 1: /* RO: text and ro-data */
91213- mod->init_size = debug_align(mod->init_size);
91214- mod->init_ro_size = mod->init_size;
91215- break;
91216- case 3: /* whole init */
91217- mod->init_size = debug_align(mod->init_size);
91218- break;
91219- }
91220 }
91221 }
91222
91223@@ -2285,7 +2328,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91224
91225 /* Put symbol section at end of init part of module. */
91226 symsect->sh_flags |= SHF_ALLOC;
91227- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
91228+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
91229 info->index.sym) | INIT_OFFSET_MASK;
91230 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
91231
91232@@ -2302,13 +2345,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91233 }
91234
91235 /* Append room for core symbols at end of core part. */
91236- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
91237- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
91238- mod->core_size += strtab_size;
91239+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
91240+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
91241+ mod->core_size_rx += strtab_size;
91242
91243 /* Put string table section at end of init part of module. */
91244 strsect->sh_flags |= SHF_ALLOC;
91245- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
91246+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
91247 info->index.str) | INIT_OFFSET_MASK;
91248 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
91249 }
91250@@ -2326,12 +2369,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91251 /* Make sure we get permanent strtab: don't use info->strtab. */
91252 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
91253
91254+ pax_open_kernel();
91255+
91256 /* Set types up while we still have access to sections. */
91257 for (i = 0; i < mod->num_symtab; i++)
91258 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
91259
91260- mod->core_symtab = dst = mod->module_core + info->symoffs;
91261- mod->core_strtab = s = mod->module_core + info->stroffs;
91262+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
91263+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
91264 src = mod->symtab;
91265 for (ndst = i = 0; i < mod->num_symtab; i++) {
91266 if (i == 0 ||
91267@@ -2343,6 +2388,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91268 }
91269 }
91270 mod->core_num_syms = ndst;
91271+
91272+ pax_close_kernel();
91273 }
91274 #else
91275 static inline void layout_symtab(struct module *mod, struct load_info *info)
91276@@ -2376,17 +2423,33 @@ void * __weak module_alloc(unsigned long size)
91277 return vmalloc_exec(size);
91278 }
91279
91280-static void *module_alloc_update_bounds(unsigned long size)
91281+static void *module_alloc_update_bounds_rw(unsigned long size)
91282 {
91283 void *ret = module_alloc(size);
91284
91285 if (ret) {
91286 mutex_lock(&module_mutex);
91287 /* Update module bounds. */
91288- if ((unsigned long)ret < module_addr_min)
91289- module_addr_min = (unsigned long)ret;
91290- if ((unsigned long)ret + size > module_addr_max)
91291- module_addr_max = (unsigned long)ret + size;
91292+ if ((unsigned long)ret < module_addr_min_rw)
91293+ module_addr_min_rw = (unsigned long)ret;
91294+ if ((unsigned long)ret + size > module_addr_max_rw)
91295+ module_addr_max_rw = (unsigned long)ret + size;
91296+ mutex_unlock(&module_mutex);
91297+ }
91298+ return ret;
91299+}
91300+
91301+static void *module_alloc_update_bounds_rx(unsigned long size)
91302+{
91303+ void *ret = module_alloc_exec(size);
91304+
91305+ if (ret) {
91306+ mutex_lock(&module_mutex);
91307+ /* Update module bounds. */
91308+ if ((unsigned long)ret < module_addr_min_rx)
91309+ module_addr_min_rx = (unsigned long)ret;
91310+ if ((unsigned long)ret + size > module_addr_max_rx)
91311+ module_addr_max_rx = (unsigned long)ret + size;
91312 mutex_unlock(&module_mutex);
91313 }
91314 return ret;
91315@@ -2640,7 +2703,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91316 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
91317
91318 if (info->index.sym == 0) {
91319+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
91320+ /*
91321+ * avoid potentially printing jibberish on attempted load
91322+ * of a module randomized with a different seed
91323+ */
91324+ pr_warn("module has no symbols (stripped?)\n");
91325+#else
91326 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
91327+#endif
91328 return ERR_PTR(-ENOEXEC);
91329 }
91330
91331@@ -2656,8 +2727,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91332 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91333 {
91334 const char *modmagic = get_modinfo(info, "vermagic");
91335+ const char *license = get_modinfo(info, "license");
91336 int err;
91337
91338+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
91339+ if (!license || !license_is_gpl_compatible(license))
91340+ return -ENOEXEC;
91341+#endif
91342+
91343 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
91344 modmagic = NULL;
91345
91346@@ -2682,7 +2759,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91347 }
91348
91349 /* Set up license info based on the info section */
91350- set_license(mod, get_modinfo(info, "license"));
91351+ set_license(mod, license);
91352
91353 return 0;
91354 }
91355@@ -2776,7 +2853,7 @@ static int move_module(struct module *mod, struct load_info *info)
91356 void *ptr;
91357
91358 /* Do the allocs. */
91359- ptr = module_alloc_update_bounds(mod->core_size);
91360+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
91361 /*
91362 * The pointer to this block is stored in the module structure
91363 * which is inside the block. Just mark it as not being a
91364@@ -2786,11 +2863,11 @@ static int move_module(struct module *mod, struct load_info *info)
91365 if (!ptr)
91366 return -ENOMEM;
91367
91368- memset(ptr, 0, mod->core_size);
91369- mod->module_core = ptr;
91370+ memset(ptr, 0, mod->core_size_rw);
91371+ mod->module_core_rw = ptr;
91372
91373- if (mod->init_size) {
91374- ptr = module_alloc_update_bounds(mod->init_size);
91375+ if (mod->init_size_rw) {
91376+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
91377 /*
91378 * The pointer to this block is stored in the module structure
91379 * which is inside the block. This block doesn't need to be
91380@@ -2799,13 +2876,45 @@ static int move_module(struct module *mod, struct load_info *info)
91381 */
91382 kmemleak_ignore(ptr);
91383 if (!ptr) {
91384- module_memfree(mod->module_core);
91385+ module_memfree(mod->module_core_rw);
91386 return -ENOMEM;
91387 }
91388- memset(ptr, 0, mod->init_size);
91389- mod->module_init = ptr;
91390+ memset(ptr, 0, mod->init_size_rw);
91391+ mod->module_init_rw = ptr;
91392 } else
91393- mod->module_init = NULL;
91394+ mod->module_init_rw = NULL;
91395+
91396+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
91397+ kmemleak_not_leak(ptr);
91398+ if (!ptr) {
91399+ if (mod->module_init_rw)
91400+ module_memfree(mod->module_init_rw);
91401+ module_memfree(mod->module_core_rw);
91402+ return -ENOMEM;
91403+ }
91404+
91405+ pax_open_kernel();
91406+ memset(ptr, 0, mod->core_size_rx);
91407+ pax_close_kernel();
91408+ mod->module_core_rx = ptr;
91409+
91410+ if (mod->init_size_rx) {
91411+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
91412+ kmemleak_ignore(ptr);
91413+ if (!ptr && mod->init_size_rx) {
91414+ module_memfree_exec(mod->module_core_rx);
91415+ if (mod->module_init_rw)
91416+ module_memfree(mod->module_init_rw);
91417+ module_memfree(mod->module_core_rw);
91418+ return -ENOMEM;
91419+ }
91420+
91421+ pax_open_kernel();
91422+ memset(ptr, 0, mod->init_size_rx);
91423+ pax_close_kernel();
91424+ mod->module_init_rx = ptr;
91425+ } else
91426+ mod->module_init_rx = NULL;
91427
91428 /* Transfer each section which specifies SHF_ALLOC */
91429 pr_debug("final section addresses:\n");
91430@@ -2816,16 +2925,45 @@ static int move_module(struct module *mod, struct load_info *info)
91431 if (!(shdr->sh_flags & SHF_ALLOC))
91432 continue;
91433
91434- if (shdr->sh_entsize & INIT_OFFSET_MASK)
91435- dest = mod->module_init
91436- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91437- else
91438- dest = mod->module_core + shdr->sh_entsize;
91439+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
91440+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
91441+ dest = mod->module_init_rw
91442+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91443+ else
91444+ dest = mod->module_init_rx
91445+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91446+ } else {
91447+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
91448+ dest = mod->module_core_rw + shdr->sh_entsize;
91449+ else
91450+ dest = mod->module_core_rx + shdr->sh_entsize;
91451+ }
91452+
91453+ if (shdr->sh_type != SHT_NOBITS) {
91454+
91455+#ifdef CONFIG_PAX_KERNEXEC
91456+#ifdef CONFIG_X86_64
91457+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
91458+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
91459+#endif
91460+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
91461+ pax_open_kernel();
91462+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
91463+ pax_close_kernel();
91464+ } else
91465+#endif
91466
91467- if (shdr->sh_type != SHT_NOBITS)
91468 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
91469+ }
91470 /* Update sh_addr to point to copy in image. */
91471- shdr->sh_addr = (unsigned long)dest;
91472+
91473+#ifdef CONFIG_PAX_KERNEXEC
91474+ if (shdr->sh_flags & SHF_EXECINSTR)
91475+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
91476+ else
91477+#endif
91478+
91479+ shdr->sh_addr = (unsigned long)dest;
91480 pr_debug("\t0x%lx %s\n",
91481 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
91482 }
91483@@ -2882,12 +3020,12 @@ static void flush_module_icache(const struct module *mod)
91484 * Do it before processing of module parameters, so the module
91485 * can provide parameter accessor functions of its own.
91486 */
91487- if (mod->module_init)
91488- flush_icache_range((unsigned long)mod->module_init,
91489- (unsigned long)mod->module_init
91490- + mod->init_size);
91491- flush_icache_range((unsigned long)mod->module_core,
91492- (unsigned long)mod->module_core + mod->core_size);
91493+ if (mod->module_init_rx)
91494+ flush_icache_range((unsigned long)mod->module_init_rx,
91495+ (unsigned long)mod->module_init_rx
91496+ + mod->init_size_rx);
91497+ flush_icache_range((unsigned long)mod->module_core_rx,
91498+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
91499
91500 set_fs(old_fs);
91501 }
91502@@ -2945,8 +3083,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
91503 {
91504 percpu_modfree(mod);
91505 module_arch_freeing_init(mod);
91506- module_memfree(mod->module_init);
91507- module_memfree(mod->module_core);
91508+ module_memfree_exec(mod->module_init_rx);
91509+ module_memfree_exec(mod->module_core_rx);
91510+ module_memfree(mod->module_init_rw);
91511+ module_memfree(mod->module_core_rw);
91512 }
91513
91514 int __weak module_finalize(const Elf_Ehdr *hdr,
91515@@ -2959,7 +3099,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
91516 static int post_relocation(struct module *mod, const struct load_info *info)
91517 {
91518 /* Sort exception table now relocations are done. */
91519+ pax_open_kernel();
91520 sort_extable(mod->extable, mod->extable + mod->num_exentries);
91521+ pax_close_kernel();
91522
91523 /* Copy relocated percpu area over. */
91524 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
91525@@ -3001,13 +3143,15 @@ static void do_mod_ctors(struct module *mod)
91526 /* For freeing module_init on success, in case kallsyms traversing */
91527 struct mod_initfree {
91528 struct rcu_head rcu;
91529- void *module_init;
91530+ void *module_init_rw;
91531+ void *module_init_rx;
91532 };
91533
91534 static void do_free_init(struct rcu_head *head)
91535 {
91536 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
91537- module_memfree(m->module_init);
91538+ module_memfree(m->module_init_rw);
91539+ module_memfree_exec(m->module_init_rx);
91540 kfree(m);
91541 }
91542
91543@@ -3022,7 +3166,8 @@ static int do_init_module(struct module *mod)
91544 ret = -ENOMEM;
91545 goto fail;
91546 }
91547- freeinit->module_init = mod->module_init;
91548+ freeinit->module_init_rw = mod->module_init_rw;
91549+ freeinit->module_init_rx = mod->module_init_rx;
91550
91551 /*
91552 * We want to find out whether @mod uses async during init. Clear
91553@@ -3081,10 +3226,10 @@ static int do_init_module(struct module *mod)
91554 #endif
91555 unset_module_init_ro_nx(mod);
91556 module_arch_freeing_init(mod);
91557- mod->module_init = NULL;
91558- mod->init_size = 0;
91559- mod->init_ro_size = 0;
91560- mod->init_text_size = 0;
91561+ mod->module_init_rw = NULL;
91562+ mod->module_init_rx = NULL;
91563+ mod->init_size_rw = 0;
91564+ mod->init_size_rx = 0;
91565 /*
91566 * We want to free module_init, but be aware that kallsyms may be
91567 * walking this with preempt disabled. In all the failure paths,
91568@@ -3198,16 +3343,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
91569 module_bug_finalize(info->hdr, info->sechdrs, mod);
91570
91571 /* Set RO and NX regions for core */
91572- set_section_ro_nx(mod->module_core,
91573- mod->core_text_size,
91574- mod->core_ro_size,
91575- mod->core_size);
91576+ set_section_ro_nx(mod->module_core_rx,
91577+ mod->core_size_rx,
91578+ mod->core_size_rx,
91579+ mod->core_size_rx);
91580
91581 /* Set RO and NX regions for init */
91582- set_section_ro_nx(mod->module_init,
91583- mod->init_text_size,
91584- mod->init_ro_size,
91585- mod->init_size);
91586+ set_section_ro_nx(mod->module_init_rx,
91587+ mod->init_size_rx,
91588+ mod->init_size_rx,
91589+ mod->init_size_rx);
91590
91591 /* Mark state as coming so strong_try_module_get() ignores us,
91592 * but kallsyms etc. can see us. */
91593@@ -3291,9 +3436,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
91594 if (err)
91595 goto free_unload;
91596
91597+ /* Now copy in args */
91598+ mod->args = strndup_user(uargs, ~0UL >> 1);
91599+ if (IS_ERR(mod->args)) {
91600+ err = PTR_ERR(mod->args);
91601+ goto free_unload;
91602+ }
91603+
91604 /* Set up MODINFO_ATTR fields */
91605 setup_modinfo(mod, info);
91606
91607+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91608+ {
91609+ char *p, *p2;
91610+
91611+ if (strstr(mod->args, "grsec_modharden_netdev")) {
91612+ 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);
91613+ err = -EPERM;
91614+ goto free_modinfo;
91615+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
91616+ p += sizeof("grsec_modharden_normal") - 1;
91617+ p2 = strstr(p, "_");
91618+ if (p2) {
91619+ *p2 = '\0';
91620+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
91621+ *p2 = '_';
91622+ }
91623+ err = -EPERM;
91624+ goto free_modinfo;
91625+ }
91626+ }
91627+#endif
91628+
91629 /* Fix up syms, so that st_value is a pointer to location. */
91630 err = simplify_symbols(mod, info);
91631 if (err < 0)
91632@@ -3309,13 +3483,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
91633
91634 flush_module_icache(mod);
91635
91636- /* Now copy in args */
91637- mod->args = strndup_user(uargs, ~0UL >> 1);
91638- if (IS_ERR(mod->args)) {
91639- err = PTR_ERR(mod->args);
91640- goto free_arch_cleanup;
91641- }
91642-
91643 dynamic_debug_setup(info->debug, info->num_debug);
91644
91645 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
91646@@ -3363,11 +3530,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
91647 ddebug_cleanup:
91648 dynamic_debug_remove(info->debug);
91649 synchronize_sched();
91650- kfree(mod->args);
91651- free_arch_cleanup:
91652 module_arch_cleanup(mod);
91653 free_modinfo:
91654 free_modinfo(mod);
91655+ kfree(mod->args);
91656 free_unload:
91657 module_unload_free(mod);
91658 unlink_mod:
91659@@ -3454,10 +3620,16 @@ static const char *get_ksymbol(struct module *mod,
91660 unsigned long nextval;
91661
91662 /* At worse, next value is at end of module */
91663- if (within_module_init(addr, mod))
91664- nextval = (unsigned long)mod->module_init+mod->init_text_size;
91665+ if (within_module_init_rx(addr, mod))
91666+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
91667+ else if (within_module_init_rw(addr, mod))
91668+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
91669+ else if (within_module_core_rx(addr, mod))
91670+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
91671+ else if (within_module_core_rw(addr, mod))
91672+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
91673 else
91674- nextval = (unsigned long)mod->module_core+mod->core_text_size;
91675+ return NULL;
91676
91677 /* Scan for closest preceding symbol, and next symbol. (ELF
91678 starts real symbols at 1). */
91679@@ -3705,7 +3877,7 @@ static int m_show(struct seq_file *m, void *p)
91680 return 0;
91681
91682 seq_printf(m, "%s %u",
91683- mod->name, mod->init_size + mod->core_size);
91684+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
91685 print_unload_info(m, mod);
91686
91687 /* Informative for users. */
91688@@ -3714,7 +3886,7 @@ static int m_show(struct seq_file *m, void *p)
91689 mod->state == MODULE_STATE_COMING ? "Loading" :
91690 "Live");
91691 /* Used by oprofile and other similar tools. */
91692- seq_printf(m, " 0x%pK", mod->module_core);
91693+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
91694
91695 /* Taints info */
91696 if (mod->taints)
91697@@ -3750,7 +3922,17 @@ static const struct file_operations proc_modules_operations = {
91698
91699 static int __init proc_modules_init(void)
91700 {
91701+#ifndef CONFIG_GRKERNSEC_HIDESYM
91702+#ifdef CONFIG_GRKERNSEC_PROC_USER
91703+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
91704+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
91705+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
91706+#else
91707 proc_create("modules", 0, NULL, &proc_modules_operations);
91708+#endif
91709+#else
91710+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
91711+#endif
91712 return 0;
91713 }
91714 module_init(proc_modules_init);
91715@@ -3811,7 +3993,8 @@ struct module *__module_address(unsigned long addr)
91716 {
91717 struct module *mod;
91718
91719- if (addr < module_addr_min || addr > module_addr_max)
91720+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
91721+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
91722 return NULL;
91723
91724 list_for_each_entry_rcu(mod, &modules, list) {
91725@@ -3852,11 +4035,20 @@ bool is_module_text_address(unsigned long addr)
91726 */
91727 struct module *__module_text_address(unsigned long addr)
91728 {
91729- struct module *mod = __module_address(addr);
91730+ struct module *mod;
91731+
91732+#ifdef CONFIG_X86_32
91733+ addr = ktla_ktva(addr);
91734+#endif
91735+
91736+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
91737+ return NULL;
91738+
91739+ mod = __module_address(addr);
91740+
91741 if (mod) {
91742 /* Make sure it's within the text section. */
91743- if (!within(addr, mod->module_init, mod->init_text_size)
91744- && !within(addr, mod->module_core, mod->core_text_size))
91745+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
91746 mod = NULL;
91747 }
91748 return mod;
91749diff --git a/kernel/notifier.c b/kernel/notifier.c
91750index 4803da6..1c5eea6 100644
91751--- a/kernel/notifier.c
91752+++ b/kernel/notifier.c
91753@@ -5,6 +5,7 @@
91754 #include <linux/rcupdate.h>
91755 #include <linux/vmalloc.h>
91756 #include <linux/reboot.h>
91757+#include <linux/mm.h>
91758
91759 /*
91760 * Notifier list for kernel code which wants to be called
91761@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
91762 while ((*nl) != NULL) {
91763 if (n->priority > (*nl)->priority)
91764 break;
91765- nl = &((*nl)->next);
91766+ nl = (struct notifier_block **)&((*nl)->next);
91767 }
91768- n->next = *nl;
91769+ pax_open_kernel();
91770+ *(const void **)&n->next = *nl;
91771 rcu_assign_pointer(*nl, n);
91772+ pax_close_kernel();
91773 return 0;
91774 }
91775
91776@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
91777 return 0;
91778 if (n->priority > (*nl)->priority)
91779 break;
91780- nl = &((*nl)->next);
91781+ nl = (struct notifier_block **)&((*nl)->next);
91782 }
91783- n->next = *nl;
91784+ pax_open_kernel();
91785+ *(const void **)&n->next = *nl;
91786 rcu_assign_pointer(*nl, n);
91787+ pax_close_kernel();
91788 return 0;
91789 }
91790
91791@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
91792 {
91793 while ((*nl) != NULL) {
91794 if ((*nl) == n) {
91795+ pax_open_kernel();
91796 rcu_assign_pointer(*nl, n->next);
91797+ pax_close_kernel();
91798 return 0;
91799 }
91800- nl = &((*nl)->next);
91801+ nl = (struct notifier_block **)&((*nl)->next);
91802 }
91803 return -ENOENT;
91804 }
91805diff --git a/kernel/padata.c b/kernel/padata.c
91806index 161402f..598814c 100644
91807--- a/kernel/padata.c
91808+++ b/kernel/padata.c
91809@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
91810 * seq_nr mod. number of cpus in use.
91811 */
91812
91813- seq_nr = atomic_inc_return(&pd->seq_nr);
91814+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
91815 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
91816
91817 return padata_index_to_cpu(pd, cpu_index);
91818@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
91819 padata_init_pqueues(pd);
91820 padata_init_squeues(pd);
91821 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
91822- atomic_set(&pd->seq_nr, -1);
91823+ atomic_set_unchecked(&pd->seq_nr, -1);
91824 atomic_set(&pd->reorder_objects, 0);
91825 atomic_set(&pd->refcnt, 0);
91826 pd->pinst = pinst;
91827diff --git a/kernel/panic.c b/kernel/panic.c
91828index 4d8d6f9..97b9b9c 100644
91829--- a/kernel/panic.c
91830+++ b/kernel/panic.c
91831@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
91832 /*
91833 * Stop ourself in panic -- architecture code may override this
91834 */
91835-void __weak panic_smp_self_stop(void)
91836+void __weak __noreturn panic_smp_self_stop(void)
91837 {
91838 while (1)
91839 cpu_relax();
91840@@ -423,7 +423,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
91841 disable_trace_on_warning();
91842
91843 pr_warn("------------[ cut here ]------------\n");
91844- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
91845+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
91846 raw_smp_processor_id(), current->pid, file, line, caller);
91847
91848 if (args)
91849@@ -488,7 +488,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
91850 */
91851 __visible void __stack_chk_fail(void)
91852 {
91853- panic("stack-protector: Kernel stack is corrupted in: %p\n",
91854+ dump_stack();
91855+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
91856 __builtin_return_address(0));
91857 }
91858 EXPORT_SYMBOL(__stack_chk_fail);
91859diff --git a/kernel/pid.c b/kernel/pid.c
91860index cd36a5e..11f185d 100644
91861--- a/kernel/pid.c
91862+++ b/kernel/pid.c
91863@@ -33,6 +33,7 @@
91864 #include <linux/rculist.h>
91865 #include <linux/bootmem.h>
91866 #include <linux/hash.h>
91867+#include <linux/security.h>
91868 #include <linux/pid_namespace.h>
91869 #include <linux/init_task.h>
91870 #include <linux/syscalls.h>
91871@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
91872
91873 int pid_max = PID_MAX_DEFAULT;
91874
91875-#define RESERVED_PIDS 300
91876+#define RESERVED_PIDS 500
91877
91878 int pid_max_min = RESERVED_PIDS + 1;
91879 int pid_max_max = PID_MAX_LIMIT;
91880@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
91881 */
91882 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
91883 {
91884+ struct task_struct *task;
91885+
91886 rcu_lockdep_assert(rcu_read_lock_held(),
91887 "find_task_by_pid_ns() needs rcu_read_lock()"
91888 " protection");
91889- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91890+
91891+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91892+
91893+ if (gr_pid_is_chrooted(task))
91894+ return NULL;
91895+
91896+ return task;
91897 }
91898
91899 struct task_struct *find_task_by_vpid(pid_t vnr)
91900@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
91901 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
91902 }
91903
91904+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
91905+{
91906+ rcu_lockdep_assert(rcu_read_lock_held(),
91907+ "find_task_by_pid_ns() needs rcu_read_lock()"
91908+ " protection");
91909+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
91910+}
91911+
91912 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
91913 {
91914 struct pid *pid;
91915diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
91916index a65ba13..f600dbb 100644
91917--- a/kernel/pid_namespace.c
91918+++ b/kernel/pid_namespace.c
91919@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
91920 void __user *buffer, size_t *lenp, loff_t *ppos)
91921 {
91922 struct pid_namespace *pid_ns = task_active_pid_ns(current);
91923- struct ctl_table tmp = *table;
91924+ ctl_table_no_const tmp = *table;
91925
91926 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
91927 return -EPERM;
91928diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
91929index 48b28d3..c63ccaf 100644
91930--- a/kernel/power/Kconfig
91931+++ b/kernel/power/Kconfig
91932@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
91933 config HIBERNATION
91934 bool "Hibernation (aka 'suspend to disk')"
91935 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
91936+ depends on !GRKERNSEC_KMEM
91937+ depends on !PAX_MEMORY_SANITIZE
91938 select HIBERNATE_CALLBACKS
91939 select LZO_COMPRESS
91940 select LZO_DECOMPRESS
91941diff --git a/kernel/power/process.c b/kernel/power/process.c
91942index 5a6ec86..3a8c884 100644
91943--- a/kernel/power/process.c
91944+++ b/kernel/power/process.c
91945@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
91946 unsigned int elapsed_msecs;
91947 bool wakeup = false;
91948 int sleep_usecs = USEC_PER_MSEC;
91949+ bool timedout = false;
91950
91951 do_gettimeofday(&start);
91952
91953@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
91954
91955 while (true) {
91956 todo = 0;
91957+ if (time_after(jiffies, end_time))
91958+ timedout = true;
91959 read_lock(&tasklist_lock);
91960 for_each_process_thread(g, p) {
91961 if (p == current || !freeze_task(p))
91962 continue;
91963
91964- if (!freezer_should_skip(p))
91965+ if (!freezer_should_skip(p)) {
91966 todo++;
91967+ if (timedout) {
91968+ printk(KERN_ERR "Task refusing to freeze:\n");
91969+ sched_show_task(p);
91970+ }
91971+ }
91972 }
91973 read_unlock(&tasklist_lock);
91974
91975@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
91976 todo += wq_busy;
91977 }
91978
91979- if (!todo || time_after(jiffies, end_time))
91980+ if (!todo || timedout)
91981 break;
91982
91983 if (pm_wakeup_pending()) {
91984diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
91985index 2cdd353..7df1786 100644
91986--- a/kernel/printk/printk.c
91987+++ b/kernel/printk/printk.c
91988@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
91989 if (from_file && type != SYSLOG_ACTION_OPEN)
91990 return 0;
91991
91992+#ifdef CONFIG_GRKERNSEC_DMESG
91993+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
91994+ return -EPERM;
91995+#endif
91996+
91997 if (syslog_action_restricted(type)) {
91998 if (capable(CAP_SYSLOG))
91999 return 0;
92000diff --git a/kernel/profile.c b/kernel/profile.c
92001index 54bf5ba..df6e0a2 100644
92002--- a/kernel/profile.c
92003+++ b/kernel/profile.c
92004@@ -37,7 +37,7 @@ struct profile_hit {
92005 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
92006 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
92007
92008-static atomic_t *prof_buffer;
92009+static atomic_unchecked_t *prof_buffer;
92010 static unsigned long prof_len, prof_shift;
92011
92012 int prof_on __read_mostly;
92013@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
92014 hits[i].pc = 0;
92015 continue;
92016 }
92017- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92018+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92019 hits[i].hits = hits[i].pc = 0;
92020 }
92021 }
92022@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92023 * Add the current hit(s) and flush the write-queue out
92024 * to the global buffer:
92025 */
92026- atomic_add(nr_hits, &prof_buffer[pc]);
92027+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
92028 for (i = 0; i < NR_PROFILE_HIT; ++i) {
92029- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92030+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92031 hits[i].pc = hits[i].hits = 0;
92032 }
92033 out:
92034@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92035 {
92036 unsigned long pc;
92037 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
92038- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92039+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92040 }
92041 #endif /* !CONFIG_SMP */
92042
92043@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
92044 return -EFAULT;
92045 buf++; p++; count--; read++;
92046 }
92047- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
92048+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
92049 if (copy_to_user(buf, (void *)pnt, count))
92050 return -EFAULT;
92051 read += count;
92052@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
92053 }
92054 #endif
92055 profile_discard_flip_buffers();
92056- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
92057+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
92058 return count;
92059 }
92060
92061diff --git a/kernel/ptrace.c b/kernel/ptrace.c
92062index 1eb9d90..d40d21e 100644
92063--- a/kernel/ptrace.c
92064+++ b/kernel/ptrace.c
92065@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
92066 if (seize)
92067 flags |= PT_SEIZED;
92068 rcu_read_lock();
92069- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92070+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92071 flags |= PT_PTRACE_CAP;
92072 rcu_read_unlock();
92073 task->ptrace = flags;
92074@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
92075 break;
92076 return -EIO;
92077 }
92078- if (copy_to_user(dst, buf, retval))
92079+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
92080 return -EFAULT;
92081 copied += retval;
92082 src += retval;
92083@@ -783,7 +783,7 @@ int ptrace_request(struct task_struct *child, long request,
92084 bool seized = child->ptrace & PT_SEIZED;
92085 int ret = -EIO;
92086 siginfo_t siginfo, *si;
92087- void __user *datavp = (void __user *) data;
92088+ void __user *datavp = (__force void __user *) data;
92089 unsigned long __user *datalp = datavp;
92090 unsigned long flags;
92091
92092@@ -1029,14 +1029,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
92093 goto out;
92094 }
92095
92096+ if (gr_handle_ptrace(child, request)) {
92097+ ret = -EPERM;
92098+ goto out_put_task_struct;
92099+ }
92100+
92101 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92102 ret = ptrace_attach(child, request, addr, data);
92103 /*
92104 * Some architectures need to do book-keeping after
92105 * a ptrace attach.
92106 */
92107- if (!ret)
92108+ if (!ret) {
92109 arch_ptrace_attach(child);
92110+ gr_audit_ptrace(child);
92111+ }
92112 goto out_put_task_struct;
92113 }
92114
92115@@ -1064,7 +1071,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
92116 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
92117 if (copied != sizeof(tmp))
92118 return -EIO;
92119- return put_user(tmp, (unsigned long __user *)data);
92120+ return put_user(tmp, (__force unsigned long __user *)data);
92121 }
92122
92123 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
92124@@ -1158,7 +1165,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
92125 }
92126
92127 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92128- compat_long_t, addr, compat_long_t, data)
92129+ compat_ulong_t, addr, compat_ulong_t, data)
92130 {
92131 struct task_struct *child;
92132 long ret;
92133@@ -1174,14 +1181,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92134 goto out;
92135 }
92136
92137+ if (gr_handle_ptrace(child, request)) {
92138+ ret = -EPERM;
92139+ goto out_put_task_struct;
92140+ }
92141+
92142 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92143 ret = ptrace_attach(child, request, addr, data);
92144 /*
92145 * Some architectures need to do book-keeping after
92146 * a ptrace attach.
92147 */
92148- if (!ret)
92149+ if (!ret) {
92150 arch_ptrace_attach(child);
92151+ gr_audit_ptrace(child);
92152+ }
92153 goto out_put_task_struct;
92154 }
92155
92156diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
92157index 4d559ba..053da37 100644
92158--- a/kernel/rcu/rcutorture.c
92159+++ b/kernel/rcu/rcutorture.c
92160@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92161 rcu_torture_count) = { 0 };
92162 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92163 rcu_torture_batch) = { 0 };
92164-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92165-static atomic_t n_rcu_torture_alloc;
92166-static atomic_t n_rcu_torture_alloc_fail;
92167-static atomic_t n_rcu_torture_free;
92168-static atomic_t n_rcu_torture_mberror;
92169-static atomic_t n_rcu_torture_error;
92170+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92171+static atomic_unchecked_t n_rcu_torture_alloc;
92172+static atomic_unchecked_t n_rcu_torture_alloc_fail;
92173+static atomic_unchecked_t n_rcu_torture_free;
92174+static atomic_unchecked_t n_rcu_torture_mberror;
92175+static atomic_unchecked_t n_rcu_torture_error;
92176 static long n_rcu_torture_barrier_error;
92177 static long n_rcu_torture_boost_ktrerror;
92178 static long n_rcu_torture_boost_rterror;
92179@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
92180 static long n_rcu_torture_timers;
92181 static long n_barrier_attempts;
92182 static long n_barrier_successes;
92183-static atomic_long_t n_cbfloods;
92184+static atomic_long_unchecked_t n_cbfloods;
92185 static struct list_head rcu_torture_removed;
92186
92187 static int rcu_torture_writer_state;
92188@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
92189
92190 spin_lock_bh(&rcu_torture_lock);
92191 if (list_empty(&rcu_torture_freelist)) {
92192- atomic_inc(&n_rcu_torture_alloc_fail);
92193+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
92194 spin_unlock_bh(&rcu_torture_lock);
92195 return NULL;
92196 }
92197- atomic_inc(&n_rcu_torture_alloc);
92198+ atomic_inc_unchecked(&n_rcu_torture_alloc);
92199 p = rcu_torture_freelist.next;
92200 list_del_init(p);
92201 spin_unlock_bh(&rcu_torture_lock);
92202@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
92203 static void
92204 rcu_torture_free(struct rcu_torture *p)
92205 {
92206- atomic_inc(&n_rcu_torture_free);
92207+ atomic_inc_unchecked(&n_rcu_torture_free);
92208 spin_lock_bh(&rcu_torture_lock);
92209 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
92210 spin_unlock_bh(&rcu_torture_lock);
92211@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
92212 i = rp->rtort_pipe_count;
92213 if (i > RCU_TORTURE_PIPE_LEN)
92214 i = RCU_TORTURE_PIPE_LEN;
92215- atomic_inc(&rcu_torture_wcount[i]);
92216+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92217 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
92218 rp->rtort_mbtest = 0;
92219 return true;
92220@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
92221 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
92222 do {
92223 schedule_timeout_interruptible(cbflood_inter_holdoff);
92224- atomic_long_inc(&n_cbfloods);
92225+ atomic_long_inc_unchecked(&n_cbfloods);
92226 WARN_ON(signal_pending(current));
92227 for (i = 0; i < cbflood_n_burst; i++) {
92228 for (j = 0; j < cbflood_n_per_burst; j++) {
92229@@ -918,7 +918,7 @@ rcu_torture_writer(void *arg)
92230 i = old_rp->rtort_pipe_count;
92231 if (i > RCU_TORTURE_PIPE_LEN)
92232 i = RCU_TORTURE_PIPE_LEN;
92233- atomic_inc(&rcu_torture_wcount[i]);
92234+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92235 old_rp->rtort_pipe_count++;
92236 switch (synctype[torture_random(&rand) % nsynctypes]) {
92237 case RTWS_DEF_FREE:
92238@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
92239 return;
92240 }
92241 if (p->rtort_mbtest == 0)
92242- atomic_inc(&n_rcu_torture_mberror);
92243+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92244 spin_lock(&rand_lock);
92245 cur_ops->read_delay(&rand);
92246 n_rcu_torture_timers++;
92247@@ -1106,7 +1106,7 @@ rcu_torture_reader(void *arg)
92248 continue;
92249 }
92250 if (p->rtort_mbtest == 0)
92251- atomic_inc(&n_rcu_torture_mberror);
92252+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92253 cur_ops->read_delay(&rand);
92254 preempt_disable();
92255 pipe_count = p->rtort_pipe_count;
92256@@ -1173,11 +1173,11 @@ rcu_torture_stats_print(void)
92257 rcu_torture_current,
92258 rcu_torture_current_version,
92259 list_empty(&rcu_torture_freelist),
92260- atomic_read(&n_rcu_torture_alloc),
92261- atomic_read(&n_rcu_torture_alloc_fail),
92262- atomic_read(&n_rcu_torture_free));
92263+ atomic_read_unchecked(&n_rcu_torture_alloc),
92264+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
92265+ atomic_read_unchecked(&n_rcu_torture_free));
92266 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
92267- atomic_read(&n_rcu_torture_mberror),
92268+ atomic_read_unchecked(&n_rcu_torture_mberror),
92269 n_rcu_torture_boost_ktrerror,
92270 n_rcu_torture_boost_rterror);
92271 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
92272@@ -1189,17 +1189,17 @@ rcu_torture_stats_print(void)
92273 n_barrier_successes,
92274 n_barrier_attempts,
92275 n_rcu_torture_barrier_error);
92276- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
92277+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
92278
92279 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92280- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
92281+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
92282 n_rcu_torture_barrier_error != 0 ||
92283 n_rcu_torture_boost_ktrerror != 0 ||
92284 n_rcu_torture_boost_rterror != 0 ||
92285 n_rcu_torture_boost_failure != 0 ||
92286 i > 1) {
92287 pr_cont("%s", "!!! ");
92288- atomic_inc(&n_rcu_torture_error);
92289+ atomic_inc_unchecked(&n_rcu_torture_error);
92290 WARN_ON_ONCE(1);
92291 }
92292 pr_cont("Reader Pipe: ");
92293@@ -1216,7 +1216,7 @@ rcu_torture_stats_print(void)
92294 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92295 pr_cont("Free-Block Circulation: ");
92296 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92297- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
92298+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
92299 }
92300 pr_cont("\n");
92301
92302@@ -1560,7 +1560,7 @@ rcu_torture_cleanup(void)
92303
92304 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
92305
92306- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92307+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92308 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
92309 else if (torture_onoff_failures())
92310 rcu_torture_print_module_parms(cur_ops,
92311@@ -1685,18 +1685,18 @@ rcu_torture_init(void)
92312
92313 rcu_torture_current = NULL;
92314 rcu_torture_current_version = 0;
92315- atomic_set(&n_rcu_torture_alloc, 0);
92316- atomic_set(&n_rcu_torture_alloc_fail, 0);
92317- atomic_set(&n_rcu_torture_free, 0);
92318- atomic_set(&n_rcu_torture_mberror, 0);
92319- atomic_set(&n_rcu_torture_error, 0);
92320+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
92321+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
92322+ atomic_set_unchecked(&n_rcu_torture_free, 0);
92323+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
92324+ atomic_set_unchecked(&n_rcu_torture_error, 0);
92325 n_rcu_torture_barrier_error = 0;
92326 n_rcu_torture_boost_ktrerror = 0;
92327 n_rcu_torture_boost_rterror = 0;
92328 n_rcu_torture_boost_failure = 0;
92329 n_rcu_torture_boosts = 0;
92330 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
92331- atomic_set(&rcu_torture_wcount[i], 0);
92332+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
92333 for_each_possible_cpu(cpu) {
92334 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92335 per_cpu(rcu_torture_count, cpu)[i] = 0;
92336diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
92337index 0db5649..e6ec167 100644
92338--- a/kernel/rcu/tiny.c
92339+++ b/kernel/rcu/tiny.c
92340@@ -42,7 +42,7 @@
92341 /* Forward declarations for tiny_plugin.h. */
92342 struct rcu_ctrlblk;
92343 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
92344-static void rcu_process_callbacks(struct softirq_action *unused);
92345+static void rcu_process_callbacks(void);
92346 static void __call_rcu(struct rcu_head *head,
92347 void (*func)(struct rcu_head *rcu),
92348 struct rcu_ctrlblk *rcp);
92349@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
92350 false));
92351 }
92352
92353-static void rcu_process_callbacks(struct softirq_action *unused)
92354+static __latent_entropy void rcu_process_callbacks(void)
92355 {
92356 __rcu_process_callbacks(&rcu_sched_ctrlblk);
92357 __rcu_process_callbacks(&rcu_bh_ctrlblk);
92358diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
92359index 858c565..7efd915 100644
92360--- a/kernel/rcu/tiny_plugin.h
92361+++ b/kernel/rcu/tiny_plugin.h
92362@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
92363 dump_stack();
92364 }
92365 if (*rcp->curtail && ULONG_CMP_GE(j, js))
92366- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
92367+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
92368 3 * rcu_jiffies_till_stall_check() + 3;
92369 else if (ULONG_CMP_GE(j, js))
92370- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92371+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92372 }
92373
92374 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
92375 {
92376 rcp->ticks_this_gp = 0;
92377 rcp->gp_start = jiffies;
92378- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92379+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92380 }
92381
92382 static void check_cpu_stalls(void)
92383diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
92384index 7680fc2..b8e9161 100644
92385--- a/kernel/rcu/tree.c
92386+++ b/kernel/rcu/tree.c
92387@@ -261,7 +261,7 @@ static void rcu_momentary_dyntick_idle(void)
92388 */
92389 rdtp = this_cpu_ptr(&rcu_dynticks);
92390 smp_mb__before_atomic(); /* Earlier stuff before QS. */
92391- atomic_add(2, &rdtp->dynticks); /* QS. */
92392+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
92393 smp_mb__after_atomic(); /* Later stuff after QS. */
92394 break;
92395 }
92396@@ -521,9 +521,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
92397 rcu_prepare_for_idle();
92398 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
92399 smp_mb__before_atomic(); /* See above. */
92400- atomic_inc(&rdtp->dynticks);
92401+ atomic_inc_unchecked(&rdtp->dynticks);
92402 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
92403- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
92404+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
92405 rcu_dynticks_task_enter();
92406
92407 /*
92408@@ -644,10 +644,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
92409
92410 rcu_dynticks_task_exit();
92411 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
92412- atomic_inc(&rdtp->dynticks);
92413+ atomic_inc_unchecked(&rdtp->dynticks);
92414 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
92415 smp_mb__after_atomic(); /* See above. */
92416- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
92417+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
92418 rcu_cleanup_after_idle();
92419 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
92420 if (!user && !is_idle_task(current)) {
92421@@ -768,14 +768,14 @@ void rcu_nmi_enter(void)
92422 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
92423
92424 if (rdtp->dynticks_nmi_nesting == 0 &&
92425- (atomic_read(&rdtp->dynticks) & 0x1))
92426+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
92427 return;
92428 rdtp->dynticks_nmi_nesting++;
92429 smp_mb__before_atomic(); /* Force delay from prior write. */
92430- atomic_inc(&rdtp->dynticks);
92431+ atomic_inc_unchecked(&rdtp->dynticks);
92432 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
92433 smp_mb__after_atomic(); /* See above. */
92434- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
92435+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
92436 }
92437
92438 /**
92439@@ -794,9 +794,9 @@ void rcu_nmi_exit(void)
92440 return;
92441 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
92442 smp_mb__before_atomic(); /* See above. */
92443- atomic_inc(&rdtp->dynticks);
92444+ atomic_inc_unchecked(&rdtp->dynticks);
92445 smp_mb__after_atomic(); /* Force delay to next write. */
92446- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
92447+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
92448 }
92449
92450 /**
92451@@ -809,7 +809,7 @@ void rcu_nmi_exit(void)
92452 */
92453 bool notrace __rcu_is_watching(void)
92454 {
92455- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
92456+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
92457 }
92458
92459 /**
92460@@ -892,7 +892,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
92461 static int dyntick_save_progress_counter(struct rcu_data *rdp,
92462 bool *isidle, unsigned long *maxj)
92463 {
92464- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
92465+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
92466 rcu_sysidle_check_cpu(rdp, isidle, maxj);
92467 if ((rdp->dynticks_snap & 0x1) == 0) {
92468 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
92469@@ -921,7 +921,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
92470 int *rcrmp;
92471 unsigned int snap;
92472
92473- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
92474+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
92475 snap = (unsigned int)rdp->dynticks_snap;
92476
92477 /*
92478@@ -984,10 +984,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
92479 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
92480 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
92481 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
92482- ACCESS_ONCE(rdp->cond_resched_completed) =
92483+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
92484 ACCESS_ONCE(rdp->mynode->completed);
92485 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
92486- ACCESS_ONCE(*rcrmp) =
92487+ ACCESS_ONCE_RW(*rcrmp) =
92488 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
92489 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
92490 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
92491@@ -1009,7 +1009,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
92492 rsp->gp_start = j;
92493 smp_wmb(); /* Record start time before stall time. */
92494 j1 = rcu_jiffies_till_stall_check();
92495- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
92496+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
92497 rsp->jiffies_resched = j + j1 / 2;
92498 }
92499
92500@@ -1050,7 +1050,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
92501 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92502 return;
92503 }
92504- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
92505+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
92506 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92507
92508 /*
92509@@ -1127,7 +1127,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
92510
92511 raw_spin_lock_irqsave(&rnp->lock, flags);
92512 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
92513- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
92514+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
92515 3 * rcu_jiffies_till_stall_check() + 3;
92516 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92517
92518@@ -1211,7 +1211,7 @@ void rcu_cpu_stall_reset(void)
92519 struct rcu_state *rsp;
92520
92521 for_each_rcu_flavor(rsp)
92522- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
92523+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
92524 }
92525
92526 /*
92527@@ -1597,7 +1597,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
92528 raw_spin_unlock_irq(&rnp->lock);
92529 return 0;
92530 }
92531- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
92532+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
92533
92534 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
92535 /*
92536@@ -1638,9 +1638,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
92537 rdp = this_cpu_ptr(rsp->rda);
92538 rcu_preempt_check_blocked_tasks(rnp);
92539 rnp->qsmask = rnp->qsmaskinit;
92540- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
92541+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
92542 WARN_ON_ONCE(rnp->completed != rsp->completed);
92543- ACCESS_ONCE(rnp->completed) = rsp->completed;
92544+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
92545 if (rnp == rdp->mynode)
92546 (void)__note_gp_changes(rsp, rnp, rdp);
92547 rcu_preempt_boost_start_gp(rnp);
92548@@ -1685,7 +1685,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
92549 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
92550 raw_spin_lock_irq(&rnp->lock);
92551 smp_mb__after_unlock_lock();
92552- ACCESS_ONCE(rsp->gp_flags) =
92553+ ACCESS_ONCE_RW(rsp->gp_flags) =
92554 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
92555 raw_spin_unlock_irq(&rnp->lock);
92556 }
92557@@ -1731,7 +1731,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
92558 rcu_for_each_node_breadth_first(rsp, rnp) {
92559 raw_spin_lock_irq(&rnp->lock);
92560 smp_mb__after_unlock_lock();
92561- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
92562+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
92563 rdp = this_cpu_ptr(rsp->rda);
92564 if (rnp == rdp->mynode)
92565 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
92566@@ -1746,14 +1746,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
92567 rcu_nocb_gp_set(rnp, nocb);
92568
92569 /* Declare grace period done. */
92570- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
92571+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
92572 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
92573 rsp->fqs_state = RCU_GP_IDLE;
92574 rdp = this_cpu_ptr(rsp->rda);
92575 /* Advance CBs to reduce false positives below. */
92576 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
92577 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
92578- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92579+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92580 trace_rcu_grace_period(rsp->name,
92581 ACCESS_ONCE(rsp->gpnum),
92582 TPS("newreq"));
92583@@ -1878,7 +1878,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
92584 */
92585 return false;
92586 }
92587- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92588+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92589 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
92590 TPS("newreq"));
92591
92592@@ -2099,7 +2099,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
92593 rsp->qlen += rdp->qlen;
92594 rdp->n_cbs_orphaned += rdp->qlen;
92595 rdp->qlen_lazy = 0;
92596- ACCESS_ONCE(rdp->qlen) = 0;
92597+ ACCESS_ONCE_RW(rdp->qlen) = 0;
92598 }
92599
92600 /*
92601@@ -2344,7 +2344,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
92602 }
92603 smp_mb(); /* List handling before counting for rcu_barrier(). */
92604 rdp->qlen_lazy -= count_lazy;
92605- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
92606+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
92607 rdp->n_cbs_invoked += count;
92608
92609 /* Reinstate batch limit if we have worked down the excess. */
92610@@ -2507,7 +2507,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
92611 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
92612 return; /* Someone beat us to it. */
92613 }
92614- ACCESS_ONCE(rsp->gp_flags) =
92615+ ACCESS_ONCE_RW(rsp->gp_flags) =
92616 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
92617 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
92618 rcu_gp_kthread_wake(rsp);
92619@@ -2553,7 +2553,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
92620 /*
92621 * Do RCU core processing for the current CPU.
92622 */
92623-static void rcu_process_callbacks(struct softirq_action *unused)
92624+static void rcu_process_callbacks(void)
92625 {
92626 struct rcu_state *rsp;
92627
92628@@ -2665,7 +2665,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
92629 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
92630 if (debug_rcu_head_queue(head)) {
92631 /* Probable double call_rcu(), so leak the callback. */
92632- ACCESS_ONCE(head->func) = rcu_leak_callback;
92633+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
92634 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
92635 return;
92636 }
92637@@ -2693,7 +2693,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
92638 local_irq_restore(flags);
92639 return;
92640 }
92641- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
92642+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
92643 if (lazy)
92644 rdp->qlen_lazy++;
92645 else
92646@@ -2966,11 +2966,11 @@ void synchronize_sched_expedited(void)
92647 * counter wrap on a 32-bit system. Quite a few more CPUs would of
92648 * course be required on a 64-bit system.
92649 */
92650- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
92651+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
92652 (ulong)atomic_long_read(&rsp->expedited_done) +
92653 ULONG_MAX / 8)) {
92654 synchronize_sched();
92655- atomic_long_inc(&rsp->expedited_wrap);
92656+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
92657 return;
92658 }
92659
92660@@ -2978,12 +2978,12 @@ void synchronize_sched_expedited(void)
92661 * Take a ticket. Note that atomic_inc_return() implies a
92662 * full memory barrier.
92663 */
92664- snap = atomic_long_inc_return(&rsp->expedited_start);
92665+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
92666 firstsnap = snap;
92667 if (!try_get_online_cpus()) {
92668 /* CPU hotplug operation in flight, fall back to normal GP. */
92669 wait_rcu_gp(call_rcu_sched);
92670- atomic_long_inc(&rsp->expedited_normal);
92671+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92672 return;
92673 }
92674 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
92675@@ -2996,7 +2996,7 @@ void synchronize_sched_expedited(void)
92676 for_each_cpu(cpu, cm) {
92677 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
92678
92679- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
92680+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
92681 cpumask_clear_cpu(cpu, cm);
92682 }
92683 if (cpumask_weight(cm) == 0)
92684@@ -3011,14 +3011,14 @@ void synchronize_sched_expedited(void)
92685 synchronize_sched_expedited_cpu_stop,
92686 NULL) == -EAGAIN) {
92687 put_online_cpus();
92688- atomic_long_inc(&rsp->expedited_tryfail);
92689+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
92690
92691 /* Check to see if someone else did our work for us. */
92692 s = atomic_long_read(&rsp->expedited_done);
92693 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
92694 /* ensure test happens before caller kfree */
92695 smp_mb__before_atomic(); /* ^^^ */
92696- atomic_long_inc(&rsp->expedited_workdone1);
92697+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
92698 free_cpumask_var(cm);
92699 return;
92700 }
92701@@ -3028,7 +3028,7 @@ void synchronize_sched_expedited(void)
92702 udelay(trycount * num_online_cpus());
92703 } else {
92704 wait_rcu_gp(call_rcu_sched);
92705- atomic_long_inc(&rsp->expedited_normal);
92706+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92707 free_cpumask_var(cm);
92708 return;
92709 }
92710@@ -3038,7 +3038,7 @@ void synchronize_sched_expedited(void)
92711 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
92712 /* ensure test happens before caller kfree */
92713 smp_mb__before_atomic(); /* ^^^ */
92714- atomic_long_inc(&rsp->expedited_workdone2);
92715+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
92716 free_cpumask_var(cm);
92717 return;
92718 }
92719@@ -3053,14 +3053,14 @@ void synchronize_sched_expedited(void)
92720 if (!try_get_online_cpus()) {
92721 /* CPU hotplug operation in flight, use normal GP. */
92722 wait_rcu_gp(call_rcu_sched);
92723- atomic_long_inc(&rsp->expedited_normal);
92724+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92725 free_cpumask_var(cm);
92726 return;
92727 }
92728- snap = atomic_long_read(&rsp->expedited_start);
92729+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
92730 smp_mb(); /* ensure read is before try_stop_cpus(). */
92731 }
92732- atomic_long_inc(&rsp->expedited_stoppedcpus);
92733+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
92734
92735 all_cpus_idle:
92736 free_cpumask_var(cm);
92737@@ -3072,16 +3072,16 @@ all_cpus_idle:
92738 * than we did already did their update.
92739 */
92740 do {
92741- atomic_long_inc(&rsp->expedited_done_tries);
92742+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
92743 s = atomic_long_read(&rsp->expedited_done);
92744 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
92745 /* ensure test happens before caller kfree */
92746 smp_mb__before_atomic(); /* ^^^ */
92747- atomic_long_inc(&rsp->expedited_done_lost);
92748+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
92749 break;
92750 }
92751 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
92752- atomic_long_inc(&rsp->expedited_done_exit);
92753+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
92754
92755 put_online_cpus();
92756 }
92757@@ -3287,7 +3287,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92758 * ACCESS_ONCE() to prevent the compiler from speculating
92759 * the increment to precede the early-exit check.
92760 */
92761- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92762+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92763 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
92764 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
92765 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
92766@@ -3342,7 +3342,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92767
92768 /* Increment ->n_barrier_done to prevent duplicate work. */
92769 smp_mb(); /* Keep increment after above mechanism. */
92770- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92771+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92772 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
92773 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
92774 smp_mb(); /* Keep increment before caller's subsequent code. */
92775@@ -3387,10 +3387,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
92776 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
92777 init_callback_list(rdp);
92778 rdp->qlen_lazy = 0;
92779- ACCESS_ONCE(rdp->qlen) = 0;
92780+ ACCESS_ONCE_RW(rdp->qlen) = 0;
92781 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
92782 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
92783- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
92784+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
92785 rdp->cpu = cpu;
92786 rdp->rsp = rsp;
92787 rcu_boot_init_nocb_percpu_data(rdp);
92788@@ -3423,8 +3423,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
92789 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
92790 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
92791 rcu_sysidle_init_percpu_data(rdp->dynticks);
92792- atomic_set(&rdp->dynticks->dynticks,
92793- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
92794+ atomic_set_unchecked(&rdp->dynticks->dynticks,
92795+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
92796 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
92797
92798 /* Add CPU to rcu_node bitmasks. */
92799diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
92800index 8e7b184..9c55768 100644
92801--- a/kernel/rcu/tree.h
92802+++ b/kernel/rcu/tree.h
92803@@ -87,11 +87,11 @@ struct rcu_dynticks {
92804 long long dynticks_nesting; /* Track irq/process nesting level. */
92805 /* Process level is worth LLONG_MAX/2. */
92806 int dynticks_nmi_nesting; /* Track NMI nesting level. */
92807- atomic_t dynticks; /* Even value for idle, else odd. */
92808+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
92809 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
92810 long long dynticks_idle_nesting;
92811 /* irq/process nesting level from idle. */
92812- atomic_t dynticks_idle; /* Even value for idle, else odd. */
92813+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
92814 /* "Idle" excludes userspace execution. */
92815 unsigned long dynticks_idle_jiffies;
92816 /* End of last non-NMI non-idle period. */
92817@@ -466,17 +466,17 @@ struct rcu_state {
92818 /* _rcu_barrier(). */
92819 /* End of fields guarded by barrier_mutex. */
92820
92821- atomic_long_t expedited_start; /* Starting ticket. */
92822- atomic_long_t expedited_done; /* Done ticket. */
92823- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
92824- atomic_long_t expedited_tryfail; /* # acquisition failures. */
92825- atomic_long_t expedited_workdone1; /* # done by others #1. */
92826- atomic_long_t expedited_workdone2; /* # done by others #2. */
92827- atomic_long_t expedited_normal; /* # fallbacks to normal. */
92828- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
92829- atomic_long_t expedited_done_tries; /* # tries to update _done. */
92830- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
92831- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
92832+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
92833+ atomic_long_t expedited_done; /* Done ticket. */
92834+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
92835+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
92836+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
92837+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
92838+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
92839+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
92840+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
92841+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
92842+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
92843
92844 unsigned long jiffies_force_qs; /* Time at which to invoke */
92845 /* force_quiescent_state(). */
92846diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
92847index 3ec85cb..3687925 100644
92848--- a/kernel/rcu/tree_plugin.h
92849+++ b/kernel/rcu/tree_plugin.h
92850@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
92851 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
92852 {
92853 return !rcu_preempted_readers_exp(rnp) &&
92854- ACCESS_ONCE(rnp->expmask) == 0;
92855+ ACCESS_ONCE_RW(rnp->expmask) == 0;
92856 }
92857
92858 /*
92859@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
92860
92861 /* Clean up and exit. */
92862 smp_mb(); /* ensure expedited GP seen before counter increment. */
92863- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
92864+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
92865 sync_rcu_preempt_exp_count + 1;
92866 unlock_mb_ret:
92867 mutex_unlock(&sync_rcu_preempt_exp_mutex);
92868@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
92869 free_cpumask_var(cm);
92870 }
92871
92872-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
92873+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
92874 .store = &rcu_cpu_kthread_task,
92875 .thread_should_run = rcu_cpu_kthread_should_run,
92876 .thread_fn = rcu_cpu_kthread,
92877@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
92878 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
92879 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
92880 cpu, ticks_value, ticks_title,
92881- atomic_read(&rdtp->dynticks) & 0xfff,
92882+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
92883 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
92884 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
92885 fast_no_hz);
92886@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
92887 return;
92888 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
92889 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
92890- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
92891+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
92892 wake_up(&rdp_leader->nocb_wq);
92893 }
92894 }
92895@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
92896
92897 /* Enqueue the callback on the nocb list and update counts. */
92898 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
92899- ACCESS_ONCE(*old_rhpp) = rhp;
92900+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
92901 atomic_long_add(rhcount, &rdp->nocb_q_count);
92902 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
92903 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
92904@@ -2286,7 +2286,7 @@ wait_again:
92905 continue; /* No CBs here, try next follower. */
92906
92907 /* Move callbacks to wait-for-GP list, which is empty. */
92908- ACCESS_ONCE(rdp->nocb_head) = NULL;
92909+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
92910 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
92911 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
92912 rdp->nocb_gp_count_lazy =
92913@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
92914 list = ACCESS_ONCE(rdp->nocb_follower_head);
92915 BUG_ON(!list);
92916 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
92917- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
92918+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
92919 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
92920 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
92921 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
92922@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
92923 list = next;
92924 }
92925 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
92926- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92927- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
92928+ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92929+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
92930 rdp->nocb_p_count_lazy - cl;
92931 rdp->n_nocbs_invoked += c;
92932 }
92933@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
92934 if (!rcu_nocb_need_deferred_wakeup(rdp))
92935 return;
92936 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
92937- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92938+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92939 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
92940 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
92941 }
92942@@ -2588,7 +2588,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
92943 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
92944 "rcuo%c/%d", rsp->abbr, cpu);
92945 BUG_ON(IS_ERR(t));
92946- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
92947+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
92948 }
92949
92950 /*
92951@@ -2793,11 +2793,11 @@ static void rcu_sysidle_enter(int irq)
92952
92953 /* Record start of fully idle period. */
92954 j = jiffies;
92955- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
92956+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
92957 smp_mb__before_atomic();
92958- atomic_inc(&rdtp->dynticks_idle);
92959+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92960 smp_mb__after_atomic();
92961- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
92962+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
92963 }
92964
92965 /*
92966@@ -2868,9 +2868,9 @@ static void rcu_sysidle_exit(int irq)
92967
92968 /* Record end of idle period. */
92969 smp_mb__before_atomic();
92970- atomic_inc(&rdtp->dynticks_idle);
92971+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92972 smp_mb__after_atomic();
92973- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
92974+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
92975
92976 /*
92977 * If we are the timekeeping CPU, we are permitted to be non-idle
92978@@ -2915,7 +2915,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
92979 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
92980
92981 /* Pick up current idle and NMI-nesting counter and check. */
92982- cur = atomic_read(&rdtp->dynticks_idle);
92983+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
92984 if (cur & 0x1) {
92985 *isidle = false; /* We are not idle! */
92986 return;
92987@@ -2964,7 +2964,7 @@ static void rcu_sysidle(unsigned long j)
92988 case RCU_SYSIDLE_NOT:
92989
92990 /* First time all are idle, so note a short idle period. */
92991- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92992+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92993 break;
92994
92995 case RCU_SYSIDLE_SHORT:
92996@@ -3002,7 +3002,7 @@ static void rcu_sysidle_cancel(void)
92997 {
92998 smp_mb();
92999 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
93000- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
93001+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
93002 }
93003
93004 /*
93005@@ -3054,7 +3054,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
93006 smp_mb(); /* grace period precedes setting inuse. */
93007
93008 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
93009- ACCESS_ONCE(rshp->inuse) = 0;
93010+ ACCESS_ONCE_RW(rshp->inuse) = 0;
93011 }
93012
93013 /*
93014@@ -3207,7 +3207,7 @@ static void rcu_bind_gp_kthread(void)
93015 static void rcu_dynticks_task_enter(void)
93016 {
93017 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93018- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
93019+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
93020 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93021 }
93022
93023@@ -3215,6 +3215,6 @@ static void rcu_dynticks_task_enter(void)
93024 static void rcu_dynticks_task_exit(void)
93025 {
93026 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93027- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
93028+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
93029 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93030 }
93031diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
93032index 5cdc62e..cc52e88 100644
93033--- a/kernel/rcu/tree_trace.c
93034+++ b/kernel/rcu/tree_trace.c
93035@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
93036 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
93037 rdp->passed_quiesce, rdp->qs_pending);
93038 seq_printf(m, " dt=%d/%llx/%d df=%lu",
93039- atomic_read(&rdp->dynticks->dynticks),
93040+ atomic_read_unchecked(&rdp->dynticks->dynticks),
93041 rdp->dynticks->dynticks_nesting,
93042 rdp->dynticks->dynticks_nmi_nesting,
93043 rdp->dynticks_fqs);
93044@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
93045 struct rcu_state *rsp = (struct rcu_state *)m->private;
93046
93047 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",
93048- atomic_long_read(&rsp->expedited_start),
93049+ atomic_long_read_unchecked(&rsp->expedited_start),
93050 atomic_long_read(&rsp->expedited_done),
93051- atomic_long_read(&rsp->expedited_wrap),
93052- atomic_long_read(&rsp->expedited_tryfail),
93053- atomic_long_read(&rsp->expedited_workdone1),
93054- atomic_long_read(&rsp->expedited_workdone2),
93055- atomic_long_read(&rsp->expedited_normal),
93056- atomic_long_read(&rsp->expedited_stoppedcpus),
93057- atomic_long_read(&rsp->expedited_done_tries),
93058- atomic_long_read(&rsp->expedited_done_lost),
93059- atomic_long_read(&rsp->expedited_done_exit));
93060+ atomic_long_read_unchecked(&rsp->expedited_wrap),
93061+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
93062+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
93063+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
93064+ atomic_long_read_unchecked(&rsp->expedited_normal),
93065+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
93066+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
93067+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
93068+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
93069 return 0;
93070 }
93071
93072diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
93073index e0d31a3..f4dafe3 100644
93074--- a/kernel/rcu/update.c
93075+++ b/kernel/rcu/update.c
93076@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
93077 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
93078 */
93079 if (till_stall_check < 3) {
93080- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
93081+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
93082 till_stall_check = 3;
93083 } else if (till_stall_check > 300) {
93084- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
93085+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
93086 till_stall_check = 300;
93087 }
93088 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
93089@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
93090 !ACCESS_ONCE(t->on_rq) ||
93091 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
93092 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
93093- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
93094+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
93095 list_del_init(&t->rcu_tasks_holdout_list);
93096 put_task_struct(t);
93097 return;
93098@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
93099 !is_idle_task(t)) {
93100 get_task_struct(t);
93101 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
93102- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
93103+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
93104 list_add(&t->rcu_tasks_holdout_list,
93105 &rcu_tasks_holdouts);
93106 }
93107@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
93108 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
93109 BUG_ON(IS_ERR(t));
93110 smp_mb(); /* Ensure others see full kthread. */
93111- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
93112+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
93113 mutex_unlock(&rcu_tasks_kthread_mutex);
93114 }
93115
93116diff --git a/kernel/resource.c b/kernel/resource.c
93117index 0bcebff..e7cd5b2 100644
93118--- a/kernel/resource.c
93119+++ b/kernel/resource.c
93120@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
93121
93122 static int __init ioresources_init(void)
93123 {
93124+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93125+#ifdef CONFIG_GRKERNSEC_PROC_USER
93126+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
93127+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
93128+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
93129+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
93130+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
93131+#endif
93132+#else
93133 proc_create("ioports", 0, NULL, &proc_ioports_operations);
93134 proc_create("iomem", 0, NULL, &proc_iomem_operations);
93135+#endif
93136 return 0;
93137 }
93138 __initcall(ioresources_init);
93139diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
93140index eae160d..c9aa22e 100644
93141--- a/kernel/sched/auto_group.c
93142+++ b/kernel/sched/auto_group.c
93143@@ -11,7 +11,7 @@
93144
93145 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
93146 static struct autogroup autogroup_default;
93147-static atomic_t autogroup_seq_nr;
93148+static atomic_unchecked_t autogroup_seq_nr;
93149
93150 void __init autogroup_init(struct task_struct *init_task)
93151 {
93152@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
93153
93154 kref_init(&ag->kref);
93155 init_rwsem(&ag->lock);
93156- ag->id = atomic_inc_return(&autogroup_seq_nr);
93157+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
93158 ag->tg = tg;
93159 #ifdef CONFIG_RT_GROUP_SCHED
93160 /*
93161diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
93162index 607f852..486bc87 100644
93163--- a/kernel/sched/completion.c
93164+++ b/kernel/sched/completion.c
93165@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
93166 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93167 * or number of jiffies left till timeout) if completed.
93168 */
93169-long __sched
93170+long __sched __intentional_overflow(-1)
93171 wait_for_completion_interruptible_timeout(struct completion *x,
93172 unsigned long timeout)
93173 {
93174@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
93175 *
93176 * Return: -ERESTARTSYS if interrupted, 0 if completed.
93177 */
93178-int __sched wait_for_completion_killable(struct completion *x)
93179+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
93180 {
93181 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
93182 if (t == -ERESTARTSYS)
93183@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
93184 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93185 * or number of jiffies left till timeout) if completed.
93186 */
93187-long __sched
93188+long __sched __intentional_overflow(-1)
93189 wait_for_completion_killable_timeout(struct completion *x,
93190 unsigned long timeout)
93191 {
93192diff --git a/kernel/sched/core.c b/kernel/sched/core.c
93193index d400c82..50fca96 100644
93194--- a/kernel/sched/core.c
93195+++ b/kernel/sched/core.c
93196@@ -1902,7 +1902,7 @@ void set_numabalancing_state(bool enabled)
93197 int sysctl_numa_balancing(struct ctl_table *table, int write,
93198 void __user *buffer, size_t *lenp, loff_t *ppos)
93199 {
93200- struct ctl_table t;
93201+ ctl_table_no_const t;
93202 int err;
93203 int state = numabalancing_enabled;
93204
93205@@ -2352,8 +2352,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
93206 next->active_mm = oldmm;
93207 atomic_inc(&oldmm->mm_count);
93208 enter_lazy_tlb(oldmm, next);
93209- } else
93210+ } else {
93211 switch_mm(oldmm, mm, next);
93212+ populate_stack();
93213+ }
93214
93215 if (!prev->mm) {
93216 prev->active_mm = NULL;
93217@@ -3154,6 +3156,8 @@ int can_nice(const struct task_struct *p, const int nice)
93218 /* convert nice value [19,-20] to rlimit style value [1,40] */
93219 int nice_rlim = nice_to_rlimit(nice);
93220
93221+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
93222+
93223 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
93224 capable(CAP_SYS_NICE));
93225 }
93226@@ -3180,7 +3184,8 @@ SYSCALL_DEFINE1(nice, int, increment)
93227 nice = task_nice(current) + increment;
93228
93229 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
93230- if (increment < 0 && !can_nice(current, nice))
93231+ if (increment < 0 && (!can_nice(current, nice) ||
93232+ gr_handle_chroot_nice()))
93233 return -EPERM;
93234
93235 retval = security_task_setnice(current, nice);
93236@@ -3475,6 +3480,7 @@ recheck:
93237 if (policy != p->policy && !rlim_rtprio)
93238 return -EPERM;
93239
93240+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
93241 /* can't increase priority */
93242 if (attr->sched_priority > p->rt_priority &&
93243 attr->sched_priority > rlim_rtprio)
93244@@ -4975,6 +4981,7 @@ void idle_task_exit(void)
93245
93246 if (mm != &init_mm) {
93247 switch_mm(mm, &init_mm, current);
93248+ populate_stack();
93249 finish_arch_post_lock_switch();
93250 }
93251 mmdrop(mm);
93252@@ -5070,7 +5077,7 @@ static void migrate_tasks(unsigned int dead_cpu)
93253
93254 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
93255
93256-static struct ctl_table sd_ctl_dir[] = {
93257+static ctl_table_no_const sd_ctl_dir[] __read_only = {
93258 {
93259 .procname = "sched_domain",
93260 .mode = 0555,
93261@@ -5087,17 +5094,17 @@ static struct ctl_table sd_ctl_root[] = {
93262 {}
93263 };
93264
93265-static struct ctl_table *sd_alloc_ctl_entry(int n)
93266+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
93267 {
93268- struct ctl_table *entry =
93269+ ctl_table_no_const *entry =
93270 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
93271
93272 return entry;
93273 }
93274
93275-static void sd_free_ctl_entry(struct ctl_table **tablep)
93276+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
93277 {
93278- struct ctl_table *entry;
93279+ ctl_table_no_const *entry;
93280
93281 /*
93282 * In the intermediate directories, both the child directory and
93283@@ -5105,22 +5112,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
93284 * will always be set. In the lowest directory the names are
93285 * static strings and all have proc handlers.
93286 */
93287- for (entry = *tablep; entry->mode; entry++) {
93288- if (entry->child)
93289- sd_free_ctl_entry(&entry->child);
93290+ for (entry = tablep; entry->mode; entry++) {
93291+ if (entry->child) {
93292+ sd_free_ctl_entry(entry->child);
93293+ pax_open_kernel();
93294+ entry->child = NULL;
93295+ pax_close_kernel();
93296+ }
93297 if (entry->proc_handler == NULL)
93298 kfree(entry->procname);
93299 }
93300
93301- kfree(*tablep);
93302- *tablep = NULL;
93303+ kfree(tablep);
93304 }
93305
93306 static int min_load_idx = 0;
93307 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
93308
93309 static void
93310-set_table_entry(struct ctl_table *entry,
93311+set_table_entry(ctl_table_no_const *entry,
93312 const char *procname, void *data, int maxlen,
93313 umode_t mode, proc_handler *proc_handler,
93314 bool load_idx)
93315@@ -5140,7 +5150,7 @@ set_table_entry(struct ctl_table *entry,
93316 static struct ctl_table *
93317 sd_alloc_ctl_domain_table(struct sched_domain *sd)
93318 {
93319- struct ctl_table *table = sd_alloc_ctl_entry(14);
93320+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
93321
93322 if (table == NULL)
93323 return NULL;
93324@@ -5178,9 +5188,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
93325 return table;
93326 }
93327
93328-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
93329+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
93330 {
93331- struct ctl_table *entry, *table;
93332+ ctl_table_no_const *entry, *table;
93333 struct sched_domain *sd;
93334 int domain_num = 0, i;
93335 char buf[32];
93336@@ -5207,11 +5217,13 @@ static struct ctl_table_header *sd_sysctl_header;
93337 static void register_sched_domain_sysctl(void)
93338 {
93339 int i, cpu_num = num_possible_cpus();
93340- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
93341+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
93342 char buf[32];
93343
93344 WARN_ON(sd_ctl_dir[0].child);
93345+ pax_open_kernel();
93346 sd_ctl_dir[0].child = entry;
93347+ pax_close_kernel();
93348
93349 if (entry == NULL)
93350 return;
93351@@ -5234,8 +5246,12 @@ static void unregister_sched_domain_sysctl(void)
93352 if (sd_sysctl_header)
93353 unregister_sysctl_table(sd_sysctl_header);
93354 sd_sysctl_header = NULL;
93355- if (sd_ctl_dir[0].child)
93356- sd_free_ctl_entry(&sd_ctl_dir[0].child);
93357+ if (sd_ctl_dir[0].child) {
93358+ sd_free_ctl_entry(sd_ctl_dir[0].child);
93359+ pax_open_kernel();
93360+ sd_ctl_dir[0].child = NULL;
93361+ pax_close_kernel();
93362+ }
93363 }
93364 #else
93365 static void register_sched_domain_sysctl(void)
93366diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
93367index fe331fc..29d620e 100644
93368--- a/kernel/sched/fair.c
93369+++ b/kernel/sched/fair.c
93370@@ -2089,7 +2089,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
93371
93372 static void reset_ptenuma_scan(struct task_struct *p)
93373 {
93374- ACCESS_ONCE(p->mm->numa_scan_seq)++;
93375+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
93376 p->mm->numa_scan_offset = 0;
93377 }
93378
93379@@ -7651,7 +7651,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
93380 * run_rebalance_domains is triggered when needed from the scheduler tick.
93381 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
93382 */
93383-static void run_rebalance_domains(struct softirq_action *h)
93384+static __latent_entropy void run_rebalance_domains(void)
93385 {
93386 struct rq *this_rq = this_rq();
93387 enum cpu_idle_type idle = this_rq->idle_balance ?
93388diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
93389index 9a2a45c..bb91ace 100644
93390--- a/kernel/sched/sched.h
93391+++ b/kernel/sched/sched.h
93392@@ -1182,7 +1182,7 @@ struct sched_class {
93393 #ifdef CONFIG_FAIR_GROUP_SCHED
93394 void (*task_move_group) (struct task_struct *p, int on_rq);
93395 #endif
93396-};
93397+} __do_const;
93398
93399 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
93400 {
93401diff --git a/kernel/seccomp.c b/kernel/seccomp.c
93402index 4ef9687..4f44028 100644
93403--- a/kernel/seccomp.c
93404+++ b/kernel/seccomp.c
93405@@ -629,7 +629,9 @@ static u32 __seccomp_phase1_filter(int this_syscall, struct seccomp_data *sd)
93406
93407 switch (action) {
93408 case SECCOMP_RET_ERRNO:
93409- /* Set the low-order 16-bits as a errno. */
93410+ /* Set low-order bits as an errno, capped at MAX_ERRNO. */
93411+ if (data > MAX_ERRNO)
93412+ data = MAX_ERRNO;
93413 syscall_set_return_value(current, task_pt_regs(current),
93414 -data, 0);
93415 goto skip;
93416diff --git a/kernel/signal.c b/kernel/signal.c
93417index 16a30529..25ad033 100644
93418--- a/kernel/signal.c
93419+++ b/kernel/signal.c
93420@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
93421
93422 int print_fatal_signals __read_mostly;
93423
93424-static void __user *sig_handler(struct task_struct *t, int sig)
93425+static __sighandler_t sig_handler(struct task_struct *t, int sig)
93426 {
93427 return t->sighand->action[sig - 1].sa.sa_handler;
93428 }
93429
93430-static int sig_handler_ignored(void __user *handler, int sig)
93431+static int sig_handler_ignored(__sighandler_t handler, int sig)
93432 {
93433 /* Is it explicitly or implicitly ignored? */
93434 return handler == SIG_IGN ||
93435@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
93436
93437 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
93438 {
93439- void __user *handler;
93440+ __sighandler_t handler;
93441
93442 handler = sig_handler(t, sig);
93443
93444@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
93445 atomic_inc(&user->sigpending);
93446 rcu_read_unlock();
93447
93448+ if (!override_rlimit)
93449+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
93450+
93451 if (override_rlimit ||
93452 atomic_read(&user->sigpending) <=
93453 task_rlimit(t, RLIMIT_SIGPENDING)) {
93454@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
93455
93456 int unhandled_signal(struct task_struct *tsk, int sig)
93457 {
93458- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
93459+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
93460 if (is_global_init(tsk))
93461 return 1;
93462 if (handler != SIG_IGN && handler != SIG_DFL)
93463@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
93464 }
93465 }
93466
93467+ /* allow glibc communication via tgkill to other threads in our
93468+ thread group */
93469+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
93470+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
93471+ && gr_handle_signal(t, sig))
93472+ return -EPERM;
93473+
93474 return security_task_kill(t, info, sig, 0);
93475 }
93476
93477@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
93478 return send_signal(sig, info, p, 1);
93479 }
93480
93481-static int
93482+int
93483 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93484 {
93485 return send_signal(sig, info, t, 0);
93486@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93487 unsigned long int flags;
93488 int ret, blocked, ignored;
93489 struct k_sigaction *action;
93490+ int is_unhandled = 0;
93491
93492 spin_lock_irqsave(&t->sighand->siglock, flags);
93493 action = &t->sighand->action[sig-1];
93494@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93495 }
93496 if (action->sa.sa_handler == SIG_DFL)
93497 t->signal->flags &= ~SIGNAL_UNKILLABLE;
93498+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
93499+ is_unhandled = 1;
93500 ret = specific_send_sig_info(sig, info, t);
93501 spin_unlock_irqrestore(&t->sighand->siglock, flags);
93502
93503+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
93504+ normal operation */
93505+ if (is_unhandled) {
93506+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
93507+ gr_handle_crash(t, sig);
93508+ }
93509+
93510 return ret;
93511 }
93512
93513@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
93514 ret = check_kill_permission(sig, info, p);
93515 rcu_read_unlock();
93516
93517- if (!ret && sig)
93518+ if (!ret && sig) {
93519 ret = do_send_sig_info(sig, info, p, true);
93520+ if (!ret)
93521+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
93522+ }
93523
93524 return ret;
93525 }
93526@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
93527 int error = -ESRCH;
93528
93529 rcu_read_lock();
93530- p = find_task_by_vpid(pid);
93531+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93532+ /* allow glibc communication via tgkill to other threads in our
93533+ thread group */
93534+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
93535+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
93536+ p = find_task_by_vpid_unrestricted(pid);
93537+ else
93538+#endif
93539+ p = find_task_by_vpid(pid);
93540 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
93541 error = check_kill_permission(sig, info, p);
93542 /*
93543@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
93544 }
93545 seg = get_fs();
93546 set_fs(KERNEL_DS);
93547- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
93548- (stack_t __force __user *) &uoss,
93549+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
93550+ (stack_t __force_user *) &uoss,
93551 compat_user_stack_pointer());
93552 set_fs(seg);
93553 if (ret >= 0 && uoss_ptr) {
93554diff --git a/kernel/smpboot.c b/kernel/smpboot.c
93555index 40190f2..8861d40 100644
93556--- a/kernel/smpboot.c
93557+++ b/kernel/smpboot.c
93558@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
93559 }
93560 smpboot_unpark_thread(plug_thread, cpu);
93561 }
93562- list_add(&plug_thread->list, &hotplug_threads);
93563+ pax_list_add(&plug_thread->list, &hotplug_threads);
93564 out:
93565 mutex_unlock(&smpboot_threads_lock);
93566 put_online_cpus();
93567@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
93568 {
93569 get_online_cpus();
93570 mutex_lock(&smpboot_threads_lock);
93571- list_del(&plug_thread->list);
93572+ pax_list_del(&plug_thread->list);
93573 smpboot_destroy_threads(plug_thread);
93574 mutex_unlock(&smpboot_threads_lock);
93575 put_online_cpus();
93576diff --git a/kernel/softirq.c b/kernel/softirq.c
93577index c497fcd..e8f90a9 100644
93578--- a/kernel/softirq.c
93579+++ b/kernel/softirq.c
93580@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
93581 EXPORT_SYMBOL(irq_stat);
93582 #endif
93583
93584-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
93585+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
93586
93587 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
93588
93589@@ -266,7 +266,7 @@ restart:
93590 kstat_incr_softirqs_this_cpu(vec_nr);
93591
93592 trace_softirq_entry(vec_nr);
93593- h->action(h);
93594+ h->action();
93595 trace_softirq_exit(vec_nr);
93596 if (unlikely(prev_count != preempt_count())) {
93597 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
93598@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
93599 or_softirq_pending(1UL << nr);
93600 }
93601
93602-void open_softirq(int nr, void (*action)(struct softirq_action *))
93603+void __init open_softirq(int nr, void (*action)(void))
93604 {
93605 softirq_vec[nr].action = action;
93606 }
93607@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
93608 }
93609 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
93610
93611-static void tasklet_action(struct softirq_action *a)
93612+static void tasklet_action(void)
93613 {
93614 struct tasklet_struct *list;
93615
93616@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
93617 }
93618 }
93619
93620-static void tasklet_hi_action(struct softirq_action *a)
93621+static __latent_entropy void tasklet_hi_action(void)
93622 {
93623 struct tasklet_struct *list;
93624
93625@@ -745,7 +745,7 @@ static struct notifier_block cpu_nfb = {
93626 .notifier_call = cpu_callback
93627 };
93628
93629-static struct smp_hotplug_thread softirq_threads = {
93630+static struct smp_hotplug_thread softirq_threads __read_only = {
93631 .store = &ksoftirqd,
93632 .thread_should_run = ksoftirqd_should_run,
93633 .thread_fn = run_ksoftirqd,
93634diff --git a/kernel/sys.c b/kernel/sys.c
93635index ea9c881..2194af5 100644
93636--- a/kernel/sys.c
93637+++ b/kernel/sys.c
93638@@ -154,6 +154,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
93639 error = -EACCES;
93640 goto out;
93641 }
93642+
93643+ if (gr_handle_chroot_setpriority(p, niceval)) {
93644+ error = -EACCES;
93645+ goto out;
93646+ }
93647+
93648 no_nice = security_task_setnice(p, niceval);
93649 if (no_nice) {
93650 error = no_nice;
93651@@ -359,6 +365,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
93652 goto error;
93653 }
93654
93655+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
93656+ goto error;
93657+
93658+ if (!gid_eq(new->gid, old->gid)) {
93659+ /* make sure we generate a learn log for what will
93660+ end up being a role transition after a full-learning
93661+ policy is generated
93662+ CAP_SETGID is required to perform a transition
93663+ we may not log a CAP_SETGID check above, e.g.
93664+ in the case where new rgid = old egid
93665+ */
93666+ gr_learn_cap(current, new, CAP_SETGID);
93667+ }
93668+
93669 if (rgid != (gid_t) -1 ||
93670 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
93671 new->sgid = new->egid;
93672@@ -394,6 +414,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
93673 old = current_cred();
93674
93675 retval = -EPERM;
93676+
93677+ if (gr_check_group_change(kgid, kgid, kgid))
93678+ goto error;
93679+
93680 if (ns_capable(old->user_ns, CAP_SETGID))
93681 new->gid = new->egid = new->sgid = new->fsgid = kgid;
93682 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
93683@@ -411,7 +435,7 @@ error:
93684 /*
93685 * change the user struct in a credentials set to match the new UID
93686 */
93687-static int set_user(struct cred *new)
93688+int set_user(struct cred *new)
93689 {
93690 struct user_struct *new_user;
93691
93692@@ -491,7 +515,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
93693 goto error;
93694 }
93695
93696+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
93697+ goto error;
93698+
93699 if (!uid_eq(new->uid, old->uid)) {
93700+ /* make sure we generate a learn log for what will
93701+ end up being a role transition after a full-learning
93702+ policy is generated
93703+ CAP_SETUID is required to perform a transition
93704+ we may not log a CAP_SETUID check above, e.g.
93705+ in the case where new ruid = old euid
93706+ */
93707+ gr_learn_cap(current, new, CAP_SETUID);
93708 retval = set_user(new);
93709 if (retval < 0)
93710 goto error;
93711@@ -541,6 +576,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
93712 old = current_cred();
93713
93714 retval = -EPERM;
93715+
93716+ if (gr_check_crash_uid(kuid))
93717+ goto error;
93718+ if (gr_check_user_change(kuid, kuid, kuid))
93719+ goto error;
93720+
93721 if (ns_capable(old->user_ns, CAP_SETUID)) {
93722 new->suid = new->uid = kuid;
93723 if (!uid_eq(kuid, old->uid)) {
93724@@ -610,6 +651,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
93725 goto error;
93726 }
93727
93728+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
93729+ goto error;
93730+
93731 if (ruid != (uid_t) -1) {
93732 new->uid = kruid;
93733 if (!uid_eq(kruid, old->uid)) {
93734@@ -694,6 +738,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
93735 goto error;
93736 }
93737
93738+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
93739+ goto error;
93740+
93741 if (rgid != (gid_t) -1)
93742 new->gid = krgid;
93743 if (egid != (gid_t) -1)
93744@@ -758,12 +805,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
93745 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
93746 ns_capable(old->user_ns, CAP_SETUID)) {
93747 if (!uid_eq(kuid, old->fsuid)) {
93748+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
93749+ goto error;
93750+
93751 new->fsuid = kuid;
93752 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
93753 goto change_okay;
93754 }
93755 }
93756
93757+error:
93758 abort_creds(new);
93759 return old_fsuid;
93760
93761@@ -796,12 +847,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
93762 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
93763 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
93764 ns_capable(old->user_ns, CAP_SETGID)) {
93765+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
93766+ goto error;
93767+
93768 if (!gid_eq(kgid, old->fsgid)) {
93769 new->fsgid = kgid;
93770 goto change_okay;
93771 }
93772 }
93773
93774+error:
93775 abort_creds(new);
93776 return old_fsgid;
93777
93778@@ -1178,19 +1233,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
93779 return -EFAULT;
93780
93781 down_read(&uts_sem);
93782- error = __copy_to_user(&name->sysname, &utsname()->sysname,
93783+ error = __copy_to_user(name->sysname, &utsname()->sysname,
93784 __OLD_UTS_LEN);
93785 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
93786- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
93787+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
93788 __OLD_UTS_LEN);
93789 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
93790- error |= __copy_to_user(&name->release, &utsname()->release,
93791+ error |= __copy_to_user(name->release, &utsname()->release,
93792 __OLD_UTS_LEN);
93793 error |= __put_user(0, name->release + __OLD_UTS_LEN);
93794- error |= __copy_to_user(&name->version, &utsname()->version,
93795+ error |= __copy_to_user(name->version, &utsname()->version,
93796 __OLD_UTS_LEN);
93797 error |= __put_user(0, name->version + __OLD_UTS_LEN);
93798- error |= __copy_to_user(&name->machine, &utsname()->machine,
93799+ error |= __copy_to_user(name->machine, &utsname()->machine,
93800 __OLD_UTS_LEN);
93801 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
93802 up_read(&uts_sem);
93803@@ -1391,6 +1446,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
93804 */
93805 new_rlim->rlim_cur = 1;
93806 }
93807+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
93808+ is changed to a lower value. Since tasks can be created by the same
93809+ user in between this limit change and an execve by this task, force
93810+ a recheck only for this task by setting PF_NPROC_EXCEEDED
93811+ */
93812+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
93813+ tsk->flags |= PF_NPROC_EXCEEDED;
93814 }
93815 if (!retval) {
93816 if (old_rlim)
93817diff --git a/kernel/sysctl.c b/kernel/sysctl.c
93818index 88ea2d6..88acc77 100644
93819--- a/kernel/sysctl.c
93820+++ b/kernel/sysctl.c
93821@@ -94,7 +94,6 @@
93822
93823
93824 #if defined(CONFIG_SYSCTL)
93825-
93826 /* External variables not in a header file. */
93827 extern int max_threads;
93828 extern int suid_dumpable;
93829@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
93830
93831 /* Constants used for minimum and maximum */
93832 #ifdef CONFIG_LOCKUP_DETECTOR
93833-static int sixty = 60;
93834+static int sixty __read_only = 60;
93835 #endif
93836
93837-static int __maybe_unused neg_one = -1;
93838+static int __maybe_unused neg_one __read_only = -1;
93839
93840-static int zero;
93841-static int __maybe_unused one = 1;
93842-static int __maybe_unused two = 2;
93843-static int __maybe_unused four = 4;
93844-static unsigned long one_ul = 1;
93845-static int one_hundred = 100;
93846+static int zero __read_only = 0;
93847+static int __maybe_unused one __read_only = 1;
93848+static int __maybe_unused two __read_only = 2;
93849+static int __maybe_unused three __read_only = 3;
93850+static int __maybe_unused four __read_only = 4;
93851+static unsigned long one_ul __read_only = 1;
93852+static int one_hundred __read_only = 100;
93853 #ifdef CONFIG_PRINTK
93854-static int ten_thousand = 10000;
93855+static int ten_thousand __read_only = 10000;
93856 #endif
93857
93858 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
93859@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
93860 void __user *buffer, size_t *lenp, loff_t *ppos);
93861 #endif
93862
93863-#ifdef CONFIG_PRINTK
93864 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93865 void __user *buffer, size_t *lenp, loff_t *ppos);
93866-#endif
93867
93868 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
93869 void __user *buffer, size_t *lenp, loff_t *ppos);
93870@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
93871
93872 #endif
93873
93874+extern struct ctl_table grsecurity_table[];
93875+
93876 static struct ctl_table kern_table[];
93877 static struct ctl_table vm_table[];
93878 static struct ctl_table fs_table[];
93879@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
93880 int sysctl_legacy_va_layout;
93881 #endif
93882
93883+#ifdef CONFIG_PAX_SOFTMODE
93884+static struct ctl_table pax_table[] = {
93885+ {
93886+ .procname = "softmode",
93887+ .data = &pax_softmode,
93888+ .maxlen = sizeof(unsigned int),
93889+ .mode = 0600,
93890+ .proc_handler = &proc_dointvec,
93891+ },
93892+
93893+ { }
93894+};
93895+#endif
93896+
93897 /* The default sysctl tables: */
93898
93899 static struct ctl_table sysctl_base_table[] = {
93900@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
93901 #endif
93902
93903 static struct ctl_table kern_table[] = {
93904+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
93905+ {
93906+ .procname = "grsecurity",
93907+ .mode = 0500,
93908+ .child = grsecurity_table,
93909+ },
93910+#endif
93911+
93912+#ifdef CONFIG_PAX_SOFTMODE
93913+ {
93914+ .procname = "pax",
93915+ .mode = 0500,
93916+ .child = pax_table,
93917+ },
93918+#endif
93919+
93920 {
93921 .procname = "sched_child_runs_first",
93922 .data = &sysctl_sched_child_runs_first,
93923@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
93924 .data = &modprobe_path,
93925 .maxlen = KMOD_PATH_LEN,
93926 .mode = 0644,
93927- .proc_handler = proc_dostring,
93928+ .proc_handler = proc_dostring_modpriv,
93929 },
93930 {
93931 .procname = "modules_disabled",
93932@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
93933 .extra1 = &zero,
93934 .extra2 = &one,
93935 },
93936+#endif
93937 {
93938 .procname = "kptr_restrict",
93939 .data = &kptr_restrict,
93940 .maxlen = sizeof(int),
93941 .mode = 0644,
93942 .proc_handler = proc_dointvec_minmax_sysadmin,
93943+#ifdef CONFIG_GRKERNSEC_HIDESYM
93944+ .extra1 = &two,
93945+#else
93946 .extra1 = &zero,
93947+#endif
93948 .extra2 = &two,
93949 },
93950-#endif
93951 {
93952 .procname = "ngroups_max",
93953 .data = &ngroups_max,
93954@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
93955 */
93956 {
93957 .procname = "perf_event_paranoid",
93958- .data = &sysctl_perf_event_paranoid,
93959- .maxlen = sizeof(sysctl_perf_event_paranoid),
93960+ .data = &sysctl_perf_event_legitimately_concerned,
93961+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
93962 .mode = 0644,
93963- .proc_handler = proc_dointvec,
93964+ /* go ahead, be a hero */
93965+ .proc_handler = proc_dointvec_minmax_sysadmin,
93966+ .extra1 = &neg_one,
93967+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
93968+ .extra2 = &three,
93969+#else
93970+ .extra2 = &two,
93971+#endif
93972 },
93973 {
93974 .procname = "perf_event_mlock_kb",
93975@@ -1340,6 +1381,13 @@ static struct ctl_table vm_table[] = {
93976 .proc_handler = proc_dointvec_minmax,
93977 .extra1 = &zero,
93978 },
93979+ {
93980+ .procname = "heap_stack_gap",
93981+ .data = &sysctl_heap_stack_gap,
93982+ .maxlen = sizeof(sysctl_heap_stack_gap),
93983+ .mode = 0644,
93984+ .proc_handler = proc_doulongvec_minmax,
93985+ },
93986 #else
93987 {
93988 .procname = "nr_trim_pages",
93989@@ -1822,6 +1870,16 @@ int proc_dostring(struct ctl_table *table, int write,
93990 (char __user *)buffer, lenp, ppos);
93991 }
93992
93993+int proc_dostring_modpriv(struct ctl_table *table, int write,
93994+ void __user *buffer, size_t *lenp, loff_t *ppos)
93995+{
93996+ if (write && !capable(CAP_SYS_MODULE))
93997+ return -EPERM;
93998+
93999+ return _proc_do_string(table->data, table->maxlen, write,
94000+ buffer, lenp, ppos);
94001+}
94002+
94003 static size_t proc_skip_spaces(char **buf)
94004 {
94005 size_t ret;
94006@@ -1927,6 +1985,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
94007 len = strlen(tmp);
94008 if (len > *size)
94009 len = *size;
94010+ if (len > sizeof(tmp))
94011+ len = sizeof(tmp);
94012 if (copy_to_user(*buf, tmp, len))
94013 return -EFAULT;
94014 *size -= len;
94015@@ -2104,7 +2164,7 @@ int proc_dointvec(struct ctl_table *table, int write,
94016 static int proc_taint(struct ctl_table *table, int write,
94017 void __user *buffer, size_t *lenp, loff_t *ppos)
94018 {
94019- struct ctl_table t;
94020+ ctl_table_no_const t;
94021 unsigned long tmptaint = get_taint();
94022 int err;
94023
94024@@ -2132,7 +2192,6 @@ static int proc_taint(struct ctl_table *table, int write,
94025 return err;
94026 }
94027
94028-#ifdef CONFIG_PRINTK
94029 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94030 void __user *buffer, size_t *lenp, loff_t *ppos)
94031 {
94032@@ -2141,7 +2200,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94033
94034 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
94035 }
94036-#endif
94037
94038 struct do_proc_dointvec_minmax_conv_param {
94039 int *min;
94040@@ -2701,6 +2759,12 @@ int proc_dostring(struct ctl_table *table, int write,
94041 return -ENOSYS;
94042 }
94043
94044+int proc_dostring_modpriv(struct ctl_table *table, int write,
94045+ void __user *buffer, size_t *lenp, loff_t *ppos)
94046+{
94047+ return -ENOSYS;
94048+}
94049+
94050 int proc_dointvec(struct ctl_table *table, int write,
94051 void __user *buffer, size_t *lenp, loff_t *ppos)
94052 {
94053@@ -2757,5 +2821,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
94054 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
94055 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
94056 EXPORT_SYMBOL(proc_dostring);
94057+EXPORT_SYMBOL(proc_dostring_modpriv);
94058 EXPORT_SYMBOL(proc_doulongvec_minmax);
94059 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
94060diff --git a/kernel/taskstats.c b/kernel/taskstats.c
94061index 670fff8..a247812 100644
94062--- a/kernel/taskstats.c
94063+++ b/kernel/taskstats.c
94064@@ -28,9 +28,12 @@
94065 #include <linux/fs.h>
94066 #include <linux/file.h>
94067 #include <linux/pid_namespace.h>
94068+#include <linux/grsecurity.h>
94069 #include <net/genetlink.h>
94070 #include <linux/atomic.h>
94071
94072+extern int gr_is_taskstats_denied(int pid);
94073+
94074 /*
94075 * Maximum length of a cpumask that can be specified in
94076 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
94077@@ -576,6 +579,9 @@ err:
94078
94079 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
94080 {
94081+ if (gr_is_taskstats_denied(current->pid))
94082+ return -EACCES;
94083+
94084 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
94085 return cmd_attr_register_cpumask(info);
94086 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
94087diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
94088index a7077d3..dd48a49 100644
94089--- a/kernel/time/alarmtimer.c
94090+++ b/kernel/time/alarmtimer.c
94091@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
94092 struct platform_device *pdev;
94093 int error = 0;
94094 int i;
94095- struct k_clock alarm_clock = {
94096+ static struct k_clock alarm_clock = {
94097 .clock_getres = alarm_clock_getres,
94098 .clock_get = alarm_clock_get,
94099 .timer_create = alarm_timer_create,
94100diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
94101index d8c724c..6b331a4 100644
94102--- a/kernel/time/hrtimer.c
94103+++ b/kernel/time/hrtimer.c
94104@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
94105 local_irq_restore(flags);
94106 }
94107
94108-static void run_hrtimer_softirq(struct softirq_action *h)
94109+static __latent_entropy void run_hrtimer_softirq(void)
94110 {
94111 hrtimer_peek_ahead_timers();
94112 }
94113diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
94114index a16b678..8c5bd9d 100644
94115--- a/kernel/time/posix-cpu-timers.c
94116+++ b/kernel/time/posix-cpu-timers.c
94117@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
94118
94119 static __init int init_posix_cpu_timers(void)
94120 {
94121- struct k_clock process = {
94122+ static struct k_clock process = {
94123 .clock_getres = process_cpu_clock_getres,
94124 .clock_get = process_cpu_clock_get,
94125 .timer_create = process_cpu_timer_create,
94126 .nsleep = process_cpu_nsleep,
94127 .nsleep_restart = process_cpu_nsleep_restart,
94128 };
94129- struct k_clock thread = {
94130+ static struct k_clock thread = {
94131 .clock_getres = thread_cpu_clock_getres,
94132 .clock_get = thread_cpu_clock_get,
94133 .timer_create = thread_cpu_timer_create,
94134diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
94135index 31ea01f..7fc61ef 100644
94136--- a/kernel/time/posix-timers.c
94137+++ b/kernel/time/posix-timers.c
94138@@ -43,6 +43,7 @@
94139 #include <linux/hash.h>
94140 #include <linux/posix-clock.h>
94141 #include <linux/posix-timers.h>
94142+#include <linux/grsecurity.h>
94143 #include <linux/syscalls.h>
94144 #include <linux/wait.h>
94145 #include <linux/workqueue.h>
94146@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
94147 * which we beg off on and pass to do_sys_settimeofday().
94148 */
94149
94150-static struct k_clock posix_clocks[MAX_CLOCKS];
94151+static struct k_clock *posix_clocks[MAX_CLOCKS];
94152
94153 /*
94154 * These ones are defined below.
94155@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
94156 */
94157 static __init int init_posix_timers(void)
94158 {
94159- struct k_clock clock_realtime = {
94160+ static struct k_clock clock_realtime = {
94161 .clock_getres = hrtimer_get_res,
94162 .clock_get = posix_clock_realtime_get,
94163 .clock_set = posix_clock_realtime_set,
94164@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
94165 .timer_get = common_timer_get,
94166 .timer_del = common_timer_del,
94167 };
94168- struct k_clock clock_monotonic = {
94169+ static struct k_clock clock_monotonic = {
94170 .clock_getres = hrtimer_get_res,
94171 .clock_get = posix_ktime_get_ts,
94172 .nsleep = common_nsleep,
94173@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
94174 .timer_get = common_timer_get,
94175 .timer_del = common_timer_del,
94176 };
94177- struct k_clock clock_monotonic_raw = {
94178+ static struct k_clock clock_monotonic_raw = {
94179 .clock_getres = hrtimer_get_res,
94180 .clock_get = posix_get_monotonic_raw,
94181 };
94182- struct k_clock clock_realtime_coarse = {
94183+ static struct k_clock clock_realtime_coarse = {
94184 .clock_getres = posix_get_coarse_res,
94185 .clock_get = posix_get_realtime_coarse,
94186 };
94187- struct k_clock clock_monotonic_coarse = {
94188+ static struct k_clock clock_monotonic_coarse = {
94189 .clock_getres = posix_get_coarse_res,
94190 .clock_get = posix_get_monotonic_coarse,
94191 };
94192- struct k_clock clock_tai = {
94193+ static struct k_clock clock_tai = {
94194 .clock_getres = hrtimer_get_res,
94195 .clock_get = posix_get_tai,
94196 .nsleep = common_nsleep,
94197@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
94198 .timer_get = common_timer_get,
94199 .timer_del = common_timer_del,
94200 };
94201- struct k_clock clock_boottime = {
94202+ static struct k_clock clock_boottime = {
94203 .clock_getres = hrtimer_get_res,
94204 .clock_get = posix_get_boottime,
94205 .nsleep = common_nsleep,
94206@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
94207 return;
94208 }
94209
94210- posix_clocks[clock_id] = *new_clock;
94211+ posix_clocks[clock_id] = new_clock;
94212 }
94213 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
94214
94215@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
94216 return (id & CLOCKFD_MASK) == CLOCKFD ?
94217 &clock_posix_dynamic : &clock_posix_cpu;
94218
94219- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
94220+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
94221 return NULL;
94222- return &posix_clocks[id];
94223+ return posix_clocks[id];
94224 }
94225
94226 static int common_timer_create(struct k_itimer *new_timer)
94227@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
94228 struct k_clock *kc = clockid_to_kclock(which_clock);
94229 struct k_itimer *new_timer;
94230 int error, new_timer_id;
94231- sigevent_t event;
94232+ sigevent_t event = { };
94233 int it_id_set = IT_ID_NOT_SET;
94234
94235 if (!kc)
94236@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
94237 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
94238 return -EFAULT;
94239
94240+ /* only the CLOCK_REALTIME clock can be set, all other clocks
94241+ have their clock_set fptr set to a nosettime dummy function
94242+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
94243+ call common_clock_set, which calls do_sys_settimeofday, which
94244+ we hook
94245+ */
94246+
94247 return kc->clock_set(which_clock, &new_tp);
94248 }
94249
94250diff --git a/kernel/time/time.c b/kernel/time/time.c
94251index 2c85b77..6530536 100644
94252--- a/kernel/time/time.c
94253+++ b/kernel/time/time.c
94254@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
94255 return error;
94256
94257 if (tz) {
94258+ /* we log in do_settimeofday called below, so don't log twice
94259+ */
94260+ if (!tv)
94261+ gr_log_timechange();
94262+
94263 sys_tz = *tz;
94264 update_vsyscall_tz();
94265 if (firsttime) {
94266diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
94267index 6a93185..288c331 100644
94268--- a/kernel/time/timekeeping.c
94269+++ b/kernel/time/timekeeping.c
94270@@ -15,6 +15,7 @@
94271 #include <linux/init.h>
94272 #include <linux/mm.h>
94273 #include <linux/sched.h>
94274+#include <linux/grsecurity.h>
94275 #include <linux/syscore_ops.h>
94276 #include <linux/clocksource.h>
94277 #include <linux/jiffies.h>
94278@@ -775,6 +776,8 @@ int do_settimeofday64(const struct timespec64 *ts)
94279 if (!timespec64_valid_strict(ts))
94280 return -EINVAL;
94281
94282+ gr_log_timechange();
94283+
94284 raw_spin_lock_irqsave(&timekeeper_lock, flags);
94285 write_seqcount_begin(&tk_core.seq);
94286
94287diff --git a/kernel/time/timer.c b/kernel/time/timer.c
94288index 2d3f5c5..7ed7dc5 100644
94289--- a/kernel/time/timer.c
94290+++ b/kernel/time/timer.c
94291@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
94292 /*
94293 * This function runs timers and the timer-tq in bottom half context.
94294 */
94295-static void run_timer_softirq(struct softirq_action *h)
94296+static __latent_entropy void run_timer_softirq(void)
94297 {
94298 struct tvec_base *base = __this_cpu_read(tvec_bases);
94299
94300@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
94301 *
94302 * In all cases the return value is guaranteed to be non-negative.
94303 */
94304-signed long __sched schedule_timeout(signed long timeout)
94305+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
94306 {
94307 struct timer_list timer;
94308 unsigned long expire;
94309diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
94310index 61ed862..3b52c65 100644
94311--- a/kernel/time/timer_list.c
94312+++ b/kernel/time/timer_list.c
94313@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
94314
94315 static void print_name_offset(struct seq_file *m, void *sym)
94316 {
94317+#ifdef CONFIG_GRKERNSEC_HIDESYM
94318+ SEQ_printf(m, "<%p>", NULL);
94319+#else
94320 char symname[KSYM_NAME_LEN];
94321
94322 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
94323 SEQ_printf(m, "<%pK>", sym);
94324 else
94325 SEQ_printf(m, "%s", symname);
94326+#endif
94327 }
94328
94329 static void
94330@@ -119,7 +123,11 @@ next_one:
94331 static void
94332 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
94333 {
94334+#ifdef CONFIG_GRKERNSEC_HIDESYM
94335+ SEQ_printf(m, " .base: %p\n", NULL);
94336+#else
94337 SEQ_printf(m, " .base: %pK\n", base);
94338+#endif
94339 SEQ_printf(m, " .index: %d\n",
94340 base->index);
94341 SEQ_printf(m, " .resolution: %Lu nsecs\n",
94342@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
94343 {
94344 struct proc_dir_entry *pe;
94345
94346+#ifdef CONFIG_GRKERNSEC_PROC_ADD
94347+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
94348+#else
94349 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
94350+#endif
94351 if (!pe)
94352 return -ENOMEM;
94353 return 0;
94354diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
94355index 1fb08f2..ca4bb1e 100644
94356--- a/kernel/time/timer_stats.c
94357+++ b/kernel/time/timer_stats.c
94358@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
94359 static unsigned long nr_entries;
94360 static struct entry entries[MAX_ENTRIES];
94361
94362-static atomic_t overflow_count;
94363+static atomic_unchecked_t overflow_count;
94364
94365 /*
94366 * The entries are in a hash-table, for fast lookup:
94367@@ -140,7 +140,7 @@ static void reset_entries(void)
94368 nr_entries = 0;
94369 memset(entries, 0, sizeof(entries));
94370 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
94371- atomic_set(&overflow_count, 0);
94372+ atomic_set_unchecked(&overflow_count, 0);
94373 }
94374
94375 static struct entry *alloc_entry(void)
94376@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
94377 if (likely(entry))
94378 entry->count++;
94379 else
94380- atomic_inc(&overflow_count);
94381+ atomic_inc_unchecked(&overflow_count);
94382
94383 out_unlock:
94384 raw_spin_unlock_irqrestore(lock, flags);
94385@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
94386
94387 static void print_name_offset(struct seq_file *m, unsigned long addr)
94388 {
94389+#ifdef CONFIG_GRKERNSEC_HIDESYM
94390+ seq_printf(m, "<%p>", NULL);
94391+#else
94392 char symname[KSYM_NAME_LEN];
94393
94394 if (lookup_symbol_name(addr, symname) < 0)
94395- seq_printf(m, "<%p>", (void *)addr);
94396+ seq_printf(m, "<%pK>", (void *)addr);
94397 else
94398 seq_printf(m, "%s", symname);
94399+#endif
94400 }
94401
94402 static int tstats_show(struct seq_file *m, void *v)
94403@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
94404
94405 seq_puts(m, "Timer Stats Version: v0.3\n");
94406 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
94407- if (atomic_read(&overflow_count))
94408- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
94409+ if (atomic_read_unchecked(&overflow_count))
94410+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
94411 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
94412
94413 for (i = 0; i < nr_entries; i++) {
94414@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
94415 {
94416 struct proc_dir_entry *pe;
94417
94418+#ifdef CONFIG_GRKERNSEC_PROC_ADD
94419+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
94420+#else
94421 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
94422+#endif
94423 if (!pe)
94424 return -ENOMEM;
94425 return 0;
94426diff --git a/kernel/torture.c b/kernel/torture.c
94427index dd70993..0bf694b 100644
94428--- a/kernel/torture.c
94429+++ b/kernel/torture.c
94430@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
94431 mutex_lock(&fullstop_mutex);
94432 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
94433 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
94434- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
94435+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
94436 } else {
94437 pr_warn("Concurrent rmmod and shutdown illegal!\n");
94438 }
94439@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
94440 if (!torture_must_stop()) {
94441 if (stutter > 1) {
94442 schedule_timeout_interruptible(stutter - 1);
94443- ACCESS_ONCE(stutter_pause_test) = 2;
94444+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
94445 }
94446 schedule_timeout_interruptible(1);
94447- ACCESS_ONCE(stutter_pause_test) = 1;
94448+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
94449 }
94450 if (!torture_must_stop())
94451 schedule_timeout_interruptible(stutter);
94452- ACCESS_ONCE(stutter_pause_test) = 0;
94453+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
94454 torture_shutdown_absorb("torture_stutter");
94455 } while (!torture_must_stop());
94456 torture_kthread_stopping("torture_stutter");
94457@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
94458 schedule_timeout_uninterruptible(10);
94459 return true;
94460 }
94461- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
94462+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
94463 mutex_unlock(&fullstop_mutex);
94464 torture_shutdown_cleanup();
94465 torture_shuffle_cleanup();
94466diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
94467index 483cecf..ac46091 100644
94468--- a/kernel/trace/blktrace.c
94469+++ b/kernel/trace/blktrace.c
94470@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
94471 struct blk_trace *bt = filp->private_data;
94472 char buf[16];
94473
94474- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
94475+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
94476
94477 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
94478 }
94479@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
94480 return 1;
94481
94482 bt = buf->chan->private_data;
94483- atomic_inc(&bt->dropped);
94484+ atomic_inc_unchecked(&bt->dropped);
94485 return 0;
94486 }
94487
94488@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
94489
94490 bt->dir = dir;
94491 bt->dev = dev;
94492- atomic_set(&bt->dropped, 0);
94493+ atomic_set_unchecked(&bt->dropped, 0);
94494 INIT_LIST_HEAD(&bt->running_list);
94495
94496 ret = -EIO;
94497diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
94498index af5bffd..57664b8 100644
94499--- a/kernel/trace/ftrace.c
94500+++ b/kernel/trace/ftrace.c
94501@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
94502 if (unlikely(ftrace_disabled))
94503 return 0;
94504
94505+ ret = ftrace_arch_code_modify_prepare();
94506+ FTRACE_WARN_ON(ret);
94507+ if (ret)
94508+ return 0;
94509+
94510 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
94511+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
94512 if (ret) {
94513 ftrace_bug(ret, rec);
94514- return 0;
94515 }
94516- return 1;
94517+ return ret ? 0 : 1;
94518 }
94519
94520 /*
94521@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
94522 if (!count)
94523 return 0;
94524
94525+ pax_open_kernel();
94526 sort(start, count, sizeof(*start),
94527 ftrace_cmp_ips, ftrace_swap_ips);
94528+ pax_close_kernel();
94529
94530 start_pg = ftrace_allocate_pages(count);
94531 if (!start_pg)
94532@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
94533
94534 if (t->ret_stack == NULL) {
94535 atomic_set(&t->tracing_graph_pause, 0);
94536- atomic_set(&t->trace_overrun, 0);
94537+ atomic_set_unchecked(&t->trace_overrun, 0);
94538 t->curr_ret_stack = -1;
94539 /* Make sure the tasks see the -1 first: */
94540 smp_wmb();
94541@@ -5876,7 +5883,7 @@ static void
94542 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
94543 {
94544 atomic_set(&t->tracing_graph_pause, 0);
94545- atomic_set(&t->trace_overrun, 0);
94546+ atomic_set_unchecked(&t->trace_overrun, 0);
94547 t->ftrace_timestamp = 0;
94548 /* make curr_ret_stack visible before we add the ret_stack */
94549 smp_wmb();
94550diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
94551index d2e151c..1498973 100644
94552--- a/kernel/trace/ring_buffer.c
94553+++ b/kernel/trace/ring_buffer.c
94554@@ -350,9 +350,9 @@ struct buffer_data_page {
94555 */
94556 struct buffer_page {
94557 struct list_head list; /* list of buffer pages */
94558- local_t write; /* index for next write */
94559+ local_unchecked_t write; /* index for next write */
94560 unsigned read; /* index for next read */
94561- local_t entries; /* entries on this page */
94562+ local_unchecked_t entries; /* entries on this page */
94563 unsigned long real_end; /* real end of data */
94564 struct buffer_data_page *page; /* Actual data page */
94565 };
94566@@ -473,11 +473,11 @@ struct ring_buffer_per_cpu {
94567 unsigned long last_overrun;
94568 local_t entries_bytes;
94569 local_t entries;
94570- local_t overrun;
94571- local_t commit_overrun;
94572- local_t dropped_events;
94573+ local_unchecked_t overrun;
94574+ local_unchecked_t commit_overrun;
94575+ local_unchecked_t dropped_events;
94576 local_t committing;
94577- local_t commits;
94578+ local_unchecked_t commits;
94579 unsigned long read;
94580 unsigned long read_bytes;
94581 u64 write_stamp;
94582@@ -1047,8 +1047,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
94583 *
94584 * We add a counter to the write field to denote this.
94585 */
94586- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
94587- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
94588+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
94589+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
94590
94591 /*
94592 * Just make sure we have seen our old_write and synchronize
94593@@ -1076,8 +1076,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
94594 * cmpxchg to only update if an interrupt did not already
94595 * do it for us. If the cmpxchg fails, we don't care.
94596 */
94597- (void)local_cmpxchg(&next_page->write, old_write, val);
94598- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
94599+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
94600+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
94601
94602 /*
94603 * No need to worry about races with clearing out the commit.
94604@@ -1445,12 +1445,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
94605
94606 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
94607 {
94608- return local_read(&bpage->entries) & RB_WRITE_MASK;
94609+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
94610 }
94611
94612 static inline unsigned long rb_page_write(struct buffer_page *bpage)
94613 {
94614- return local_read(&bpage->write) & RB_WRITE_MASK;
94615+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
94616 }
94617
94618 static int
94619@@ -1545,7 +1545,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
94620 * bytes consumed in ring buffer from here.
94621 * Increment overrun to account for the lost events.
94622 */
94623- local_add(page_entries, &cpu_buffer->overrun);
94624+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
94625 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
94626 }
94627
94628@@ -2107,7 +2107,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
94629 * it is our responsibility to update
94630 * the counters.
94631 */
94632- local_add(entries, &cpu_buffer->overrun);
94633+ local_add_unchecked(entries, &cpu_buffer->overrun);
94634 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
94635
94636 /*
94637@@ -2257,7 +2257,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94638 if (tail == BUF_PAGE_SIZE)
94639 tail_page->real_end = 0;
94640
94641- local_sub(length, &tail_page->write);
94642+ local_sub_unchecked(length, &tail_page->write);
94643 return;
94644 }
94645
94646@@ -2292,7 +2292,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94647 rb_event_set_padding(event);
94648
94649 /* Set the write back to the previous setting */
94650- local_sub(length, &tail_page->write);
94651+ local_sub_unchecked(length, &tail_page->write);
94652 return;
94653 }
94654
94655@@ -2304,7 +2304,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94656
94657 /* Set write to end of buffer */
94658 length = (tail + length) - BUF_PAGE_SIZE;
94659- local_sub(length, &tail_page->write);
94660+ local_sub_unchecked(length, &tail_page->write);
94661 }
94662
94663 /*
94664@@ -2330,7 +2330,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94665 * about it.
94666 */
94667 if (unlikely(next_page == commit_page)) {
94668- local_inc(&cpu_buffer->commit_overrun);
94669+ local_inc_unchecked(&cpu_buffer->commit_overrun);
94670 goto out_reset;
94671 }
94672
94673@@ -2360,7 +2360,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94674 * this is easy, just stop here.
94675 */
94676 if (!(buffer->flags & RB_FL_OVERWRITE)) {
94677- local_inc(&cpu_buffer->dropped_events);
94678+ local_inc_unchecked(&cpu_buffer->dropped_events);
94679 goto out_reset;
94680 }
94681
94682@@ -2386,7 +2386,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94683 cpu_buffer->tail_page) &&
94684 (cpu_buffer->commit_page ==
94685 cpu_buffer->reader_page))) {
94686- local_inc(&cpu_buffer->commit_overrun);
94687+ local_inc_unchecked(&cpu_buffer->commit_overrun);
94688 goto out_reset;
94689 }
94690 }
94691@@ -2434,7 +2434,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
94692 length += RB_LEN_TIME_EXTEND;
94693
94694 tail_page = cpu_buffer->tail_page;
94695- write = local_add_return(length, &tail_page->write);
94696+ write = local_add_return_unchecked(length, &tail_page->write);
94697
94698 /* set write to only the index of the write */
94699 write &= RB_WRITE_MASK;
94700@@ -2458,7 +2458,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
94701 kmemcheck_annotate_bitfield(event, bitfield);
94702 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
94703
94704- local_inc(&tail_page->entries);
94705+ local_inc_unchecked(&tail_page->entries);
94706
94707 /*
94708 * If this is the first commit on the page, then update
94709@@ -2491,7 +2491,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94710
94711 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
94712 unsigned long write_mask =
94713- local_read(&bpage->write) & ~RB_WRITE_MASK;
94714+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
94715 unsigned long event_length = rb_event_length(event);
94716 /*
94717 * This is on the tail page. It is possible that
94718@@ -2501,7 +2501,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94719 */
94720 old_index += write_mask;
94721 new_index += write_mask;
94722- index = local_cmpxchg(&bpage->write, old_index, new_index);
94723+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
94724 if (index == old_index) {
94725 /* update counters */
94726 local_sub(event_length, &cpu_buffer->entries_bytes);
94727@@ -2516,7 +2516,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94728 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
94729 {
94730 local_inc(&cpu_buffer->committing);
94731- local_inc(&cpu_buffer->commits);
94732+ local_inc_unchecked(&cpu_buffer->commits);
94733 }
94734
94735 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94736@@ -2528,7 +2528,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94737 return;
94738
94739 again:
94740- commits = local_read(&cpu_buffer->commits);
94741+ commits = local_read_unchecked(&cpu_buffer->commits);
94742 /* synchronize with interrupts */
94743 barrier();
94744 if (local_read(&cpu_buffer->committing) == 1)
94745@@ -2544,7 +2544,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94746 * updating of the commit page and the clearing of the
94747 * committing counter.
94748 */
94749- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
94750+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
94751 !local_read(&cpu_buffer->committing)) {
94752 local_inc(&cpu_buffer->committing);
94753 goto again;
94754@@ -2574,7 +2574,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
94755 barrier();
94756 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
94757 local_dec(&cpu_buffer->committing);
94758- local_dec(&cpu_buffer->commits);
94759+ local_dec_unchecked(&cpu_buffer->commits);
94760 return NULL;
94761 }
94762 #endif
94763@@ -2904,7 +2904,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94764
94765 /* Do the likely case first */
94766 if (likely(bpage->page == (void *)addr)) {
94767- local_dec(&bpage->entries);
94768+ local_dec_unchecked(&bpage->entries);
94769 return;
94770 }
94771
94772@@ -2916,7 +2916,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94773 start = bpage;
94774 do {
94775 if (bpage->page == (void *)addr) {
94776- local_dec(&bpage->entries);
94777+ local_dec_unchecked(&bpage->entries);
94778 return;
94779 }
94780 rb_inc_page(cpu_buffer, &bpage);
94781@@ -3200,7 +3200,7 @@ static inline unsigned long
94782 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
94783 {
94784 return local_read(&cpu_buffer->entries) -
94785- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
94786+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
94787 }
94788
94789 /**
94790@@ -3289,7 +3289,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
94791 return 0;
94792
94793 cpu_buffer = buffer->buffers[cpu];
94794- ret = local_read(&cpu_buffer->overrun);
94795+ ret = local_read_unchecked(&cpu_buffer->overrun);
94796
94797 return ret;
94798 }
94799@@ -3312,7 +3312,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
94800 return 0;
94801
94802 cpu_buffer = buffer->buffers[cpu];
94803- ret = local_read(&cpu_buffer->commit_overrun);
94804+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
94805
94806 return ret;
94807 }
94808@@ -3334,7 +3334,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
94809 return 0;
94810
94811 cpu_buffer = buffer->buffers[cpu];
94812- ret = local_read(&cpu_buffer->dropped_events);
94813+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
94814
94815 return ret;
94816 }
94817@@ -3397,7 +3397,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
94818 /* if you care about this being correct, lock the buffer */
94819 for_each_buffer_cpu(buffer, cpu) {
94820 cpu_buffer = buffer->buffers[cpu];
94821- overruns += local_read(&cpu_buffer->overrun);
94822+ overruns += local_read_unchecked(&cpu_buffer->overrun);
94823 }
94824
94825 return overruns;
94826@@ -3568,8 +3568,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94827 /*
94828 * Reset the reader page to size zero.
94829 */
94830- local_set(&cpu_buffer->reader_page->write, 0);
94831- local_set(&cpu_buffer->reader_page->entries, 0);
94832+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94833+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94834 local_set(&cpu_buffer->reader_page->page->commit, 0);
94835 cpu_buffer->reader_page->real_end = 0;
94836
94837@@ -3603,7 +3603,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94838 * want to compare with the last_overrun.
94839 */
94840 smp_mb();
94841- overwrite = local_read(&(cpu_buffer->overrun));
94842+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
94843
94844 /*
94845 * Here's the tricky part.
94846@@ -4175,8 +4175,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94847
94848 cpu_buffer->head_page
94849 = list_entry(cpu_buffer->pages, struct buffer_page, list);
94850- local_set(&cpu_buffer->head_page->write, 0);
94851- local_set(&cpu_buffer->head_page->entries, 0);
94852+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
94853+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
94854 local_set(&cpu_buffer->head_page->page->commit, 0);
94855
94856 cpu_buffer->head_page->read = 0;
94857@@ -4186,18 +4186,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94858
94859 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
94860 INIT_LIST_HEAD(&cpu_buffer->new_pages);
94861- local_set(&cpu_buffer->reader_page->write, 0);
94862- local_set(&cpu_buffer->reader_page->entries, 0);
94863+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94864+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94865 local_set(&cpu_buffer->reader_page->page->commit, 0);
94866 cpu_buffer->reader_page->read = 0;
94867
94868 local_set(&cpu_buffer->entries_bytes, 0);
94869- local_set(&cpu_buffer->overrun, 0);
94870- local_set(&cpu_buffer->commit_overrun, 0);
94871- local_set(&cpu_buffer->dropped_events, 0);
94872+ local_set_unchecked(&cpu_buffer->overrun, 0);
94873+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
94874+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
94875 local_set(&cpu_buffer->entries, 0);
94876 local_set(&cpu_buffer->committing, 0);
94877- local_set(&cpu_buffer->commits, 0);
94878+ local_set_unchecked(&cpu_buffer->commits, 0);
94879 cpu_buffer->read = 0;
94880 cpu_buffer->read_bytes = 0;
94881
94882@@ -4598,8 +4598,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
94883 rb_init_page(bpage);
94884 bpage = reader->page;
94885 reader->page = *data_page;
94886- local_set(&reader->write, 0);
94887- local_set(&reader->entries, 0);
94888+ local_set_unchecked(&reader->write, 0);
94889+ local_set_unchecked(&reader->entries, 0);
94890 reader->read = 0;
94891 *data_page = bpage;
94892
94893diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
94894index 361a827..6a319a3 100644
94895--- a/kernel/trace/trace.c
94896+++ b/kernel/trace/trace.c
94897@@ -3499,7 +3499,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
94898 return 0;
94899 }
94900
94901-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
94902+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
94903 {
94904 /* do nothing if flag is already set */
94905 if (!!(trace_flags & mask) == !!enabled)
94906diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
94907index 8de48ba..3e5b4fa 100644
94908--- a/kernel/trace/trace.h
94909+++ b/kernel/trace/trace.h
94910@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
94911 void trace_printk_init_buffers(void);
94912 void trace_printk_start_comm(void);
94913 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
94914-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
94915+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
94916
94917 /*
94918 * Normal trace_printk() and friends allocates special buffers
94919diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
94920index 57b67b1..66082a9 100644
94921--- a/kernel/trace/trace_clock.c
94922+++ b/kernel/trace/trace_clock.c
94923@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
94924 return now;
94925 }
94926
94927-static atomic64_t trace_counter;
94928+static atomic64_unchecked_t trace_counter;
94929
94930 /*
94931 * trace_clock_counter(): simply an atomic counter.
94932@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
94933 */
94934 u64 notrace trace_clock_counter(void)
94935 {
94936- return atomic64_add_return(1, &trace_counter);
94937+ return atomic64_inc_return_unchecked(&trace_counter);
94938 }
94939diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
94940index b03a0ea..2df3168 100644
94941--- a/kernel/trace/trace_events.c
94942+++ b/kernel/trace/trace_events.c
94943@@ -1755,7 +1755,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
94944 return 0;
94945 }
94946
94947-struct ftrace_module_file_ops;
94948 static void __add_event_to_tracers(struct ftrace_event_call *call);
94949
94950 /* Add an additional event_call dynamically */
94951diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
94952index ba47600..d0e47fa 100644
94953--- a/kernel/trace/trace_functions_graph.c
94954+++ b/kernel/trace/trace_functions_graph.c
94955@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
94956
94957 /* The return trace stack is full */
94958 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
94959- atomic_inc(&current->trace_overrun);
94960+ atomic_inc_unchecked(&current->trace_overrun);
94961 return -EBUSY;
94962 }
94963
94964@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
94965 *ret = current->ret_stack[index].ret;
94966 trace->func = current->ret_stack[index].func;
94967 trace->calltime = current->ret_stack[index].calltime;
94968- trace->overrun = atomic_read(&current->trace_overrun);
94969+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
94970 trace->depth = index;
94971 }
94972
94973diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
94974index 7a9ba62..2e0e4a1 100644
94975--- a/kernel/trace/trace_mmiotrace.c
94976+++ b/kernel/trace/trace_mmiotrace.c
94977@@ -24,7 +24,7 @@ struct header_iter {
94978 static struct trace_array *mmio_trace_array;
94979 static bool overrun_detected;
94980 static unsigned long prev_overruns;
94981-static atomic_t dropped_count;
94982+static atomic_unchecked_t dropped_count;
94983
94984 static void mmio_reset_data(struct trace_array *tr)
94985 {
94986@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
94987
94988 static unsigned long count_overruns(struct trace_iterator *iter)
94989 {
94990- unsigned long cnt = atomic_xchg(&dropped_count, 0);
94991+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
94992 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
94993
94994 if (over > prev_overruns)
94995@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
94996 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
94997 sizeof(*entry), 0, pc);
94998 if (!event) {
94999- atomic_inc(&dropped_count);
95000+ atomic_inc_unchecked(&dropped_count);
95001 return;
95002 }
95003 entry = ring_buffer_event_data(event);
95004@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
95005 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
95006 sizeof(*entry), 0, pc);
95007 if (!event) {
95008- atomic_inc(&dropped_count);
95009+ atomic_inc_unchecked(&dropped_count);
95010 return;
95011 }
95012 entry = ring_buffer_event_data(event);
95013diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
95014index b77b9a6..82f19bd 100644
95015--- a/kernel/trace/trace_output.c
95016+++ b/kernel/trace/trace_output.c
95017@@ -707,14 +707,16 @@ int register_ftrace_event(struct trace_event *event)
95018 goto out;
95019 }
95020
95021+ pax_open_kernel();
95022 if (event->funcs->trace == NULL)
95023- event->funcs->trace = trace_nop_print;
95024+ *(void **)&event->funcs->trace = trace_nop_print;
95025 if (event->funcs->raw == NULL)
95026- event->funcs->raw = trace_nop_print;
95027+ *(void **)&event->funcs->raw = trace_nop_print;
95028 if (event->funcs->hex == NULL)
95029- event->funcs->hex = trace_nop_print;
95030+ *(void **)&event->funcs->hex = trace_nop_print;
95031 if (event->funcs->binary == NULL)
95032- event->funcs->binary = trace_nop_print;
95033+ *(void **)&event->funcs->binary = trace_nop_print;
95034+ pax_close_kernel();
95035
95036 key = event->type & (EVENT_HASHSIZE - 1);
95037
95038diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
95039index f8b45d8..70ff6c8 100644
95040--- a/kernel/trace/trace_seq.c
95041+++ b/kernel/trace/trace_seq.c
95042@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
95043 return 0;
95044 }
95045
95046- seq_buf_path(&s->seq, path, "\n");
95047+ seq_buf_path(&s->seq, path, "\n\\");
95048
95049 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
95050 s->seq.len = save_len;
95051diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
95052index 16eddb3..758b308 100644
95053--- a/kernel/trace/trace_stack.c
95054+++ b/kernel/trace/trace_stack.c
95055@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
95056 return;
95057
95058 /* we do not handle interrupt stacks yet */
95059- if (!object_is_on_stack(stack))
95060+ if (!object_starts_on_stack(stack))
95061 return;
95062
95063 local_irq_save(flags);
95064diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
95065index c6ee36f..78513f3 100644
95066--- a/kernel/trace/trace_syscalls.c
95067+++ b/kernel/trace/trace_syscalls.c
95068@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
95069 int num;
95070
95071 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95072+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95073+ return -EINVAL;
95074
95075 mutex_lock(&syscall_trace_lock);
95076 if (!sys_perf_refcount_enter)
95077@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
95078 int num;
95079
95080 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95081+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95082+ return;
95083
95084 mutex_lock(&syscall_trace_lock);
95085 sys_perf_refcount_enter--;
95086@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
95087 int num;
95088
95089 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95090+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95091+ return -EINVAL;
95092
95093 mutex_lock(&syscall_trace_lock);
95094 if (!sys_perf_refcount_exit)
95095@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
95096 int num;
95097
95098 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95099+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95100+ return;
95101
95102 mutex_lock(&syscall_trace_lock);
95103 sys_perf_refcount_exit--;
95104diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
95105index 4109f83..fe1f830 100644
95106--- a/kernel/user_namespace.c
95107+++ b/kernel/user_namespace.c
95108@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
95109 !kgid_has_mapping(parent_ns, group))
95110 return -EPERM;
95111
95112+#ifdef CONFIG_GRKERNSEC
95113+ /*
95114+ * This doesn't really inspire confidence:
95115+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
95116+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
95117+ * Increases kernel attack surface in areas developers
95118+ * previously cared little about ("low importance due
95119+ * to requiring "root" capability")
95120+ * To be removed when this code receives *proper* review
95121+ */
95122+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
95123+ !capable(CAP_SETGID))
95124+ return -EPERM;
95125+#endif
95126+
95127 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
95128 if (!ns)
95129 return -ENOMEM;
95130@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
95131 if (atomic_read(&current->mm->mm_users) > 1)
95132 return -EINVAL;
95133
95134- if (current->fs->users != 1)
95135+ if (atomic_read(&current->fs->users) != 1)
95136 return -EINVAL;
95137
95138 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
95139diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
95140index c8eac43..4b5f08f 100644
95141--- a/kernel/utsname_sysctl.c
95142+++ b/kernel/utsname_sysctl.c
95143@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
95144 static int proc_do_uts_string(struct ctl_table *table, int write,
95145 void __user *buffer, size_t *lenp, loff_t *ppos)
95146 {
95147- struct ctl_table uts_table;
95148+ ctl_table_no_const uts_table;
95149 int r;
95150 memcpy(&uts_table, table, sizeof(uts_table));
95151 uts_table.data = get_uts(table, write);
95152diff --git a/kernel/watchdog.c b/kernel/watchdog.c
95153index 70bf118..4be3c37 100644
95154--- a/kernel/watchdog.c
95155+++ b/kernel/watchdog.c
95156@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
95157 static void watchdog_nmi_disable(unsigned int cpu) { return; }
95158 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
95159
95160-static struct smp_hotplug_thread watchdog_threads = {
95161+static struct smp_hotplug_thread watchdog_threads __read_only = {
95162 .store = &softlockup_watchdog,
95163 .thread_should_run = watchdog_should_run,
95164 .thread_fn = watchdog,
95165diff --git a/kernel/workqueue.c b/kernel/workqueue.c
95166index 82d0c8d..37f4222 100644
95167--- a/kernel/workqueue.c
95168+++ b/kernel/workqueue.c
95169@@ -4565,7 +4565,7 @@ static void rebind_workers(struct worker_pool *pool)
95170 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
95171 worker_flags |= WORKER_REBOUND;
95172 worker_flags &= ~WORKER_UNBOUND;
95173- ACCESS_ONCE(worker->flags) = worker_flags;
95174+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
95175 }
95176
95177 spin_unlock_irq(&pool->lock);
95178diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
95179index 5f2ce61..85a0b1b 100644
95180--- a/lib/Kconfig.debug
95181+++ b/lib/Kconfig.debug
95182@@ -910,7 +910,7 @@ config DEBUG_MUTEXES
95183
95184 config DEBUG_WW_MUTEX_SLOWPATH
95185 bool "Wait/wound mutex debugging: Slowpath testing"
95186- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95187+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95188 select DEBUG_LOCK_ALLOC
95189 select DEBUG_SPINLOCK
95190 select DEBUG_MUTEXES
95191@@ -927,7 +927,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
95192
95193 config DEBUG_LOCK_ALLOC
95194 bool "Lock debugging: detect incorrect freeing of live locks"
95195- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95196+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95197 select DEBUG_SPINLOCK
95198 select DEBUG_MUTEXES
95199 select LOCKDEP
95200@@ -941,7 +941,7 @@ config DEBUG_LOCK_ALLOC
95201
95202 config PROVE_LOCKING
95203 bool "Lock debugging: prove locking correctness"
95204- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95205+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95206 select LOCKDEP
95207 select DEBUG_SPINLOCK
95208 select DEBUG_MUTEXES
95209@@ -992,7 +992,7 @@ config LOCKDEP
95210
95211 config LOCK_STAT
95212 bool "Lock usage statistics"
95213- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95214+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95215 select LOCKDEP
95216 select DEBUG_SPINLOCK
95217 select DEBUG_MUTEXES
95218@@ -1453,6 +1453,7 @@ config LATENCYTOP
95219 depends on DEBUG_KERNEL
95220 depends on STACKTRACE_SUPPORT
95221 depends on PROC_FS
95222+ depends on !GRKERNSEC_HIDESYM
95223 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
95224 select KALLSYMS
95225 select KALLSYMS_ALL
95226@@ -1469,7 +1470,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95227 config DEBUG_STRICT_USER_COPY_CHECKS
95228 bool "Strict user copy size checks"
95229 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95230- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
95231+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
95232 help
95233 Enabling this option turns a certain set of sanity checks for user
95234 copy operations into compile time failures.
95235@@ -1597,7 +1598,7 @@ endmenu # runtime tests
95236
95237 config PROVIDE_OHCI1394_DMA_INIT
95238 bool "Remote debugging over FireWire early on boot"
95239- depends on PCI && X86
95240+ depends on PCI && X86 && !GRKERNSEC
95241 help
95242 If you want to debug problems which hang or crash the kernel early
95243 on boot and the crashing machine has a FireWire port, you can use
95244diff --git a/lib/Makefile b/lib/Makefile
95245index 3c3b30b..ca29102 100644
95246--- a/lib/Makefile
95247+++ b/lib/Makefile
95248@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
95249 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
95250 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
95251 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
95252-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
95253+obj-y += list_debug.o
95254 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
95255
95256 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
95257diff --git a/lib/average.c b/lib/average.c
95258index 114d1be..ab0350c 100644
95259--- a/lib/average.c
95260+++ b/lib/average.c
95261@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
95262 {
95263 unsigned long internal = ACCESS_ONCE(avg->internal);
95264
95265- ACCESS_ONCE(avg->internal) = internal ?
95266+ ACCESS_ONCE_RW(avg->internal) = internal ?
95267 (((internal << avg->weight) - internal) +
95268 (val << avg->factor)) >> avg->weight :
95269 (val << avg->factor);
95270diff --git a/lib/bitmap.c b/lib/bitmap.c
95271index 324ea9e..46b1ae2 100644
95272--- a/lib/bitmap.c
95273+++ b/lib/bitmap.c
95274@@ -271,7 +271,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
95275 }
95276 EXPORT_SYMBOL(__bitmap_subset);
95277
95278-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95279+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95280 {
95281 unsigned int k, lim = bits/BITS_PER_LONG;
95282 int w = 0;
95283@@ -437,7 +437,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
95284 {
95285 int c, old_c, totaldigits, ndigits, nchunks, nbits;
95286 u32 chunk;
95287- const char __user __force *ubuf = (const char __user __force *)buf;
95288+ const char __user *ubuf = (const char __force_user *)buf;
95289
95290 bitmap_zero(maskp, nmaskbits);
95291
95292@@ -522,7 +522,7 @@ int bitmap_parse_user(const char __user *ubuf,
95293 {
95294 if (!access_ok(VERIFY_READ, ubuf, ulen))
95295 return -EFAULT;
95296- return __bitmap_parse((const char __force *)ubuf,
95297+ return __bitmap_parse((const char __force_kernel *)ubuf,
95298 ulen, 1, maskp, nmaskbits);
95299
95300 }
95301@@ -640,7 +640,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
95302 {
95303 unsigned a, b;
95304 int c, old_c, totaldigits;
95305- const char __user __force *ubuf = (const char __user __force *)buf;
95306+ const char __user *ubuf = (const char __force_user *)buf;
95307 int exp_digit, in_range;
95308
95309 totaldigits = c = 0;
95310@@ -735,7 +735,7 @@ int bitmap_parselist_user(const char __user *ubuf,
95311 {
95312 if (!access_ok(VERIFY_READ, ubuf, ulen))
95313 return -EFAULT;
95314- return __bitmap_parselist((const char __force *)ubuf,
95315+ return __bitmap_parselist((const char __force_kernel *)ubuf,
95316 ulen, 1, maskp, nmaskbits);
95317 }
95318 EXPORT_SYMBOL(bitmap_parselist_user);
95319diff --git a/lib/bug.c b/lib/bug.c
95320index 0c3bd95..5a615a1 100644
95321--- a/lib/bug.c
95322+++ b/lib/bug.c
95323@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
95324 return BUG_TRAP_TYPE_NONE;
95325
95326 bug = find_bug(bugaddr);
95327+ if (!bug)
95328+ return BUG_TRAP_TYPE_NONE;
95329
95330 file = NULL;
95331 line = 0;
95332diff --git a/lib/debugobjects.c b/lib/debugobjects.c
95333index 547f7f9..a6d4ba0 100644
95334--- a/lib/debugobjects.c
95335+++ b/lib/debugobjects.c
95336@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
95337 if (limit > 4)
95338 return;
95339
95340- is_on_stack = object_is_on_stack(addr);
95341+ is_on_stack = object_starts_on_stack(addr);
95342 if (is_on_stack == onstack)
95343 return;
95344
95345diff --git a/lib/div64.c b/lib/div64.c
95346index 4382ad7..08aa558 100644
95347--- a/lib/div64.c
95348+++ b/lib/div64.c
95349@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
95350 EXPORT_SYMBOL(__div64_32);
95351
95352 #ifndef div_s64_rem
95353-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
95354+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
95355 {
95356 u64 quotient;
95357
95358@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
95359 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
95360 */
95361 #ifndef div64_u64
95362-u64 div64_u64(u64 dividend, u64 divisor)
95363+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
95364 {
95365 u32 high = divisor >> 32;
95366 u64 quot;
95367diff --git a/lib/dma-debug.c b/lib/dma-debug.c
95368index 9722bd2..0d826f4 100644
95369--- a/lib/dma-debug.c
95370+++ b/lib/dma-debug.c
95371@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
95372
95373 void dma_debug_add_bus(struct bus_type *bus)
95374 {
95375- struct notifier_block *nb;
95376+ notifier_block_no_const *nb;
95377
95378 if (dma_debug_disabled())
95379 return;
95380@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
95381
95382 static void check_for_stack(struct device *dev, void *addr)
95383 {
95384- if (object_is_on_stack(addr))
95385+ if (object_starts_on_stack(addr))
95386 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
95387 "stack [addr=%p]\n", addr);
95388 }
95389diff --git a/lib/inflate.c b/lib/inflate.c
95390index 013a761..c28f3fc 100644
95391--- a/lib/inflate.c
95392+++ b/lib/inflate.c
95393@@ -269,7 +269,7 @@ static void free(void *where)
95394 malloc_ptr = free_mem_ptr;
95395 }
95396 #else
95397-#define malloc(a) kmalloc(a, GFP_KERNEL)
95398+#define malloc(a) kmalloc((a), GFP_KERNEL)
95399 #define free(a) kfree(a)
95400 #endif
95401
95402diff --git a/lib/ioremap.c b/lib/ioremap.c
95403index 0c9216c..863bd89 100644
95404--- a/lib/ioremap.c
95405+++ b/lib/ioremap.c
95406@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
95407 unsigned long next;
95408
95409 phys_addr -= addr;
95410- pmd = pmd_alloc(&init_mm, pud, addr);
95411+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
95412 if (!pmd)
95413 return -ENOMEM;
95414 do {
95415@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
95416 unsigned long next;
95417
95418 phys_addr -= addr;
95419- pud = pud_alloc(&init_mm, pgd, addr);
95420+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
95421 if (!pud)
95422 return -ENOMEM;
95423 do {
95424diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
95425index bd2bea9..6b3c95e 100644
95426--- a/lib/is_single_threaded.c
95427+++ b/lib/is_single_threaded.c
95428@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
95429 struct task_struct *p, *t;
95430 bool ret;
95431
95432+ if (!mm)
95433+ return true;
95434+
95435 if (atomic_read(&task->signal->live) != 1)
95436 return false;
95437
95438diff --git a/lib/kobject.c b/lib/kobject.c
95439index 03d4ab3..46f6374 100644
95440--- a/lib/kobject.c
95441+++ b/lib/kobject.c
95442@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
95443
95444
95445 static DEFINE_SPINLOCK(kobj_ns_type_lock);
95446-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
95447+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
95448
95449-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
95450+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
95451 {
95452 enum kobj_ns_type type = ops->type;
95453 int error;
95454diff --git a/lib/list_debug.c b/lib/list_debug.c
95455index c24c2f7..f0296f4 100644
95456--- a/lib/list_debug.c
95457+++ b/lib/list_debug.c
95458@@ -11,7 +11,9 @@
95459 #include <linux/bug.h>
95460 #include <linux/kernel.h>
95461 #include <linux/rculist.h>
95462+#include <linux/mm.h>
95463
95464+#ifdef CONFIG_DEBUG_LIST
95465 /*
95466 * Insert a new entry between two known consecutive entries.
95467 *
95468@@ -19,21 +21,40 @@
95469 * the prev/next entries already!
95470 */
95471
95472+static bool __list_add_debug(struct list_head *new,
95473+ struct list_head *prev,
95474+ struct list_head *next)
95475+{
95476+ if (unlikely(next->prev != prev)) {
95477+ printk(KERN_ERR "list_add corruption. next->prev should be "
95478+ "prev (%p), but was %p. (next=%p).\n",
95479+ prev, next->prev, next);
95480+ BUG();
95481+ return false;
95482+ }
95483+ if (unlikely(prev->next != next)) {
95484+ printk(KERN_ERR "list_add corruption. prev->next should be "
95485+ "next (%p), but was %p. (prev=%p).\n",
95486+ next, prev->next, prev);
95487+ BUG();
95488+ return false;
95489+ }
95490+ if (unlikely(new == prev || new == next)) {
95491+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
95492+ new, prev, next);
95493+ BUG();
95494+ return false;
95495+ }
95496+ return true;
95497+}
95498+
95499 void __list_add(struct list_head *new,
95500- struct list_head *prev,
95501- struct list_head *next)
95502+ struct list_head *prev,
95503+ struct list_head *next)
95504 {
95505- WARN(next->prev != prev,
95506- "list_add corruption. next->prev should be "
95507- "prev (%p), but was %p. (next=%p).\n",
95508- prev, next->prev, next);
95509- WARN(prev->next != next,
95510- "list_add corruption. prev->next should be "
95511- "next (%p), but was %p. (prev=%p).\n",
95512- next, prev->next, prev);
95513- WARN(new == prev || new == next,
95514- "list_add double add: new=%p, prev=%p, next=%p.\n",
95515- new, prev, next);
95516+ if (!__list_add_debug(new, prev, next))
95517+ return;
95518+
95519 next->prev = new;
95520 new->next = next;
95521 new->prev = prev;
95522@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
95523 }
95524 EXPORT_SYMBOL(__list_add);
95525
95526-void __list_del_entry(struct list_head *entry)
95527+static bool __list_del_entry_debug(struct list_head *entry)
95528 {
95529 struct list_head *prev, *next;
95530
95531 prev = entry->prev;
95532 next = entry->next;
95533
95534- if (WARN(next == LIST_POISON1,
95535- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
95536- entry, LIST_POISON1) ||
95537- WARN(prev == LIST_POISON2,
95538- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
95539- entry, LIST_POISON2) ||
95540- WARN(prev->next != entry,
95541- "list_del corruption. prev->next should be %p, "
95542- "but was %p\n", entry, prev->next) ||
95543- WARN(next->prev != entry,
95544- "list_del corruption. next->prev should be %p, "
95545- "but was %p\n", entry, next->prev))
95546+ if (unlikely(next == LIST_POISON1)) {
95547+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
95548+ entry, LIST_POISON1);
95549+ BUG();
95550+ return false;
95551+ }
95552+ if (unlikely(prev == LIST_POISON2)) {
95553+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
95554+ entry, LIST_POISON2);
95555+ BUG();
95556+ return false;
95557+ }
95558+ if (unlikely(entry->prev->next != entry)) {
95559+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
95560+ "but was %p\n", entry, prev->next);
95561+ BUG();
95562+ return false;
95563+ }
95564+ if (unlikely(entry->next->prev != entry)) {
95565+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
95566+ "but was %p\n", entry, next->prev);
95567+ BUG();
95568+ return false;
95569+ }
95570+ return true;
95571+}
95572+
95573+void __list_del_entry(struct list_head *entry)
95574+{
95575+ if (!__list_del_entry_debug(entry))
95576 return;
95577
95578- __list_del(prev, next);
95579+ __list_del(entry->prev, entry->next);
95580 }
95581 EXPORT_SYMBOL(__list_del_entry);
95582
95583@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
95584 void __list_add_rcu(struct list_head *new,
95585 struct list_head *prev, struct list_head *next)
95586 {
95587- WARN(next->prev != prev,
95588- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
95589- prev, next->prev, next);
95590- WARN(prev->next != next,
95591- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
95592- next, prev->next, prev);
95593+ if (!__list_add_debug(new, prev, next))
95594+ return;
95595+
95596 new->next = next;
95597 new->prev = prev;
95598 rcu_assign_pointer(list_next_rcu(prev), new);
95599 next->prev = new;
95600 }
95601 EXPORT_SYMBOL(__list_add_rcu);
95602+#endif
95603+
95604+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
95605+{
95606+#ifdef CONFIG_DEBUG_LIST
95607+ if (!__list_add_debug(new, prev, next))
95608+ return;
95609+#endif
95610+
95611+ pax_open_kernel();
95612+ next->prev = new;
95613+ new->next = next;
95614+ new->prev = prev;
95615+ prev->next = new;
95616+ pax_close_kernel();
95617+}
95618+EXPORT_SYMBOL(__pax_list_add);
95619+
95620+void pax_list_del(struct list_head *entry)
95621+{
95622+#ifdef CONFIG_DEBUG_LIST
95623+ if (!__list_del_entry_debug(entry))
95624+ return;
95625+#endif
95626+
95627+ pax_open_kernel();
95628+ __list_del(entry->prev, entry->next);
95629+ entry->next = LIST_POISON1;
95630+ entry->prev = LIST_POISON2;
95631+ pax_close_kernel();
95632+}
95633+EXPORT_SYMBOL(pax_list_del);
95634+
95635+void pax_list_del_init(struct list_head *entry)
95636+{
95637+ pax_open_kernel();
95638+ __list_del(entry->prev, entry->next);
95639+ INIT_LIST_HEAD(entry);
95640+ pax_close_kernel();
95641+}
95642+EXPORT_SYMBOL(pax_list_del_init);
95643+
95644+void __pax_list_add_rcu(struct list_head *new,
95645+ struct list_head *prev, struct list_head *next)
95646+{
95647+#ifdef CONFIG_DEBUG_LIST
95648+ if (!__list_add_debug(new, prev, next))
95649+ return;
95650+#endif
95651+
95652+ pax_open_kernel();
95653+ new->next = next;
95654+ new->prev = prev;
95655+ rcu_assign_pointer(list_next_rcu(prev), new);
95656+ next->prev = new;
95657+ pax_close_kernel();
95658+}
95659+EXPORT_SYMBOL(__pax_list_add_rcu);
95660+
95661+void pax_list_del_rcu(struct list_head *entry)
95662+{
95663+#ifdef CONFIG_DEBUG_LIST
95664+ if (!__list_del_entry_debug(entry))
95665+ return;
95666+#endif
95667+
95668+ pax_open_kernel();
95669+ __list_del(entry->prev, entry->next);
95670+ entry->next = LIST_POISON1;
95671+ entry->prev = LIST_POISON2;
95672+ pax_close_kernel();
95673+}
95674+EXPORT_SYMBOL(pax_list_del_rcu);
95675diff --git a/lib/lockref.c b/lib/lockref.c
95676index d2233de..fa1a2f6 100644
95677--- a/lib/lockref.c
95678+++ b/lib/lockref.c
95679@@ -48,13 +48,13 @@
95680 void lockref_get(struct lockref *lockref)
95681 {
95682 CMPXCHG_LOOP(
95683- new.count++;
95684+ __lockref_inc(&new);
95685 ,
95686 return;
95687 );
95688
95689 spin_lock(&lockref->lock);
95690- lockref->count++;
95691+ __lockref_inc(lockref);
95692 spin_unlock(&lockref->lock);
95693 }
95694 EXPORT_SYMBOL(lockref_get);
95695@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
95696 int retval;
95697
95698 CMPXCHG_LOOP(
95699- new.count++;
95700+ __lockref_inc(&new);
95701 if (!old.count)
95702 return 0;
95703 ,
95704@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
95705 spin_lock(&lockref->lock);
95706 retval = 0;
95707 if (lockref->count) {
95708- lockref->count++;
95709+ __lockref_inc(lockref);
95710 retval = 1;
95711 }
95712 spin_unlock(&lockref->lock);
95713@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
95714 int lockref_get_or_lock(struct lockref *lockref)
95715 {
95716 CMPXCHG_LOOP(
95717- new.count++;
95718+ __lockref_inc(&new);
95719 if (!old.count)
95720 break;
95721 ,
95722@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
95723 spin_lock(&lockref->lock);
95724 if (!lockref->count)
95725 return 0;
95726- lockref->count++;
95727+ __lockref_inc(lockref);
95728 spin_unlock(&lockref->lock);
95729 return 1;
95730 }
95731@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
95732 int lockref_put_or_lock(struct lockref *lockref)
95733 {
95734 CMPXCHG_LOOP(
95735- new.count--;
95736+ __lockref_dec(&new);
95737 if (old.count <= 1)
95738 break;
95739 ,
95740@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
95741 spin_lock(&lockref->lock);
95742 if (lockref->count <= 1)
95743 return 0;
95744- lockref->count--;
95745+ __lockref_dec(lockref);
95746 spin_unlock(&lockref->lock);
95747 return 1;
95748 }
95749@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
95750 int retval;
95751
95752 CMPXCHG_LOOP(
95753- new.count++;
95754+ __lockref_inc(&new);
95755 if ((int)old.count < 0)
95756 return 0;
95757 ,
95758@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
95759 spin_lock(&lockref->lock);
95760 retval = 0;
95761 if ((int) lockref->count >= 0) {
95762- lockref->count++;
95763+ __lockref_inc(lockref);
95764 retval = 1;
95765 }
95766 spin_unlock(&lockref->lock);
95767diff --git a/lib/nlattr.c b/lib/nlattr.c
95768index 9c3e85f..0affd1b 100644
95769--- a/lib/nlattr.c
95770+++ b/lib/nlattr.c
95771@@ -279,7 +279,11 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
95772 {
95773 int minlen = min_t(int, count, nla_len(src));
95774
95775+ BUG_ON(minlen < 0);
95776+
95777 memcpy(dest, nla_data(src), minlen);
95778+ if (count > minlen)
95779+ memset(dest + minlen, 0, count - minlen);
95780
95781 return minlen;
95782 }
95783diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
95784index 6111bcb..02e816b 100644
95785--- a/lib/percpu-refcount.c
95786+++ b/lib/percpu-refcount.c
95787@@ -31,7 +31,7 @@
95788 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
95789 */
95790
95791-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
95792+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
95793
95794 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
95795
95796diff --git a/lib/radix-tree.c b/lib/radix-tree.c
95797index 3291a8e..346a91e 100644
95798--- a/lib/radix-tree.c
95799+++ b/lib/radix-tree.c
95800@@ -67,7 +67,7 @@ struct radix_tree_preload {
95801 int nr;
95802 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
95803 };
95804-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
95805+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
95806
95807 static inline void *ptr_to_indirect(void *ptr)
95808 {
95809diff --git a/lib/random32.c b/lib/random32.c
95810index 0bee183..526f12f 100644
95811--- a/lib/random32.c
95812+++ b/lib/random32.c
95813@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
95814 }
95815 #endif
95816
95817-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
95818+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
95819
95820 /**
95821 * prandom_u32_state - seeded pseudo-random number generator.
95822diff --git a/lib/rbtree.c b/lib/rbtree.c
95823index c16c81a..4dcbda1 100644
95824--- a/lib/rbtree.c
95825+++ b/lib/rbtree.c
95826@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
95827 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
95828
95829 static const struct rb_augment_callbacks dummy_callbacks = {
95830- dummy_propagate, dummy_copy, dummy_rotate
95831+ .propagate = dummy_propagate,
95832+ .copy = dummy_copy,
95833+ .rotate = dummy_rotate
95834 };
95835
95836 void rb_insert_color(struct rb_node *node, struct rb_root *root)
95837diff --git a/lib/show_mem.c b/lib/show_mem.c
95838index 7de89f4..00d70b7 100644
95839--- a/lib/show_mem.c
95840+++ b/lib/show_mem.c
95841@@ -50,6 +50,6 @@ void show_mem(unsigned int filter)
95842 quicklist_total_size());
95843 #endif
95844 #ifdef CONFIG_MEMORY_FAILURE
95845- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
95846+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
95847 #endif
95848 }
95849diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
95850index bb2b201..46abaf9 100644
95851--- a/lib/strncpy_from_user.c
95852+++ b/lib/strncpy_from_user.c
95853@@ -21,7 +21,7 @@
95854 */
95855 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
95856 {
95857- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95858+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95859 long res = 0;
95860
95861 /*
95862diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
95863index a28df52..3d55877 100644
95864--- a/lib/strnlen_user.c
95865+++ b/lib/strnlen_user.c
95866@@ -26,7 +26,7 @@
95867 */
95868 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
95869 {
95870- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95871+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95872 long align, res = 0;
95873 unsigned long c;
95874
95875diff --git a/lib/swiotlb.c b/lib/swiotlb.c
95876index 4abda07..b9d3765 100644
95877--- a/lib/swiotlb.c
95878+++ b/lib/swiotlb.c
95879@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
95880
95881 void
95882 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
95883- dma_addr_t dev_addr)
95884+ dma_addr_t dev_addr, struct dma_attrs *attrs)
95885 {
95886 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
95887
95888diff --git a/lib/usercopy.c b/lib/usercopy.c
95889index 4f5b1dd..7cab418 100644
95890--- a/lib/usercopy.c
95891+++ b/lib/usercopy.c
95892@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
95893 WARN(1, "Buffer overflow detected!\n");
95894 }
95895 EXPORT_SYMBOL(copy_from_user_overflow);
95896+
95897+void copy_to_user_overflow(void)
95898+{
95899+ WARN(1, "Buffer overflow detected!\n");
95900+}
95901+EXPORT_SYMBOL(copy_to_user_overflow);
95902diff --git a/lib/vsprintf.c b/lib/vsprintf.c
95903index ec337f6..8484eb2 100644
95904--- a/lib/vsprintf.c
95905+++ b/lib/vsprintf.c
95906@@ -16,6 +16,9 @@
95907 * - scnprintf and vscnprintf
95908 */
95909
95910+#ifdef CONFIG_GRKERNSEC_HIDESYM
95911+#define __INCLUDED_BY_HIDESYM 1
95912+#endif
95913 #include <stdarg.h>
95914 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
95915 #include <linux/types.h>
95916@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
95917 #ifdef CONFIG_KALLSYMS
95918 if (*fmt == 'B')
95919 sprint_backtrace(sym, value);
95920- else if (*fmt != 'f' && *fmt != 's')
95921+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
95922 sprint_symbol(sym, value);
95923 else
95924 sprint_symbol_no_offset(sym, value);
95925@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
95926 return number(buf, end, num, spec);
95927 }
95928
95929+#ifdef CONFIG_GRKERNSEC_HIDESYM
95930+int kptr_restrict __read_mostly = 2;
95931+#else
95932 int kptr_restrict __read_mostly;
95933+#endif
95934
95935 /*
95936 * Show a '%p' thing. A kernel extension is that the '%p' is followed
95937@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
95938 *
95939 * - 'F' For symbolic function descriptor pointers with offset
95940 * - 'f' For simple symbolic function names without offset
95941+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
95942 * - 'S' For symbolic direct pointers with offset
95943 * - 's' For symbolic direct pointers without offset
95944+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
95945 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
95946 * - 'B' For backtraced symbolic direct pointers with offset
95947 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
95948@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95949
95950 if (!ptr && *fmt != 'K') {
95951 /*
95952- * Print (null) with the same width as a pointer so it makes
95953+ * Print (nil) with the same width as a pointer so it makes
95954 * tabular output look nice.
95955 */
95956 if (spec.field_width == -1)
95957 spec.field_width = default_width;
95958- return string(buf, end, "(null)", spec);
95959+ return string(buf, end, "(nil)", spec);
95960 }
95961
95962 switch (*fmt) {
95963@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95964 /* Fallthrough */
95965 case 'S':
95966 case 's':
95967+#ifdef CONFIG_GRKERNSEC_HIDESYM
95968+ break;
95969+#else
95970+ return symbol_string(buf, end, ptr, spec, fmt);
95971+#endif
95972+ case 'X':
95973+ ptr = dereference_function_descriptor(ptr);
95974+ case 'A':
95975 case 'B':
95976 return symbol_string(buf, end, ptr, spec, fmt);
95977 case 'R':
95978@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95979 va_end(va);
95980 return buf;
95981 }
95982+ case 'P':
95983+ break;
95984 case 'K':
95985 /*
95986 * %pK cannot be used in IRQ context because its test
95987@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95988 ((const struct file *)ptr)->f_path.dentry,
95989 spec, fmt);
95990 }
95991+
95992+#ifdef CONFIG_GRKERNSEC_HIDESYM
95993+ /* 'P' = approved pointers to copy to userland,
95994+ as in the /proc/kallsyms case, as we make it display nothing
95995+ for non-root users, and the real contents for root users
95996+ 'X' = approved simple symbols
95997+ Also ignore 'K' pointers, since we force their NULLing for non-root users
95998+ above
95999+ */
96000+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
96001+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
96002+ dump_stack();
96003+ ptr = NULL;
96004+ }
96005+#endif
96006+
96007 spec.flags |= SMALL;
96008 if (spec.field_width == -1) {
96009 spec.field_width = default_width;
96010@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
96011 typeof(type) value; \
96012 if (sizeof(type) == 8) { \
96013 args = PTR_ALIGN(args, sizeof(u32)); \
96014- *(u32 *)&value = *(u32 *)args; \
96015- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
96016+ *(u32 *)&value = *(const u32 *)args; \
96017+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
96018 } else { \
96019 args = PTR_ALIGN(args, sizeof(type)); \
96020- value = *(typeof(type) *)args; \
96021+ value = *(const typeof(type) *)args; \
96022 } \
96023 args += sizeof(type); \
96024 value; \
96025@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
96026 case FORMAT_TYPE_STR: {
96027 const char *str_arg = args;
96028 args += strlen(str_arg) + 1;
96029- str = string(str, end, (char *)str_arg, spec);
96030+ str = string(str, end, str_arg, spec);
96031 break;
96032 }
96033
96034diff --git a/localversion-grsec b/localversion-grsec
96035new file mode 100644
96036index 0000000..7cd6065
96037--- /dev/null
96038+++ b/localversion-grsec
96039@@ -0,0 +1 @@
96040+-grsec
96041diff --git a/mm/Kconfig b/mm/Kconfig
96042index 1d1ae6b..0f05885 100644
96043--- a/mm/Kconfig
96044+++ b/mm/Kconfig
96045@@ -341,10 +341,11 @@ config KSM
96046 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
96047
96048 config DEFAULT_MMAP_MIN_ADDR
96049- int "Low address space to protect from user allocation"
96050+ int "Low address space to protect from user allocation"
96051 depends on MMU
96052- default 4096
96053- help
96054+ default 32768 if ALPHA || ARM || PARISC || SPARC32
96055+ default 65536
96056+ help
96057 This is the portion of low virtual memory which should be protected
96058 from userspace allocation. Keeping a user from writing to low pages
96059 can help reduce the impact of kernel NULL pointer bugs.
96060@@ -375,7 +376,7 @@ config MEMORY_FAILURE
96061
96062 config HWPOISON_INJECT
96063 tristate "HWPoison pages injector"
96064- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
96065+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
96066 select PROC_PAGE_MONITOR
96067
96068 config NOMMU_INITIAL_TRIM_EXCESS
96069diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
96070index 957d3da..1d34e20 100644
96071--- a/mm/Kconfig.debug
96072+++ b/mm/Kconfig.debug
96073@@ -10,6 +10,7 @@ config PAGE_EXTENSION
96074 config DEBUG_PAGEALLOC
96075 bool "Debug page memory allocations"
96076 depends on DEBUG_KERNEL
96077+ depends on !PAX_MEMORY_SANITIZE
96078 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
96079 depends on !KMEMCHECK
96080 select PAGE_EXTENSION
96081diff --git a/mm/backing-dev.c b/mm/backing-dev.c
96082index 0ae0df5..82ac56b 100644
96083--- a/mm/backing-dev.c
96084+++ b/mm/backing-dev.c
96085@@ -12,7 +12,7 @@
96086 #include <linux/device.h>
96087 #include <trace/events/writeback.h>
96088
96089-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
96090+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
96091
96092 struct backing_dev_info default_backing_dev_info = {
96093 .name = "default",
96094@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
96095 return err;
96096
96097 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
96098- atomic_long_inc_return(&bdi_seq));
96099+ atomic_long_inc_return_unchecked(&bdi_seq));
96100 if (err) {
96101 bdi_destroy(bdi);
96102 return err;
96103diff --git a/mm/filemap.c b/mm/filemap.c
96104index 673e458..7192013 100644
96105--- a/mm/filemap.c
96106+++ b/mm/filemap.c
96107@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
96108 struct address_space *mapping = file->f_mapping;
96109
96110 if (!mapping->a_ops->readpage)
96111- return -ENOEXEC;
96112+ return -ENODEV;
96113 file_accessed(file);
96114 vma->vm_ops = &generic_file_vm_ops;
96115 return 0;
96116@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
96117 *pos = i_size_read(inode);
96118
96119 if (limit != RLIM_INFINITY) {
96120+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
96121 if (*pos >= limit) {
96122 send_sig(SIGXFSZ, current, 0);
96123 return -EFBIG;
96124diff --git a/mm/fremap.c b/mm/fremap.c
96125index 2805d71..8b56e7d 100644
96126--- a/mm/fremap.c
96127+++ b/mm/fremap.c
96128@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
96129 retry:
96130 vma = find_vma(mm, start);
96131
96132+#ifdef CONFIG_PAX_SEGMEXEC
96133+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
96134+ goto out;
96135+#endif
96136+
96137 /*
96138 * Make sure the vma is shared, that it supports prefaulting,
96139 * and that the remapped range is valid and fully within
96140diff --git a/mm/gup.c b/mm/gup.c
96141index e29c374..66e998f 100644
96142--- a/mm/gup.c
96143+++ b/mm/gup.c
96144@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
96145 unsigned int fault_flags = 0;
96146 int ret;
96147
96148- /* For mlock, just skip the stack guard page. */
96149- if ((*flags & FOLL_MLOCK) &&
96150- (stack_guard_page_start(vma, address) ||
96151- stack_guard_page_end(vma, address + PAGE_SIZE)))
96152- return -ENOENT;
96153 if (*flags & FOLL_WRITE)
96154 fault_flags |= FAULT_FLAG_WRITE;
96155 if (nonblocking)
96156@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96157 if (!(gup_flags & FOLL_FORCE))
96158 gup_flags |= FOLL_NUMA;
96159
96160- do {
96161+ while (nr_pages) {
96162 struct page *page;
96163 unsigned int foll_flags = gup_flags;
96164 unsigned int page_increm;
96165
96166 /* first iteration or cross vma bound */
96167 if (!vma || start >= vma->vm_end) {
96168- vma = find_extend_vma(mm, start);
96169+ vma = find_vma(mm, start);
96170 if (!vma && in_gate_area(mm, start)) {
96171 int ret;
96172 ret = get_gate_page(mm, start & PAGE_MASK,
96173@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96174 goto next_page;
96175 }
96176
96177- if (!vma || check_vma_flags(vma, gup_flags))
96178+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
96179 return i ? : -EFAULT;
96180 if (is_vm_hugetlb_page(vma)) {
96181 i = follow_hugetlb_page(mm, vma, pages, vmas,
96182@@ -509,7 +504,7 @@ next_page:
96183 i += page_increm;
96184 start += page_increm * PAGE_SIZE;
96185 nr_pages -= page_increm;
96186- } while (nr_pages);
96187+ }
96188 return i;
96189 }
96190 EXPORT_SYMBOL(__get_user_pages);
96191diff --git a/mm/highmem.c b/mm/highmem.c
96192index 123bcd3..0de52ba 100644
96193--- a/mm/highmem.c
96194+++ b/mm/highmem.c
96195@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
96196 * So no dangers, even with speculative execution.
96197 */
96198 page = pte_page(pkmap_page_table[i]);
96199+ pax_open_kernel();
96200 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
96201-
96202+ pax_close_kernel();
96203 set_page_address(page, NULL);
96204 need_flush = 1;
96205 }
96206@@ -259,9 +260,11 @@ start:
96207 }
96208 }
96209 vaddr = PKMAP_ADDR(last_pkmap_nr);
96210+
96211+ pax_open_kernel();
96212 set_pte_at(&init_mm, vaddr,
96213 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
96214-
96215+ pax_close_kernel();
96216 pkmap_count[last_pkmap_nr] = 1;
96217 set_page_address(page, (void *)vaddr);
96218
96219diff --git a/mm/hugetlb.c b/mm/hugetlb.c
96220index a2bfd02..2126298 100644
96221--- a/mm/hugetlb.c
96222+++ b/mm/hugetlb.c
96223@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96224 struct ctl_table *table, int write,
96225 void __user *buffer, size_t *length, loff_t *ppos)
96226 {
96227+ ctl_table_no_const t;
96228 struct hstate *h = &default_hstate;
96229 unsigned long tmp = h->max_huge_pages;
96230 int ret;
96231@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96232 if (!hugepages_supported())
96233 return -ENOTSUPP;
96234
96235- table->data = &tmp;
96236- table->maxlen = sizeof(unsigned long);
96237- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
96238+ t = *table;
96239+ t.data = &tmp;
96240+ t.maxlen = sizeof(unsigned long);
96241+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
96242 if (ret)
96243 goto out;
96244
96245@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
96246 struct hstate *h = &default_hstate;
96247 unsigned long tmp;
96248 int ret;
96249+ ctl_table_no_const hugetlb_table;
96250
96251 if (!hugepages_supported())
96252 return -ENOTSUPP;
96253@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
96254 if (write && hstate_is_gigantic(h))
96255 return -EINVAL;
96256
96257- table->data = &tmp;
96258- table->maxlen = sizeof(unsigned long);
96259- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
96260+ hugetlb_table = *table;
96261+ hugetlb_table.data = &tmp;
96262+ hugetlb_table.maxlen = sizeof(unsigned long);
96263+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
96264 if (ret)
96265 goto out;
96266
96267@@ -2798,6 +2802,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
96268 i_mmap_unlock_write(mapping);
96269 }
96270
96271+#ifdef CONFIG_PAX_SEGMEXEC
96272+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
96273+{
96274+ struct mm_struct *mm = vma->vm_mm;
96275+ struct vm_area_struct *vma_m;
96276+ unsigned long address_m;
96277+ pte_t *ptep_m;
96278+
96279+ vma_m = pax_find_mirror_vma(vma);
96280+ if (!vma_m)
96281+ return;
96282+
96283+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96284+ address_m = address + SEGMEXEC_TASK_SIZE;
96285+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
96286+ get_page(page_m);
96287+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
96288+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
96289+}
96290+#endif
96291+
96292 /*
96293 * Hugetlb_cow() should be called with page lock of the original hugepage held.
96294 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
96295@@ -2910,6 +2935,11 @@ retry_avoidcopy:
96296 make_huge_pte(vma, new_page, 1));
96297 page_remove_rmap(old_page);
96298 hugepage_add_new_anon_rmap(new_page, vma, address);
96299+
96300+#ifdef CONFIG_PAX_SEGMEXEC
96301+ pax_mirror_huge_pte(vma, address, new_page);
96302+#endif
96303+
96304 /* Make the old page be freed below */
96305 new_page = old_page;
96306 }
96307@@ -3070,6 +3100,10 @@ retry:
96308 && (vma->vm_flags & VM_SHARED)));
96309 set_huge_pte_at(mm, address, ptep, new_pte);
96310
96311+#ifdef CONFIG_PAX_SEGMEXEC
96312+ pax_mirror_huge_pte(vma, address, page);
96313+#endif
96314+
96315 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
96316 /* Optimization, do the COW without a second fault */
96317 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
96318@@ -3137,6 +3171,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96319 struct address_space *mapping;
96320 int need_wait_lock = 0;
96321
96322+#ifdef CONFIG_PAX_SEGMEXEC
96323+ struct vm_area_struct *vma_m;
96324+#endif
96325+
96326 address &= huge_page_mask(h);
96327
96328 ptep = huge_pte_offset(mm, address);
96329@@ -3150,6 +3188,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96330 VM_FAULT_SET_HINDEX(hstate_index(h));
96331 }
96332
96333+#ifdef CONFIG_PAX_SEGMEXEC
96334+ vma_m = pax_find_mirror_vma(vma);
96335+ if (vma_m) {
96336+ unsigned long address_m;
96337+
96338+ if (vma->vm_start > vma_m->vm_start) {
96339+ address_m = address;
96340+ address -= SEGMEXEC_TASK_SIZE;
96341+ vma = vma_m;
96342+ h = hstate_vma(vma);
96343+ } else
96344+ address_m = address + SEGMEXEC_TASK_SIZE;
96345+
96346+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
96347+ return VM_FAULT_OOM;
96348+ address_m &= HPAGE_MASK;
96349+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
96350+ }
96351+#endif
96352+
96353 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
96354 if (!ptep)
96355 return VM_FAULT_OOM;
96356diff --git a/mm/internal.h b/mm/internal.h
96357index efad241..57ae4ca 100644
96358--- a/mm/internal.h
96359+++ b/mm/internal.h
96360@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
96361
96362 extern int __isolate_free_page(struct page *page, unsigned int order);
96363 extern void __free_pages_bootmem(struct page *page, unsigned int order);
96364+extern void free_compound_page(struct page *page);
96365 extern void prep_compound_page(struct page *page, unsigned long order);
96366 #ifdef CONFIG_MEMORY_FAILURE
96367 extern bool is_free_buddy_page(struct page *page);
96368@@ -387,7 +388,7 @@ extern u32 hwpoison_filter_enable;
96369
96370 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
96371 unsigned long, unsigned long,
96372- unsigned long, unsigned long);
96373+ unsigned long, unsigned long) __intentional_overflow(-1);
96374
96375 extern void set_pageblock_order(void);
96376 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
96377diff --git a/mm/kmemleak.c b/mm/kmemleak.c
96378index 3cda50c..032ba634 100644
96379--- a/mm/kmemleak.c
96380+++ b/mm/kmemleak.c
96381@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
96382
96383 for (i = 0; i < object->trace_len; i++) {
96384 void *ptr = (void *)object->trace[i];
96385- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
96386+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
96387 }
96388 }
96389
96390@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
96391 return -ENOMEM;
96392 }
96393
96394- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
96395+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
96396 &kmemleak_fops);
96397 if (!dentry)
96398 pr_warning("Failed to create the debugfs kmemleak file\n");
96399diff --git a/mm/maccess.c b/mm/maccess.c
96400index d53adf9..03a24bf 100644
96401--- a/mm/maccess.c
96402+++ b/mm/maccess.c
96403@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
96404 set_fs(KERNEL_DS);
96405 pagefault_disable();
96406 ret = __copy_from_user_inatomic(dst,
96407- (__force const void __user *)src, size);
96408+ (const void __force_user *)src, size);
96409 pagefault_enable();
96410 set_fs(old_fs);
96411
96412@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
96413
96414 set_fs(KERNEL_DS);
96415 pagefault_disable();
96416- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
96417+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
96418 pagefault_enable();
96419 set_fs(old_fs);
96420
96421diff --git a/mm/madvise.c b/mm/madvise.c
96422index a271adc..5e1a2b4 100644
96423--- a/mm/madvise.c
96424+++ b/mm/madvise.c
96425@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
96426 pgoff_t pgoff;
96427 unsigned long new_flags = vma->vm_flags;
96428
96429+#ifdef CONFIG_PAX_SEGMEXEC
96430+ struct vm_area_struct *vma_m;
96431+#endif
96432+
96433 switch (behavior) {
96434 case MADV_NORMAL:
96435 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
96436@@ -126,6 +130,13 @@ success:
96437 /*
96438 * vm_flags is protected by the mmap_sem held in write mode.
96439 */
96440+
96441+#ifdef CONFIG_PAX_SEGMEXEC
96442+ vma_m = pax_find_mirror_vma(vma);
96443+ if (vma_m)
96444+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
96445+#endif
96446+
96447 vma->vm_flags = new_flags;
96448
96449 out:
96450@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
96451 struct vm_area_struct **prev,
96452 unsigned long start, unsigned long end)
96453 {
96454+
96455+#ifdef CONFIG_PAX_SEGMEXEC
96456+ struct vm_area_struct *vma_m;
96457+#endif
96458+
96459 *prev = vma;
96460 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
96461 return -EINVAL;
96462@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
96463 zap_page_range(vma, start, end - start, &details);
96464 } else
96465 zap_page_range(vma, start, end - start, NULL);
96466+
96467+#ifdef CONFIG_PAX_SEGMEXEC
96468+ vma_m = pax_find_mirror_vma(vma);
96469+ if (vma_m) {
96470+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
96471+ struct zap_details details = {
96472+ .nonlinear_vma = vma_m,
96473+ .last_index = ULONG_MAX,
96474+ };
96475+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, &details);
96476+ } else
96477+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
96478+ }
96479+#endif
96480+
96481 return 0;
96482 }
96483
96484@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
96485 if (end < start)
96486 return error;
96487
96488+#ifdef CONFIG_PAX_SEGMEXEC
96489+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
96490+ if (end > SEGMEXEC_TASK_SIZE)
96491+ return error;
96492+ } else
96493+#endif
96494+
96495+ if (end > TASK_SIZE)
96496+ return error;
96497+
96498 error = 0;
96499 if (end == start)
96500 return error;
96501diff --git a/mm/memory-failure.c b/mm/memory-failure.c
96502index 20c29dd..22bd8e2 100644
96503--- a/mm/memory-failure.c
96504+++ b/mm/memory-failure.c
96505@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
96506
96507 int sysctl_memory_failure_recovery __read_mostly = 1;
96508
96509-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
96510+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
96511
96512 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
96513
96514@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
96515 pfn, t->comm, t->pid);
96516 si.si_signo = SIGBUS;
96517 si.si_errno = 0;
96518- si.si_addr = (void *)addr;
96519+ si.si_addr = (void __user *)addr;
96520 #ifdef __ARCH_SI_TRAPNO
96521 si.si_trapno = trapno;
96522 #endif
96523@@ -786,7 +786,7 @@ static struct page_state {
96524 unsigned long res;
96525 char *msg;
96526 int (*action)(struct page *p, unsigned long pfn);
96527-} error_states[] = {
96528+} __do_const error_states[] = {
96529 { reserved, reserved, "reserved kernel", me_kernel },
96530 /*
96531 * free pages are specially detected outside this table:
96532@@ -1094,7 +1094,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96533 nr_pages = 1 << compound_order(hpage);
96534 else /* normal page or thp */
96535 nr_pages = 1;
96536- atomic_long_add(nr_pages, &num_poisoned_pages);
96537+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
96538
96539 /*
96540 * We need/can do nothing about count=0 pages.
96541@@ -1123,7 +1123,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96542 if (PageHWPoison(hpage)) {
96543 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
96544 || (p != hpage && TestSetPageHWPoison(hpage))) {
96545- atomic_long_sub(nr_pages, &num_poisoned_pages);
96546+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96547 unlock_page(hpage);
96548 return 0;
96549 }
96550@@ -1191,14 +1191,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96551 */
96552 if (!PageHWPoison(p)) {
96553 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
96554- atomic_long_sub(nr_pages, &num_poisoned_pages);
96555+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96556 put_page(hpage);
96557 res = 0;
96558 goto out;
96559 }
96560 if (hwpoison_filter(p)) {
96561 if (TestClearPageHWPoison(p))
96562- atomic_long_sub(nr_pages, &num_poisoned_pages);
96563+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96564 unlock_page(hpage);
96565 put_page(hpage);
96566 return 0;
96567@@ -1428,7 +1428,7 @@ int unpoison_memory(unsigned long pfn)
96568 return 0;
96569 }
96570 if (TestClearPageHWPoison(p))
96571- atomic_long_dec(&num_poisoned_pages);
96572+ atomic_long_dec_unchecked(&num_poisoned_pages);
96573 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
96574 return 0;
96575 }
96576@@ -1442,7 +1442,7 @@ int unpoison_memory(unsigned long pfn)
96577 */
96578 if (TestClearPageHWPoison(page)) {
96579 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
96580- atomic_long_sub(nr_pages, &num_poisoned_pages);
96581+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96582 freeit = 1;
96583 if (PageHuge(page))
96584 clear_page_hwpoison_huge_page(page);
96585@@ -1567,11 +1567,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
96586 if (PageHuge(page)) {
96587 set_page_hwpoison_huge_page(hpage);
96588 dequeue_hwpoisoned_huge_page(hpage);
96589- atomic_long_add(1 << compound_order(hpage),
96590+ atomic_long_add_unchecked(1 << compound_order(hpage),
96591 &num_poisoned_pages);
96592 } else {
96593 SetPageHWPoison(page);
96594- atomic_long_inc(&num_poisoned_pages);
96595+ atomic_long_inc_unchecked(&num_poisoned_pages);
96596 }
96597 }
96598 return ret;
96599@@ -1610,7 +1610,7 @@ static int __soft_offline_page(struct page *page, int flags)
96600 put_page(page);
96601 pr_info("soft_offline: %#lx: invalidated\n", pfn);
96602 SetPageHWPoison(page);
96603- atomic_long_inc(&num_poisoned_pages);
96604+ atomic_long_inc_unchecked(&num_poisoned_pages);
96605 return 0;
96606 }
96607
96608@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
96609 if (!is_free_buddy_page(page))
96610 pr_info("soft offline: %#lx: page leaked\n",
96611 pfn);
96612- atomic_long_inc(&num_poisoned_pages);
96613+ atomic_long_inc_unchecked(&num_poisoned_pages);
96614 }
96615 } else {
96616 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
96617@@ -1729,11 +1729,11 @@ int soft_offline_page(struct page *page, int flags)
96618 if (PageHuge(page)) {
96619 set_page_hwpoison_huge_page(hpage);
96620 dequeue_hwpoisoned_huge_page(hpage);
96621- atomic_long_add(1 << compound_order(hpage),
96622+ atomic_long_add_unchecked(1 << compound_order(hpage),
96623 &num_poisoned_pages);
96624 } else {
96625 SetPageHWPoison(page);
96626- atomic_long_inc(&num_poisoned_pages);
96627+ atomic_long_inc_unchecked(&num_poisoned_pages);
96628 }
96629 }
96630 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
96631diff --git a/mm/memory.c b/mm/memory.c
96632index 6aa7822..3c76005 100644
96633--- a/mm/memory.c
96634+++ b/mm/memory.c
96635@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
96636 free_pte_range(tlb, pmd, addr);
96637 } while (pmd++, addr = next, addr != end);
96638
96639+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
96640 start &= PUD_MASK;
96641 if (start < floor)
96642 return;
96643@@ -428,6 +429,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
96644 pmd = pmd_offset(pud, start);
96645 pud_clear(pud);
96646 pmd_free_tlb(tlb, pmd, start);
96647+#endif
96648+
96649 }
96650
96651 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96652@@ -447,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96653 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
96654 } while (pud++, addr = next, addr != end);
96655
96656+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
96657 start &= PGDIR_MASK;
96658 if (start < floor)
96659 return;
96660@@ -461,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96661 pud = pud_offset(pgd, start);
96662 pgd_clear(pgd);
96663 pud_free_tlb(tlb, pud, start);
96664+#endif
96665+
96666 }
96667
96668 /*
96669@@ -690,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
96670 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
96671 */
96672 if (vma->vm_ops)
96673- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
96674+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
96675 vma->vm_ops->fault);
96676 if (vma->vm_file)
96677- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
96678+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
96679 vma->vm_file->f_op->mmap);
96680 dump_stack();
96681 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
96682@@ -1488,6 +1494,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
96683 page_add_file_rmap(page);
96684 set_pte_at(mm, addr, pte, mk_pte(page, prot));
96685
96686+#ifdef CONFIG_PAX_SEGMEXEC
96687+ pax_mirror_file_pte(vma, addr, page, ptl);
96688+#endif
96689+
96690 retval = 0;
96691 pte_unmap_unlock(pte, ptl);
96692 return retval;
96693@@ -1532,9 +1542,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
96694 if (!page_count(page))
96695 return -EINVAL;
96696 if (!(vma->vm_flags & VM_MIXEDMAP)) {
96697+
96698+#ifdef CONFIG_PAX_SEGMEXEC
96699+ struct vm_area_struct *vma_m;
96700+#endif
96701+
96702 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
96703 BUG_ON(vma->vm_flags & VM_PFNMAP);
96704 vma->vm_flags |= VM_MIXEDMAP;
96705+
96706+#ifdef CONFIG_PAX_SEGMEXEC
96707+ vma_m = pax_find_mirror_vma(vma);
96708+ if (vma_m)
96709+ vma_m->vm_flags |= VM_MIXEDMAP;
96710+#endif
96711+
96712 }
96713 return insert_page(vma, addr, page, vma->vm_page_prot);
96714 }
96715@@ -1617,6 +1639,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
96716 unsigned long pfn)
96717 {
96718 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
96719+ BUG_ON(vma->vm_mirror);
96720
96721 if (addr < vma->vm_start || addr >= vma->vm_end)
96722 return -EFAULT;
96723@@ -1864,7 +1887,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
96724
96725 BUG_ON(pud_huge(*pud));
96726
96727- pmd = pmd_alloc(mm, pud, addr);
96728+ pmd = (mm == &init_mm) ?
96729+ pmd_alloc_kernel(mm, pud, addr) :
96730+ pmd_alloc(mm, pud, addr);
96731 if (!pmd)
96732 return -ENOMEM;
96733 do {
96734@@ -1884,7 +1909,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
96735 unsigned long next;
96736 int err;
96737
96738- pud = pud_alloc(mm, pgd, addr);
96739+ pud = (mm == &init_mm) ?
96740+ pud_alloc_kernel(mm, pgd, addr) :
96741+ pud_alloc(mm, pgd, addr);
96742 if (!pud)
96743 return -ENOMEM;
96744 do {
96745@@ -2006,6 +2033,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
96746 return ret;
96747 }
96748
96749+#ifdef CONFIG_PAX_SEGMEXEC
96750+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
96751+{
96752+ struct mm_struct *mm = vma->vm_mm;
96753+ spinlock_t *ptl;
96754+ pte_t *pte, entry;
96755+
96756+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
96757+ entry = *pte;
96758+ if (!pte_present(entry)) {
96759+ if (!pte_none(entry)) {
96760+ BUG_ON(pte_file(entry));
96761+ free_swap_and_cache(pte_to_swp_entry(entry));
96762+ pte_clear_not_present_full(mm, address, pte, 0);
96763+ }
96764+ } else {
96765+ struct page *page;
96766+
96767+ flush_cache_page(vma, address, pte_pfn(entry));
96768+ entry = ptep_clear_flush(vma, address, pte);
96769+ BUG_ON(pte_dirty(entry));
96770+ page = vm_normal_page(vma, address, entry);
96771+ if (page) {
96772+ update_hiwater_rss(mm);
96773+ if (PageAnon(page))
96774+ dec_mm_counter_fast(mm, MM_ANONPAGES);
96775+ else
96776+ dec_mm_counter_fast(mm, MM_FILEPAGES);
96777+ page_remove_rmap(page);
96778+ page_cache_release(page);
96779+ }
96780+ }
96781+ pte_unmap_unlock(pte, ptl);
96782+}
96783+
96784+/* PaX: if vma is mirrored, synchronize the mirror's PTE
96785+ *
96786+ * the ptl of the lower mapped page is held on entry and is not released on exit
96787+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
96788+ */
96789+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96790+{
96791+ struct mm_struct *mm = vma->vm_mm;
96792+ unsigned long address_m;
96793+ spinlock_t *ptl_m;
96794+ struct vm_area_struct *vma_m;
96795+ pmd_t *pmd_m;
96796+ pte_t *pte_m, entry_m;
96797+
96798+ BUG_ON(!page_m || !PageAnon(page_m));
96799+
96800+ vma_m = pax_find_mirror_vma(vma);
96801+ if (!vma_m)
96802+ return;
96803+
96804+ BUG_ON(!PageLocked(page_m));
96805+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96806+ address_m = address + SEGMEXEC_TASK_SIZE;
96807+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96808+ pte_m = pte_offset_map(pmd_m, address_m);
96809+ ptl_m = pte_lockptr(mm, pmd_m);
96810+ if (ptl != ptl_m) {
96811+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96812+ if (!pte_none(*pte_m))
96813+ goto out;
96814+ }
96815+
96816+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96817+ page_cache_get(page_m);
96818+ page_add_anon_rmap(page_m, vma_m, address_m);
96819+ inc_mm_counter_fast(mm, MM_ANONPAGES);
96820+ set_pte_at(mm, address_m, pte_m, entry_m);
96821+ update_mmu_cache(vma_m, address_m, pte_m);
96822+out:
96823+ if (ptl != ptl_m)
96824+ spin_unlock(ptl_m);
96825+ pte_unmap(pte_m);
96826+ unlock_page(page_m);
96827+}
96828+
96829+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96830+{
96831+ struct mm_struct *mm = vma->vm_mm;
96832+ unsigned long address_m;
96833+ spinlock_t *ptl_m;
96834+ struct vm_area_struct *vma_m;
96835+ pmd_t *pmd_m;
96836+ pte_t *pte_m, entry_m;
96837+
96838+ BUG_ON(!page_m || PageAnon(page_m));
96839+
96840+ vma_m = pax_find_mirror_vma(vma);
96841+ if (!vma_m)
96842+ return;
96843+
96844+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96845+ address_m = address + SEGMEXEC_TASK_SIZE;
96846+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96847+ pte_m = pte_offset_map(pmd_m, address_m);
96848+ ptl_m = pte_lockptr(mm, pmd_m);
96849+ if (ptl != ptl_m) {
96850+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96851+ if (!pte_none(*pte_m))
96852+ goto out;
96853+ }
96854+
96855+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96856+ page_cache_get(page_m);
96857+ page_add_file_rmap(page_m);
96858+ inc_mm_counter_fast(mm, MM_FILEPAGES);
96859+ set_pte_at(mm, address_m, pte_m, entry_m);
96860+ update_mmu_cache(vma_m, address_m, pte_m);
96861+out:
96862+ if (ptl != ptl_m)
96863+ spin_unlock(ptl_m);
96864+ pte_unmap(pte_m);
96865+}
96866+
96867+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
96868+{
96869+ struct mm_struct *mm = vma->vm_mm;
96870+ unsigned long address_m;
96871+ spinlock_t *ptl_m;
96872+ struct vm_area_struct *vma_m;
96873+ pmd_t *pmd_m;
96874+ pte_t *pte_m, entry_m;
96875+
96876+ vma_m = pax_find_mirror_vma(vma);
96877+ if (!vma_m)
96878+ return;
96879+
96880+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96881+ address_m = address + SEGMEXEC_TASK_SIZE;
96882+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96883+ pte_m = pte_offset_map(pmd_m, address_m);
96884+ ptl_m = pte_lockptr(mm, pmd_m);
96885+ if (ptl != ptl_m) {
96886+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96887+ if (!pte_none(*pte_m))
96888+ goto out;
96889+ }
96890+
96891+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
96892+ set_pte_at(mm, address_m, pte_m, entry_m);
96893+out:
96894+ if (ptl != ptl_m)
96895+ spin_unlock(ptl_m);
96896+ pte_unmap(pte_m);
96897+}
96898+
96899+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
96900+{
96901+ struct page *page_m;
96902+ pte_t entry;
96903+
96904+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
96905+ goto out;
96906+
96907+ entry = *pte;
96908+ page_m = vm_normal_page(vma, address, entry);
96909+ if (!page_m)
96910+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
96911+ else if (PageAnon(page_m)) {
96912+ if (pax_find_mirror_vma(vma)) {
96913+ pte_unmap_unlock(pte, ptl);
96914+ lock_page(page_m);
96915+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
96916+ if (pte_same(entry, *pte))
96917+ pax_mirror_anon_pte(vma, address, page_m, ptl);
96918+ else
96919+ unlock_page(page_m);
96920+ }
96921+ } else
96922+ pax_mirror_file_pte(vma, address, page_m, ptl);
96923+
96924+out:
96925+ pte_unmap_unlock(pte, ptl);
96926+}
96927+#endif
96928+
96929 /*
96930 * This routine handles present pages, when users try to write
96931 * to a shared page. It is done by copying the page to a new address
96932@@ -2212,6 +2419,12 @@ gotten:
96933 */
96934 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
96935 if (likely(pte_same(*page_table, orig_pte))) {
96936+
96937+#ifdef CONFIG_PAX_SEGMEXEC
96938+ if (pax_find_mirror_vma(vma))
96939+ BUG_ON(!trylock_page(new_page));
96940+#endif
96941+
96942 if (old_page) {
96943 if (!PageAnon(old_page)) {
96944 dec_mm_counter_fast(mm, MM_FILEPAGES);
96945@@ -2265,6 +2478,10 @@ gotten:
96946 page_remove_rmap(old_page);
96947 }
96948
96949+#ifdef CONFIG_PAX_SEGMEXEC
96950+ pax_mirror_anon_pte(vma, address, new_page, ptl);
96951+#endif
96952+
96953 /* Free the old page.. */
96954 new_page = old_page;
96955 ret |= VM_FAULT_WRITE;
96956@@ -2539,6 +2756,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96957 swap_free(entry);
96958 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
96959 try_to_free_swap(page);
96960+
96961+#ifdef CONFIG_PAX_SEGMEXEC
96962+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
96963+#endif
96964+
96965 unlock_page(page);
96966 if (page != swapcache) {
96967 /*
96968@@ -2562,6 +2784,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96969
96970 /* No need to invalidate - it was non-present before */
96971 update_mmu_cache(vma, address, page_table);
96972+
96973+#ifdef CONFIG_PAX_SEGMEXEC
96974+ pax_mirror_anon_pte(vma, address, page, ptl);
96975+#endif
96976+
96977 unlock:
96978 pte_unmap_unlock(page_table, ptl);
96979 out:
96980@@ -2581,40 +2808,6 @@ out_release:
96981 }
96982
96983 /*
96984- * This is like a special single-page "expand_{down|up}wards()",
96985- * except we must first make sure that 'address{-|+}PAGE_SIZE'
96986- * doesn't hit another vma.
96987- */
96988-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
96989-{
96990- address &= PAGE_MASK;
96991- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
96992- struct vm_area_struct *prev = vma->vm_prev;
96993-
96994- /*
96995- * Is there a mapping abutting this one below?
96996- *
96997- * That's only ok if it's the same stack mapping
96998- * that has gotten split..
96999- */
97000- if (prev && prev->vm_end == address)
97001- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
97002-
97003- return expand_downwards(vma, address - PAGE_SIZE);
97004- }
97005- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
97006- struct vm_area_struct *next = vma->vm_next;
97007-
97008- /* As VM_GROWSDOWN but s/below/above/ */
97009- if (next && next->vm_start == address + PAGE_SIZE)
97010- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
97011-
97012- return expand_upwards(vma, address + PAGE_SIZE);
97013- }
97014- return 0;
97015-}
97016-
97017-/*
97018 * We enter with non-exclusive mmap_sem (to exclude vma changes,
97019 * but allow concurrent faults), and pte mapped but not yet locked.
97020 * We return with mmap_sem still held, but pte unmapped and unlocked.
97021@@ -2624,27 +2817,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97022 unsigned int flags)
97023 {
97024 struct mem_cgroup *memcg;
97025- struct page *page;
97026+ struct page *page = NULL;
97027 spinlock_t *ptl;
97028 pte_t entry;
97029
97030- pte_unmap(page_table);
97031-
97032- /* Check if we need to add a guard page to the stack */
97033- if (check_stack_guard_page(vma, address) < 0)
97034- return VM_FAULT_SIGSEGV;
97035-
97036- /* Use the zero-page for reads */
97037 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
97038 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
97039 vma->vm_page_prot));
97040- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
97041+ ptl = pte_lockptr(mm, pmd);
97042+ spin_lock(ptl);
97043 if (!pte_none(*page_table))
97044 goto unlock;
97045 goto setpte;
97046 }
97047
97048 /* Allocate our own private page. */
97049+ pte_unmap(page_table);
97050+
97051 if (unlikely(anon_vma_prepare(vma)))
97052 goto oom;
97053 page = alloc_zeroed_user_highpage_movable(vma, address);
97054@@ -2668,6 +2857,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97055 if (!pte_none(*page_table))
97056 goto release;
97057
97058+#ifdef CONFIG_PAX_SEGMEXEC
97059+ if (pax_find_mirror_vma(vma))
97060+ BUG_ON(!trylock_page(page));
97061+#endif
97062+
97063 inc_mm_counter_fast(mm, MM_ANONPAGES);
97064 page_add_new_anon_rmap(page, vma, address);
97065 mem_cgroup_commit_charge(page, memcg, false);
97066@@ -2677,6 +2871,12 @@ setpte:
97067
97068 /* No need to invalidate - it was non-present before */
97069 update_mmu_cache(vma, address, page_table);
97070+
97071+#ifdef CONFIG_PAX_SEGMEXEC
97072+ if (page)
97073+ pax_mirror_anon_pte(vma, address, page, ptl);
97074+#endif
97075+
97076 unlock:
97077 pte_unmap_unlock(page_table, ptl);
97078 return 0;
97079@@ -2907,6 +3107,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97080 return ret;
97081 }
97082 do_set_pte(vma, address, fault_page, pte, false, false);
97083+
97084+#ifdef CONFIG_PAX_SEGMEXEC
97085+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97086+#endif
97087+
97088 unlock_page(fault_page);
97089 unlock_out:
97090 pte_unmap_unlock(pte, ptl);
97091@@ -2949,7 +3154,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97092 page_cache_release(fault_page);
97093 goto uncharge_out;
97094 }
97095+
97096+#ifdef CONFIG_PAX_SEGMEXEC
97097+ if (pax_find_mirror_vma(vma))
97098+ BUG_ON(!trylock_page(new_page));
97099+#endif
97100+
97101 do_set_pte(vma, address, new_page, pte, true, true);
97102+
97103+#ifdef CONFIG_PAX_SEGMEXEC
97104+ pax_mirror_anon_pte(vma, address, new_page, ptl);
97105+#endif
97106+
97107 mem_cgroup_commit_charge(new_page, memcg, false);
97108 lru_cache_add_active_or_unevictable(new_page, vma);
97109 pte_unmap_unlock(pte, ptl);
97110@@ -2999,6 +3215,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97111 return ret;
97112 }
97113 do_set_pte(vma, address, fault_page, pte, true, false);
97114+
97115+#ifdef CONFIG_PAX_SEGMEXEC
97116+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97117+#endif
97118+
97119 pte_unmap_unlock(pte, ptl);
97120
97121 if (set_page_dirty(fault_page))
97122@@ -3255,6 +3476,12 @@ static int handle_pte_fault(struct mm_struct *mm,
97123 if (flags & FAULT_FLAG_WRITE)
97124 flush_tlb_fix_spurious_fault(vma, address);
97125 }
97126+
97127+#ifdef CONFIG_PAX_SEGMEXEC
97128+ pax_mirror_pte(vma, address, pte, pmd, ptl);
97129+ return 0;
97130+#endif
97131+
97132 unlock:
97133 pte_unmap_unlock(pte, ptl);
97134 return 0;
97135@@ -3274,9 +3501,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97136 pmd_t *pmd;
97137 pte_t *pte;
97138
97139+#ifdef CONFIG_PAX_SEGMEXEC
97140+ struct vm_area_struct *vma_m;
97141+#endif
97142+
97143 if (unlikely(is_vm_hugetlb_page(vma)))
97144 return hugetlb_fault(mm, vma, address, flags);
97145
97146+#ifdef CONFIG_PAX_SEGMEXEC
97147+ vma_m = pax_find_mirror_vma(vma);
97148+ if (vma_m) {
97149+ unsigned long address_m;
97150+ pgd_t *pgd_m;
97151+ pud_t *pud_m;
97152+ pmd_t *pmd_m;
97153+
97154+ if (vma->vm_start > vma_m->vm_start) {
97155+ address_m = address;
97156+ address -= SEGMEXEC_TASK_SIZE;
97157+ vma = vma_m;
97158+ } else
97159+ address_m = address + SEGMEXEC_TASK_SIZE;
97160+
97161+ pgd_m = pgd_offset(mm, address_m);
97162+ pud_m = pud_alloc(mm, pgd_m, address_m);
97163+ if (!pud_m)
97164+ return VM_FAULT_OOM;
97165+ pmd_m = pmd_alloc(mm, pud_m, address_m);
97166+ if (!pmd_m)
97167+ return VM_FAULT_OOM;
97168+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
97169+ return VM_FAULT_OOM;
97170+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
97171+ }
97172+#endif
97173+
97174 pgd = pgd_offset(mm, address);
97175 pud = pud_alloc(mm, pgd, address);
97176 if (!pud)
97177@@ -3411,6 +3670,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97178 spin_unlock(&mm->page_table_lock);
97179 return 0;
97180 }
97181+
97182+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97183+{
97184+ pud_t *new = pud_alloc_one(mm, address);
97185+ if (!new)
97186+ return -ENOMEM;
97187+
97188+ smp_wmb(); /* See comment in __pte_alloc */
97189+
97190+ spin_lock(&mm->page_table_lock);
97191+ if (pgd_present(*pgd)) /* Another has populated it */
97192+ pud_free(mm, new);
97193+ else
97194+ pgd_populate_kernel(mm, pgd, new);
97195+ spin_unlock(&mm->page_table_lock);
97196+ return 0;
97197+}
97198 #endif /* __PAGETABLE_PUD_FOLDED */
97199
97200 #ifndef __PAGETABLE_PMD_FOLDED
97201@@ -3441,6 +3717,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
97202 spin_unlock(&mm->page_table_lock);
97203 return 0;
97204 }
97205+
97206+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
97207+{
97208+ pmd_t *new = pmd_alloc_one(mm, address);
97209+ if (!new)
97210+ return -ENOMEM;
97211+
97212+ smp_wmb(); /* See comment in __pte_alloc */
97213+
97214+ spin_lock(&mm->page_table_lock);
97215+#ifndef __ARCH_HAS_4LEVEL_HACK
97216+ if (pud_present(*pud)) /* Another has populated it */
97217+ pmd_free(mm, new);
97218+ else
97219+ pud_populate_kernel(mm, pud, new);
97220+#else
97221+ if (pgd_present(*pud)) /* Another has populated it */
97222+ pmd_free(mm, new);
97223+ else
97224+ pgd_populate_kernel(mm, pud, new);
97225+#endif /* __ARCH_HAS_4LEVEL_HACK */
97226+ spin_unlock(&mm->page_table_lock);
97227+ return 0;
97228+}
97229 #endif /* __PAGETABLE_PMD_FOLDED */
97230
97231 static int __follow_pte(struct mm_struct *mm, unsigned long address,
97232@@ -3550,8 +3850,8 @@ out:
97233 return ret;
97234 }
97235
97236-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97237- void *buf, int len, int write)
97238+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97239+ void *buf, size_t len, int write)
97240 {
97241 resource_size_t phys_addr;
97242 unsigned long prot = 0;
97243@@ -3577,8 +3877,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
97244 * Access another process' address space as given in mm. If non-NULL, use the
97245 * given task for page fault accounting.
97246 */
97247-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97248- unsigned long addr, void *buf, int len, int write)
97249+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97250+ unsigned long addr, void *buf, size_t len, int write)
97251 {
97252 struct vm_area_struct *vma;
97253 void *old_buf = buf;
97254@@ -3586,7 +3886,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97255 down_read(&mm->mmap_sem);
97256 /* ignore errors, just check how much was successfully transferred */
97257 while (len) {
97258- int bytes, ret, offset;
97259+ ssize_t bytes, ret, offset;
97260 void *maddr;
97261 struct page *page = NULL;
97262
97263@@ -3647,8 +3947,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97264 *
97265 * The caller must hold a reference on @mm.
97266 */
97267-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97268- void *buf, int len, int write)
97269+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97270+ void *buf, size_t len, int write)
97271 {
97272 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97273 }
97274@@ -3658,11 +3958,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97275 * Source/target buffer must be kernel space,
97276 * Do not walk the page table directly, use get_user_pages
97277 */
97278-int access_process_vm(struct task_struct *tsk, unsigned long addr,
97279- void *buf, int len, int write)
97280+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
97281+ void *buf, size_t len, int write)
97282 {
97283 struct mm_struct *mm;
97284- int ret;
97285+ ssize_t ret;
97286
97287 mm = get_task_mm(tsk);
97288 if (!mm)
97289diff --git a/mm/mempolicy.c b/mm/mempolicy.c
97290index 0e0961b..c9143b9 100644
97291--- a/mm/mempolicy.c
97292+++ b/mm/mempolicy.c
97293@@ -744,6 +744,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
97294 unsigned long vmstart;
97295 unsigned long vmend;
97296
97297+#ifdef CONFIG_PAX_SEGMEXEC
97298+ struct vm_area_struct *vma_m;
97299+#endif
97300+
97301 vma = find_vma(mm, start);
97302 if (!vma || vma->vm_start > start)
97303 return -EFAULT;
97304@@ -787,6 +791,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
97305 err = vma_replace_policy(vma, new_pol);
97306 if (err)
97307 goto out;
97308+
97309+#ifdef CONFIG_PAX_SEGMEXEC
97310+ vma_m = pax_find_mirror_vma(vma);
97311+ if (vma_m) {
97312+ err = vma_replace_policy(vma_m, new_pol);
97313+ if (err)
97314+ goto out;
97315+ }
97316+#endif
97317+
97318 }
97319
97320 out:
97321@@ -1201,6 +1215,17 @@ static long do_mbind(unsigned long start, unsigned long len,
97322
97323 if (end < start)
97324 return -EINVAL;
97325+
97326+#ifdef CONFIG_PAX_SEGMEXEC
97327+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97328+ if (end > SEGMEXEC_TASK_SIZE)
97329+ return -EINVAL;
97330+ } else
97331+#endif
97332+
97333+ if (end > TASK_SIZE)
97334+ return -EINVAL;
97335+
97336 if (end == start)
97337 return 0;
97338
97339@@ -1426,8 +1451,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
97340 */
97341 tcred = __task_cred(task);
97342 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
97343- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
97344- !capable(CAP_SYS_NICE)) {
97345+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
97346 rcu_read_unlock();
97347 err = -EPERM;
97348 goto out_put;
97349@@ -1458,6 +1482,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
97350 goto out;
97351 }
97352
97353+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
97354+ if (mm != current->mm &&
97355+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
97356+ mmput(mm);
97357+ err = -EPERM;
97358+ goto out;
97359+ }
97360+#endif
97361+
97362 err = do_migrate_pages(mm, old, new,
97363 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
97364
97365diff --git a/mm/migrate.c b/mm/migrate.c
97366index be6d1ed..d778cc1 100644
97367--- a/mm/migrate.c
97368+++ b/mm/migrate.c
97369@@ -1504,8 +1504,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
97370 */
97371 tcred = __task_cred(task);
97372 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
97373- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
97374- !capable(CAP_SYS_NICE)) {
97375+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
97376 rcu_read_unlock();
97377 err = -EPERM;
97378 goto out;
97379diff --git a/mm/mlock.c b/mm/mlock.c
97380index 73cf098..ab547c7 100644
97381--- a/mm/mlock.c
97382+++ b/mm/mlock.c
97383@@ -14,6 +14,7 @@
97384 #include <linux/pagevec.h>
97385 #include <linux/mempolicy.h>
97386 #include <linux/syscalls.h>
97387+#include <linux/security.h>
97388 #include <linux/sched.h>
97389 #include <linux/export.h>
97390 #include <linux/rmap.h>
97391@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
97392 {
97393 unsigned long nstart, end, tmp;
97394 struct vm_area_struct * vma, * prev;
97395- int error;
97396+ int error = 0;
97397
97398 VM_BUG_ON(start & ~PAGE_MASK);
97399 VM_BUG_ON(len != PAGE_ALIGN(len));
97400@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
97401 return -EINVAL;
97402 if (end == start)
97403 return 0;
97404+ if (end > TASK_SIZE)
97405+ return -EINVAL;
97406+
97407 vma = find_vma(current->mm, start);
97408 if (!vma || vma->vm_start > start)
97409 return -ENOMEM;
97410@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
97411 for (nstart = start ; ; ) {
97412 vm_flags_t newflags;
97413
97414+#ifdef CONFIG_PAX_SEGMEXEC
97415+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
97416+ break;
97417+#endif
97418+
97419 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
97420
97421 newflags = vma->vm_flags & ~VM_LOCKED;
97422@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
97423 locked += current->mm->locked_vm;
97424
97425 /* check against resource limits */
97426+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
97427 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
97428 error = do_mlock(start, len, 1);
97429
97430@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
97431 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
97432 vm_flags_t newflags;
97433
97434+#ifdef CONFIG_PAX_SEGMEXEC
97435+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
97436+ break;
97437+#endif
97438+
97439 newflags = vma->vm_flags & ~VM_LOCKED;
97440 if (flags & MCL_CURRENT)
97441 newflags |= VM_LOCKED;
97442@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
97443 lock_limit >>= PAGE_SHIFT;
97444
97445 ret = -ENOMEM;
97446+
97447+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
97448+
97449 down_write(&current->mm->mmap_sem);
97450-
97451 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
97452 capable(CAP_IPC_LOCK))
97453 ret = do_mlockall(flags);
97454diff --git a/mm/mmap.c b/mm/mmap.c
97455index 0bc66f1..2bfa432 100644
97456--- a/mm/mmap.c
97457+++ b/mm/mmap.c
97458@@ -41,6 +41,7 @@
97459 #include <linux/notifier.h>
97460 #include <linux/memory.h>
97461 #include <linux/printk.h>
97462+#include <linux/random.h>
97463
97464 #include <asm/uaccess.h>
97465 #include <asm/cacheflush.h>
97466@@ -57,6 +58,16 @@
97467 #define arch_rebalance_pgtables(addr, len) (addr)
97468 #endif
97469
97470+static inline void verify_mm_writelocked(struct mm_struct *mm)
97471+{
97472+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
97473+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97474+ up_read(&mm->mmap_sem);
97475+ BUG();
97476+ }
97477+#endif
97478+}
97479+
97480 static void unmap_region(struct mm_struct *mm,
97481 struct vm_area_struct *vma, struct vm_area_struct *prev,
97482 unsigned long start, unsigned long end);
97483@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
97484 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
97485 *
97486 */
97487-pgprot_t protection_map[16] = {
97488+pgprot_t protection_map[16] __read_only = {
97489 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
97490 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
97491 };
97492
97493-pgprot_t vm_get_page_prot(unsigned long vm_flags)
97494+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
97495 {
97496- return __pgprot(pgprot_val(protection_map[vm_flags &
97497+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
97498 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
97499 pgprot_val(arch_vm_get_page_prot(vm_flags)));
97500+
97501+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97502+ if (!(__supported_pte_mask & _PAGE_NX) &&
97503+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
97504+ (vm_flags & (VM_READ | VM_WRITE)))
97505+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
97506+#endif
97507+
97508+ return prot;
97509 }
97510 EXPORT_SYMBOL(vm_get_page_prot);
97511
97512@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
97513 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
97514 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97515 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97516+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
97517 /*
97518 * Make sure vm_committed_as in one cacheline and not cacheline shared with
97519 * other variables. It can be updated by several CPUs frequently.
97520@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
97521 struct vm_area_struct *next = vma->vm_next;
97522
97523 might_sleep();
97524+ BUG_ON(vma->vm_mirror);
97525 if (vma->vm_ops && vma->vm_ops->close)
97526 vma->vm_ops->close(vma);
97527 if (vma->vm_file)
97528@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
97529
97530 SYSCALL_DEFINE1(brk, unsigned long, brk)
97531 {
97532+ unsigned long rlim;
97533 unsigned long retval;
97534 unsigned long newbrk, oldbrk;
97535 struct mm_struct *mm = current->mm;
97536@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
97537 * segment grow beyond its set limit the in case where the limit is
97538 * not page aligned -Ram Gupta
97539 */
97540- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
97541+ rlim = rlimit(RLIMIT_DATA);
97542+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
97543+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
97544+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
97545+ rlim = 4096 * PAGE_SIZE;
97546+#endif
97547+ if (check_data_rlimit(rlim, brk, mm->start_brk,
97548 mm->end_data, mm->start_data))
97549 goto out;
97550
97551@@ -976,6 +1005,12 @@ static int
97552 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
97553 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
97554 {
97555+
97556+#ifdef CONFIG_PAX_SEGMEXEC
97557+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
97558+ return 0;
97559+#endif
97560+
97561 if (is_mergeable_vma(vma, file, vm_flags) &&
97562 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
97563 if (vma->vm_pgoff == vm_pgoff)
97564@@ -995,6 +1030,12 @@ static int
97565 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
97566 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
97567 {
97568+
97569+#ifdef CONFIG_PAX_SEGMEXEC
97570+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
97571+ return 0;
97572+#endif
97573+
97574 if (is_mergeable_vma(vma, file, vm_flags) &&
97575 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
97576 pgoff_t vm_pglen;
97577@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97578 struct vm_area_struct *area, *next;
97579 int err;
97580
97581+#ifdef CONFIG_PAX_SEGMEXEC
97582+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
97583+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
97584+
97585+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
97586+#endif
97587+
97588 /*
97589 * We later require that vma->vm_flags == vm_flags,
97590 * so this tests vma->vm_flags & VM_SPECIAL, too.
97591@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97592 if (next && next->vm_end == end) /* cases 6, 7, 8 */
97593 next = next->vm_next;
97594
97595+#ifdef CONFIG_PAX_SEGMEXEC
97596+ if (prev)
97597+ prev_m = pax_find_mirror_vma(prev);
97598+ if (area)
97599+ area_m = pax_find_mirror_vma(area);
97600+ if (next)
97601+ next_m = pax_find_mirror_vma(next);
97602+#endif
97603+
97604 /*
97605 * Can it merge with the predecessor?
97606 */
97607@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97608 /* cases 1, 6 */
97609 err = vma_adjust(prev, prev->vm_start,
97610 next->vm_end, prev->vm_pgoff, NULL);
97611- } else /* cases 2, 5, 7 */
97612+
97613+#ifdef CONFIG_PAX_SEGMEXEC
97614+ if (!err && prev_m)
97615+ err = vma_adjust(prev_m, prev_m->vm_start,
97616+ next_m->vm_end, prev_m->vm_pgoff, NULL);
97617+#endif
97618+
97619+ } else { /* cases 2, 5, 7 */
97620 err = vma_adjust(prev, prev->vm_start,
97621 end, prev->vm_pgoff, NULL);
97622+
97623+#ifdef CONFIG_PAX_SEGMEXEC
97624+ if (!err && prev_m)
97625+ err = vma_adjust(prev_m, prev_m->vm_start,
97626+ end_m, prev_m->vm_pgoff, NULL);
97627+#endif
97628+
97629+ }
97630 if (err)
97631 return NULL;
97632 khugepaged_enter_vma_merge(prev, vm_flags);
97633@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97634 mpol_equal(policy, vma_policy(next)) &&
97635 can_vma_merge_before(next, vm_flags,
97636 anon_vma, file, pgoff+pglen)) {
97637- if (prev && addr < prev->vm_end) /* case 4 */
97638+ if (prev && addr < prev->vm_end) { /* case 4 */
97639 err = vma_adjust(prev, prev->vm_start,
97640 addr, prev->vm_pgoff, NULL);
97641- else /* cases 3, 8 */
97642+
97643+#ifdef CONFIG_PAX_SEGMEXEC
97644+ if (!err && prev_m)
97645+ err = vma_adjust(prev_m, prev_m->vm_start,
97646+ addr_m, prev_m->vm_pgoff, NULL);
97647+#endif
97648+
97649+ } else { /* cases 3, 8 */
97650 err = vma_adjust(area, addr, next->vm_end,
97651 next->vm_pgoff - pglen, NULL);
97652+
97653+#ifdef CONFIG_PAX_SEGMEXEC
97654+ if (!err && area_m)
97655+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
97656+ next_m->vm_pgoff - pglen, NULL);
97657+#endif
97658+
97659+ }
97660 if (err)
97661 return NULL;
97662 khugepaged_enter_vma_merge(area, vm_flags);
97663@@ -1208,8 +1295,10 @@ none:
97664 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
97665 struct file *file, long pages)
97666 {
97667- const unsigned long stack_flags
97668- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
97669+
97670+#ifdef CONFIG_PAX_RANDMMAP
97671+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
97672+#endif
97673
97674 mm->total_vm += pages;
97675
97676@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
97677 mm->shared_vm += pages;
97678 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
97679 mm->exec_vm += pages;
97680- } else if (flags & stack_flags)
97681+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
97682 mm->stack_vm += pages;
97683 }
97684 #endif /* CONFIG_PROC_FS */
97685@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
97686 locked += mm->locked_vm;
97687 lock_limit = rlimit(RLIMIT_MEMLOCK);
97688 lock_limit >>= PAGE_SHIFT;
97689+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
97690 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
97691 return -EAGAIN;
97692 }
97693@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97694 * (the exception is when the underlying filesystem is noexec
97695 * mounted, in which case we dont add PROT_EXEC.)
97696 */
97697- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97698+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97699 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
97700 prot |= PROT_EXEC;
97701
97702@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97703 /* Obtain the address to map to. we verify (or select) it and ensure
97704 * that it represents a valid section of the address space.
97705 */
97706- addr = get_unmapped_area(file, addr, len, pgoff, flags);
97707+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
97708 if (addr & ~PAGE_MASK)
97709 return addr;
97710
97711@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97712 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
97713 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
97714
97715+#ifdef CONFIG_PAX_MPROTECT
97716+ if (mm->pax_flags & MF_PAX_MPROTECT) {
97717+
97718+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
97719+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
97720+ mm->binfmt->handle_mmap)
97721+ mm->binfmt->handle_mmap(file);
97722+#endif
97723+
97724+#ifndef CONFIG_PAX_MPROTECT_COMPAT
97725+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
97726+ gr_log_rwxmmap(file);
97727+
97728+#ifdef CONFIG_PAX_EMUPLT
97729+ vm_flags &= ~VM_EXEC;
97730+#else
97731+ return -EPERM;
97732+#endif
97733+
97734+ }
97735+
97736+ if (!(vm_flags & VM_EXEC))
97737+ vm_flags &= ~VM_MAYEXEC;
97738+#else
97739+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97740+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97741+#endif
97742+ else
97743+ vm_flags &= ~VM_MAYWRITE;
97744+ }
97745+#endif
97746+
97747+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97748+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
97749+ vm_flags &= ~VM_PAGEEXEC;
97750+#endif
97751+
97752 if (flags & MAP_LOCKED)
97753 if (!can_do_mlock())
97754 return -EPERM;
97755@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97756 vm_flags |= VM_NORESERVE;
97757 }
97758
97759+ if (!gr_acl_handle_mmap(file, prot))
97760+ return -EACCES;
97761+
97762 addr = mmap_region(file, addr, len, vm_flags, pgoff);
97763 if (!IS_ERR_VALUE(addr) &&
97764 ((vm_flags & VM_LOCKED) ||
97765@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
97766 vm_flags_t vm_flags = vma->vm_flags;
97767
97768 /* If it was private or non-writable, the write bit is already clear */
97769- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
97770+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
97771 return 0;
97772
97773 /* The backer wishes to know when pages are first written to? */
97774@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97775 struct rb_node **rb_link, *rb_parent;
97776 unsigned long charged = 0;
97777
97778+#ifdef CONFIG_PAX_SEGMEXEC
97779+ struct vm_area_struct *vma_m = NULL;
97780+#endif
97781+
97782+ /*
97783+ * mm->mmap_sem is required to protect against another thread
97784+ * changing the mappings in case we sleep.
97785+ */
97786+ verify_mm_writelocked(mm);
97787+
97788 /* Check against address space limit. */
97789+
97790+#ifdef CONFIG_PAX_RANDMMAP
97791+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
97792+#endif
97793+
97794 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
97795 unsigned long nr_pages;
97796
97797@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97798
97799 /* Clear old maps */
97800 error = -ENOMEM;
97801-munmap_back:
97802 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97803 if (do_munmap(mm, addr, len))
97804 return -ENOMEM;
97805- goto munmap_back;
97806+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97807 }
97808
97809 /*
97810@@ -1595,6 +1739,16 @@ munmap_back:
97811 goto unacct_error;
97812 }
97813
97814+#ifdef CONFIG_PAX_SEGMEXEC
97815+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
97816+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97817+ if (!vma_m) {
97818+ error = -ENOMEM;
97819+ goto free_vma;
97820+ }
97821+ }
97822+#endif
97823+
97824 vma->vm_mm = mm;
97825 vma->vm_start = addr;
97826 vma->vm_end = addr + len;
97827@@ -1625,6 +1779,13 @@ munmap_back:
97828 if (error)
97829 goto unmap_and_free_vma;
97830
97831+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97832+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
97833+ vma->vm_flags |= VM_PAGEEXEC;
97834+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97835+ }
97836+#endif
97837+
97838 /* Can addr have changed??
97839 *
97840 * Answer: Yes, several device drivers can do it in their
97841@@ -1643,6 +1804,12 @@ munmap_back:
97842 }
97843
97844 vma_link(mm, vma, prev, rb_link, rb_parent);
97845+
97846+#ifdef CONFIG_PAX_SEGMEXEC
97847+ if (vma_m)
97848+ BUG_ON(pax_mirror_vma(vma_m, vma));
97849+#endif
97850+
97851 /* Once vma denies write, undo our temporary denial count */
97852 if (file) {
97853 if (vm_flags & VM_SHARED)
97854@@ -1655,6 +1822,7 @@ out:
97855 perf_event_mmap(vma);
97856
97857 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
97858+ track_exec_limit(mm, addr, addr + len, vm_flags);
97859 if (vm_flags & VM_LOCKED) {
97860 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
97861 vma == get_gate_vma(current->mm)))
97862@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
97863 if (vm_flags & VM_DENYWRITE)
97864 allow_write_access(file);
97865 free_vma:
97866+
97867+#ifdef CONFIG_PAX_SEGMEXEC
97868+ if (vma_m)
97869+ kmem_cache_free(vm_area_cachep, vma_m);
97870+#endif
97871+
97872 kmem_cache_free(vm_area_cachep, vma);
97873 unacct_error:
97874 if (charged)
97875@@ -1699,7 +1873,63 @@ unacct_error:
97876 return error;
97877 }
97878
97879-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97880+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
97881+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
97882+{
97883+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
97884+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
97885+
97886+ return 0;
97887+}
97888+#endif
97889+
97890+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
97891+{
97892+ if (!vma) {
97893+#ifdef CONFIG_STACK_GROWSUP
97894+ if (addr > sysctl_heap_stack_gap)
97895+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
97896+ else
97897+ vma = find_vma(current->mm, 0);
97898+ if (vma && (vma->vm_flags & VM_GROWSUP))
97899+ return false;
97900+#endif
97901+ return true;
97902+ }
97903+
97904+ if (addr + len > vma->vm_start)
97905+ return false;
97906+
97907+ if (vma->vm_flags & VM_GROWSDOWN)
97908+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
97909+#ifdef CONFIG_STACK_GROWSUP
97910+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
97911+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
97912+#endif
97913+ else if (offset)
97914+ return offset <= vma->vm_start - addr - len;
97915+
97916+ return true;
97917+}
97918+
97919+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
97920+{
97921+ if (vma->vm_start < len)
97922+ return -ENOMEM;
97923+
97924+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
97925+ if (offset <= vma->vm_start - len)
97926+ return vma->vm_start - len - offset;
97927+ else
97928+ return -ENOMEM;
97929+ }
97930+
97931+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
97932+ return vma->vm_start - len - sysctl_heap_stack_gap;
97933+ return -ENOMEM;
97934+}
97935+
97936+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
97937 {
97938 /*
97939 * We implement the search by looking for an rbtree node that
97940@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97941 }
97942 }
97943
97944- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
97945+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
97946 check_current:
97947 /* Check if current node has a suitable gap */
97948 if (gap_start > high_limit)
97949 return -ENOMEM;
97950+
97951+ if (gap_end - gap_start > info->threadstack_offset)
97952+ gap_start += info->threadstack_offset;
97953+ else
97954+ gap_start = gap_end;
97955+
97956+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97957+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97958+ gap_start += sysctl_heap_stack_gap;
97959+ else
97960+ gap_start = gap_end;
97961+ }
97962+ if (vma->vm_flags & VM_GROWSDOWN) {
97963+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97964+ gap_end -= sysctl_heap_stack_gap;
97965+ else
97966+ gap_end = gap_start;
97967+ }
97968 if (gap_end >= low_limit && gap_end - gap_start >= length)
97969 goto found;
97970
97971@@ -1801,7 +2049,7 @@ found:
97972 return gap_start;
97973 }
97974
97975-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
97976+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
97977 {
97978 struct mm_struct *mm = current->mm;
97979 struct vm_area_struct *vma;
97980@@ -1855,6 +2103,24 @@ check_current:
97981 gap_end = vma->vm_start;
97982 if (gap_end < low_limit)
97983 return -ENOMEM;
97984+
97985+ if (gap_end - gap_start > info->threadstack_offset)
97986+ gap_end -= info->threadstack_offset;
97987+ else
97988+ gap_end = gap_start;
97989+
97990+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97991+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97992+ gap_start += sysctl_heap_stack_gap;
97993+ else
97994+ gap_start = gap_end;
97995+ }
97996+ if (vma->vm_flags & VM_GROWSDOWN) {
97997+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97998+ gap_end -= sysctl_heap_stack_gap;
97999+ else
98000+ gap_end = gap_start;
98001+ }
98002 if (gap_start <= high_limit && gap_end - gap_start >= length)
98003 goto found;
98004
98005@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98006 struct mm_struct *mm = current->mm;
98007 struct vm_area_struct *vma;
98008 struct vm_unmapped_area_info info;
98009+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
98010
98011 if (len > TASK_SIZE - mmap_min_addr)
98012 return -ENOMEM;
98013@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98014 if (flags & MAP_FIXED)
98015 return addr;
98016
98017+#ifdef CONFIG_PAX_RANDMMAP
98018+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98019+#endif
98020+
98021 if (addr) {
98022 addr = PAGE_ALIGN(addr);
98023 vma = find_vma(mm, addr);
98024 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98025- (!vma || addr + len <= vma->vm_start))
98026+ check_heap_stack_gap(vma, addr, len, offset))
98027 return addr;
98028 }
98029
98030@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98031 info.low_limit = mm->mmap_base;
98032 info.high_limit = TASK_SIZE;
98033 info.align_mask = 0;
98034+ info.threadstack_offset = offset;
98035 return vm_unmapped_area(&info);
98036 }
98037 #endif
98038@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98039 struct mm_struct *mm = current->mm;
98040 unsigned long addr = addr0;
98041 struct vm_unmapped_area_info info;
98042+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
98043
98044 /* requested length too big for entire address space */
98045 if (len > TASK_SIZE - mmap_min_addr)
98046@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98047 if (flags & MAP_FIXED)
98048 return addr;
98049
98050+#ifdef CONFIG_PAX_RANDMMAP
98051+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98052+#endif
98053+
98054 /* requesting a specific address */
98055 if (addr) {
98056 addr = PAGE_ALIGN(addr);
98057 vma = find_vma(mm, addr);
98058 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98059- (!vma || addr + len <= vma->vm_start))
98060+ check_heap_stack_gap(vma, addr, len, offset))
98061 return addr;
98062 }
98063
98064@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98065 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
98066 info.high_limit = mm->mmap_base;
98067 info.align_mask = 0;
98068+ info.threadstack_offset = offset;
98069 addr = vm_unmapped_area(&info);
98070
98071 /*
98072@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98073 VM_BUG_ON(addr != -ENOMEM);
98074 info.flags = 0;
98075 info.low_limit = TASK_UNMAPPED_BASE;
98076+
98077+#ifdef CONFIG_PAX_RANDMMAP
98078+ if (mm->pax_flags & MF_PAX_RANDMMAP)
98079+ info.low_limit += mm->delta_mmap;
98080+#endif
98081+
98082 info.high_limit = TASK_SIZE;
98083 addr = vm_unmapped_area(&info);
98084 }
98085@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
98086 return vma;
98087 }
98088
98089+#ifdef CONFIG_PAX_SEGMEXEC
98090+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
98091+{
98092+ struct vm_area_struct *vma_m;
98093+
98094+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
98095+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
98096+ BUG_ON(vma->vm_mirror);
98097+ return NULL;
98098+ }
98099+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
98100+ vma_m = vma->vm_mirror;
98101+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
98102+ BUG_ON(vma->vm_file != vma_m->vm_file);
98103+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
98104+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
98105+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
98106+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
98107+ return vma_m;
98108+}
98109+#endif
98110+
98111 /*
98112 * Verify that the stack growth is acceptable and
98113 * update accounting. This is shared with both the
98114@@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98115
98116 /* Stack limit test */
98117 actual_size = size;
98118- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
98119- actual_size -= PAGE_SIZE;
98120+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
98121 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
98122 return -ENOMEM;
98123
98124@@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98125 locked = mm->locked_vm + grow;
98126 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
98127 limit >>= PAGE_SHIFT;
98128+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
98129 if (locked > limit && !capable(CAP_IPC_LOCK))
98130 return -ENOMEM;
98131 }
98132@@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98133 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
98134 * vma is the last one with address > vma->vm_end. Have to extend vma.
98135 */
98136+#ifndef CONFIG_IA64
98137+static
98138+#endif
98139 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98140 {
98141 int error;
98142+ bool locknext;
98143
98144 if (!(vma->vm_flags & VM_GROWSUP))
98145 return -EFAULT;
98146
98147+ /* Also guard against wrapping around to address 0. */
98148+ if (address < PAGE_ALIGN(address+1))
98149+ address = PAGE_ALIGN(address+1);
98150+ else
98151+ return -ENOMEM;
98152+
98153 /*
98154 * We must make sure the anon_vma is allocated
98155 * so that the anon_vma locking is not a noop.
98156 */
98157 if (unlikely(anon_vma_prepare(vma)))
98158 return -ENOMEM;
98159+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
98160+ if (locknext && anon_vma_prepare(vma->vm_next))
98161+ return -ENOMEM;
98162 vma_lock_anon_vma(vma);
98163+ if (locknext)
98164+ vma_lock_anon_vma(vma->vm_next);
98165
98166 /*
98167 * vma->vm_start/vm_end cannot change under us because the caller
98168 * is required to hold the mmap_sem in read mode. We need the
98169- * anon_vma lock to serialize against concurrent expand_stacks.
98170- * Also guard against wrapping around to address 0.
98171+ * anon_vma locks to serialize against concurrent expand_stacks
98172+ * and expand_upwards.
98173 */
98174- if (address < PAGE_ALIGN(address+4))
98175- address = PAGE_ALIGN(address+4);
98176- else {
98177- vma_unlock_anon_vma(vma);
98178- return -ENOMEM;
98179- }
98180 error = 0;
98181
98182 /* Somebody else might have raced and expanded it already */
98183- if (address > vma->vm_end) {
98184+ 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)
98185+ error = -ENOMEM;
98186+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
98187 unsigned long size, grow;
98188
98189 size = address - vma->vm_start;
98190@@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98191 }
98192 }
98193 }
98194+ if (locknext)
98195+ vma_unlock_anon_vma(vma->vm_next);
98196 vma_unlock_anon_vma(vma);
98197 khugepaged_enter_vma_merge(vma, vma->vm_flags);
98198 validate_mm(vma->vm_mm);
98199@@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
98200 unsigned long address)
98201 {
98202 int error;
98203+ bool lockprev = false;
98204+ struct vm_area_struct *prev;
98205
98206 /*
98207 * We must make sure the anon_vma is allocated
98208@@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
98209 if (error)
98210 return error;
98211
98212+ prev = vma->vm_prev;
98213+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
98214+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
98215+#endif
98216+ if (lockprev && anon_vma_prepare(prev))
98217+ return -ENOMEM;
98218+ if (lockprev)
98219+ vma_lock_anon_vma(prev);
98220+
98221 vma_lock_anon_vma(vma);
98222
98223 /*
98224@@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
98225 */
98226
98227 /* Somebody else might have raced and expanded it already */
98228- if (address < vma->vm_start) {
98229+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
98230+ error = -ENOMEM;
98231+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
98232 unsigned long size, grow;
98233
98234+#ifdef CONFIG_PAX_SEGMEXEC
98235+ struct vm_area_struct *vma_m;
98236+
98237+ vma_m = pax_find_mirror_vma(vma);
98238+#endif
98239+
98240 size = vma->vm_end - address;
98241 grow = (vma->vm_start - address) >> PAGE_SHIFT;
98242
98243@@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
98244 vma->vm_pgoff -= grow;
98245 anon_vma_interval_tree_post_update_vma(vma);
98246 vma_gap_update(vma);
98247+
98248+#ifdef CONFIG_PAX_SEGMEXEC
98249+ if (vma_m) {
98250+ anon_vma_interval_tree_pre_update_vma(vma_m);
98251+ vma_m->vm_start -= grow << PAGE_SHIFT;
98252+ vma_m->vm_pgoff -= grow;
98253+ anon_vma_interval_tree_post_update_vma(vma_m);
98254+ vma_gap_update(vma_m);
98255+ }
98256+#endif
98257+
98258 spin_unlock(&vma->vm_mm->page_table_lock);
98259
98260+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
98261 perf_event_mmap(vma);
98262 }
98263 }
98264 }
98265 vma_unlock_anon_vma(vma);
98266+ if (lockprev)
98267+ vma_unlock_anon_vma(prev);
98268 khugepaged_enter_vma_merge(vma, vma->vm_flags);
98269 validate_mm(vma->vm_mm);
98270 return error;
98271@@ -2382,6 +2734,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
98272 do {
98273 long nrpages = vma_pages(vma);
98274
98275+#ifdef CONFIG_PAX_SEGMEXEC
98276+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
98277+ vma = remove_vma(vma);
98278+ continue;
98279+ }
98280+#endif
98281+
98282 if (vma->vm_flags & VM_ACCOUNT)
98283 nr_accounted += nrpages;
98284 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
98285@@ -2426,6 +2785,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
98286 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
98287 vma->vm_prev = NULL;
98288 do {
98289+
98290+#ifdef CONFIG_PAX_SEGMEXEC
98291+ if (vma->vm_mirror) {
98292+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
98293+ vma->vm_mirror->vm_mirror = NULL;
98294+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
98295+ vma->vm_mirror = NULL;
98296+ }
98297+#endif
98298+
98299 vma_rb_erase(vma, &mm->mm_rb);
98300 mm->map_count--;
98301 tail_vma = vma;
98302@@ -2453,14 +2822,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98303 struct vm_area_struct *new;
98304 int err = -ENOMEM;
98305
98306+#ifdef CONFIG_PAX_SEGMEXEC
98307+ struct vm_area_struct *vma_m, *new_m = NULL;
98308+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
98309+#endif
98310+
98311 if (is_vm_hugetlb_page(vma) && (addr &
98312 ~(huge_page_mask(hstate_vma(vma)))))
98313 return -EINVAL;
98314
98315+#ifdef CONFIG_PAX_SEGMEXEC
98316+ vma_m = pax_find_mirror_vma(vma);
98317+#endif
98318+
98319 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
98320 if (!new)
98321 goto out_err;
98322
98323+#ifdef CONFIG_PAX_SEGMEXEC
98324+ if (vma_m) {
98325+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
98326+ if (!new_m) {
98327+ kmem_cache_free(vm_area_cachep, new);
98328+ goto out_err;
98329+ }
98330+ }
98331+#endif
98332+
98333 /* most fields are the same, copy all, and then fixup */
98334 *new = *vma;
98335
98336@@ -2473,6 +2861,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98337 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
98338 }
98339
98340+#ifdef CONFIG_PAX_SEGMEXEC
98341+ if (vma_m) {
98342+ *new_m = *vma_m;
98343+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
98344+ new_m->vm_mirror = new;
98345+ new->vm_mirror = new_m;
98346+
98347+ if (new_below)
98348+ new_m->vm_end = addr_m;
98349+ else {
98350+ new_m->vm_start = addr_m;
98351+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
98352+ }
98353+ }
98354+#endif
98355+
98356 err = vma_dup_policy(vma, new);
98357 if (err)
98358 goto out_free_vma;
98359@@ -2493,6 +2897,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98360 else
98361 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
98362
98363+#ifdef CONFIG_PAX_SEGMEXEC
98364+ if (!err && vma_m) {
98365+ struct mempolicy *pol = vma_policy(new);
98366+
98367+ if (anon_vma_clone(new_m, vma_m))
98368+ goto out_free_mpol;
98369+
98370+ mpol_get(pol);
98371+ set_vma_policy(new_m, pol);
98372+
98373+ if (new_m->vm_file)
98374+ get_file(new_m->vm_file);
98375+
98376+ if (new_m->vm_ops && new_m->vm_ops->open)
98377+ new_m->vm_ops->open(new_m);
98378+
98379+ if (new_below)
98380+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
98381+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
98382+ else
98383+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
98384+
98385+ if (err) {
98386+ if (new_m->vm_ops && new_m->vm_ops->close)
98387+ new_m->vm_ops->close(new_m);
98388+ if (new_m->vm_file)
98389+ fput(new_m->vm_file);
98390+ mpol_put(pol);
98391+ }
98392+ }
98393+#endif
98394+
98395 /* Success. */
98396 if (!err)
98397 return 0;
98398@@ -2502,10 +2938,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98399 new->vm_ops->close(new);
98400 if (new->vm_file)
98401 fput(new->vm_file);
98402- unlink_anon_vmas(new);
98403 out_free_mpol:
98404 mpol_put(vma_policy(new));
98405 out_free_vma:
98406+
98407+#ifdef CONFIG_PAX_SEGMEXEC
98408+ if (new_m) {
98409+ unlink_anon_vmas(new_m);
98410+ kmem_cache_free(vm_area_cachep, new_m);
98411+ }
98412+#endif
98413+
98414+ unlink_anon_vmas(new);
98415 kmem_cache_free(vm_area_cachep, new);
98416 out_err:
98417 return err;
98418@@ -2518,6 +2962,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98419 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98420 unsigned long addr, int new_below)
98421 {
98422+
98423+#ifdef CONFIG_PAX_SEGMEXEC
98424+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
98425+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
98426+ if (mm->map_count >= sysctl_max_map_count-1)
98427+ return -ENOMEM;
98428+ } else
98429+#endif
98430+
98431 if (mm->map_count >= sysctl_max_map_count)
98432 return -ENOMEM;
98433
98434@@ -2529,11 +2982,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98435 * work. This now handles partial unmappings.
98436 * Jeremy Fitzhardinge <jeremy@goop.org>
98437 */
98438+#ifdef CONFIG_PAX_SEGMEXEC
98439 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98440 {
98441+ int ret = __do_munmap(mm, start, len);
98442+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
98443+ return ret;
98444+
98445+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
98446+}
98447+
98448+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98449+#else
98450+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98451+#endif
98452+{
98453 unsigned long end;
98454 struct vm_area_struct *vma, *prev, *last;
98455
98456+ /*
98457+ * mm->mmap_sem is required to protect against another thread
98458+ * changing the mappings in case we sleep.
98459+ */
98460+ verify_mm_writelocked(mm);
98461+
98462 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
98463 return -EINVAL;
98464
98465@@ -2611,6 +3083,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98466 /* Fix up all other VM information */
98467 remove_vma_list(mm, vma);
98468
98469+ track_exec_limit(mm, start, end, 0UL);
98470+
98471 return 0;
98472 }
98473
98474@@ -2619,6 +3093,13 @@ int vm_munmap(unsigned long start, size_t len)
98475 int ret;
98476 struct mm_struct *mm = current->mm;
98477
98478+
98479+#ifdef CONFIG_PAX_SEGMEXEC
98480+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
98481+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
98482+ return -EINVAL;
98483+#endif
98484+
98485 down_write(&mm->mmap_sem);
98486 ret = do_munmap(mm, start, len);
98487 up_write(&mm->mmap_sem);
98488@@ -2632,16 +3113,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
98489 return vm_munmap(addr, len);
98490 }
98491
98492-static inline void verify_mm_writelocked(struct mm_struct *mm)
98493-{
98494-#ifdef CONFIG_DEBUG_VM
98495- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
98496- WARN_ON(1);
98497- up_read(&mm->mmap_sem);
98498- }
98499-#endif
98500-}
98501-
98502 /*
98503 * this is really a simplified "do_mmap". it only handles
98504 * anonymous maps. eventually we may be able to do some
98505@@ -2655,6 +3126,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98506 struct rb_node **rb_link, *rb_parent;
98507 pgoff_t pgoff = addr >> PAGE_SHIFT;
98508 int error;
98509+ unsigned long charged;
98510
98511 len = PAGE_ALIGN(len);
98512 if (!len)
98513@@ -2662,10 +3134,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98514
98515 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
98516
98517+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
98518+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
98519+ flags &= ~VM_EXEC;
98520+
98521+#ifdef CONFIG_PAX_MPROTECT
98522+ if (mm->pax_flags & MF_PAX_MPROTECT)
98523+ flags &= ~VM_MAYEXEC;
98524+#endif
98525+
98526+ }
98527+#endif
98528+
98529 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
98530 if (error & ~PAGE_MASK)
98531 return error;
98532
98533+ charged = len >> PAGE_SHIFT;
98534+
98535 error = mlock_future_check(mm, mm->def_flags, len);
98536 if (error)
98537 return error;
98538@@ -2679,21 +3165,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98539 /*
98540 * Clear old maps. this also does some error checking for us
98541 */
98542- munmap_back:
98543 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
98544 if (do_munmap(mm, addr, len))
98545 return -ENOMEM;
98546- goto munmap_back;
98547+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
98548 }
98549
98550 /* Check against address space limits *after* clearing old maps... */
98551- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
98552+ if (!may_expand_vm(mm, charged))
98553 return -ENOMEM;
98554
98555 if (mm->map_count > sysctl_max_map_count)
98556 return -ENOMEM;
98557
98558- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
98559+ if (security_vm_enough_memory_mm(mm, charged))
98560 return -ENOMEM;
98561
98562 /* Can we just expand an old private anonymous mapping? */
98563@@ -2707,7 +3192,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98564 */
98565 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98566 if (!vma) {
98567- vm_unacct_memory(len >> PAGE_SHIFT);
98568+ vm_unacct_memory(charged);
98569 return -ENOMEM;
98570 }
98571
98572@@ -2721,10 +3206,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98573 vma_link(mm, vma, prev, rb_link, rb_parent);
98574 out:
98575 perf_event_mmap(vma);
98576- mm->total_vm += len >> PAGE_SHIFT;
98577+ mm->total_vm += charged;
98578 if (flags & VM_LOCKED)
98579- mm->locked_vm += (len >> PAGE_SHIFT);
98580+ mm->locked_vm += charged;
98581 vma->vm_flags |= VM_SOFTDIRTY;
98582+ track_exec_limit(mm, addr, addr + len, flags);
98583 return addr;
98584 }
98585
98586@@ -2786,6 +3272,7 @@ void exit_mmap(struct mm_struct *mm)
98587 while (vma) {
98588 if (vma->vm_flags & VM_ACCOUNT)
98589 nr_accounted += vma_pages(vma);
98590+ vma->vm_mirror = NULL;
98591 vma = remove_vma(vma);
98592 }
98593 vm_unacct_memory(nr_accounted);
98594@@ -2803,6 +3290,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
98595 struct vm_area_struct *prev;
98596 struct rb_node **rb_link, *rb_parent;
98597
98598+#ifdef CONFIG_PAX_SEGMEXEC
98599+ struct vm_area_struct *vma_m = NULL;
98600+#endif
98601+
98602+ if (security_mmap_addr(vma->vm_start))
98603+ return -EPERM;
98604+
98605 /*
98606 * The vm_pgoff of a purely anonymous vma should be irrelevant
98607 * until its first write fault, when page's anon_vma and index
98608@@ -2826,7 +3320,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
98609 security_vm_enough_memory_mm(mm, vma_pages(vma)))
98610 return -ENOMEM;
98611
98612+#ifdef CONFIG_PAX_SEGMEXEC
98613+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
98614+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98615+ if (!vma_m)
98616+ return -ENOMEM;
98617+ }
98618+#endif
98619+
98620 vma_link(mm, vma, prev, rb_link, rb_parent);
98621+
98622+#ifdef CONFIG_PAX_SEGMEXEC
98623+ if (vma_m)
98624+ BUG_ON(pax_mirror_vma(vma_m, vma));
98625+#endif
98626+
98627 return 0;
98628 }
98629
98630@@ -2845,6 +3353,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
98631 struct rb_node **rb_link, *rb_parent;
98632 bool faulted_in_anon_vma = true;
98633
98634+ BUG_ON(vma->vm_mirror);
98635+
98636 /*
98637 * If anonymous vma has not yet been faulted, update new pgoff
98638 * to match new location, to increase its chance of merging.
98639@@ -2909,6 +3419,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
98640 return NULL;
98641 }
98642
98643+#ifdef CONFIG_PAX_SEGMEXEC
98644+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
98645+{
98646+ struct vm_area_struct *prev_m;
98647+ struct rb_node **rb_link_m, *rb_parent_m;
98648+ struct mempolicy *pol_m;
98649+
98650+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
98651+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
98652+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
98653+ *vma_m = *vma;
98654+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
98655+ if (anon_vma_clone(vma_m, vma))
98656+ return -ENOMEM;
98657+ pol_m = vma_policy(vma_m);
98658+ mpol_get(pol_m);
98659+ set_vma_policy(vma_m, pol_m);
98660+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
98661+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
98662+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
98663+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
98664+ if (vma_m->vm_file)
98665+ get_file(vma_m->vm_file);
98666+ if (vma_m->vm_ops && vma_m->vm_ops->open)
98667+ vma_m->vm_ops->open(vma_m);
98668+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
98669+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
98670+ vma_m->vm_mirror = vma;
98671+ vma->vm_mirror = vma_m;
98672+ return 0;
98673+}
98674+#endif
98675+
98676 /*
98677 * Return true if the calling process may expand its vm space by the passed
98678 * number of pages
98679@@ -2920,6 +3463,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
98680
98681 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
98682
98683+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
98684 if (cur + npages > lim)
98685 return 0;
98686 return 1;
98687@@ -3002,6 +3546,22 @@ static struct vm_area_struct *__install_special_mapping(
98688 vma->vm_start = addr;
98689 vma->vm_end = addr + len;
98690
98691+#ifdef CONFIG_PAX_MPROTECT
98692+ if (mm->pax_flags & MF_PAX_MPROTECT) {
98693+#ifndef CONFIG_PAX_MPROTECT_COMPAT
98694+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
98695+ return ERR_PTR(-EPERM);
98696+ if (!(vm_flags & VM_EXEC))
98697+ vm_flags &= ~VM_MAYEXEC;
98698+#else
98699+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
98700+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
98701+#endif
98702+ else
98703+ vm_flags &= ~VM_MAYWRITE;
98704+ }
98705+#endif
98706+
98707 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
98708 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
98709
98710diff --git a/mm/mprotect.c b/mm/mprotect.c
98711index ace9345..63320dc 100644
98712--- a/mm/mprotect.c
98713+++ b/mm/mprotect.c
98714@@ -24,10 +24,18 @@
98715 #include <linux/migrate.h>
98716 #include <linux/perf_event.h>
98717 #include <linux/ksm.h>
98718+#include <linux/sched/sysctl.h>
98719+
98720+#ifdef CONFIG_PAX_MPROTECT
98721+#include <linux/elf.h>
98722+#include <linux/binfmts.h>
98723+#endif
98724+
98725 #include <asm/uaccess.h>
98726 #include <asm/pgtable.h>
98727 #include <asm/cacheflush.h>
98728 #include <asm/tlbflush.h>
98729+#include <asm/mmu_context.h>
98730
98731 /*
98732 * For a prot_numa update we only hold mmap_sem for read so there is a
98733@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
98734 return pages;
98735 }
98736
98737+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98738+/* called while holding the mmap semaphor for writing except stack expansion */
98739+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
98740+{
98741+ unsigned long oldlimit, newlimit = 0UL;
98742+
98743+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
98744+ return;
98745+
98746+ spin_lock(&mm->page_table_lock);
98747+ oldlimit = mm->context.user_cs_limit;
98748+ if ((prot & VM_EXEC) && oldlimit < end)
98749+ /* USER_CS limit moved up */
98750+ newlimit = end;
98751+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
98752+ /* USER_CS limit moved down */
98753+ newlimit = start;
98754+
98755+ if (newlimit) {
98756+ mm->context.user_cs_limit = newlimit;
98757+
98758+#ifdef CONFIG_SMP
98759+ wmb();
98760+ cpus_clear(mm->context.cpu_user_cs_mask);
98761+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
98762+#endif
98763+
98764+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
98765+ }
98766+ spin_unlock(&mm->page_table_lock);
98767+ if (newlimit == end) {
98768+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
98769+
98770+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
98771+ if (is_vm_hugetlb_page(vma))
98772+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
98773+ else
98774+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
98775+ }
98776+}
98777+#endif
98778+
98779 int
98780 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98781 unsigned long start, unsigned long end, unsigned long newflags)
98782@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98783 int error;
98784 int dirty_accountable = 0;
98785
98786+#ifdef CONFIG_PAX_SEGMEXEC
98787+ struct vm_area_struct *vma_m = NULL;
98788+ unsigned long start_m, end_m;
98789+
98790+ start_m = start + SEGMEXEC_TASK_SIZE;
98791+ end_m = end + SEGMEXEC_TASK_SIZE;
98792+#endif
98793+
98794 if (newflags == oldflags) {
98795 *pprev = vma;
98796 return 0;
98797 }
98798
98799+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
98800+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
98801+
98802+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
98803+ return -ENOMEM;
98804+
98805+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
98806+ return -ENOMEM;
98807+ }
98808+
98809 /*
98810 * If we make a private mapping writable we increase our commit;
98811 * but (without finer accounting) cannot reduce our commit if we
98812@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98813 }
98814 }
98815
98816+#ifdef CONFIG_PAX_SEGMEXEC
98817+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
98818+ if (start != vma->vm_start) {
98819+ error = split_vma(mm, vma, start, 1);
98820+ if (error)
98821+ goto fail;
98822+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
98823+ *pprev = (*pprev)->vm_next;
98824+ }
98825+
98826+ if (end != vma->vm_end) {
98827+ error = split_vma(mm, vma, end, 0);
98828+ if (error)
98829+ goto fail;
98830+ }
98831+
98832+ if (pax_find_mirror_vma(vma)) {
98833+ error = __do_munmap(mm, start_m, end_m - start_m);
98834+ if (error)
98835+ goto fail;
98836+ } else {
98837+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98838+ if (!vma_m) {
98839+ error = -ENOMEM;
98840+ goto fail;
98841+ }
98842+ vma->vm_flags = newflags;
98843+ error = pax_mirror_vma(vma_m, vma);
98844+ if (error) {
98845+ vma->vm_flags = oldflags;
98846+ goto fail;
98847+ }
98848+ }
98849+ }
98850+#endif
98851+
98852 /*
98853 * First try to merge with previous and/or next vma.
98854 */
98855@@ -314,7 +418,19 @@ success:
98856 * vm_flags and vm_page_prot are protected by the mmap_sem
98857 * held in write mode.
98858 */
98859+
98860+#ifdef CONFIG_PAX_SEGMEXEC
98861+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
98862+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
98863+#endif
98864+
98865 vma->vm_flags = newflags;
98866+
98867+#ifdef CONFIG_PAX_MPROTECT
98868+ if (mm->binfmt && mm->binfmt->handle_mprotect)
98869+ mm->binfmt->handle_mprotect(vma, newflags);
98870+#endif
98871+
98872 dirty_accountable = vma_wants_writenotify(vma);
98873 vma_set_page_prot(vma);
98874
98875@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98876 end = start + len;
98877 if (end <= start)
98878 return -ENOMEM;
98879+
98880+#ifdef CONFIG_PAX_SEGMEXEC
98881+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
98882+ if (end > SEGMEXEC_TASK_SIZE)
98883+ return -EINVAL;
98884+ } else
98885+#endif
98886+
98887+ if (end > TASK_SIZE)
98888+ return -EINVAL;
98889+
98890 if (!arch_validate_prot(prot))
98891 return -EINVAL;
98892
98893@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98894 /*
98895 * Does the application expect PROT_READ to imply PROT_EXEC:
98896 */
98897- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
98898+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
98899 prot |= PROT_EXEC;
98900
98901 vm_flags = calc_vm_prot_bits(prot);
98902@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98903 if (start > vma->vm_start)
98904 prev = vma;
98905
98906+#ifdef CONFIG_PAX_MPROTECT
98907+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
98908+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
98909+#endif
98910+
98911 for (nstart = start ; ; ) {
98912 unsigned long newflags;
98913
98914@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98915
98916 /* newflags >> 4 shift VM_MAY% in place of VM_% */
98917 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
98918+ if (prot & (PROT_WRITE | PROT_EXEC))
98919+ gr_log_rwxmprotect(vma);
98920+
98921+ error = -EACCES;
98922+ goto out;
98923+ }
98924+
98925+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
98926 error = -EACCES;
98927 goto out;
98928 }
98929@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98930 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
98931 if (error)
98932 goto out;
98933+
98934+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
98935+
98936 nstart = tmp;
98937
98938 if (nstart < prev->vm_end)
98939diff --git a/mm/mremap.c b/mm/mremap.c
98940index 17fa018..6f7892b 100644
98941--- a/mm/mremap.c
98942+++ b/mm/mremap.c
98943@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
98944 continue;
98945 pte = ptep_get_and_clear(mm, old_addr, old_pte);
98946 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
98947+
98948+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98949+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
98950+ pte = pte_exprotect(pte);
98951+#endif
98952+
98953 pte = move_soft_dirty_pte(pte);
98954 set_pte_at(mm, new_addr, new_pte, pte);
98955 }
98956@@ -346,6 +352,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
98957 if (is_vm_hugetlb_page(vma))
98958 goto Einval;
98959
98960+#ifdef CONFIG_PAX_SEGMEXEC
98961+ if (pax_find_mirror_vma(vma))
98962+ goto Einval;
98963+#endif
98964+
98965 /* We can't remap across vm area boundaries */
98966 if (old_len > vma->vm_end - addr)
98967 goto Efault;
98968@@ -401,20 +412,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
98969 unsigned long ret = -EINVAL;
98970 unsigned long charged = 0;
98971 unsigned long map_flags;
98972+ unsigned long pax_task_size = TASK_SIZE;
98973
98974 if (new_addr & ~PAGE_MASK)
98975 goto out;
98976
98977- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
98978+#ifdef CONFIG_PAX_SEGMEXEC
98979+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
98980+ pax_task_size = SEGMEXEC_TASK_SIZE;
98981+#endif
98982+
98983+ pax_task_size -= PAGE_SIZE;
98984+
98985+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
98986 goto out;
98987
98988 /* Check if the location we're moving into overlaps the
98989 * old location at all, and fail if it does.
98990 */
98991- if ((new_addr <= addr) && (new_addr+new_len) > addr)
98992- goto out;
98993-
98994- if ((addr <= new_addr) && (addr+old_len) > new_addr)
98995+ if (addr + old_len > new_addr && new_addr + new_len > addr)
98996 goto out;
98997
98998 ret = do_munmap(mm, new_addr, new_len);
98999@@ -483,6 +499,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99000 unsigned long ret = -EINVAL;
99001 unsigned long charged = 0;
99002 bool locked = false;
99003+ unsigned long pax_task_size = TASK_SIZE;
99004
99005 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
99006 return ret;
99007@@ -504,6 +521,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99008 if (!new_len)
99009 return ret;
99010
99011+#ifdef CONFIG_PAX_SEGMEXEC
99012+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
99013+ pax_task_size = SEGMEXEC_TASK_SIZE;
99014+#endif
99015+
99016+ pax_task_size -= PAGE_SIZE;
99017+
99018+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
99019+ old_len > pax_task_size || addr > pax_task_size-old_len)
99020+ return ret;
99021+
99022 down_write(&current->mm->mmap_sem);
99023
99024 if (flags & MREMAP_FIXED) {
99025@@ -554,6 +582,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99026 new_addr = addr;
99027 }
99028 ret = addr;
99029+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
99030 goto out;
99031 }
99032 }
99033@@ -577,7 +606,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99034 goto out;
99035 }
99036
99037+ map_flags = vma->vm_flags;
99038 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
99039+ if (!(ret & ~PAGE_MASK)) {
99040+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
99041+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
99042+ }
99043 }
99044 out:
99045 if (ret & ~PAGE_MASK)
99046diff --git a/mm/nommu.c b/mm/nommu.c
99047index ae5baae..cbb2ed5 100644
99048--- a/mm/nommu.c
99049+++ b/mm/nommu.c
99050@@ -71,7 +71,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
99051 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
99052 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
99053 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
99054-int heap_stack_gap = 0;
99055
99056 atomic_long_t mmap_pages_allocated;
99057
99058@@ -858,15 +857,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
99059 EXPORT_SYMBOL(find_vma);
99060
99061 /*
99062- * find a VMA
99063- * - we don't extend stack VMAs under NOMMU conditions
99064- */
99065-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
99066-{
99067- return find_vma(mm, addr);
99068-}
99069-
99070-/*
99071 * expand a stack to a given address
99072 * - not supported under NOMMU conditions
99073 */
99074@@ -1560,6 +1550,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99075
99076 /* most fields are the same, copy all, and then fixup */
99077 *new = *vma;
99078+ INIT_LIST_HEAD(&new->anon_vma_chain);
99079 *region = *vma->vm_region;
99080 new->vm_region = region;
99081
99082@@ -1990,8 +1981,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
99083 }
99084 EXPORT_SYMBOL(generic_file_remap_pages);
99085
99086-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99087- unsigned long addr, void *buf, int len, int write)
99088+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99089+ unsigned long addr, void *buf, size_t len, int write)
99090 {
99091 struct vm_area_struct *vma;
99092
99093@@ -2032,8 +2023,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99094 *
99095 * The caller must hold a reference on @mm.
99096 */
99097-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99098- void *buf, int len, int write)
99099+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
99100+ void *buf, size_t len, int write)
99101 {
99102 return __access_remote_vm(NULL, mm, addr, buf, len, write);
99103 }
99104@@ -2042,7 +2033,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99105 * Access another process' address space.
99106 * - source/target buffer must be kernel space
99107 */
99108-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
99109+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
99110 {
99111 struct mm_struct *mm;
99112
99113diff --git a/mm/page-writeback.c b/mm/page-writeback.c
99114index f24d4c9..77820e3 100644
99115--- a/mm/page-writeback.c
99116+++ b/mm/page-writeback.c
99117@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
99118 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
99119 * - the bdi dirty thresh drops quickly due to change of JBOD workload
99120 */
99121-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
99122+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
99123 unsigned long thresh,
99124 unsigned long bg_thresh,
99125 unsigned long dirty,
99126diff --git a/mm/page_alloc.c b/mm/page_alloc.c
99127index 8bbef06..a8d1989 100644
99128--- a/mm/page_alloc.c
99129+++ b/mm/page_alloc.c
99130@@ -60,6 +60,7 @@
99131 #include <linux/hugetlb.h>
99132 #include <linux/sched/rt.h>
99133 #include <linux/page_owner.h>
99134+#include <linux/random.h>
99135
99136 #include <asm/sections.h>
99137 #include <asm/tlbflush.h>
99138@@ -358,7 +359,7 @@ out:
99139 * This usage means that zero-order pages may not be compound.
99140 */
99141
99142-static void free_compound_page(struct page *page)
99143+void free_compound_page(struct page *page)
99144 {
99145 __free_pages_ok(page, compound_order(page));
99146 }
99147@@ -511,7 +512,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
99148 __mod_zone_freepage_state(zone, (1 << order), migratetype);
99149 }
99150 #else
99151-struct page_ext_operations debug_guardpage_ops = { NULL, };
99152+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
99153 static inline void set_page_guard(struct zone *zone, struct page *page,
99154 unsigned int order, int migratetype) {}
99155 static inline void clear_page_guard(struct zone *zone, struct page *page,
99156@@ -802,6 +803,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99157 int i;
99158 int bad = 0;
99159
99160+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99161+ unsigned long index = 1UL << order;
99162+#endif
99163+
99164 VM_BUG_ON_PAGE(PageTail(page), page);
99165 VM_BUG_ON_PAGE(PageHead(page) && compound_order(page) != order, page);
99166
99167@@ -823,6 +828,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99168 debug_check_no_obj_freed(page_address(page),
99169 PAGE_SIZE << order);
99170 }
99171+
99172+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99173+ for (; index; --index)
99174+ sanitize_highpage(page + index - 1);
99175+#endif
99176+
99177 arch_free_page(page, order);
99178 kernel_map_pages(page, 1 << order, 0);
99179
99180@@ -846,6 +857,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
99181 local_irq_restore(flags);
99182 }
99183
99184+#ifdef CONFIG_PAX_LATENT_ENTROPY
99185+bool __meminitdata extra_latent_entropy;
99186+
99187+static int __init setup_pax_extra_latent_entropy(char *str)
99188+{
99189+ extra_latent_entropy = true;
99190+ return 0;
99191+}
99192+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
99193+
99194+volatile u64 latent_entropy __latent_entropy;
99195+EXPORT_SYMBOL(latent_entropy);
99196+#endif
99197+
99198 void __init __free_pages_bootmem(struct page *page, unsigned int order)
99199 {
99200 unsigned int nr_pages = 1 << order;
99201@@ -861,6 +886,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
99202 __ClearPageReserved(p);
99203 set_page_count(p, 0);
99204
99205+#ifdef CONFIG_PAX_LATENT_ENTROPY
99206+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
99207+ u64 hash = 0;
99208+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
99209+ const u64 *data = lowmem_page_address(page);
99210+
99211+ for (index = 0; index < end; index++)
99212+ hash ^= hash + data[index];
99213+ latent_entropy ^= hash;
99214+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99215+ }
99216+#endif
99217+
99218 page_zone(page)->managed_pages += nr_pages;
99219 set_page_refcounted(page);
99220 __free_pages(page, order);
99221@@ -986,8 +1024,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
99222 arch_alloc_page(page, order);
99223 kernel_map_pages(page, 1 << order, 1);
99224
99225+#ifndef CONFIG_PAX_MEMORY_SANITIZE
99226 if (gfp_flags & __GFP_ZERO)
99227 prep_zero_page(page, order, gfp_flags);
99228+#endif
99229
99230 if (order && (gfp_flags & __GFP_COMP))
99231 prep_compound_page(page, order);
99232@@ -1700,7 +1740,7 @@ again:
99233 }
99234
99235 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
99236- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
99237+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
99238 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
99239 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
99240
99241@@ -2021,7 +2061,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
99242 do {
99243 mod_zone_page_state(zone, NR_ALLOC_BATCH,
99244 high_wmark_pages(zone) - low_wmark_pages(zone) -
99245- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
99246+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
99247 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
99248 } while (zone++ != preferred_zone);
99249 }
99250@@ -5781,7 +5821,7 @@ static void __setup_per_zone_wmarks(void)
99251
99252 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
99253 high_wmark_pages(zone) - low_wmark_pages(zone) -
99254- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
99255+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
99256
99257 setup_zone_migrate_reserve(zone);
99258 spin_unlock_irqrestore(&zone->lock, flags);
99259diff --git a/mm/percpu.c b/mm/percpu.c
99260index d39e2f4..de5f4b4 100644
99261--- a/mm/percpu.c
99262+++ b/mm/percpu.c
99263@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
99264 static unsigned int pcpu_high_unit_cpu __read_mostly;
99265
99266 /* the address of the first chunk which starts with the kernel static area */
99267-void *pcpu_base_addr __read_mostly;
99268+void *pcpu_base_addr __read_only;
99269 EXPORT_SYMBOL_GPL(pcpu_base_addr);
99270
99271 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
99272diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
99273index 5077afc..846c9ef 100644
99274--- a/mm/process_vm_access.c
99275+++ b/mm/process_vm_access.c
99276@@ -13,6 +13,7 @@
99277 #include <linux/uio.h>
99278 #include <linux/sched.h>
99279 #include <linux/highmem.h>
99280+#include <linux/security.h>
99281 #include <linux/ptrace.h>
99282 #include <linux/slab.h>
99283 #include <linux/syscalls.h>
99284@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
99285 ssize_t iov_len;
99286 size_t total_len = iov_iter_count(iter);
99287
99288+ return -ENOSYS; // PaX: until properly audited
99289+
99290 /*
99291 * Work out how many pages of struct pages we're going to need
99292 * when eventually calling get_user_pages
99293 */
99294 for (i = 0; i < riovcnt; i++) {
99295 iov_len = rvec[i].iov_len;
99296- if (iov_len > 0) {
99297- nr_pages_iov = ((unsigned long)rvec[i].iov_base
99298- + iov_len)
99299- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
99300- / PAGE_SIZE + 1;
99301- nr_pages = max(nr_pages, nr_pages_iov);
99302- }
99303+ if (iov_len <= 0)
99304+ continue;
99305+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
99306+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
99307+ nr_pages = max(nr_pages, nr_pages_iov);
99308 }
99309
99310 if (nr_pages == 0)
99311@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
99312 goto free_proc_pages;
99313 }
99314
99315+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
99316+ rc = -EPERM;
99317+ goto put_task_struct;
99318+ }
99319+
99320 mm = mm_access(task, PTRACE_MODE_ATTACH);
99321 if (!mm || IS_ERR(mm)) {
99322 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
99323diff --git a/mm/rmap.c b/mm/rmap.c
99324index ecb444a..0ff9eb3 100644
99325--- a/mm/rmap.c
99326+++ b/mm/rmap.c
99327@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99328 struct anon_vma *anon_vma = vma->anon_vma;
99329 struct anon_vma_chain *avc;
99330
99331+#ifdef CONFIG_PAX_SEGMEXEC
99332+ struct anon_vma_chain *avc_m = NULL;
99333+#endif
99334+
99335 might_sleep();
99336 if (unlikely(!anon_vma)) {
99337 struct mm_struct *mm = vma->vm_mm;
99338@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99339 if (!avc)
99340 goto out_enomem;
99341
99342+#ifdef CONFIG_PAX_SEGMEXEC
99343+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
99344+ if (!avc_m)
99345+ goto out_enomem_free_avc;
99346+#endif
99347+
99348 anon_vma = find_mergeable_anon_vma(vma);
99349 allocated = NULL;
99350 if (!anon_vma) {
99351@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99352 /* page_table_lock to protect against threads */
99353 spin_lock(&mm->page_table_lock);
99354 if (likely(!vma->anon_vma)) {
99355+
99356+#ifdef CONFIG_PAX_SEGMEXEC
99357+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
99358+
99359+ if (vma_m) {
99360+ BUG_ON(vma_m->anon_vma);
99361+ vma_m->anon_vma = anon_vma;
99362+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
99363+ anon_vma->degree++;
99364+ avc_m = NULL;
99365+ }
99366+#endif
99367+
99368 vma->anon_vma = anon_vma;
99369 anon_vma_chain_link(vma, avc, anon_vma);
99370 /* vma reference or self-parent link for new root */
99371@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99372
99373 if (unlikely(allocated))
99374 put_anon_vma(allocated);
99375+
99376+#ifdef CONFIG_PAX_SEGMEXEC
99377+ if (unlikely(avc_m))
99378+ anon_vma_chain_free(avc_m);
99379+#endif
99380+
99381 if (unlikely(avc))
99382 anon_vma_chain_free(avc);
99383 }
99384 return 0;
99385
99386 out_enomem_free_avc:
99387+
99388+#ifdef CONFIG_PAX_SEGMEXEC
99389+ if (avc_m)
99390+ anon_vma_chain_free(avc_m);
99391+#endif
99392+
99393 anon_vma_chain_free(avc);
99394 out_enomem:
99395 return -ENOMEM;
99396@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
99397 * good chance of avoiding scanning the whole hierarchy when it searches where
99398 * page is mapped.
99399 */
99400-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
99401+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
99402 {
99403 struct anon_vma_chain *avc, *pavc;
99404 struct anon_vma *root = NULL;
99405@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
99406 * the corresponding VMA in the parent process is attached to.
99407 * Returns 0 on success, non-zero on failure.
99408 */
99409-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
99410+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
99411 {
99412 struct anon_vma_chain *avc;
99413 struct anon_vma *anon_vma;
99414@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
99415 void __init anon_vma_init(void)
99416 {
99417 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
99418- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
99419- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
99420+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
99421+ anon_vma_ctor);
99422+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
99423+ SLAB_PANIC|SLAB_NO_SANITIZE);
99424 }
99425
99426 /*
99427diff --git a/mm/shmem.c b/mm/shmem.c
99428index 993e6ba..a962ba3 100644
99429--- a/mm/shmem.c
99430+++ b/mm/shmem.c
99431@@ -33,7 +33,7 @@
99432 #include <linux/swap.h>
99433 #include <linux/aio.h>
99434
99435-static struct vfsmount *shm_mnt;
99436+struct vfsmount *shm_mnt;
99437
99438 #ifdef CONFIG_SHMEM
99439 /*
99440@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
99441 #define BOGO_DIRENT_SIZE 20
99442
99443 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
99444-#define SHORT_SYMLINK_LEN 128
99445+#define SHORT_SYMLINK_LEN 64
99446
99447 /*
99448 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
99449@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
99450 static int shmem_xattr_validate(const char *name)
99451 {
99452 struct { const char *prefix; size_t len; } arr[] = {
99453+
99454+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
99455+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
99456+#endif
99457+
99458 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
99459 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
99460 };
99461@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
99462 if (err)
99463 return err;
99464
99465+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
99466+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
99467+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
99468+ return -EOPNOTSUPP;
99469+ if (size > 8)
99470+ return -EINVAL;
99471+ }
99472+#endif
99473+
99474 return simple_xattr_set(&info->xattrs, name, value, size, flags);
99475 }
99476
99477@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
99478 int err = -ENOMEM;
99479
99480 /* Round up to L1_CACHE_BYTES to resist false sharing */
99481- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
99482- L1_CACHE_BYTES), GFP_KERNEL);
99483+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
99484 if (!sbinfo)
99485 return -ENOMEM;
99486
99487diff --git a/mm/slab.c b/mm/slab.c
99488index 65b5dcb..d53d866 100644
99489--- a/mm/slab.c
99490+++ b/mm/slab.c
99491@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
99492 if ((x)->max_freeable < i) \
99493 (x)->max_freeable = i; \
99494 } while (0)
99495-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
99496-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
99497-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
99498-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
99499+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
99500+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
99501+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
99502+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
99503+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
99504+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
99505 #else
99506 #define STATS_INC_ACTIVE(x) do { } while (0)
99507 #define STATS_DEC_ACTIVE(x) do { } while (0)
99508@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
99509 #define STATS_INC_ALLOCMISS(x) do { } while (0)
99510 #define STATS_INC_FREEHIT(x) do { } while (0)
99511 #define STATS_INC_FREEMISS(x) do { } while (0)
99512+#define STATS_INC_SANITIZED(x) do { } while (0)
99513+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
99514 #endif
99515
99516 #if DEBUG
99517@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
99518 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
99519 */
99520 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
99521- const struct page *page, void *obj)
99522+ const struct page *page, const void *obj)
99523 {
99524 u32 offset = (obj - page->s_mem);
99525 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
99526@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
99527 * structures first. Without this, further allocations will bug.
99528 */
99529 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
99530- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
99531+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
99532 slab_state = PARTIAL_NODE;
99533
99534 slab_early_init = 0;
99535@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99536
99537 cachep = find_mergeable(size, align, flags, name, ctor);
99538 if (cachep) {
99539- cachep->refcount++;
99540+ atomic_inc(&cachep->refcount);
99541
99542 /*
99543 * Adjust the object sizes so that we clear
99544@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
99545 struct array_cache *ac = cpu_cache_get(cachep);
99546
99547 check_irq_off();
99548+
99549+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99550+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
99551+ STATS_INC_NOT_SANITIZED(cachep);
99552+ else {
99553+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
99554+
99555+ if (cachep->ctor)
99556+ cachep->ctor(objp);
99557+
99558+ STATS_INC_SANITIZED(cachep);
99559+ }
99560+#endif
99561+
99562 kmemleak_free_recursive(objp, cachep->flags);
99563 objp = cache_free_debugcheck(cachep, objp, caller);
99564
99565@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
99566 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
99567 }
99568
99569-void *__kmalloc_node(size_t size, gfp_t flags, int node)
99570+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
99571 {
99572 return __do_kmalloc_node(size, flags, node, _RET_IP_);
99573 }
99574@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
99575 * @flags: the type of memory to allocate (see kmalloc).
99576 * @caller: function caller for debug tracking of the caller
99577 */
99578-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
99579+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
99580 unsigned long caller)
99581 {
99582 struct kmem_cache *cachep;
99583@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
99584
99585 if (unlikely(ZERO_OR_NULL_PTR(objp)))
99586 return;
99587+ VM_BUG_ON(!virt_addr_valid(objp));
99588 local_irq_save(flags);
99589 kfree_debugcheck(objp);
99590 c = virt_to_cache(objp);
99591@@ -3984,14 +4003,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
99592 }
99593 /* cpu stats */
99594 {
99595- unsigned long allochit = atomic_read(&cachep->allochit);
99596- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
99597- unsigned long freehit = atomic_read(&cachep->freehit);
99598- unsigned long freemiss = atomic_read(&cachep->freemiss);
99599+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
99600+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
99601+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
99602+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
99603
99604 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
99605 allochit, allocmiss, freehit, freemiss);
99606 }
99607+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99608+ {
99609+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
99610+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
99611+
99612+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
99613+ }
99614+#endif
99615 #endif
99616 }
99617
99618@@ -4199,13 +4226,69 @@ static const struct file_operations proc_slabstats_operations = {
99619 static int __init slab_proc_init(void)
99620 {
99621 #ifdef CONFIG_DEBUG_SLAB_LEAK
99622- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
99623+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
99624 #endif
99625 return 0;
99626 }
99627 module_init(slab_proc_init);
99628 #endif
99629
99630+bool is_usercopy_object(const void *ptr)
99631+{
99632+ struct page *page;
99633+ struct kmem_cache *cachep;
99634+
99635+ if (ZERO_OR_NULL_PTR(ptr))
99636+ return false;
99637+
99638+ if (!slab_is_available())
99639+ return false;
99640+
99641+ if (!virt_addr_valid(ptr))
99642+ return false;
99643+
99644+ page = virt_to_head_page(ptr);
99645+
99646+ if (!PageSlab(page))
99647+ return false;
99648+
99649+ cachep = page->slab_cache;
99650+ return cachep->flags & SLAB_USERCOPY;
99651+}
99652+
99653+#ifdef CONFIG_PAX_USERCOPY
99654+const char *check_heap_object(const void *ptr, unsigned long n)
99655+{
99656+ struct page *page;
99657+ struct kmem_cache *cachep;
99658+ unsigned int objnr;
99659+ unsigned long offset;
99660+
99661+ if (ZERO_OR_NULL_PTR(ptr))
99662+ return "<null>";
99663+
99664+ if (!virt_addr_valid(ptr))
99665+ return NULL;
99666+
99667+ page = virt_to_head_page(ptr);
99668+
99669+ if (!PageSlab(page))
99670+ return NULL;
99671+
99672+ cachep = page->slab_cache;
99673+ if (!(cachep->flags & SLAB_USERCOPY))
99674+ return cachep->name;
99675+
99676+ objnr = obj_to_index(cachep, page, ptr);
99677+ BUG_ON(objnr >= cachep->num);
99678+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
99679+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
99680+ return NULL;
99681+
99682+ return cachep->name;
99683+}
99684+#endif
99685+
99686 /**
99687 * ksize - get the actual amount of memory allocated for a given object
99688 * @objp: Pointer to the object
99689diff --git a/mm/slab.h b/mm/slab.h
99690index 1cf40054..10ad563 100644
99691--- a/mm/slab.h
99692+++ b/mm/slab.h
99693@@ -22,7 +22,7 @@ struct kmem_cache {
99694 unsigned int align; /* Alignment as calculated */
99695 unsigned long flags; /* Active flags on the slab */
99696 const char *name; /* Slab name for sysfs */
99697- int refcount; /* Use counter */
99698+ atomic_t refcount; /* Use counter */
99699 void (*ctor)(void *); /* Called on object slot creation */
99700 struct list_head list; /* List of all slab caches on the system */
99701 };
99702@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
99703 /* The slab cache that manages slab cache information */
99704 extern struct kmem_cache *kmem_cache;
99705
99706+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99707+#ifdef CONFIG_X86_64
99708+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
99709+#else
99710+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
99711+#endif
99712+enum pax_sanitize_mode {
99713+ PAX_SANITIZE_SLAB_OFF = 0,
99714+ PAX_SANITIZE_SLAB_FAST,
99715+ PAX_SANITIZE_SLAB_FULL,
99716+};
99717+extern enum pax_sanitize_mode pax_sanitize_slab;
99718+#endif
99719+
99720 unsigned long calculate_alignment(unsigned long flags,
99721 unsigned long align, unsigned long size);
99722
99723@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
99724
99725 /* Legal flag mask for kmem_cache_create(), for various configurations */
99726 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
99727- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
99728+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
99729+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
99730
99731 #if defined(CONFIG_DEBUG_SLAB)
99732 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
99733@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
99734 return s;
99735
99736 page = virt_to_head_page(x);
99737+
99738+ BUG_ON(!PageSlab(page));
99739+
99740 cachep = page->slab_cache;
99741 if (slab_equal_or_root(cachep, s))
99742 return cachep;
99743diff --git a/mm/slab_common.c b/mm/slab_common.c
99744index e03dd6f..c475838 100644
99745--- a/mm/slab_common.c
99746+++ b/mm/slab_common.c
99747@@ -25,11 +25,35 @@
99748
99749 #include "slab.h"
99750
99751-enum slab_state slab_state;
99752+enum slab_state slab_state __read_only;
99753 LIST_HEAD(slab_caches);
99754 DEFINE_MUTEX(slab_mutex);
99755 struct kmem_cache *kmem_cache;
99756
99757+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99758+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
99759+static int __init pax_sanitize_slab_setup(char *str)
99760+{
99761+ if (!str)
99762+ return 0;
99763+
99764+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
99765+ pr_info("PaX slab sanitization: %s\n", "disabled");
99766+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
99767+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
99768+ pr_info("PaX slab sanitization: %s\n", "fast");
99769+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
99770+ } else if (!strcmp(str, "full")) {
99771+ pr_info("PaX slab sanitization: %s\n", "full");
99772+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
99773+ } else
99774+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
99775+
99776+ return 0;
99777+}
99778+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
99779+#endif
99780+
99781 /*
99782 * Set of flags that will prevent slab merging
99783 */
99784@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
99785 * Merge control. If this is set then no merging of slab caches will occur.
99786 * (Could be removed. This was introduced to pacify the merge skeptics.)
99787 */
99788-static int slab_nomerge;
99789+static int slab_nomerge = 1;
99790
99791 static int __init setup_slab_nomerge(char *str)
99792 {
99793@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
99794 /*
99795 * We may have set a slab to be unmergeable during bootstrap.
99796 */
99797- if (s->refcount < 0)
99798+ if (atomic_read(&s->refcount) < 0)
99799 return 1;
99800
99801 return 0;
99802@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
99803 if (err)
99804 goto out_free_cache;
99805
99806- s->refcount = 1;
99807+ atomic_set(&s->refcount, 1);
99808 list_add(&s->list, &slab_caches);
99809 out:
99810 if (err)
99811@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
99812 */
99813 flags &= CACHE_CREATE_MASK;
99814
99815+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99816+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
99817+ flags |= SLAB_NO_SANITIZE;
99818+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
99819+ flags &= ~SLAB_NO_SANITIZE;
99820+#endif
99821+
99822 s = __kmem_cache_alias(name, size, align, flags, ctor);
99823 if (s)
99824 goto out_unlock;
99825@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99826
99827 mutex_lock(&slab_mutex);
99828
99829- s->refcount--;
99830- if (s->refcount)
99831+ if (!atomic_dec_and_test(&s->refcount))
99832 goto out_unlock;
99833
99834 if (memcg_cleanup_cache_params(s) != 0)
99835@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99836 rcu_barrier();
99837
99838 memcg_free_cache_params(s);
99839-#ifdef SLAB_SUPPORTS_SYSFS
99840+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99841 sysfs_slab_remove(s);
99842 #else
99843 slab_kmem_cache_release(s);
99844@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
99845 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
99846 name, size, err);
99847
99848- s->refcount = -1; /* Exempt from merging for now */
99849+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
99850 }
99851
99852 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99853@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99854
99855 create_boot_cache(s, name, size, flags);
99856 list_add(&s->list, &slab_caches);
99857- s->refcount = 1;
99858+ atomic_set(&s->refcount, 1);
99859 return s;
99860 }
99861
99862@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99863 EXPORT_SYMBOL(kmalloc_dma_caches);
99864 #endif
99865
99866+#ifdef CONFIG_PAX_USERCOPY_SLABS
99867+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
99868+EXPORT_SYMBOL(kmalloc_usercopy_caches);
99869+#endif
99870+
99871 /*
99872 * Conversion table for small slabs sizes / 8 to the index in the
99873 * kmalloc array. This is necessary for slabs < 192 since we have non power
99874@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
99875 return kmalloc_dma_caches[index];
99876
99877 #endif
99878+
99879+#ifdef CONFIG_PAX_USERCOPY_SLABS
99880+ if (unlikely((flags & GFP_USERCOPY)))
99881+ return kmalloc_usercopy_caches[index];
99882+
99883+#endif
99884+
99885 return kmalloc_caches[index];
99886 }
99887
99888@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
99889 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
99890 if (!kmalloc_caches[i]) {
99891 kmalloc_caches[i] = create_kmalloc_cache(NULL,
99892- 1 << i, flags);
99893+ 1 << i, SLAB_USERCOPY | flags);
99894 }
99895
99896 /*
99897@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
99898 * earlier power of two caches
99899 */
99900 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
99901- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
99902+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
99903
99904 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
99905- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
99906+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
99907 }
99908
99909 /* Kmalloc array is now usable */
99910@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
99911 }
99912 }
99913 #endif
99914+
99915+#ifdef CONFIG_PAX_USERCOPY_SLABS
99916+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
99917+ struct kmem_cache *s = kmalloc_caches[i];
99918+
99919+ if (s) {
99920+ int size = kmalloc_size(i);
99921+ char *n = kasprintf(GFP_NOWAIT,
99922+ "usercopy-kmalloc-%d", size);
99923+
99924+ BUG_ON(!n);
99925+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
99926+ size, SLAB_USERCOPY | flags);
99927+ }
99928+ }
99929+#endif
99930+
99931 }
99932 #endif /* !CONFIG_SLOB */
99933
99934@@ -830,6 +889,9 @@ static void print_slabinfo_header(struct seq_file *m)
99935 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
99936 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
99937 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
99938+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99939+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
99940+#endif
99941 #endif
99942 seq_putc(m, '\n');
99943 }
99944@@ -964,7 +1026,7 @@ static int __init slab_proc_init(void)
99945 module_init(slab_proc_init);
99946 #endif /* CONFIG_SLABINFO */
99947
99948-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
99949+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
99950 gfp_t flags)
99951 {
99952 void *ret;
99953diff --git a/mm/slob.c b/mm/slob.c
99954index 96a8620..46b3f12 100644
99955--- a/mm/slob.c
99956+++ b/mm/slob.c
99957@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
99958 /*
99959 * Return the size of a slob block.
99960 */
99961-static slobidx_t slob_units(slob_t *s)
99962+static slobidx_t slob_units(const slob_t *s)
99963 {
99964 if (s->units > 0)
99965 return s->units;
99966@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
99967 /*
99968 * Return the next free slob block pointer after this one.
99969 */
99970-static slob_t *slob_next(slob_t *s)
99971+static slob_t *slob_next(const slob_t *s)
99972 {
99973 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
99974 slobidx_t next;
99975@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
99976 /*
99977 * Returns true if s is the last free block in its page.
99978 */
99979-static int slob_last(slob_t *s)
99980+static int slob_last(const slob_t *s)
99981 {
99982 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
99983 }
99984
99985-static void *slob_new_pages(gfp_t gfp, int order, int node)
99986+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
99987 {
99988- void *page;
99989+ struct page *page;
99990
99991 #ifdef CONFIG_NUMA
99992 if (node != NUMA_NO_NODE)
99993@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
99994 if (!page)
99995 return NULL;
99996
99997- return page_address(page);
99998+ __SetPageSlab(page);
99999+ return page;
100000 }
100001
100002-static void slob_free_pages(void *b, int order)
100003+static void slob_free_pages(struct page *sp, int order)
100004 {
100005 if (current->reclaim_state)
100006 current->reclaim_state->reclaimed_slab += 1 << order;
100007- free_pages((unsigned long)b, order);
100008+ __ClearPageSlab(sp);
100009+ page_mapcount_reset(sp);
100010+ sp->private = 0;
100011+ __free_pages(sp, order);
100012 }
100013
100014 /*
100015@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
100016
100017 /* Not enough space: must allocate a new page */
100018 if (!b) {
100019- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100020- if (!b)
100021+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100022+ if (!sp)
100023 return NULL;
100024- sp = virt_to_page(b);
100025- __SetPageSlab(sp);
100026+ b = page_address(sp);
100027
100028 spin_lock_irqsave(&slob_lock, flags);
100029 sp->units = SLOB_UNITS(PAGE_SIZE);
100030 sp->freelist = b;
100031+ sp->private = 0;
100032 INIT_LIST_HEAD(&sp->lru);
100033 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
100034 set_slob_page_free(sp, slob_list);
100035@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
100036 /*
100037 * slob_free: entry point into the slob allocator.
100038 */
100039-static void slob_free(void *block, int size)
100040+static void slob_free(struct kmem_cache *c, void *block, int size)
100041 {
100042 struct page *sp;
100043 slob_t *prev, *next, *b = (slob_t *)block;
100044@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
100045 if (slob_page_free(sp))
100046 clear_slob_page_free(sp);
100047 spin_unlock_irqrestore(&slob_lock, flags);
100048- __ClearPageSlab(sp);
100049- page_mapcount_reset(sp);
100050- slob_free_pages(b, 0);
100051+ slob_free_pages(sp, 0);
100052 return;
100053 }
100054
100055+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100056+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
100057+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
100058+#endif
100059+
100060 if (!slob_page_free(sp)) {
100061 /* This slob page is about to become partially free. Easy! */
100062 sp->units = units;
100063@@ -424,11 +431,10 @@ out:
100064 */
100065
100066 static __always_inline void *
100067-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100068+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
100069 {
100070- unsigned int *m;
100071- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100072- void *ret;
100073+ slob_t *m;
100074+ void *ret = NULL;
100075
100076 gfp &= gfp_allowed_mask;
100077
100078@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100079
100080 if (!m)
100081 return NULL;
100082- *m = size;
100083+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
100084+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
100085+ m[0].units = size;
100086+ m[1].units = align;
100087 ret = (void *)m + align;
100088
100089 trace_kmalloc_node(caller, ret,
100090 size, size + align, gfp, node);
100091 } else {
100092 unsigned int order = get_order(size);
100093+ struct page *page;
100094
100095 if (likely(order))
100096 gfp |= __GFP_COMP;
100097- ret = slob_new_pages(gfp, order, node);
100098+ page = slob_new_pages(gfp, order, node);
100099+ if (page) {
100100+ ret = page_address(page);
100101+ page->private = size;
100102+ }
100103
100104 trace_kmalloc_node(caller, ret,
100105 size, PAGE_SIZE << order, gfp, node);
100106 }
100107
100108- kmemleak_alloc(ret, size, 1, gfp);
100109 return ret;
100110 }
100111
100112-void *__kmalloc(size_t size, gfp_t gfp)
100113+static __always_inline void *
100114+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100115+{
100116+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100117+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
100118+
100119+ if (!ZERO_OR_NULL_PTR(ret))
100120+ kmemleak_alloc(ret, size, 1, gfp);
100121+ return ret;
100122+}
100123+
100124+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
100125 {
100126 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
100127 }
100128@@ -491,34 +515,112 @@ void kfree(const void *block)
100129 return;
100130 kmemleak_free(block);
100131
100132+ VM_BUG_ON(!virt_addr_valid(block));
100133 sp = virt_to_page(block);
100134- if (PageSlab(sp)) {
100135+ VM_BUG_ON(!PageSlab(sp));
100136+ if (!sp->private) {
100137 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100138- unsigned int *m = (unsigned int *)(block - align);
100139- slob_free(m, *m + align);
100140- } else
100141+ slob_t *m = (slob_t *)(block - align);
100142+ slob_free(NULL, m, m[0].units + align);
100143+ } else {
100144+ __ClearPageSlab(sp);
100145+ page_mapcount_reset(sp);
100146+ sp->private = 0;
100147 __free_pages(sp, compound_order(sp));
100148+ }
100149 }
100150 EXPORT_SYMBOL(kfree);
100151
100152+bool is_usercopy_object(const void *ptr)
100153+{
100154+ if (!slab_is_available())
100155+ return false;
100156+
100157+ // PAX: TODO
100158+
100159+ return false;
100160+}
100161+
100162+#ifdef CONFIG_PAX_USERCOPY
100163+const char *check_heap_object(const void *ptr, unsigned long n)
100164+{
100165+ struct page *page;
100166+ const slob_t *free;
100167+ const void *base;
100168+ unsigned long flags;
100169+
100170+ if (ZERO_OR_NULL_PTR(ptr))
100171+ return "<null>";
100172+
100173+ if (!virt_addr_valid(ptr))
100174+ return NULL;
100175+
100176+ page = virt_to_head_page(ptr);
100177+ if (!PageSlab(page))
100178+ return NULL;
100179+
100180+ if (page->private) {
100181+ base = page;
100182+ if (base <= ptr && n <= page->private - (ptr - base))
100183+ return NULL;
100184+ return "<slob>";
100185+ }
100186+
100187+ /* some tricky double walking to find the chunk */
100188+ spin_lock_irqsave(&slob_lock, flags);
100189+ base = (void *)((unsigned long)ptr & PAGE_MASK);
100190+ free = page->freelist;
100191+
100192+ while (!slob_last(free) && (void *)free <= ptr) {
100193+ base = free + slob_units(free);
100194+ free = slob_next(free);
100195+ }
100196+
100197+ while (base < (void *)free) {
100198+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
100199+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
100200+ int offset;
100201+
100202+ if (ptr < base + align)
100203+ break;
100204+
100205+ offset = ptr - base - align;
100206+ if (offset >= m) {
100207+ base += size;
100208+ continue;
100209+ }
100210+
100211+ if (n > m - offset)
100212+ break;
100213+
100214+ spin_unlock_irqrestore(&slob_lock, flags);
100215+ return NULL;
100216+ }
100217+
100218+ spin_unlock_irqrestore(&slob_lock, flags);
100219+ return "<slob>";
100220+}
100221+#endif
100222+
100223 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
100224 size_t ksize(const void *block)
100225 {
100226 struct page *sp;
100227 int align;
100228- unsigned int *m;
100229+ slob_t *m;
100230
100231 BUG_ON(!block);
100232 if (unlikely(block == ZERO_SIZE_PTR))
100233 return 0;
100234
100235 sp = virt_to_page(block);
100236- if (unlikely(!PageSlab(sp)))
100237- return PAGE_SIZE << compound_order(sp);
100238+ VM_BUG_ON(!PageSlab(sp));
100239+ if (sp->private)
100240+ return sp->private;
100241
100242 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100243- m = (unsigned int *)(block - align);
100244- return SLOB_UNITS(*m) * SLOB_UNIT;
100245+ m = (slob_t *)(block - align);
100246+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
100247 }
100248 EXPORT_SYMBOL(ksize);
100249
100250@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
100251
100252 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
100253 {
100254- void *b;
100255+ void *b = NULL;
100256
100257 flags &= gfp_allowed_mask;
100258
100259 lockdep_trace_alloc(flags);
100260
100261+#ifdef CONFIG_PAX_USERCOPY_SLABS
100262+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
100263+#else
100264 if (c->size < PAGE_SIZE) {
100265 b = slob_alloc(c->size, flags, c->align, node);
100266 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
100267 SLOB_UNITS(c->size) * SLOB_UNIT,
100268 flags, node);
100269 } else {
100270- b = slob_new_pages(flags, get_order(c->size), node);
100271+ struct page *sp;
100272+
100273+ sp = slob_new_pages(flags, get_order(c->size), node);
100274+ if (sp) {
100275+ b = page_address(sp);
100276+ sp->private = c->size;
100277+ }
100278 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
100279 PAGE_SIZE << get_order(c->size),
100280 flags, node);
100281 }
100282+#endif
100283
100284 if (b && c->ctor)
100285 c->ctor(b);
100286@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
100287 EXPORT_SYMBOL(kmem_cache_alloc);
100288
100289 #ifdef CONFIG_NUMA
100290-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
100291+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
100292 {
100293 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
100294 }
100295@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
100296 EXPORT_SYMBOL(kmem_cache_alloc_node);
100297 #endif
100298
100299-static void __kmem_cache_free(void *b, int size)
100300+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
100301 {
100302- if (size < PAGE_SIZE)
100303- slob_free(b, size);
100304+ struct page *sp;
100305+
100306+ sp = virt_to_page(b);
100307+ BUG_ON(!PageSlab(sp));
100308+ if (!sp->private)
100309+ slob_free(c, b, size);
100310 else
100311- slob_free_pages(b, get_order(size));
100312+ slob_free_pages(sp, get_order(size));
100313 }
100314
100315 static void kmem_rcu_free(struct rcu_head *head)
100316@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
100317 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
100318 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
100319
100320- __kmem_cache_free(b, slob_rcu->size);
100321+ __kmem_cache_free(NULL, b, slob_rcu->size);
100322 }
100323
100324 void kmem_cache_free(struct kmem_cache *c, void *b)
100325 {
100326+ int size = c->size;
100327+
100328+#ifdef CONFIG_PAX_USERCOPY_SLABS
100329+ if (size + c->align < PAGE_SIZE) {
100330+ size += c->align;
100331+ b -= c->align;
100332+ }
100333+#endif
100334+
100335 kmemleak_free_recursive(b, c->flags);
100336 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
100337 struct slob_rcu *slob_rcu;
100338- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
100339- slob_rcu->size = c->size;
100340+ slob_rcu = b + (size - sizeof(struct slob_rcu));
100341+ slob_rcu->size = size;
100342 call_rcu(&slob_rcu->head, kmem_rcu_free);
100343 } else {
100344- __kmem_cache_free(b, c->size);
100345+ __kmem_cache_free(c, b, size);
100346 }
100347
100348+#ifdef CONFIG_PAX_USERCOPY_SLABS
100349+ trace_kfree(_RET_IP_, b);
100350+#else
100351 trace_kmem_cache_free(_RET_IP_, b);
100352+#endif
100353+
100354 }
100355 EXPORT_SYMBOL(kmem_cache_free);
100356
100357diff --git a/mm/slub.c b/mm/slub.c
100358index fe376fe..2f5757c 100644
100359--- a/mm/slub.c
100360+++ b/mm/slub.c
100361@@ -197,7 +197,7 @@ struct track {
100362
100363 enum track_item { TRACK_ALLOC, TRACK_FREE };
100364
100365-#ifdef CONFIG_SYSFS
100366+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100367 static int sysfs_slab_add(struct kmem_cache *);
100368 static int sysfs_slab_alias(struct kmem_cache *, const char *);
100369 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
100370@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
100371 if (!t->addr)
100372 return;
100373
100374- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
100375+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
100376 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
100377 #ifdef CONFIG_STACKTRACE
100378 {
100379@@ -2652,6 +2652,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
100380
100381 slab_free_hook(s, x);
100382
100383+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100384+ if (!(s->flags & SLAB_NO_SANITIZE)) {
100385+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
100386+ if (s->ctor)
100387+ s->ctor(x);
100388+ }
100389+#endif
100390+
100391 redo:
100392 /*
100393 * Determine the currently cpus per cpu slab.
100394@@ -2989,6 +2997,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
100395 s->inuse = size;
100396
100397 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
100398+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100399+ (!(flags & SLAB_NO_SANITIZE)) ||
100400+#endif
100401 s->ctor)) {
100402 /*
100403 * Relocate free pointer after the object if it is not
100404@@ -3243,7 +3254,7 @@ static int __init setup_slub_min_objects(char *str)
100405
100406 __setup("slub_min_objects=", setup_slub_min_objects);
100407
100408-void *__kmalloc(size_t size, gfp_t flags)
100409+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
100410 {
100411 struct kmem_cache *s;
100412 void *ret;
100413@@ -3279,7 +3290,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
100414 return ptr;
100415 }
100416
100417-void *__kmalloc_node(size_t size, gfp_t flags, int node)
100418+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100419 {
100420 struct kmem_cache *s;
100421 void *ret;
100422@@ -3308,6 +3319,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
100423 EXPORT_SYMBOL(__kmalloc_node);
100424 #endif
100425
100426+bool is_usercopy_object(const void *ptr)
100427+{
100428+ struct page *page;
100429+ struct kmem_cache *s;
100430+
100431+ if (ZERO_OR_NULL_PTR(ptr))
100432+ return false;
100433+
100434+ if (!slab_is_available())
100435+ return false;
100436+
100437+ if (!virt_addr_valid(ptr))
100438+ return false;
100439+
100440+ page = virt_to_head_page(ptr);
100441+
100442+ if (!PageSlab(page))
100443+ return false;
100444+
100445+ s = page->slab_cache;
100446+ return s->flags & SLAB_USERCOPY;
100447+}
100448+
100449+#ifdef CONFIG_PAX_USERCOPY
100450+const char *check_heap_object(const void *ptr, unsigned long n)
100451+{
100452+ struct page *page;
100453+ struct kmem_cache *s;
100454+ unsigned long offset;
100455+
100456+ if (ZERO_OR_NULL_PTR(ptr))
100457+ return "<null>";
100458+
100459+ if (!virt_addr_valid(ptr))
100460+ return NULL;
100461+
100462+ page = virt_to_head_page(ptr);
100463+
100464+ if (!PageSlab(page))
100465+ return NULL;
100466+
100467+ s = page->slab_cache;
100468+ if (!(s->flags & SLAB_USERCOPY))
100469+ return s->name;
100470+
100471+ offset = (ptr - page_address(page)) % s->size;
100472+ if (offset <= s->object_size && n <= s->object_size - offset)
100473+ return NULL;
100474+
100475+ return s->name;
100476+}
100477+#endif
100478+
100479 size_t ksize(const void *object)
100480 {
100481 struct page *page;
100482@@ -3336,6 +3400,7 @@ void kfree(const void *x)
100483 if (unlikely(ZERO_OR_NULL_PTR(x)))
100484 return;
100485
100486+ VM_BUG_ON(!virt_addr_valid(x));
100487 page = virt_to_head_page(x);
100488 if (unlikely(!PageSlab(page))) {
100489 BUG_ON(!PageCompound(page));
100490@@ -3631,7 +3696,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
100491 int i;
100492 struct kmem_cache *c;
100493
100494- s->refcount++;
100495+ atomic_inc(&s->refcount);
100496
100497 /*
100498 * Adjust the object sizes so that we clear
100499@@ -3650,7 +3715,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
100500 }
100501
100502 if (sysfs_slab_alias(s, name)) {
100503- s->refcount--;
100504+ atomic_dec(&s->refcount);
100505 s = NULL;
100506 }
100507 }
100508@@ -3767,7 +3832,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
100509 }
100510 #endif
100511
100512-#ifdef CONFIG_SYSFS
100513+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100514 static int count_inuse(struct page *page)
100515 {
100516 return page->inuse;
100517@@ -4048,7 +4113,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
100518 len += sprintf(buf + len, "%7ld ", l->count);
100519
100520 if (l->addr)
100521+#ifdef CONFIG_GRKERNSEC_HIDESYM
100522+ len += sprintf(buf + len, "%pS", NULL);
100523+#else
100524 len += sprintf(buf + len, "%pS", (void *)l->addr);
100525+#endif
100526 else
100527 len += sprintf(buf + len, "<not-available>");
100528
100529@@ -4150,12 +4219,12 @@ static void __init resiliency_test(void)
100530 validate_slab_cache(kmalloc_caches[9]);
100531 }
100532 #else
100533-#ifdef CONFIG_SYSFS
100534+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100535 static void resiliency_test(void) {};
100536 #endif
100537 #endif
100538
100539-#ifdef CONFIG_SYSFS
100540+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100541 enum slab_stat_type {
100542 SL_ALL, /* All slabs */
100543 SL_PARTIAL, /* Only partially allocated slabs */
100544@@ -4392,13 +4461,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
100545 {
100546 if (!s->ctor)
100547 return 0;
100548+#ifdef CONFIG_GRKERNSEC_HIDESYM
100549+ return sprintf(buf, "%pS\n", NULL);
100550+#else
100551 return sprintf(buf, "%pS\n", s->ctor);
100552+#endif
100553 }
100554 SLAB_ATTR_RO(ctor);
100555
100556 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
100557 {
100558- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
100559+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
100560 }
100561 SLAB_ATTR_RO(aliases);
100562
100563@@ -4486,6 +4559,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
100564 SLAB_ATTR_RO(cache_dma);
100565 #endif
100566
100567+#ifdef CONFIG_PAX_USERCOPY_SLABS
100568+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
100569+{
100570+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
100571+}
100572+SLAB_ATTR_RO(usercopy);
100573+#endif
100574+
100575+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100576+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
100577+{
100578+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
100579+}
100580+SLAB_ATTR_RO(sanitize);
100581+#endif
100582+
100583 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
100584 {
100585 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
100586@@ -4541,7 +4630,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
100587 * as well as cause other issues like converting a mergeable
100588 * cache into an umergeable one.
100589 */
100590- if (s->refcount > 1)
100591+ if (atomic_read(&s->refcount) > 1)
100592 return -EINVAL;
100593
100594 s->flags &= ~SLAB_TRACE;
100595@@ -4661,7 +4750,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
100596 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
100597 size_t length)
100598 {
100599- if (s->refcount > 1)
100600+ if (atomic_read(&s->refcount) > 1)
100601 return -EINVAL;
100602
100603 s->flags &= ~SLAB_FAILSLAB;
100604@@ -4831,6 +4920,12 @@ static struct attribute *slab_attrs[] = {
100605 #ifdef CONFIG_ZONE_DMA
100606 &cache_dma_attr.attr,
100607 #endif
100608+#ifdef CONFIG_PAX_USERCOPY_SLABS
100609+ &usercopy_attr.attr,
100610+#endif
100611+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100612+ &sanitize_attr.attr,
100613+#endif
100614 #ifdef CONFIG_NUMA
100615 &remote_node_defrag_ratio_attr.attr,
100616 #endif
100617@@ -5075,6 +5170,7 @@ static char *create_unique_id(struct kmem_cache *s)
100618 return name;
100619 }
100620
100621+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100622 static int sysfs_slab_add(struct kmem_cache *s)
100623 {
100624 int err;
100625@@ -5148,6 +5244,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
100626 kobject_del(&s->kobj);
100627 kobject_put(&s->kobj);
100628 }
100629+#endif
100630
100631 /*
100632 * Need to buffer aliases during bootup until sysfs becomes
100633@@ -5161,6 +5258,7 @@ struct saved_alias {
100634
100635 static struct saved_alias *alias_list;
100636
100637+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100638 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
100639 {
100640 struct saved_alias *al;
100641@@ -5183,6 +5281,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
100642 alias_list = al;
100643 return 0;
100644 }
100645+#endif
100646
100647 static int __init slab_sysfs_init(void)
100648 {
100649diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
100650index 4cba9c2..b4f9fcc 100644
100651--- a/mm/sparse-vmemmap.c
100652+++ b/mm/sparse-vmemmap.c
100653@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
100654 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
100655 if (!p)
100656 return NULL;
100657- pud_populate(&init_mm, pud, p);
100658+ pud_populate_kernel(&init_mm, pud, p);
100659 }
100660 return pud;
100661 }
100662@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
100663 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
100664 if (!p)
100665 return NULL;
100666- pgd_populate(&init_mm, pgd, p);
100667+ pgd_populate_kernel(&init_mm, pgd, p);
100668 }
100669 return pgd;
100670 }
100671diff --git a/mm/sparse.c b/mm/sparse.c
100672index d1b48b6..6e8590e 100644
100673--- a/mm/sparse.c
100674+++ b/mm/sparse.c
100675@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
100676
100677 for (i = 0; i < PAGES_PER_SECTION; i++) {
100678 if (PageHWPoison(&memmap[i])) {
100679- atomic_long_sub(1, &num_poisoned_pages);
100680+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
100681 ClearPageHWPoison(&memmap[i]);
100682 }
100683 }
100684diff --git a/mm/swap.c b/mm/swap.c
100685index 8a12b33..7068e78 100644
100686--- a/mm/swap.c
100687+++ b/mm/swap.c
100688@@ -31,6 +31,7 @@
100689 #include <linux/memcontrol.h>
100690 #include <linux/gfp.h>
100691 #include <linux/uio.h>
100692+#include <linux/hugetlb.h>
100693
100694 #include "internal.h"
100695
100696@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
100697
100698 __page_cache_release(page);
100699 dtor = get_compound_page_dtor(page);
100700+ if (!PageHuge(page))
100701+ BUG_ON(dtor != free_compound_page);
100702 (*dtor)(page);
100703 }
100704
100705diff --git a/mm/swapfile.c b/mm/swapfile.c
100706index 63f55cc..31874e6 100644
100707--- a/mm/swapfile.c
100708+++ b/mm/swapfile.c
100709@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
100710
100711 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
100712 /* Activity counter to indicate that a swapon or swapoff has occurred */
100713-static atomic_t proc_poll_event = ATOMIC_INIT(0);
100714+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
100715
100716 static inline unsigned char swap_count(unsigned char ent)
100717 {
100718@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
100719 spin_unlock(&swap_lock);
100720
100721 err = 0;
100722- atomic_inc(&proc_poll_event);
100723+ atomic_inc_unchecked(&proc_poll_event);
100724 wake_up_interruptible(&proc_poll_wait);
100725
100726 out_dput:
100727@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
100728
100729 poll_wait(file, &proc_poll_wait, wait);
100730
100731- if (seq->poll_event != atomic_read(&proc_poll_event)) {
100732- seq->poll_event = atomic_read(&proc_poll_event);
100733+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
100734+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
100735 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
100736 }
100737
100738@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
100739 return ret;
100740
100741 seq = file->private_data;
100742- seq->poll_event = atomic_read(&proc_poll_event);
100743+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
100744 return 0;
100745 }
100746
100747@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
100748 (frontswap_map) ? "FS" : "");
100749
100750 mutex_unlock(&swapon_mutex);
100751- atomic_inc(&proc_poll_event);
100752+ atomic_inc_unchecked(&proc_poll_event);
100753 wake_up_interruptible(&proc_poll_wait);
100754
100755 if (S_ISREG(inode->i_mode))
100756diff --git a/mm/util.c b/mm/util.c
100757index fec39d4..3e60325 100644
100758--- a/mm/util.c
100759+++ b/mm/util.c
100760@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
100761 void arch_pick_mmap_layout(struct mm_struct *mm)
100762 {
100763 mm->mmap_base = TASK_UNMAPPED_BASE;
100764+
100765+#ifdef CONFIG_PAX_RANDMMAP
100766+ if (mm->pax_flags & MF_PAX_RANDMMAP)
100767+ mm->mmap_base += mm->delta_mmap;
100768+#endif
100769+
100770 mm->get_unmapped_area = arch_get_unmapped_area;
100771 }
100772 #endif
100773@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
100774 if (!mm->arg_end)
100775 goto out_mm; /* Shh! No looking before we're done */
100776
100777+ if (gr_acl_handle_procpidmem(task))
100778+ goto out_mm;
100779+
100780 len = mm->arg_end - mm->arg_start;
100781
100782 if (len > buflen)
100783diff --git a/mm/vmalloc.c b/mm/vmalloc.c
100784index 39c3388..7d976d4 100644
100785--- a/mm/vmalloc.c
100786+++ b/mm/vmalloc.c
100787@@ -39,20 +39,65 @@ struct vfree_deferred {
100788 struct work_struct wq;
100789 };
100790 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
100791+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
100792+
100793+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100794+struct stack_deferred_llist {
100795+ struct llist_head list;
100796+ void *stack;
100797+ void *lowmem_stack;
100798+};
100799+
100800+struct stack_deferred {
100801+ struct stack_deferred_llist list;
100802+ struct work_struct wq;
100803+};
100804+
100805+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
100806+#endif
100807
100808 static void __vunmap(const void *, int);
100809
100810-static void free_work(struct work_struct *w)
100811+static void vfree_work(struct work_struct *w)
100812+{
100813+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
100814+ struct llist_node *llnode = llist_del_all(&p->list);
100815+ while (llnode) {
100816+ void *x = llnode;
100817+ llnode = llist_next(llnode);
100818+ __vunmap(x, 1);
100819+ }
100820+}
100821+
100822+static void vunmap_work(struct work_struct *w)
100823 {
100824 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
100825 struct llist_node *llnode = llist_del_all(&p->list);
100826 while (llnode) {
100827 void *p = llnode;
100828 llnode = llist_next(llnode);
100829- __vunmap(p, 1);
100830+ __vunmap(p, 0);
100831 }
100832 }
100833
100834+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100835+static void unmap_work(struct work_struct *w)
100836+{
100837+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
100838+ struct llist_node *llnode = llist_del_all(&p->list.list);
100839+ while (llnode) {
100840+ struct stack_deferred_llist *x =
100841+ llist_entry((struct llist_head *)llnode,
100842+ struct stack_deferred_llist, list);
100843+ void *stack = ACCESS_ONCE(x->stack);
100844+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
100845+ llnode = llist_next(llnode);
100846+ __vunmap(stack, 0);
100847+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
100848+ }
100849+}
100850+#endif
100851+
100852 /*** Page table manipulation functions ***/
100853
100854 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100855@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100856
100857 pte = pte_offset_kernel(pmd, addr);
100858 do {
100859- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100860- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100861+
100862+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100863+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
100864+ BUG_ON(!pte_exec(*pte));
100865+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
100866+ continue;
100867+ }
100868+#endif
100869+
100870+ {
100871+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100872+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100873+ }
100874 } while (pte++, addr += PAGE_SIZE, addr != end);
100875 }
100876
100877@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
100878 pte = pte_alloc_kernel(pmd, addr);
100879 if (!pte)
100880 return -ENOMEM;
100881+
100882+ pax_open_kernel();
100883 do {
100884 struct page *page = pages[*nr];
100885
100886- if (WARN_ON(!pte_none(*pte)))
100887+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100888+ if (pgprot_val(prot) & _PAGE_NX)
100889+#endif
100890+
100891+ if (!pte_none(*pte)) {
100892+ pax_close_kernel();
100893+ WARN_ON(1);
100894 return -EBUSY;
100895- if (WARN_ON(!page))
100896+ }
100897+ if (!page) {
100898+ pax_close_kernel();
100899+ WARN_ON(1);
100900 return -ENOMEM;
100901+ }
100902 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
100903 (*nr)++;
100904 } while (pte++, addr += PAGE_SIZE, addr != end);
100905+ pax_close_kernel();
100906 return 0;
100907 }
100908
100909@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
100910 pmd_t *pmd;
100911 unsigned long next;
100912
100913- pmd = pmd_alloc(&init_mm, pud, addr);
100914+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
100915 if (!pmd)
100916 return -ENOMEM;
100917 do {
100918@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
100919 pud_t *pud;
100920 unsigned long next;
100921
100922- pud = pud_alloc(&init_mm, pgd, addr);
100923+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
100924 if (!pud)
100925 return -ENOMEM;
100926 do {
100927@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
100928 if (addr >= MODULES_VADDR && addr < MODULES_END)
100929 return 1;
100930 #endif
100931+
100932+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100933+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
100934+ return 1;
100935+#endif
100936+
100937 return is_vmalloc_addr(x);
100938 }
100939
100940@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
100941
100942 if (!pgd_none(*pgd)) {
100943 pud_t *pud = pud_offset(pgd, addr);
100944+#ifdef CONFIG_X86
100945+ if (!pud_large(*pud))
100946+#endif
100947 if (!pud_none(*pud)) {
100948 pmd_t *pmd = pmd_offset(pud, addr);
100949+#ifdef CONFIG_X86
100950+ if (!pmd_large(*pmd))
100951+#endif
100952 if (!pmd_none(*pmd)) {
100953 pte_t *ptep, pte;
100954
100955@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
100956 * Allocate a region of KVA of the specified size and alignment, within the
100957 * vstart and vend.
100958 */
100959-static struct vmap_area *alloc_vmap_area(unsigned long size,
100960+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
100961 unsigned long align,
100962 unsigned long vstart, unsigned long vend,
100963 int node, gfp_t gfp_mask)
100964@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
100965 for_each_possible_cpu(i) {
100966 struct vmap_block_queue *vbq;
100967 struct vfree_deferred *p;
100968+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100969+ struct stack_deferred *p2;
100970+#endif
100971
100972 vbq = &per_cpu(vmap_block_queue, i);
100973 spin_lock_init(&vbq->lock);
100974 INIT_LIST_HEAD(&vbq->free);
100975+
100976 p = &per_cpu(vfree_deferred, i);
100977 init_llist_head(&p->list);
100978- INIT_WORK(&p->wq, free_work);
100979+ INIT_WORK(&p->wq, vfree_work);
100980+
100981+ p = &per_cpu(vunmap_deferred, i);
100982+ init_llist_head(&p->list);
100983+ INIT_WORK(&p->wq, vunmap_work);
100984+
100985+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100986+ p2 = &per_cpu(stack_deferred, i);
100987+ init_llist_head(&p2->list.list);
100988+ INIT_WORK(&p2->wq, unmap_work);
100989+#endif
100990 }
100991
100992 /* Import existing vmlist entries. */
100993@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
100994 struct vm_struct *area;
100995
100996 BUG_ON(in_interrupt());
100997+
100998+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100999+ if (flags & VM_KERNEXEC) {
101000+ if (start != VMALLOC_START || end != VMALLOC_END)
101001+ return NULL;
101002+ start = (unsigned long)MODULES_EXEC_VADDR;
101003+ end = (unsigned long)MODULES_EXEC_END;
101004+ }
101005+#endif
101006+
101007 if (flags & VM_IOREMAP)
101008 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
101009
101010@@ -1511,13 +1616,37 @@ EXPORT_SYMBOL(vfree);
101011 */
101012 void vunmap(const void *addr)
101013 {
101014- BUG_ON(in_interrupt());
101015- might_sleep();
101016- if (addr)
101017+ if (!addr)
101018+ return;
101019+
101020+ if (unlikely(in_interrupt())) {
101021+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
101022+ if (llist_add((struct llist_node *)addr, &p->list))
101023+ schedule_work(&p->wq);
101024+ } else {
101025+ might_sleep();
101026 __vunmap(addr, 0);
101027+ }
101028 }
101029 EXPORT_SYMBOL(vunmap);
101030
101031+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101032+void unmap_process_stacks(struct task_struct *task)
101033+{
101034+ if (unlikely(in_interrupt())) {
101035+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
101036+ struct stack_deferred_llist *list = task->stack;
101037+ list->stack = task->stack;
101038+ list->lowmem_stack = task->lowmem_stack;
101039+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
101040+ schedule_work(&p->wq);
101041+ } else {
101042+ __vunmap(task->stack, 0);
101043+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
101044+ }
101045+}
101046+#endif
101047+
101048 /**
101049 * vmap - map an array of pages into virtually contiguous space
101050 * @pages: array of page pointers
101051@@ -1538,6 +1667,11 @@ void *vmap(struct page **pages, unsigned int count,
101052 if (count > totalram_pages)
101053 return NULL;
101054
101055+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101056+ if (!(pgprot_val(prot) & _PAGE_NX))
101057+ flags |= VM_KERNEXEC;
101058+#endif
101059+
101060 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
101061 __builtin_return_address(0));
101062 if (!area)
101063@@ -1640,6 +1774,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
101064 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
101065 goto fail;
101066
101067+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101068+ if (!(pgprot_val(prot) & _PAGE_NX))
101069+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
101070+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
101071+ else
101072+#endif
101073+
101074 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
101075 start, end, node, gfp_mask, caller);
101076 if (!area)
101077@@ -1816,10 +1957,9 @@ EXPORT_SYMBOL(vzalloc_node);
101078 * For tight control over page level allocator and protection flags
101079 * use __vmalloc() instead.
101080 */
101081-
101082 void *vmalloc_exec(unsigned long size)
101083 {
101084- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
101085+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
101086 NUMA_NO_NODE, __builtin_return_address(0));
101087 }
101088
101089@@ -2126,6 +2266,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
101090 {
101091 struct vm_struct *area;
101092
101093+ BUG_ON(vma->vm_mirror);
101094+
101095 size = PAGE_ALIGN(size);
101096
101097 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
101098@@ -2608,7 +2750,11 @@ static int s_show(struct seq_file *m, void *p)
101099 v->addr, v->addr + v->size, v->size);
101100
101101 if (v->caller)
101102+#ifdef CONFIG_GRKERNSEC_HIDESYM
101103+ seq_printf(m, " %pK", v->caller);
101104+#else
101105 seq_printf(m, " %pS", v->caller);
101106+#endif
101107
101108 if (v->nr_pages)
101109 seq_printf(m, " pages=%d", v->nr_pages);
101110diff --git a/mm/vmstat.c b/mm/vmstat.c
101111index cdac773..7dd324e 100644
101112--- a/mm/vmstat.c
101113+++ b/mm/vmstat.c
101114@@ -24,6 +24,7 @@
101115 #include <linux/mm_inline.h>
101116 #include <linux/page_ext.h>
101117 #include <linux/page_owner.h>
101118+#include <linux/grsecurity.h>
101119
101120 #include "internal.h"
101121
101122@@ -83,7 +84,7 @@ void vm_events_fold_cpu(int cpu)
101123 *
101124 * vm_stat contains the global counters
101125 */
101126-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101127+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101128 EXPORT_SYMBOL(vm_stat);
101129
101130 #ifdef CONFIG_SMP
101131@@ -435,7 +436,7 @@ static int fold_diff(int *diff)
101132
101133 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101134 if (diff[i]) {
101135- atomic_long_add(diff[i], &vm_stat[i]);
101136+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
101137 changes++;
101138 }
101139 return changes;
101140@@ -473,7 +474,7 @@ static int refresh_cpu_vm_stats(void)
101141 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
101142 if (v) {
101143
101144- atomic_long_add(v, &zone->vm_stat[i]);
101145+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101146 global_diff[i] += v;
101147 #ifdef CONFIG_NUMA
101148 /* 3 seconds idle till flush */
101149@@ -537,7 +538,7 @@ void cpu_vm_stats_fold(int cpu)
101150
101151 v = p->vm_stat_diff[i];
101152 p->vm_stat_diff[i] = 0;
101153- atomic_long_add(v, &zone->vm_stat[i]);
101154+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101155 global_diff[i] += v;
101156 }
101157 }
101158@@ -557,8 +558,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
101159 if (pset->vm_stat_diff[i]) {
101160 int v = pset->vm_stat_diff[i];
101161 pset->vm_stat_diff[i] = 0;
101162- atomic_long_add(v, &zone->vm_stat[i]);
101163- atomic_long_add(v, &vm_stat[i]);
101164+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101165+ atomic_long_add_unchecked(v, &vm_stat[i]);
101166 }
101167 }
101168 #endif
101169@@ -1291,10 +1292,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
101170 stat_items_size += sizeof(struct vm_event_state);
101171 #endif
101172
101173- v = kmalloc(stat_items_size, GFP_KERNEL);
101174+ v = kzalloc(stat_items_size, GFP_KERNEL);
101175 m->private = v;
101176 if (!v)
101177 return ERR_PTR(-ENOMEM);
101178+
101179+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101180+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101181+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
101182+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
101183+ && !in_group_p(grsec_proc_gid)
101184+#endif
101185+ )
101186+ return (unsigned long *)m->private + *pos;
101187+#endif
101188+#endif
101189+
101190 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101191 v[i] = global_page_state(i);
101192 v += NR_VM_ZONE_STAT_ITEMS;
101193@@ -1526,10 +1539,16 @@ static int __init setup_vmstat(void)
101194 cpu_notifier_register_done();
101195 #endif
101196 #ifdef CONFIG_PROC_FS
101197- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
101198- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
101199- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101200- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
101201+ {
101202+ mode_t gr_mode = S_IRUGO;
101203+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101204+ gr_mode = S_IRUSR;
101205+#endif
101206+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
101207+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
101208+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101209+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
101210+ }
101211 #endif
101212 return 0;
101213 }
101214diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
101215index 64c6bed..b79a5de 100644
101216--- a/net/8021q/vlan.c
101217+++ b/net/8021q/vlan.c
101218@@ -481,7 +481,7 @@ out:
101219 return NOTIFY_DONE;
101220 }
101221
101222-static struct notifier_block vlan_notifier_block __read_mostly = {
101223+static struct notifier_block vlan_notifier_block = {
101224 .notifier_call = vlan_device_event,
101225 };
101226
101227@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
101228 err = -EPERM;
101229 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
101230 break;
101231- if ((args.u.name_type >= 0) &&
101232- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
101233+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
101234 struct vlan_net *vn;
101235
101236 vn = net_generic(net, vlan_net_id);
101237diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
101238index 8ac8a5c..991defc 100644
101239--- a/net/8021q/vlan_netlink.c
101240+++ b/net/8021q/vlan_netlink.c
101241@@ -238,7 +238,7 @@ nla_put_failure:
101242 return -EMSGSIZE;
101243 }
101244
101245-struct rtnl_link_ops vlan_link_ops __read_mostly = {
101246+struct rtnl_link_ops vlan_link_ops = {
101247 .kind = "vlan",
101248 .maxtype = IFLA_VLAN_MAX,
101249 .policy = vlan_policy,
101250diff --git a/net/9p/client.c b/net/9p/client.c
101251index e86a9bea..e91f70e 100644
101252--- a/net/9p/client.c
101253+++ b/net/9p/client.c
101254@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
101255 len - inline_len);
101256 } else {
101257 err = copy_from_user(ename + inline_len,
101258- uidata, len - inline_len);
101259+ (char __force_user *)uidata, len - inline_len);
101260 if (err) {
101261 err = -EFAULT;
101262 goto out_err;
101263@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
101264 kernel_buf = 1;
101265 indata = data;
101266 } else
101267- indata = (__force char *)udata;
101268+ indata = (__force_kernel char *)udata;
101269 /*
101270 * response header len is 11
101271 * PDU Header(7) + IO Size (4)
101272@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
101273 kernel_buf = 1;
101274 odata = data;
101275 } else
101276- odata = (char *)udata;
101277+ odata = (char __force_kernel *)udata;
101278 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
101279 P9_ZC_HDR_SZ, kernel_buf, "dqd",
101280 fid->fid, offset, rsize);
101281diff --git a/net/9p/mod.c b/net/9p/mod.c
101282index 6ab36ae..6f1841b 100644
101283--- a/net/9p/mod.c
101284+++ b/net/9p/mod.c
101285@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
101286 void v9fs_register_trans(struct p9_trans_module *m)
101287 {
101288 spin_lock(&v9fs_trans_lock);
101289- list_add_tail(&m->list, &v9fs_trans_list);
101290+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
101291 spin_unlock(&v9fs_trans_lock);
101292 }
101293 EXPORT_SYMBOL(v9fs_register_trans);
101294@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
101295 void v9fs_unregister_trans(struct p9_trans_module *m)
101296 {
101297 spin_lock(&v9fs_trans_lock);
101298- list_del_init(&m->list);
101299+ pax_list_del_init((struct list_head *)&m->list);
101300 spin_unlock(&v9fs_trans_lock);
101301 }
101302 EXPORT_SYMBOL(v9fs_unregister_trans);
101303diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
101304index 80d08f6..de63fd1 100644
101305--- a/net/9p/trans_fd.c
101306+++ b/net/9p/trans_fd.c
101307@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
101308 oldfs = get_fs();
101309 set_fs(get_ds());
101310 /* The cast to a user pointer is valid due to the set_fs() */
101311- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
101312+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
101313 set_fs(oldfs);
101314
101315 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
101316diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
101317index af46bc4..f9adfcd 100644
101318--- a/net/appletalk/atalk_proc.c
101319+++ b/net/appletalk/atalk_proc.c
101320@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
101321 struct proc_dir_entry *p;
101322 int rc = -ENOMEM;
101323
101324- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
101325+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
101326 if (!atalk_proc_dir)
101327 goto out;
101328
101329diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
101330index 876fbe8..8bbea9f 100644
101331--- a/net/atm/atm_misc.c
101332+++ b/net/atm/atm_misc.c
101333@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
101334 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
101335 return 1;
101336 atm_return(vcc, truesize);
101337- atomic_inc(&vcc->stats->rx_drop);
101338+ atomic_inc_unchecked(&vcc->stats->rx_drop);
101339 return 0;
101340 }
101341 EXPORT_SYMBOL(atm_charge);
101342@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
101343 }
101344 }
101345 atm_return(vcc, guess);
101346- atomic_inc(&vcc->stats->rx_drop);
101347+ atomic_inc_unchecked(&vcc->stats->rx_drop);
101348 return NULL;
101349 }
101350 EXPORT_SYMBOL(atm_alloc_charge);
101351@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
101352
101353 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
101354 {
101355-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
101356+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
101357 __SONET_ITEMS
101358 #undef __HANDLE_ITEM
101359 }
101360@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
101361
101362 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
101363 {
101364-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
101365+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
101366 __SONET_ITEMS
101367 #undef __HANDLE_ITEM
101368 }
101369diff --git a/net/atm/lec.c b/net/atm/lec.c
101370index 4b98f89..5a2f6cb 100644
101371--- a/net/atm/lec.c
101372+++ b/net/atm/lec.c
101373@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
101374 }
101375
101376 static struct lane2_ops lane2_ops = {
101377- lane2_resolve, /* resolve, spec 3.1.3 */
101378- lane2_associate_req, /* associate_req, spec 3.1.4 */
101379- NULL /* associate indicator, spec 3.1.5 */
101380+ .resolve = lane2_resolve,
101381+ .associate_req = lane2_associate_req,
101382+ .associate_indicator = NULL
101383 };
101384
101385 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
101386diff --git a/net/atm/lec.h b/net/atm/lec.h
101387index 4149db1..f2ab682 100644
101388--- a/net/atm/lec.h
101389+++ b/net/atm/lec.h
101390@@ -48,7 +48,7 @@ struct lane2_ops {
101391 const u8 *tlvs, u32 sizeoftlvs);
101392 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
101393 const u8 *tlvs, u32 sizeoftlvs);
101394-};
101395+} __no_const;
101396
101397 /*
101398 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
101399diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
101400index d1b2d9a..d549f7f 100644
101401--- a/net/atm/mpoa_caches.c
101402+++ b/net/atm/mpoa_caches.c
101403@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
101404
101405
101406 static struct in_cache_ops ingress_ops = {
101407- in_cache_add_entry, /* add_entry */
101408- in_cache_get, /* get */
101409- in_cache_get_with_mask, /* get_with_mask */
101410- in_cache_get_by_vcc, /* get_by_vcc */
101411- in_cache_put, /* put */
101412- in_cache_remove_entry, /* remove_entry */
101413- cache_hit, /* cache_hit */
101414- clear_count_and_expired, /* clear_count */
101415- check_resolving_entries, /* check_resolving */
101416- refresh_entries, /* refresh */
101417- in_destroy_cache /* destroy_cache */
101418+ .add_entry = in_cache_add_entry,
101419+ .get = in_cache_get,
101420+ .get_with_mask = in_cache_get_with_mask,
101421+ .get_by_vcc = in_cache_get_by_vcc,
101422+ .put = in_cache_put,
101423+ .remove_entry = in_cache_remove_entry,
101424+ .cache_hit = cache_hit,
101425+ .clear_count = clear_count_and_expired,
101426+ .check_resolving = check_resolving_entries,
101427+ .refresh = refresh_entries,
101428+ .destroy_cache = in_destroy_cache
101429 };
101430
101431 static struct eg_cache_ops egress_ops = {
101432- eg_cache_add_entry, /* add_entry */
101433- eg_cache_get_by_cache_id, /* get_by_cache_id */
101434- eg_cache_get_by_tag, /* get_by_tag */
101435- eg_cache_get_by_vcc, /* get_by_vcc */
101436- eg_cache_get_by_src_ip, /* get_by_src_ip */
101437- eg_cache_put, /* put */
101438- eg_cache_remove_entry, /* remove_entry */
101439- update_eg_cache_entry, /* update */
101440- clear_expired, /* clear_expired */
101441- eg_destroy_cache /* destroy_cache */
101442+ .add_entry = eg_cache_add_entry,
101443+ .get_by_cache_id = eg_cache_get_by_cache_id,
101444+ .get_by_tag = eg_cache_get_by_tag,
101445+ .get_by_vcc = eg_cache_get_by_vcc,
101446+ .get_by_src_ip = eg_cache_get_by_src_ip,
101447+ .put = eg_cache_put,
101448+ .remove_entry = eg_cache_remove_entry,
101449+ .update = update_eg_cache_entry,
101450+ .clear_expired = clear_expired,
101451+ .destroy_cache = eg_destroy_cache
101452 };
101453
101454
101455diff --git a/net/atm/proc.c b/net/atm/proc.c
101456index bbb6461..cf04016 100644
101457--- a/net/atm/proc.c
101458+++ b/net/atm/proc.c
101459@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
101460 const struct k_atm_aal_stats *stats)
101461 {
101462 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
101463- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
101464- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
101465- atomic_read(&stats->rx_drop));
101466+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
101467+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
101468+ atomic_read_unchecked(&stats->rx_drop));
101469 }
101470
101471 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
101472diff --git a/net/atm/resources.c b/net/atm/resources.c
101473index 0447d5d..3cf4728 100644
101474--- a/net/atm/resources.c
101475+++ b/net/atm/resources.c
101476@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
101477 static void copy_aal_stats(struct k_atm_aal_stats *from,
101478 struct atm_aal_stats *to)
101479 {
101480-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
101481+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
101482 __AAL_STAT_ITEMS
101483 #undef __HANDLE_ITEM
101484 }
101485@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
101486 static void subtract_aal_stats(struct k_atm_aal_stats *from,
101487 struct atm_aal_stats *to)
101488 {
101489-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
101490+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
101491 __AAL_STAT_ITEMS
101492 #undef __HANDLE_ITEM
101493 }
101494diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
101495index 919a5ce..cc6b444 100644
101496--- a/net/ax25/sysctl_net_ax25.c
101497+++ b/net/ax25/sysctl_net_ax25.c
101498@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
101499 {
101500 char path[sizeof("net/ax25/") + IFNAMSIZ];
101501 int k;
101502- struct ctl_table *table;
101503+ ctl_table_no_const *table;
101504
101505 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
101506 if (!table)
101507diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
101508index 1e80539..676c37a 100644
101509--- a/net/batman-adv/bat_iv_ogm.c
101510+++ b/net/batman-adv/bat_iv_ogm.c
101511@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
101512
101513 /* randomize initial seqno to avoid collision */
101514 get_random_bytes(&random_seqno, sizeof(random_seqno));
101515- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
101516+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
101517
101518 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
101519 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
101520@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
101521 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
101522
101523 /* change sequence number to network order */
101524- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
101525+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
101526 batadv_ogm_packet->seqno = htonl(seqno);
101527- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
101528+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
101529
101530 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
101531
101532@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
101533 return;
101534
101535 /* could be changed by schedule_own_packet() */
101536- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
101537+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
101538
101539 if (ogm_packet->flags & BATADV_DIRECTLINK)
101540 has_directlink_flag = true;
101541diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
101542index 00f9e14..e1c7203 100644
101543--- a/net/batman-adv/fragmentation.c
101544+++ b/net/batman-adv/fragmentation.c
101545@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
101546 frag_header.packet_type = BATADV_UNICAST_FRAG;
101547 frag_header.version = BATADV_COMPAT_VERSION;
101548 frag_header.ttl = BATADV_TTL;
101549- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
101550+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
101551 frag_header.reserved = 0;
101552 frag_header.no = 0;
101553 frag_header.total_size = htons(skb->len);
101554diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
101555index 5467955..75ad4e3 100644
101556--- a/net/batman-adv/soft-interface.c
101557+++ b/net/batman-adv/soft-interface.c
101558@@ -296,7 +296,7 @@ send:
101559 primary_if->net_dev->dev_addr);
101560
101561 /* set broadcast sequence number */
101562- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
101563+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
101564 bcast_packet->seqno = htonl(seqno);
101565
101566 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
101567@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
101568 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
101569
101570 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
101571- atomic_set(&bat_priv->bcast_seqno, 1);
101572+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
101573 atomic_set(&bat_priv->tt.vn, 0);
101574 atomic_set(&bat_priv->tt.local_changes, 0);
101575 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
101576@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
101577
101578 /* randomize initial seqno to avoid collision */
101579 get_random_bytes(&random_seqno, sizeof(random_seqno));
101580- atomic_set(&bat_priv->frag_seqno, random_seqno);
101581+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
101582
101583 bat_priv->primary_if = NULL;
101584 bat_priv->num_ifaces = 0;
101585@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
101586 return 0;
101587 }
101588
101589-struct rtnl_link_ops batadv_link_ops __read_mostly = {
101590+struct rtnl_link_ops batadv_link_ops = {
101591 .kind = "batadv",
101592 .priv_size = sizeof(struct batadv_priv),
101593 .setup = batadv_softif_init_early,
101594diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
101595index 8854c05..ee5d5497 100644
101596--- a/net/batman-adv/types.h
101597+++ b/net/batman-adv/types.h
101598@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
101599 struct batadv_hard_iface_bat_iv {
101600 unsigned char *ogm_buff;
101601 int ogm_buff_len;
101602- atomic_t ogm_seqno;
101603+ atomic_unchecked_t ogm_seqno;
101604 };
101605
101606 /**
101607@@ -768,7 +768,7 @@ struct batadv_priv {
101608 atomic_t bonding;
101609 atomic_t fragmentation;
101610 atomic_t packet_size_max;
101611- atomic_t frag_seqno;
101612+ atomic_unchecked_t frag_seqno;
101613 #ifdef CONFIG_BATMAN_ADV_BLA
101614 atomic_t bridge_loop_avoidance;
101615 #endif
101616@@ -787,7 +787,7 @@ struct batadv_priv {
101617 #endif
101618 uint32_t isolation_mark;
101619 uint32_t isolation_mark_mask;
101620- atomic_t bcast_seqno;
101621+ atomic_unchecked_t bcast_seqno;
101622 atomic_t bcast_queue_left;
101623 atomic_t batman_queue_left;
101624 char num_ifaces;
101625diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
101626index 2c245fd..dccf543 100644
101627--- a/net/bluetooth/hci_sock.c
101628+++ b/net/bluetooth/hci_sock.c
101629@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
101630 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
101631 }
101632
101633- len = min_t(unsigned int, len, sizeof(uf));
101634+ len = min((size_t)len, sizeof(uf));
101635 if (copy_from_user(&uf, optval, len)) {
101636 err = -EFAULT;
101637 break;
101638diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
101639index d04dc00..d25d576 100644
101640--- a/net/bluetooth/l2cap_core.c
101641+++ b/net/bluetooth/l2cap_core.c
101642@@ -3524,8 +3524,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
101643 break;
101644
101645 case L2CAP_CONF_RFC:
101646- if (olen == sizeof(rfc))
101647- memcpy(&rfc, (void *)val, olen);
101648+ if (olen != sizeof(rfc))
101649+ break;
101650+
101651+ memcpy(&rfc, (void *)val, olen);
101652
101653 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
101654 rfc.mode != chan->mode)
101655diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
101656index f65caf4..c07110c 100644
101657--- a/net/bluetooth/l2cap_sock.c
101658+++ b/net/bluetooth/l2cap_sock.c
101659@@ -634,7 +634,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
101660 struct sock *sk = sock->sk;
101661 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
101662 struct l2cap_options opts;
101663- int len, err = 0;
101664+ int err = 0;
101665+ size_t len = optlen;
101666 u32 opt;
101667
101668 BT_DBG("sk %p", sk);
101669@@ -661,7 +662,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
101670 opts.max_tx = chan->max_tx;
101671 opts.txwin_size = chan->tx_win;
101672
101673- len = min_t(unsigned int, sizeof(opts), optlen);
101674+ len = min(sizeof(opts), len);
101675 if (copy_from_user((char *) &opts, optval, len)) {
101676 err = -EFAULT;
101677 break;
101678@@ -748,7 +749,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101679 struct bt_security sec;
101680 struct bt_power pwr;
101681 struct l2cap_conn *conn;
101682- int len, err = 0;
101683+ int err = 0;
101684+ size_t len = optlen;
101685 u32 opt;
101686
101687 BT_DBG("sk %p", sk);
101688@@ -772,7 +774,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101689
101690 sec.level = BT_SECURITY_LOW;
101691
101692- len = min_t(unsigned int, sizeof(sec), optlen);
101693+ len = min(sizeof(sec), len);
101694 if (copy_from_user((char *) &sec, optval, len)) {
101695 err = -EFAULT;
101696 break;
101697@@ -868,7 +870,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101698
101699 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
101700
101701- len = min_t(unsigned int, sizeof(pwr), optlen);
101702+ len = min(sizeof(pwr), len);
101703 if (copy_from_user((char *) &pwr, optval, len)) {
101704 err = -EFAULT;
101705 break;
101706diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
101707index 2348176..b9b6cf2 100644
101708--- a/net/bluetooth/rfcomm/sock.c
101709+++ b/net/bluetooth/rfcomm/sock.c
101710@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
101711 struct sock *sk = sock->sk;
101712 struct bt_security sec;
101713 int err = 0;
101714- size_t len;
101715+ size_t len = optlen;
101716 u32 opt;
101717
101718 BT_DBG("sk %p", sk);
101719@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
101720
101721 sec.level = BT_SECURITY_LOW;
101722
101723- len = min_t(unsigned int, sizeof(sec), optlen);
101724+ len = min(sizeof(sec), len);
101725 if (copy_from_user((char *) &sec, optval, len)) {
101726 err = -EFAULT;
101727 break;
101728diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
101729index 8e385a0..a5bdd8e 100644
101730--- a/net/bluetooth/rfcomm/tty.c
101731+++ b/net/bluetooth/rfcomm/tty.c
101732@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
101733 BT_DBG("tty %p id %d", tty, tty->index);
101734
101735 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
101736- dev->channel, dev->port.count);
101737+ dev->channel, atomic_read(&dev->port.count));
101738
101739 err = tty_port_open(&dev->port, tty, filp);
101740 if (err)
101741@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
101742 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
101743
101744 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
101745- dev->port.count);
101746+ atomic_read(&dev->port.count));
101747
101748 tty_port_close(&dev->port, tty, filp);
101749 }
101750diff --git a/net/bridge/br.c b/net/bridge/br.c
101751index 44425af..4ee730e 100644
101752--- a/net/bridge/br.c
101753+++ b/net/bridge/br.c
101754@@ -147,6 +147,8 @@ static int __init br_init(void)
101755 {
101756 int err;
101757
101758+ BUILD_BUG_ON(sizeof(struct br_input_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
101759+
101760 err = stp_proto_register(&br_stp_proto);
101761 if (err < 0) {
101762 pr_err("bridge: can't register sap for STP\n");
101763diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
101764index 9f5eb55..45ab9c5 100644
101765--- a/net/bridge/br_netlink.c
101766+++ b/net/bridge/br_netlink.c
101767@@ -566,7 +566,7 @@ static struct rtnl_af_ops br_af_ops = {
101768 .get_link_af_size = br_get_link_af_size,
101769 };
101770
101771-struct rtnl_link_ops br_link_ops __read_mostly = {
101772+struct rtnl_link_ops br_link_ops = {
101773 .kind = "bridge",
101774 .priv_size = sizeof(struct net_bridge),
101775 .setup = br_dev_setup,
101776diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
101777index d9a8c05..8dadc6c6 100644
101778--- a/net/bridge/netfilter/ebtables.c
101779+++ b/net/bridge/netfilter/ebtables.c
101780@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
101781 tmp.valid_hooks = t->table->valid_hooks;
101782 }
101783 mutex_unlock(&ebt_mutex);
101784- if (copy_to_user(user, &tmp, *len) != 0) {
101785+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101786 BUGPRINT("c2u Didn't work\n");
101787 ret = -EFAULT;
101788 break;
101789@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
101790 goto out;
101791 tmp.valid_hooks = t->valid_hooks;
101792
101793- if (copy_to_user(user, &tmp, *len) != 0) {
101794+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101795 ret = -EFAULT;
101796 break;
101797 }
101798@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
101799 tmp.entries_size = t->table->entries_size;
101800 tmp.valid_hooks = t->table->valid_hooks;
101801
101802- if (copy_to_user(user, &tmp, *len) != 0) {
101803+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101804 ret = -EFAULT;
101805 break;
101806 }
101807diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
101808index f5afda1..dcf770a 100644
101809--- a/net/caif/cfctrl.c
101810+++ b/net/caif/cfctrl.c
101811@@ -10,6 +10,7 @@
101812 #include <linux/spinlock.h>
101813 #include <linux/slab.h>
101814 #include <linux/pkt_sched.h>
101815+#include <linux/sched.h>
101816 #include <net/caif/caif_layer.h>
101817 #include <net/caif/cfpkt.h>
101818 #include <net/caif/cfctrl.h>
101819@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
101820 memset(&dev_info, 0, sizeof(dev_info));
101821 dev_info.id = 0xff;
101822 cfsrvl_init(&this->serv, 0, &dev_info, false);
101823- atomic_set(&this->req_seq_no, 1);
101824- atomic_set(&this->rsp_seq_no, 1);
101825+ atomic_set_unchecked(&this->req_seq_no, 1);
101826+ atomic_set_unchecked(&this->rsp_seq_no, 1);
101827 this->serv.layer.receive = cfctrl_recv;
101828 sprintf(this->serv.layer.name, "ctrl");
101829 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
101830@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
101831 struct cfctrl_request_info *req)
101832 {
101833 spin_lock_bh(&ctrl->info_list_lock);
101834- atomic_inc(&ctrl->req_seq_no);
101835- req->sequence_no = atomic_read(&ctrl->req_seq_no);
101836+ atomic_inc_unchecked(&ctrl->req_seq_no);
101837+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
101838 list_add_tail(&req->list, &ctrl->list);
101839 spin_unlock_bh(&ctrl->info_list_lock);
101840 }
101841@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
101842 if (p != first)
101843 pr_warn("Requests are not received in order\n");
101844
101845- atomic_set(&ctrl->rsp_seq_no,
101846+ atomic_set_unchecked(&ctrl->rsp_seq_no,
101847 p->sequence_no);
101848 list_del(&p->list);
101849 goto out;
101850diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
101851index 67a4a36..8d28068 100644
101852--- a/net/caif/chnl_net.c
101853+++ b/net/caif/chnl_net.c
101854@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
101855 };
101856
101857
101858-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
101859+static struct rtnl_link_ops ipcaif_link_ops = {
101860 .kind = "caif",
101861 .priv_size = sizeof(struct chnl_net),
101862 .setup = ipcaif_net_setup,
101863diff --git a/net/can/af_can.c b/net/can/af_can.c
101864index 32d710e..93bcf05 100644
101865--- a/net/can/af_can.c
101866+++ b/net/can/af_can.c
101867@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
101868 };
101869
101870 /* notifier block for netdevice event */
101871-static struct notifier_block can_netdev_notifier __read_mostly = {
101872+static struct notifier_block can_netdev_notifier = {
101873 .notifier_call = can_notifier,
101874 };
101875
101876diff --git a/net/can/bcm.c b/net/can/bcm.c
101877index ee9ffd9..dfdf3d4 100644
101878--- a/net/can/bcm.c
101879+++ b/net/can/bcm.c
101880@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
101881 }
101882
101883 /* create /proc/net/can-bcm directory */
101884- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
101885+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
101886 return 0;
101887 }
101888
101889diff --git a/net/can/gw.c b/net/can/gw.c
101890index 295f62e..0c3b09e 100644
101891--- a/net/can/gw.c
101892+++ b/net/can/gw.c
101893@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
101894 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
101895
101896 static HLIST_HEAD(cgw_list);
101897-static struct notifier_block notifier;
101898
101899 static struct kmem_cache *cgw_cache __read_mostly;
101900
101901@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
101902 return err;
101903 }
101904
101905+static struct notifier_block notifier = {
101906+ .notifier_call = cgw_notifier
101907+};
101908+
101909 static __init int cgw_module_init(void)
101910 {
101911 /* sanitize given module parameter */
101912@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
101913 return -ENOMEM;
101914
101915 /* set notifier */
101916- notifier.notifier_call = cgw_notifier;
101917 register_netdevice_notifier(&notifier);
101918
101919 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
101920diff --git a/net/can/proc.c b/net/can/proc.c
101921index 1a19b98..df2b4ec 100644
101922--- a/net/can/proc.c
101923+++ b/net/can/proc.c
101924@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
101925 void can_init_proc(void)
101926 {
101927 /* create /proc/net/can directory */
101928- can_dir = proc_mkdir("can", init_net.proc_net);
101929+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
101930
101931 if (!can_dir) {
101932 printk(KERN_INFO "can: failed to create /proc/net/can . "
101933diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
101934index 74d30ec..25df678 100644
101935--- a/net/ceph/messenger.c
101936+++ b/net/ceph/messenger.c
101937@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
101938 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
101939
101940 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
101941-static atomic_t addr_str_seq = ATOMIC_INIT(0);
101942+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
101943
101944 static struct page *zero_page; /* used in certain error cases */
101945
101946@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
101947 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
101948 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
101949
101950- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101951+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101952 s = addr_str[i];
101953
101954 switch (ss->ss_family) {
101955diff --git a/net/compat.c b/net/compat.c
101956index f7bd286..76ea56a 100644
101957--- a/net/compat.c
101958+++ b/net/compat.c
101959@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
101960
101961 #define CMSG_COMPAT_FIRSTHDR(msg) \
101962 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
101963- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
101964+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
101965 (struct compat_cmsghdr __user *)NULL)
101966
101967 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
101968 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
101969 (ucmlen) <= (unsigned long) \
101970 ((mhdr)->msg_controllen - \
101971- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
101972+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
101973
101974 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
101975 struct compat_cmsghdr __user *cmsg, int cmsg_len)
101976 {
101977 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
101978- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
101979+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
101980 msg->msg_controllen)
101981 return NULL;
101982 return (struct compat_cmsghdr __user *)ptr;
101983@@ -203,7 +203,7 @@ Efault:
101984
101985 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
101986 {
101987- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101988+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101989 struct compat_cmsghdr cmhdr;
101990 struct compat_timeval ctv;
101991 struct compat_timespec cts[3];
101992@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
101993
101994 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
101995 {
101996- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101997+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101998 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
101999 int fdnum = scm->fp->count;
102000 struct file **fp = scm->fp->fp;
102001@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
102002 return -EFAULT;
102003 old_fs = get_fs();
102004 set_fs(KERNEL_DS);
102005- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
102006+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
102007 set_fs(old_fs);
102008
102009 return err;
102010@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
102011 len = sizeof(ktime);
102012 old_fs = get_fs();
102013 set_fs(KERNEL_DS);
102014- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
102015+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
102016 set_fs(old_fs);
102017
102018 if (!err) {
102019@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102020 case MCAST_JOIN_GROUP:
102021 case MCAST_LEAVE_GROUP:
102022 {
102023- struct compat_group_req __user *gr32 = (void *)optval;
102024+ struct compat_group_req __user *gr32 = (void __user *)optval;
102025 struct group_req __user *kgr =
102026 compat_alloc_user_space(sizeof(struct group_req));
102027 u32 interface;
102028@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102029 case MCAST_BLOCK_SOURCE:
102030 case MCAST_UNBLOCK_SOURCE:
102031 {
102032- struct compat_group_source_req __user *gsr32 = (void *)optval;
102033+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
102034 struct group_source_req __user *kgsr = compat_alloc_user_space(
102035 sizeof(struct group_source_req));
102036 u32 interface;
102037@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102038 }
102039 case MCAST_MSFILTER:
102040 {
102041- struct compat_group_filter __user *gf32 = (void *)optval;
102042+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102043 struct group_filter __user *kgf;
102044 u32 interface, fmode, numsrc;
102045
102046@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
102047 char __user *optval, int __user *optlen,
102048 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
102049 {
102050- struct compat_group_filter __user *gf32 = (void *)optval;
102051+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102052 struct group_filter __user *kgf;
102053 int __user *koptlen;
102054 u32 interface, fmode, numsrc;
102055@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
102056
102057 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
102058 return -EINVAL;
102059- if (copy_from_user(a, args, nas[call]))
102060+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
102061 return -EFAULT;
102062 a0 = a[0];
102063 a1 = a[1];
102064diff --git a/net/core/datagram.c b/net/core/datagram.c
102065index df493d6..1145766 100644
102066--- a/net/core/datagram.c
102067+++ b/net/core/datagram.c
102068@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
102069 }
102070
102071 kfree_skb(skb);
102072- atomic_inc(&sk->sk_drops);
102073+ atomic_inc_unchecked(&sk->sk_drops);
102074 sk_mem_reclaim_partial(sk);
102075
102076 return err;
102077diff --git a/net/core/dev.c b/net/core/dev.c
102078index 5dd905c..a95d262 100644
102079--- a/net/core/dev.c
102080+++ b/net/core/dev.c
102081@@ -1680,14 +1680,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
102082 {
102083 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
102084 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
102085- atomic_long_inc(&dev->rx_dropped);
102086+ atomic_long_inc_unchecked(&dev->rx_dropped);
102087 kfree_skb(skb);
102088 return NET_RX_DROP;
102089 }
102090 }
102091
102092 if (unlikely(!is_skb_forwardable(dev, skb))) {
102093- atomic_long_inc(&dev->rx_dropped);
102094+ atomic_long_inc_unchecked(&dev->rx_dropped);
102095 kfree_skb(skb);
102096 return NET_RX_DROP;
102097 }
102098@@ -2960,7 +2960,7 @@ recursion_alert:
102099 drop:
102100 rcu_read_unlock_bh();
102101
102102- atomic_long_inc(&dev->tx_dropped);
102103+ atomic_long_inc_unchecked(&dev->tx_dropped);
102104 kfree_skb_list(skb);
102105 return rc;
102106 out:
102107@@ -3303,7 +3303,7 @@ enqueue:
102108
102109 local_irq_restore(flags);
102110
102111- atomic_long_inc(&skb->dev->rx_dropped);
102112+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102113 kfree_skb(skb);
102114 return NET_RX_DROP;
102115 }
102116@@ -3380,7 +3380,7 @@ int netif_rx_ni(struct sk_buff *skb)
102117 }
102118 EXPORT_SYMBOL(netif_rx_ni);
102119
102120-static void net_tx_action(struct softirq_action *h)
102121+static __latent_entropy void net_tx_action(void)
102122 {
102123 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102124
102125@@ -3713,7 +3713,7 @@ ncls:
102126 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
102127 } else {
102128 drop:
102129- atomic_long_inc(&skb->dev->rx_dropped);
102130+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102131 kfree_skb(skb);
102132 /* Jamal, now you will not able to escape explaining
102133 * me how you were going to use this. :-)
102134@@ -4601,7 +4601,7 @@ out_unlock:
102135 return work;
102136 }
102137
102138-static void net_rx_action(struct softirq_action *h)
102139+static __latent_entropy void net_rx_action(void)
102140 {
102141 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102142 unsigned long time_limit = jiffies + 2;
102143@@ -6612,8 +6612,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
102144 } else {
102145 netdev_stats_to_stats64(storage, &dev->stats);
102146 }
102147- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
102148- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
102149+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
102150+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
102151 return storage;
102152 }
102153 EXPORT_SYMBOL(dev_get_stats);
102154diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
102155index b94b1d2..da3ed7c 100644
102156--- a/net/core/dev_ioctl.c
102157+++ b/net/core/dev_ioctl.c
102158@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
102159 no_module = !dev;
102160 if (no_module && capable(CAP_NET_ADMIN))
102161 no_module = request_module("netdev-%s", name);
102162- if (no_module && capable(CAP_SYS_MODULE))
102163+ if (no_module && capable(CAP_SYS_MODULE)) {
102164+#ifdef CONFIG_GRKERNSEC_MODHARDEN
102165+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
102166+#else
102167 request_module("%s", name);
102168+#endif
102169+ }
102170 }
102171 EXPORT_SYMBOL(dev_load);
102172
102173diff --git a/net/core/filter.c b/net/core/filter.c
102174index ec9baea..dd6195d 100644
102175--- a/net/core/filter.c
102176+++ b/net/core/filter.c
102177@@ -533,7 +533,11 @@ do_pass:
102178
102179 /* Unkown instruction. */
102180 default:
102181- goto err;
102182+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
102183+ fp->code, fp->jt, fp->jf, fp->k);
102184+ kfree(addrs);
102185+ BUG();
102186+ return -EINVAL;
102187 }
102188
102189 insn++;
102190@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
102191 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
102192 int pc, ret = 0;
102193
102194- BUILD_BUG_ON(BPF_MEMWORDS > 16);
102195+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
102196
102197 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
102198 if (!masks)
102199@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
102200 if (!fp)
102201 return -ENOMEM;
102202
102203- memcpy(fp->insns, fprog->filter, fsize);
102204+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
102205
102206 fp->len = fprog->len;
102207 /* Since unattached filters are not copied back to user
102208diff --git a/net/core/flow.c b/net/core/flow.c
102209index 1033725..340f65d 100644
102210--- a/net/core/flow.c
102211+++ b/net/core/flow.c
102212@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
102213 static int flow_entry_valid(struct flow_cache_entry *fle,
102214 struct netns_xfrm *xfrm)
102215 {
102216- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
102217+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
102218 return 0;
102219 if (fle->object && !fle->object->ops->check(fle->object))
102220 return 0;
102221@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
102222 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
102223 fcp->hash_count++;
102224 }
102225- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
102226+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
102227 flo = fle->object;
102228 if (!flo)
102229 goto ret_object;
102230@@ -263,7 +263,7 @@ nocache:
102231 }
102232 flo = resolver(net, key, family, dir, flo, ctx);
102233 if (fle) {
102234- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
102235+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
102236 if (!IS_ERR(flo))
102237 fle->object = flo;
102238 else
102239diff --git a/net/core/neighbour.c b/net/core/neighbour.c
102240index 8d614c9..55752ea 100644
102241--- a/net/core/neighbour.c
102242+++ b/net/core/neighbour.c
102243@@ -2802,7 +2802,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
102244 void __user *buffer, size_t *lenp, loff_t *ppos)
102245 {
102246 int size, ret;
102247- struct ctl_table tmp = *ctl;
102248+ ctl_table_no_const tmp = *ctl;
102249
102250 tmp.extra1 = &zero;
102251 tmp.extra2 = &unres_qlen_max;
102252@@ -2864,7 +2864,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
102253 void __user *buffer,
102254 size_t *lenp, loff_t *ppos)
102255 {
102256- struct ctl_table tmp = *ctl;
102257+ ctl_table_no_const tmp = *ctl;
102258 int ret;
102259
102260 tmp.extra1 = &zero;
102261diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
102262index 2bf8329..2eb1423 100644
102263--- a/net/core/net-procfs.c
102264+++ b/net/core/net-procfs.c
102265@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
102266 struct rtnl_link_stats64 temp;
102267 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
102268
102269- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102270+ if (gr_proc_is_restricted())
102271+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102272+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
102273+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
102274+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
102275+ else
102276+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102277 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
102278 dev->name, stats->rx_bytes, stats->rx_packets,
102279 stats->rx_errors,
102280@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
102281 return 0;
102282 }
102283
102284-static const struct seq_operations dev_seq_ops = {
102285+const struct seq_operations dev_seq_ops = {
102286 .start = dev_seq_start,
102287 .next = dev_seq_next,
102288 .stop = dev_seq_stop,
102289@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
102290
102291 static int softnet_seq_open(struct inode *inode, struct file *file)
102292 {
102293- return seq_open(file, &softnet_seq_ops);
102294+ return seq_open_restrict(file, &softnet_seq_ops);
102295 }
102296
102297 static const struct file_operations softnet_seq_fops = {
102298@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
102299 else
102300 seq_printf(seq, "%04x", ntohs(pt->type));
102301
102302+#ifdef CONFIG_GRKERNSEC_HIDESYM
102303+ seq_printf(seq, " %-8s %pf\n",
102304+ pt->dev ? pt->dev->name : "", NULL);
102305+#else
102306 seq_printf(seq, " %-8s %pf\n",
102307 pt->dev ? pt->dev->name : "", pt->func);
102308+#endif
102309 }
102310
102311 return 0;
102312diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
102313index 9993412..2a4672b 100644
102314--- a/net/core/net-sysfs.c
102315+++ b/net/core/net-sysfs.c
102316@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
102317 {
102318 struct net_device *netdev = to_net_dev(dev);
102319 return sprintf(buf, fmt_dec,
102320- atomic_read(&netdev->carrier_changes));
102321+ atomic_read_unchecked(&netdev->carrier_changes));
102322 }
102323 static DEVICE_ATTR_RO(carrier_changes);
102324
102325diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
102326index ce780c7..6d296b3 100644
102327--- a/net/core/net_namespace.c
102328+++ b/net/core/net_namespace.c
102329@@ -448,7 +448,7 @@ static int __register_pernet_operations(struct list_head *list,
102330 int error;
102331 LIST_HEAD(net_exit_list);
102332
102333- list_add_tail(&ops->list, list);
102334+ pax_list_add_tail((struct list_head *)&ops->list, list);
102335 if (ops->init || (ops->id && ops->size)) {
102336 for_each_net(net) {
102337 error = ops_init(ops, net);
102338@@ -461,7 +461,7 @@ static int __register_pernet_operations(struct list_head *list,
102339
102340 out_undo:
102341 /* If I have an error cleanup all namespaces I initialized */
102342- list_del(&ops->list);
102343+ pax_list_del((struct list_head *)&ops->list);
102344 ops_exit_list(ops, &net_exit_list);
102345 ops_free_list(ops, &net_exit_list);
102346 return error;
102347@@ -472,7 +472,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
102348 struct net *net;
102349 LIST_HEAD(net_exit_list);
102350
102351- list_del(&ops->list);
102352+ pax_list_del((struct list_head *)&ops->list);
102353 for_each_net(net)
102354 list_add_tail(&net->exit_list, &net_exit_list);
102355 ops_exit_list(ops, &net_exit_list);
102356@@ -606,7 +606,7 @@ int register_pernet_device(struct pernet_operations *ops)
102357 mutex_lock(&net_mutex);
102358 error = register_pernet_operations(&pernet_list, ops);
102359 if (!error && (first_device == &pernet_list))
102360- first_device = &ops->list;
102361+ first_device = (struct list_head *)&ops->list;
102362 mutex_unlock(&net_mutex);
102363 return error;
102364 }
102365diff --git a/net/core/netpoll.c b/net/core/netpoll.c
102366index e0ad5d1..04fa7f7 100644
102367--- a/net/core/netpoll.c
102368+++ b/net/core/netpoll.c
102369@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
102370 struct udphdr *udph;
102371 struct iphdr *iph;
102372 struct ethhdr *eth;
102373- static atomic_t ip_ident;
102374+ static atomic_unchecked_t ip_ident;
102375 struct ipv6hdr *ip6h;
102376
102377 udp_len = len + sizeof(*udph);
102378@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
102379 put_unaligned(0x45, (unsigned char *)iph);
102380 iph->tos = 0;
102381 put_unaligned(htons(ip_len), &(iph->tot_len));
102382- iph->id = htons(atomic_inc_return(&ip_ident));
102383+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
102384 iph->frag_off = 0;
102385 iph->ttl = 64;
102386 iph->protocol = IPPROTO_UDP;
102387diff --git a/net/core/pktgen.c b/net/core/pktgen.c
102388index 352d183..1bddfaf 100644
102389--- a/net/core/pktgen.c
102390+++ b/net/core/pktgen.c
102391@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
102392 pn->net = net;
102393 INIT_LIST_HEAD(&pn->pktgen_threads);
102394 pn->pktgen_exiting = false;
102395- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
102396+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
102397 if (!pn->proc_dir) {
102398 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
102399 return -ENODEV;
102400diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
102401index 76ec6c5..9cfb81c 100644
102402--- a/net/core/rtnetlink.c
102403+++ b/net/core/rtnetlink.c
102404@@ -60,7 +60,7 @@ struct rtnl_link {
102405 rtnl_doit_func doit;
102406 rtnl_dumpit_func dumpit;
102407 rtnl_calcit_func calcit;
102408-};
102409+} __no_const;
102410
102411 static DEFINE_MUTEX(rtnl_mutex);
102412
102413@@ -306,10 +306,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
102414 * to use the ops for creating device. So do not
102415 * fill up dellink as well. That disables rtnl_dellink.
102416 */
102417- if (ops->setup && !ops->dellink)
102418- ops->dellink = unregister_netdevice_queue;
102419+ if (ops->setup && !ops->dellink) {
102420+ pax_open_kernel();
102421+ *(void **)&ops->dellink = unregister_netdevice_queue;
102422+ pax_close_kernel();
102423+ }
102424
102425- list_add_tail(&ops->list, &link_ops);
102426+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
102427 return 0;
102428 }
102429 EXPORT_SYMBOL_GPL(__rtnl_link_register);
102430@@ -356,7 +359,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
102431 for_each_net(net) {
102432 __rtnl_kill_links(net, ops);
102433 }
102434- list_del(&ops->list);
102435+ pax_list_del((struct list_head *)&ops->list);
102436 }
102437 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
102438
102439@@ -1035,7 +1038,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
102440 (dev->ifalias &&
102441 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
102442 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
102443- atomic_read(&dev->carrier_changes)))
102444+ atomic_read_unchecked(&dev->carrier_changes)))
102445 goto nla_put_failure;
102446
102447 if (1) {
102448@@ -2094,6 +2097,10 @@ replay:
102449 if (IS_ERR(dest_net))
102450 return PTR_ERR(dest_net);
102451
102452+ err = -EPERM;
102453+ if (!netlink_ns_capable(skb, dest_net->user_ns, CAP_NET_ADMIN))
102454+ goto out;
102455+
102456 dev = rtnl_create_link(dest_net, ifname, name_assign_type, ops, tb);
102457 if (IS_ERR(dev)) {
102458 err = PTR_ERR(dev);
102459diff --git a/net/core/scm.c b/net/core/scm.c
102460index 3b6899b..cf36238 100644
102461--- a/net/core/scm.c
102462+++ b/net/core/scm.c
102463@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
102464 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
102465 {
102466 struct cmsghdr __user *cm
102467- = (__force struct cmsghdr __user *)msg->msg_control;
102468+ = (struct cmsghdr __force_user *)msg->msg_control;
102469 struct cmsghdr cmhdr;
102470 int cmlen = CMSG_LEN(len);
102471 int err;
102472@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
102473 err = -EFAULT;
102474 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
102475 goto out;
102476- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
102477+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
102478 goto out;
102479 cmlen = CMSG_SPACE(len);
102480 if (msg->msg_controllen < cmlen)
102481@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
102482 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
102483 {
102484 struct cmsghdr __user *cm
102485- = (__force struct cmsghdr __user*)msg->msg_control;
102486+ = (struct cmsghdr __force_user *)msg->msg_control;
102487
102488 int fdmax = 0;
102489 int fdnum = scm->fp->count;
102490@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
102491 if (fdnum < fdmax)
102492 fdmax = fdnum;
102493
102494- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
102495+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
102496 i++, cmfptr++)
102497 {
102498 struct socket *sock;
102499diff --git a/net/core/skbuff.c b/net/core/skbuff.c
102500index 39c444c..361c354 100644
102501--- a/net/core/skbuff.c
102502+++ b/net/core/skbuff.c
102503@@ -2123,7 +2123,7 @@ EXPORT_SYMBOL(__skb_checksum);
102504 __wsum skb_checksum(const struct sk_buff *skb, int offset,
102505 int len, __wsum csum)
102506 {
102507- const struct skb_checksum_ops ops = {
102508+ static const struct skb_checksum_ops ops = {
102509 .update = csum_partial_ext,
102510 .combine = csum_block_add_ext,
102511 };
102512@@ -3363,12 +3363,14 @@ void __init skb_init(void)
102513 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
102514 sizeof(struct sk_buff),
102515 0,
102516- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
102517+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
102518+ SLAB_NO_SANITIZE,
102519 NULL);
102520 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
102521 sizeof(struct sk_buff_fclones),
102522 0,
102523- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
102524+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
102525+ SLAB_NO_SANITIZE,
102526 NULL);
102527 }
102528
102529diff --git a/net/core/sock.c b/net/core/sock.c
102530index a91f99f..603a20c 100644
102531--- a/net/core/sock.c
102532+++ b/net/core/sock.c
102533@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102534 struct sk_buff_head *list = &sk->sk_receive_queue;
102535
102536 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
102537- atomic_inc(&sk->sk_drops);
102538+ atomic_inc_unchecked(&sk->sk_drops);
102539 trace_sock_rcvqueue_full(sk, skb);
102540 return -ENOMEM;
102541 }
102542@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102543 return err;
102544
102545 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
102546- atomic_inc(&sk->sk_drops);
102547+ atomic_inc_unchecked(&sk->sk_drops);
102548 return -ENOBUFS;
102549 }
102550
102551@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102552 skb_dst_force(skb);
102553
102554 spin_lock_irqsave(&list->lock, flags);
102555- skb->dropcount = atomic_read(&sk->sk_drops);
102556+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
102557 __skb_queue_tail(list, skb);
102558 spin_unlock_irqrestore(&list->lock, flags);
102559
102560@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
102561 skb->dev = NULL;
102562
102563 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
102564- atomic_inc(&sk->sk_drops);
102565+ atomic_inc_unchecked(&sk->sk_drops);
102566 goto discard_and_relse;
102567 }
102568 if (nested)
102569@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
102570 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
102571 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
102572 bh_unlock_sock(sk);
102573- atomic_inc(&sk->sk_drops);
102574+ atomic_inc_unchecked(&sk->sk_drops);
102575 goto discard_and_relse;
102576 }
102577
102578@@ -907,6 +907,7 @@ set_rcvbuf:
102579 }
102580 break;
102581
102582+#ifndef GRKERNSEC_BPF_HARDEN
102583 case SO_ATTACH_BPF:
102584 ret = -EINVAL;
102585 if (optlen == sizeof(u32)) {
102586@@ -919,7 +920,7 @@ set_rcvbuf:
102587 ret = sk_attach_bpf(ufd, sk);
102588 }
102589 break;
102590-
102591+#endif
102592 case SO_DETACH_FILTER:
102593 ret = sk_detach_filter(sk);
102594 break;
102595@@ -1023,12 +1024,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102596 struct timeval tm;
102597 } v;
102598
102599- int lv = sizeof(int);
102600- int len;
102601+ unsigned int lv = sizeof(int);
102602+ unsigned int len;
102603
102604 if (get_user(len, optlen))
102605 return -EFAULT;
102606- if (len < 0)
102607+ if (len > INT_MAX)
102608 return -EINVAL;
102609
102610 memset(&v, 0, sizeof(v));
102611@@ -1166,11 +1167,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102612
102613 case SO_PEERNAME:
102614 {
102615- char address[128];
102616+ char address[_K_SS_MAXSIZE];
102617
102618 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
102619 return -ENOTCONN;
102620- if (lv < len)
102621+ if (lv < len || sizeof address < len)
102622 return -EINVAL;
102623 if (copy_to_user(optval, address, len))
102624 return -EFAULT;
102625@@ -1255,7 +1256,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102626
102627 if (len > lv)
102628 len = lv;
102629- if (copy_to_user(optval, &v, len))
102630+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
102631 return -EFAULT;
102632 lenout:
102633 if (put_user(len, optlen))
102634@@ -2368,7 +2369,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
102635 */
102636 smp_wmb();
102637 atomic_set(&sk->sk_refcnt, 1);
102638- atomic_set(&sk->sk_drops, 0);
102639+ atomic_set_unchecked(&sk->sk_drops, 0);
102640 }
102641 EXPORT_SYMBOL(sock_init_data);
102642
102643@@ -2496,6 +2497,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
102644 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
102645 int level, int type)
102646 {
102647+ struct sock_extended_err ee;
102648 struct sock_exterr_skb *serr;
102649 struct sk_buff *skb;
102650 int copied, err;
102651@@ -2517,7 +2519,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
102652 sock_recv_timestamp(msg, sk, skb);
102653
102654 serr = SKB_EXT_ERR(skb);
102655- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
102656+ ee = serr->ee;
102657+ put_cmsg(msg, level, type, sizeof ee, &ee);
102658
102659 msg->msg_flags |= MSG_ERRQUEUE;
102660 err = copied;
102661diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
102662index ad704c7..ca48aff 100644
102663--- a/net/core/sock_diag.c
102664+++ b/net/core/sock_diag.c
102665@@ -9,26 +9,33 @@
102666 #include <linux/inet_diag.h>
102667 #include <linux/sock_diag.h>
102668
102669-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
102670+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
102671 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
102672 static DEFINE_MUTEX(sock_diag_table_mutex);
102673
102674 int sock_diag_check_cookie(void *sk, __u32 *cookie)
102675 {
102676+#ifndef CONFIG_GRKERNSEC_HIDESYM
102677 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
102678 cookie[1] != INET_DIAG_NOCOOKIE) &&
102679 ((u32)(unsigned long)sk != cookie[0] ||
102680 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
102681 return -ESTALE;
102682 else
102683+#endif
102684 return 0;
102685 }
102686 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
102687
102688 void sock_diag_save_cookie(void *sk, __u32 *cookie)
102689 {
102690+#ifdef CONFIG_GRKERNSEC_HIDESYM
102691+ cookie[0] = 0;
102692+ cookie[1] = 0;
102693+#else
102694 cookie[0] = (u32)(unsigned long)sk;
102695 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
102696+#endif
102697 }
102698 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
102699
102700@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
102701 mutex_lock(&sock_diag_table_mutex);
102702 if (sock_diag_handlers[hndl->family])
102703 err = -EBUSY;
102704- else
102705+ else {
102706+ pax_open_kernel();
102707 sock_diag_handlers[hndl->family] = hndl;
102708+ pax_close_kernel();
102709+ }
102710 mutex_unlock(&sock_diag_table_mutex);
102711
102712 return err;
102713@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
102714
102715 mutex_lock(&sock_diag_table_mutex);
102716 BUG_ON(sock_diag_handlers[family] != hnld);
102717+ pax_open_kernel();
102718 sock_diag_handlers[family] = NULL;
102719+ pax_close_kernel();
102720 mutex_unlock(&sock_diag_table_mutex);
102721 }
102722 EXPORT_SYMBOL_GPL(sock_diag_unregister);
102723diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
102724index bbb1d5a..754e2e5 100644
102725--- a/net/core/sysctl_net_core.c
102726+++ b/net/core/sysctl_net_core.c
102727@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
102728 {
102729 unsigned int orig_size, size;
102730 int ret, i;
102731- struct ctl_table tmp = {
102732+ ctl_table_no_const tmp = {
102733 .data = &size,
102734 .maxlen = sizeof(size),
102735 .mode = table->mode
102736@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
102737 void __user *buffer, size_t *lenp, loff_t *ppos)
102738 {
102739 char id[IFNAMSIZ];
102740- struct ctl_table tbl = {
102741+ ctl_table_no_const tbl = {
102742 .data = id,
102743 .maxlen = IFNAMSIZ,
102744 };
102745@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
102746 static int proc_do_rss_key(struct ctl_table *table, int write,
102747 void __user *buffer, size_t *lenp, loff_t *ppos)
102748 {
102749- struct ctl_table fake_table;
102750+ ctl_table_no_const fake_table;
102751 char buf[NETDEV_RSS_KEY_LEN * 3];
102752
102753 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
102754@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
102755 .mode = 0444,
102756 .proc_handler = proc_do_rss_key,
102757 },
102758-#ifdef CONFIG_BPF_JIT
102759+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
102760 {
102761 .procname = "bpf_jit_enable",
102762 .data = &bpf_jit_enable,
102763@@ -402,13 +402,12 @@ static struct ctl_table netns_core_table[] = {
102764
102765 static __net_init int sysctl_core_net_init(struct net *net)
102766 {
102767- struct ctl_table *tbl;
102768+ ctl_table_no_const *tbl = NULL;
102769
102770 net->core.sysctl_somaxconn = SOMAXCONN;
102771
102772- tbl = netns_core_table;
102773 if (!net_eq(net, &init_net)) {
102774- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
102775+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
102776 if (tbl == NULL)
102777 goto err_dup;
102778
102779@@ -418,17 +417,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
102780 if (net->user_ns != &init_user_ns) {
102781 tbl[0].procname = NULL;
102782 }
102783- }
102784-
102785- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
102786+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
102787+ } else
102788+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
102789 if (net->core.sysctl_hdr == NULL)
102790 goto err_reg;
102791
102792 return 0;
102793
102794 err_reg:
102795- if (tbl != netns_core_table)
102796- kfree(tbl);
102797+ kfree(tbl);
102798 err_dup:
102799 return -ENOMEM;
102800 }
102801@@ -443,7 +441,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
102802 kfree(tbl);
102803 }
102804
102805-static __net_initdata struct pernet_operations sysctl_core_ops = {
102806+static __net_initconst struct pernet_operations sysctl_core_ops = {
102807 .init = sysctl_core_net_init,
102808 .exit = sysctl_core_net_exit,
102809 };
102810diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
102811index 8102286..a0c2755 100644
102812--- a/net/decnet/af_decnet.c
102813+++ b/net/decnet/af_decnet.c
102814@@ -466,6 +466,7 @@ static struct proto dn_proto = {
102815 .sysctl_rmem = sysctl_decnet_rmem,
102816 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
102817 .obj_size = sizeof(struct dn_sock),
102818+ .slab_flags = SLAB_USERCOPY,
102819 };
102820
102821 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
102822diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
102823index 4400da7..3429972 100644
102824--- a/net/decnet/dn_dev.c
102825+++ b/net/decnet/dn_dev.c
102826@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
102827 .extra1 = &min_t3,
102828 .extra2 = &max_t3
102829 },
102830- {0}
102831+ { }
102832 },
102833 };
102834
102835diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
102836index 5325b54..a0d4d69 100644
102837--- a/net/decnet/sysctl_net_decnet.c
102838+++ b/net/decnet/sysctl_net_decnet.c
102839@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
102840
102841 if (len > *lenp) len = *lenp;
102842
102843- if (copy_to_user(buffer, addr, len))
102844+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
102845 return -EFAULT;
102846
102847 *lenp = len;
102848@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
102849
102850 if (len > *lenp) len = *lenp;
102851
102852- if (copy_to_user(buffer, devname, len))
102853+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
102854 return -EFAULT;
102855
102856 *lenp = len;
102857diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
102858index a2c7e4c..3dc9f67 100644
102859--- a/net/hsr/hsr_netlink.c
102860+++ b/net/hsr/hsr_netlink.c
102861@@ -102,7 +102,7 @@ nla_put_failure:
102862 return -EMSGSIZE;
102863 }
102864
102865-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
102866+static struct rtnl_link_ops hsr_link_ops = {
102867 .kind = "hsr",
102868 .maxtype = IFLA_HSR_MAX,
102869 .policy = hsr_policy,
102870diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
102871index 27eaa65..7083217 100644
102872--- a/net/ieee802154/6lowpan_rtnl.c
102873+++ b/net/ieee802154/6lowpan_rtnl.c
102874@@ -642,7 +642,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
102875 dev_put(real_dev);
102876 }
102877
102878-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
102879+static struct rtnl_link_ops lowpan_link_ops = {
102880 .kind = "lowpan",
102881 .priv_size = sizeof(struct lowpan_dev_info),
102882 .setup = lowpan_setup,
102883diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
102884index 9d980ed..7d01e12 100644
102885--- a/net/ieee802154/reassembly.c
102886+++ b/net/ieee802154/reassembly.c
102887@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
102888
102889 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102890 {
102891- struct ctl_table *table;
102892+ ctl_table_no_const *table = NULL;
102893 struct ctl_table_header *hdr;
102894 struct netns_ieee802154_lowpan *ieee802154_lowpan =
102895 net_ieee802154_lowpan(net);
102896
102897- table = lowpan_frags_ns_ctl_table;
102898 if (!net_eq(net, &init_net)) {
102899- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
102900+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
102901 GFP_KERNEL);
102902 if (table == NULL)
102903 goto err_alloc;
102904@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102905 /* Don't export sysctls to unprivileged users */
102906 if (net->user_ns != &init_user_ns)
102907 table[0].procname = NULL;
102908- }
102909-
102910- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102911+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102912+ } else
102913+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
102914 if (hdr == NULL)
102915 goto err_reg;
102916
102917@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102918 return 0;
102919
102920 err_reg:
102921- if (!net_eq(net, &init_net))
102922- kfree(table);
102923+ kfree(table);
102924 err_alloc:
102925 return -ENOMEM;
102926 }
102927diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
102928index a44773c..a6ae415 100644
102929--- a/net/ipv4/af_inet.c
102930+++ b/net/ipv4/af_inet.c
102931@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
102932 return ip_recv_error(sk, msg, len, addr_len);
102933 #if IS_ENABLED(CONFIG_IPV6)
102934 if (sk->sk_family == AF_INET6)
102935- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
102936+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
102937 #endif
102938 return -EINVAL;
102939 }
102940diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
102941index 214882e..ec032f6 100644
102942--- a/net/ipv4/devinet.c
102943+++ b/net/ipv4/devinet.c
102944@@ -69,7 +69,8 @@
102945
102946 static struct ipv4_devconf ipv4_devconf = {
102947 .data = {
102948- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102949+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102950+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102951 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102952 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102953 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102954@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
102955
102956 static struct ipv4_devconf ipv4_devconf_dflt = {
102957 .data = {
102958- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102959+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102960+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102961 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102962 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102963 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102964@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
102965 idx = 0;
102966 head = &net->dev_index_head[h];
102967 rcu_read_lock();
102968- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102969+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102970 net->dev_base_seq;
102971 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102972 if (idx < s_idx)
102973@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
102974 idx = 0;
102975 head = &net->dev_index_head[h];
102976 rcu_read_lock();
102977- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102978+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102979 net->dev_base_seq;
102980 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102981 if (idx < s_idx)
102982@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
102983 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
102984 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
102985
102986-static struct devinet_sysctl_table {
102987+static const struct devinet_sysctl_table {
102988 struct ctl_table_header *sysctl_header;
102989 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
102990 } devinet_sysctl = {
102991@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
102992 int err;
102993 struct ipv4_devconf *all, *dflt;
102994 #ifdef CONFIG_SYSCTL
102995- struct ctl_table *tbl = ctl_forward_entry;
102996+ ctl_table_no_const *tbl = NULL;
102997 struct ctl_table_header *forw_hdr;
102998 #endif
102999
103000@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
103001 goto err_alloc_dflt;
103002
103003 #ifdef CONFIG_SYSCTL
103004- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
103005+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
103006 if (tbl == NULL)
103007 goto err_alloc_ctl;
103008
103009@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
103010 goto err_reg_dflt;
103011
103012 err = -ENOMEM;
103013- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
103014+ if (!net_eq(net, &init_net))
103015+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
103016+ else
103017+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
103018 if (forw_hdr == NULL)
103019 goto err_reg_ctl;
103020 net->ipv4.forw_hdr = forw_hdr;
103021@@ -2287,8 +2292,7 @@ err_reg_ctl:
103022 err_reg_dflt:
103023 __devinet_sysctl_unregister(all);
103024 err_reg_all:
103025- if (tbl != ctl_forward_entry)
103026- kfree(tbl);
103027+ kfree(tbl);
103028 err_alloc_ctl:
103029 #endif
103030 if (dflt != &ipv4_devconf_dflt)
103031diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
103032index 23104a3..9f5570b 100644
103033--- a/net/ipv4/fib_frontend.c
103034+++ b/net/ipv4/fib_frontend.c
103035@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
103036 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103037 fib_sync_up(dev);
103038 #endif
103039- atomic_inc(&net->ipv4.dev_addr_genid);
103040+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103041 rt_cache_flush(dev_net(dev));
103042 break;
103043 case NETDEV_DOWN:
103044 fib_del_ifaddr(ifa, NULL);
103045- atomic_inc(&net->ipv4.dev_addr_genid);
103046+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103047 if (ifa->ifa_dev->ifa_list == NULL) {
103048 /* Last address was deleted from this interface.
103049 * Disable IP.
103050@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
103051 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103052 fib_sync_up(dev);
103053 #endif
103054- atomic_inc(&net->ipv4.dev_addr_genid);
103055+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103056 rt_cache_flush(net);
103057 break;
103058 case NETDEV_DOWN:
103059diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
103060index f99f41b..1879da9 100644
103061--- a/net/ipv4/fib_semantics.c
103062+++ b/net/ipv4/fib_semantics.c
103063@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
103064 nh->nh_saddr = inet_select_addr(nh->nh_dev,
103065 nh->nh_gw,
103066 nh->nh_parent->fib_scope);
103067- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
103068+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
103069
103070 return nh->nh_saddr;
103071 }
103072diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
103073index b986298..7e726da 100644
103074--- a/net/ipv4/fou.c
103075+++ b/net/ipv4/fou.c
103076@@ -765,12 +765,12 @@ EXPORT_SYMBOL(gue_build_header);
103077
103078 #ifdef CONFIG_NET_FOU_IP_TUNNELS
103079
103080-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
103081+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
103082 .encap_hlen = fou_encap_hlen,
103083 .build_header = fou_build_header,
103084 };
103085
103086-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
103087+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
103088 .encap_hlen = gue_encap_hlen,
103089 .build_header = gue_build_header,
103090 };
103091diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
103092index 9111a4e..3576905 100644
103093--- a/net/ipv4/inet_hashtables.c
103094+++ b/net/ipv4/inet_hashtables.c
103095@@ -18,6 +18,7 @@
103096 #include <linux/sched.h>
103097 #include <linux/slab.h>
103098 #include <linux/wait.h>
103099+#include <linux/security.h>
103100
103101 #include <net/inet_connection_sock.h>
103102 #include <net/inet_hashtables.h>
103103@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
103104 return inet_ehashfn(net, laddr, lport, faddr, fport);
103105 }
103106
103107+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
103108+
103109 /*
103110 * Allocate and initialize a new local port bind bucket.
103111 * The bindhash mutex for snum's hash chain must be held here.
103112@@ -554,6 +557,8 @@ ok:
103113 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
103114 spin_unlock(&head->lock);
103115
103116+ gr_update_task_in_ip_table(inet_sk(sk));
103117+
103118 if (tw) {
103119 inet_twsk_deschedule(tw, death_row);
103120 while (twrefcnt) {
103121diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
103122index 241afd7..31b95d5 100644
103123--- a/net/ipv4/inetpeer.c
103124+++ b/net/ipv4/inetpeer.c
103125@@ -461,7 +461,7 @@ relookup:
103126 if (p) {
103127 p->daddr = *daddr;
103128 atomic_set(&p->refcnt, 1);
103129- atomic_set(&p->rid, 0);
103130+ atomic_set_unchecked(&p->rid, 0);
103131 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
103132 p->rate_tokens = 0;
103133 /* 60*HZ is arbitrary, but chosen enough high so that the first
103134diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
103135index 145a50c..5dd8cc5 100644
103136--- a/net/ipv4/ip_fragment.c
103137+++ b/net/ipv4/ip_fragment.c
103138@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
103139 return 0;
103140
103141 start = qp->rid;
103142- end = atomic_inc_return(&peer->rid);
103143+ end = atomic_inc_return_unchecked(&peer->rid);
103144 qp->rid = end;
103145
103146 rc = qp->q.fragments && (end - start) > max;
103147@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
103148
103149 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103150 {
103151- struct ctl_table *table;
103152+ ctl_table_no_const *table = NULL;
103153 struct ctl_table_header *hdr;
103154
103155- table = ip4_frags_ns_ctl_table;
103156 if (!net_eq(net, &init_net)) {
103157- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103158+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103159 if (table == NULL)
103160 goto err_alloc;
103161
103162@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103163 /* Don't export sysctls to unprivileged users */
103164 if (net->user_ns != &init_user_ns)
103165 table[0].procname = NULL;
103166- }
103167+ hdr = register_net_sysctl(net, "net/ipv4", table);
103168+ } else
103169+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
103170
103171- hdr = register_net_sysctl(net, "net/ipv4", table);
103172 if (hdr == NULL)
103173 goto err_reg;
103174
103175@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103176 return 0;
103177
103178 err_reg:
103179- if (!net_eq(net, &init_net))
103180- kfree(table);
103181+ kfree(table);
103182 err_alloc:
103183 return -ENOMEM;
103184 }
103185diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
103186index 4f4bf5b..2c936fe 100644
103187--- a/net/ipv4/ip_gre.c
103188+++ b/net/ipv4/ip_gre.c
103189@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
103190 module_param(log_ecn_error, bool, 0644);
103191 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
103192
103193-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
103194+static struct rtnl_link_ops ipgre_link_ops;
103195 static int ipgre_tunnel_init(struct net_device *dev);
103196
103197 static int ipgre_net_id __read_mostly;
103198@@ -816,7 +816,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
103199 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
103200 };
103201
103202-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103203+static struct rtnl_link_ops ipgre_link_ops = {
103204 .kind = "gre",
103205 .maxtype = IFLA_GRE_MAX,
103206 .policy = ipgre_policy,
103207@@ -830,7 +830,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103208 .fill_info = ipgre_fill_info,
103209 };
103210
103211-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
103212+static struct rtnl_link_ops ipgre_tap_ops = {
103213 .kind = "gretap",
103214 .maxtype = IFLA_GRE_MAX,
103215 .policy = ipgre_policy,
103216diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
103217index 3d4da2c..40f9c29 100644
103218--- a/net/ipv4/ip_input.c
103219+++ b/net/ipv4/ip_input.c
103220@@ -147,6 +147,10 @@
103221 #include <linux/mroute.h>
103222 #include <linux/netlink.h>
103223
103224+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103225+extern int grsec_enable_blackhole;
103226+#endif
103227+
103228 /*
103229 * Process Router Attention IP option (RFC 2113)
103230 */
103231@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
103232 if (!raw) {
103233 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
103234 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
103235+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103236+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103237+#endif
103238 icmp_send(skb, ICMP_DEST_UNREACH,
103239 ICMP_PROT_UNREACH, 0);
103240 }
103241diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
103242index 6b85adb..cd7e5d3 100644
103243--- a/net/ipv4/ip_sockglue.c
103244+++ b/net/ipv4/ip_sockglue.c
103245@@ -1193,7 +1193,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
103246 len = min_t(unsigned int, len, opt->optlen);
103247 if (put_user(len, optlen))
103248 return -EFAULT;
103249- if (copy_to_user(optval, opt->__data, len))
103250+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
103251+ copy_to_user(optval, opt->__data, len))
103252 return -EFAULT;
103253 return 0;
103254 }
103255@@ -1324,7 +1325,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
103256 if (sk->sk_type != SOCK_STREAM)
103257 return -ENOPROTOOPT;
103258
103259- msg.msg_control = (__force void *) optval;
103260+ msg.msg_control = (__force_kernel void *) optval;
103261 msg.msg_controllen = len;
103262 msg.msg_flags = flags;
103263
103264diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
103265index 1a7e979..fd05aa4 100644
103266--- a/net/ipv4/ip_vti.c
103267+++ b/net/ipv4/ip_vti.c
103268@@ -45,7 +45,7 @@
103269 #include <net/net_namespace.h>
103270 #include <net/netns/generic.h>
103271
103272-static struct rtnl_link_ops vti_link_ops __read_mostly;
103273+static struct rtnl_link_ops vti_link_ops;
103274
103275 static int vti_net_id __read_mostly;
103276 static int vti_tunnel_init(struct net_device *dev);
103277@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
103278 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
103279 };
103280
103281-static struct rtnl_link_ops vti_link_ops __read_mostly = {
103282+static struct rtnl_link_ops vti_link_ops = {
103283 .kind = "vti",
103284 .maxtype = IFLA_VTI_MAX,
103285 .policy = vti_policy,
103286diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
103287index 7fa18bc..bea16af 100644
103288--- a/net/ipv4/ipconfig.c
103289+++ b/net/ipv4/ipconfig.c
103290@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
103291
103292 mm_segment_t oldfs = get_fs();
103293 set_fs(get_ds());
103294- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
103295+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
103296 set_fs(oldfs);
103297 return res;
103298 }
103299@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
103300
103301 mm_segment_t oldfs = get_fs();
103302 set_fs(get_ds());
103303- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
103304+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
103305 set_fs(oldfs);
103306 return res;
103307 }
103308@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
103309
103310 mm_segment_t oldfs = get_fs();
103311 set_fs(get_ds());
103312- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
103313+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
103314 set_fs(oldfs);
103315 return res;
103316 }
103317diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
103318index 40403114..c35c647 100644
103319--- a/net/ipv4/ipip.c
103320+++ b/net/ipv4/ipip.c
103321@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
103322 static int ipip_net_id __read_mostly;
103323
103324 static int ipip_tunnel_init(struct net_device *dev);
103325-static struct rtnl_link_ops ipip_link_ops __read_mostly;
103326+static struct rtnl_link_ops ipip_link_ops;
103327
103328 static int ipip_err(struct sk_buff *skb, u32 info)
103329 {
103330@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
103331 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
103332 };
103333
103334-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
103335+static struct rtnl_link_ops ipip_link_ops = {
103336 .kind = "ipip",
103337 .maxtype = IFLA_IPTUN_MAX,
103338 .policy = ipip_policy,
103339diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
103340index f95b6f9..2ee2097 100644
103341--- a/net/ipv4/netfilter/arp_tables.c
103342+++ b/net/ipv4/netfilter/arp_tables.c
103343@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
103344 #endif
103345
103346 static int get_info(struct net *net, void __user *user,
103347- const int *len, int compat)
103348+ int len, int compat)
103349 {
103350 char name[XT_TABLE_MAXNAMELEN];
103351 struct xt_table *t;
103352 int ret;
103353
103354- if (*len != sizeof(struct arpt_getinfo)) {
103355- duprintf("length %u != %Zu\n", *len,
103356+ if (len != sizeof(struct arpt_getinfo)) {
103357+ duprintf("length %u != %Zu\n", len,
103358 sizeof(struct arpt_getinfo));
103359 return -EINVAL;
103360 }
103361@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
103362 info.size = private->size;
103363 strcpy(info.name, name);
103364
103365- if (copy_to_user(user, &info, *len) != 0)
103366+ if (copy_to_user(user, &info, len) != 0)
103367 ret = -EFAULT;
103368 else
103369 ret = 0;
103370@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
103371
103372 switch (cmd) {
103373 case ARPT_SO_GET_INFO:
103374- ret = get_info(sock_net(sk), user, len, 1);
103375+ ret = get_info(sock_net(sk), user, *len, 1);
103376 break;
103377 case ARPT_SO_GET_ENTRIES:
103378 ret = compat_get_entries(sock_net(sk), user, len);
103379@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
103380
103381 switch (cmd) {
103382 case ARPT_SO_GET_INFO:
103383- ret = get_info(sock_net(sk), user, len, 0);
103384+ ret = get_info(sock_net(sk), user, *len, 0);
103385 break;
103386
103387 case ARPT_SO_GET_ENTRIES:
103388diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
103389index 99e810f..3711b81 100644
103390--- a/net/ipv4/netfilter/ip_tables.c
103391+++ b/net/ipv4/netfilter/ip_tables.c
103392@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
103393 #endif
103394
103395 static int get_info(struct net *net, void __user *user,
103396- const int *len, int compat)
103397+ int len, int compat)
103398 {
103399 char name[XT_TABLE_MAXNAMELEN];
103400 struct xt_table *t;
103401 int ret;
103402
103403- if (*len != sizeof(struct ipt_getinfo)) {
103404- duprintf("length %u != %zu\n", *len,
103405+ if (len != sizeof(struct ipt_getinfo)) {
103406+ duprintf("length %u != %zu\n", len,
103407 sizeof(struct ipt_getinfo));
103408 return -EINVAL;
103409 }
103410@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
103411 info.size = private->size;
103412 strcpy(info.name, name);
103413
103414- if (copy_to_user(user, &info, *len) != 0)
103415+ if (copy_to_user(user, &info, len) != 0)
103416 ret = -EFAULT;
103417 else
103418 ret = 0;
103419@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103420
103421 switch (cmd) {
103422 case IPT_SO_GET_INFO:
103423- ret = get_info(sock_net(sk), user, len, 1);
103424+ ret = get_info(sock_net(sk), user, *len, 1);
103425 break;
103426 case IPT_SO_GET_ENTRIES:
103427 ret = compat_get_entries(sock_net(sk), user, len);
103428@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103429
103430 switch (cmd) {
103431 case IPT_SO_GET_INFO:
103432- ret = get_info(sock_net(sk), user, len, 0);
103433+ ret = get_info(sock_net(sk), user, *len, 0);
103434 break;
103435
103436 case IPT_SO_GET_ENTRIES:
103437diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
103438index e90f83a..3e6acca 100644
103439--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
103440+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
103441@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
103442 spin_lock_init(&cn->lock);
103443
103444 #ifdef CONFIG_PROC_FS
103445- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
103446+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
103447 if (!cn->procdir) {
103448 pr_err("Unable to proc dir entry\n");
103449 return -ENOMEM;
103450diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
103451index 0ae28f5..d32b565 100644
103452--- a/net/ipv4/ping.c
103453+++ b/net/ipv4/ping.c
103454@@ -59,7 +59,7 @@ struct ping_table {
103455 };
103456
103457 static struct ping_table ping_table;
103458-struct pingv6_ops pingv6_ops;
103459+struct pingv6_ops *pingv6_ops;
103460 EXPORT_SYMBOL_GPL(pingv6_ops);
103461
103462 static u16 ping_port_rover;
103463@@ -358,7 +358,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
103464 return -ENODEV;
103465 }
103466 }
103467- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
103468+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
103469 scoped);
103470 rcu_read_unlock();
103471
103472@@ -566,7 +566,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
103473 }
103474 #if IS_ENABLED(CONFIG_IPV6)
103475 } else if (skb->protocol == htons(ETH_P_IPV6)) {
103476- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
103477+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
103478 #endif
103479 }
103480
103481@@ -584,7 +584,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
103482 info, (u8 *)icmph);
103483 #if IS_ENABLED(CONFIG_IPV6)
103484 } else if (family == AF_INET6) {
103485- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
103486+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
103487 info, (u8 *)icmph);
103488 #endif
103489 }
103490@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
103491 }
103492
103493 if (inet6_sk(sk)->rxopt.all)
103494- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
103495+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
103496 if (skb->protocol == htons(ETH_P_IPV6) &&
103497 inet6_sk(sk)->rxopt.all)
103498- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
103499+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
103500 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
103501 ip_cmsg_recv(msg, skb);
103502 #endif
103503@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
103504 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
103505 0, sock_i_ino(sp),
103506 atomic_read(&sp->sk_refcnt), sp,
103507- atomic_read(&sp->sk_drops));
103508+ atomic_read_unchecked(&sp->sk_drops));
103509 }
103510
103511 static int ping_v4_seq_show(struct seq_file *seq, void *v)
103512diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
103513index 0bb68df..59405fc 100644
103514--- a/net/ipv4/raw.c
103515+++ b/net/ipv4/raw.c
103516@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
103517 int raw_rcv(struct sock *sk, struct sk_buff *skb)
103518 {
103519 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
103520- atomic_inc(&sk->sk_drops);
103521+ atomic_inc_unchecked(&sk->sk_drops);
103522 kfree_skb(skb);
103523 return NET_RX_DROP;
103524 }
103525@@ -774,16 +774,20 @@ static int raw_init(struct sock *sk)
103526
103527 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
103528 {
103529+ struct icmp_filter filter;
103530+
103531 if (optlen > sizeof(struct icmp_filter))
103532 optlen = sizeof(struct icmp_filter);
103533- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
103534+ if (copy_from_user(&filter, optval, optlen))
103535 return -EFAULT;
103536+ raw_sk(sk)->filter = filter;
103537 return 0;
103538 }
103539
103540 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
103541 {
103542 int len, ret = -EFAULT;
103543+ struct icmp_filter filter;
103544
103545 if (get_user(len, optlen))
103546 goto out;
103547@@ -793,8 +797,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
103548 if (len > sizeof(struct icmp_filter))
103549 len = sizeof(struct icmp_filter);
103550 ret = -EFAULT;
103551- if (put_user(len, optlen) ||
103552- copy_to_user(optval, &raw_sk(sk)->filter, len))
103553+ filter = raw_sk(sk)->filter;
103554+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
103555 goto out;
103556 ret = 0;
103557 out: return ret;
103558@@ -1023,7 +1027,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
103559 0, 0L, 0,
103560 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
103561 0, sock_i_ino(sp),
103562- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
103563+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
103564 }
103565
103566 static int raw_seq_show(struct seq_file *seq, void *v)
103567diff --git a/net/ipv4/route.c b/net/ipv4/route.c
103568index 52e1f2b..e736cb4 100644
103569--- a/net/ipv4/route.c
103570+++ b/net/ipv4/route.c
103571@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
103572
103573 static int rt_cache_seq_open(struct inode *inode, struct file *file)
103574 {
103575- return seq_open(file, &rt_cache_seq_ops);
103576+ return seq_open_restrict(file, &rt_cache_seq_ops);
103577 }
103578
103579 static const struct file_operations rt_cache_seq_fops = {
103580@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
103581
103582 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
103583 {
103584- return seq_open(file, &rt_cpu_seq_ops);
103585+ return seq_open_restrict(file, &rt_cpu_seq_ops);
103586 }
103587
103588 static const struct file_operations rt_cpu_seq_fops = {
103589@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
103590
103591 static int rt_acct_proc_open(struct inode *inode, struct file *file)
103592 {
103593- return single_open(file, rt_acct_proc_show, NULL);
103594+ return single_open_restrict(file, rt_acct_proc_show, NULL);
103595 }
103596
103597 static const struct file_operations rt_acct_proc_fops = {
103598@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
103599
103600 #define IP_IDENTS_SZ 2048u
103601 struct ip_ident_bucket {
103602- atomic_t id;
103603+ atomic_unchecked_t id;
103604 u32 stamp32;
103605 };
103606
103607-static struct ip_ident_bucket *ip_idents __read_mostly;
103608+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
103609
103610 /* In order to protect privacy, we add a perturbation to identifiers
103611 * if one generator is seldom used. This makes hard for an attacker
103612@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
103613 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
103614 delta = prandom_u32_max(now - old);
103615
103616- return atomic_add_return(segs + delta, &bucket->id) - segs;
103617+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
103618 }
103619 EXPORT_SYMBOL(ip_idents_reserve);
103620
103621@@ -2628,34 +2628,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
103622 .maxlen = sizeof(int),
103623 .mode = 0200,
103624 .proc_handler = ipv4_sysctl_rtcache_flush,
103625+ .extra1 = &init_net,
103626 },
103627 { },
103628 };
103629
103630 static __net_init int sysctl_route_net_init(struct net *net)
103631 {
103632- struct ctl_table *tbl;
103633+ ctl_table_no_const *tbl = NULL;
103634
103635- tbl = ipv4_route_flush_table;
103636 if (!net_eq(net, &init_net)) {
103637- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
103638+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
103639 if (tbl == NULL)
103640 goto err_dup;
103641
103642 /* Don't export sysctls to unprivileged users */
103643 if (net->user_ns != &init_user_ns)
103644 tbl[0].procname = NULL;
103645- }
103646- tbl[0].extra1 = net;
103647+ tbl[0].extra1 = net;
103648+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
103649+ } else
103650+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
103651
103652- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
103653 if (net->ipv4.route_hdr == NULL)
103654 goto err_reg;
103655 return 0;
103656
103657 err_reg:
103658- if (tbl != ipv4_route_flush_table)
103659- kfree(tbl);
103660+ kfree(tbl);
103661 err_dup:
103662 return -ENOMEM;
103663 }
103664@@ -2678,8 +2678,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
103665
103666 static __net_init int rt_genid_init(struct net *net)
103667 {
103668- atomic_set(&net->ipv4.rt_genid, 0);
103669- atomic_set(&net->fnhe_genid, 0);
103670+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
103671+ atomic_set_unchecked(&net->fnhe_genid, 0);
103672 get_random_bytes(&net->ipv4.dev_addr_genid,
103673 sizeof(net->ipv4.dev_addr_genid));
103674 return 0;
103675@@ -2722,11 +2722,7 @@ int __init ip_rt_init(void)
103676 {
103677 int rc = 0;
103678
103679- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
103680- if (!ip_idents)
103681- panic("IP: failed to allocate ip_idents\n");
103682-
103683- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
103684+ prandom_bytes(ip_idents, sizeof(ip_idents));
103685
103686 #ifdef CONFIG_IP_ROUTE_CLASSID
103687 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
103688diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
103689index e0ee384..e2688d9 100644
103690--- a/net/ipv4/sysctl_net_ipv4.c
103691+++ b/net/ipv4/sysctl_net_ipv4.c
103692@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
103693 container_of(table->data, struct net, ipv4.ip_local_ports.range);
103694 int ret;
103695 int range[2];
103696- struct ctl_table tmp = {
103697+ ctl_table_no_const tmp = {
103698 .data = &range,
103699 .maxlen = sizeof(range),
103700 .mode = table->mode,
103701@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
103702 int ret;
103703 gid_t urange[2];
103704 kgid_t low, high;
103705- struct ctl_table tmp = {
103706+ ctl_table_no_const tmp = {
103707 .data = &urange,
103708 .maxlen = sizeof(urange),
103709 .mode = table->mode,
103710@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
103711 void __user *buffer, size_t *lenp, loff_t *ppos)
103712 {
103713 char val[TCP_CA_NAME_MAX];
103714- struct ctl_table tbl = {
103715+ ctl_table_no_const tbl = {
103716 .data = val,
103717 .maxlen = TCP_CA_NAME_MAX,
103718 };
103719@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
103720 void __user *buffer, size_t *lenp,
103721 loff_t *ppos)
103722 {
103723- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
103724+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
103725 int ret;
103726
103727 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
103728@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
103729 void __user *buffer, size_t *lenp,
103730 loff_t *ppos)
103731 {
103732- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
103733+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
103734 int ret;
103735
103736 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
103737@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
103738 void __user *buffer, size_t *lenp,
103739 loff_t *ppos)
103740 {
103741- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
103742+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
103743 struct tcp_fastopen_context *ctxt;
103744 int ret;
103745 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
103746@@ -881,13 +881,12 @@ static struct ctl_table ipv4_net_table[] = {
103747
103748 static __net_init int ipv4_sysctl_init_net(struct net *net)
103749 {
103750- struct ctl_table *table;
103751+ ctl_table_no_const *table = NULL;
103752
103753- table = ipv4_net_table;
103754 if (!net_eq(net, &init_net)) {
103755 int i;
103756
103757- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
103758+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
103759 if (table == NULL)
103760 goto err_alloc;
103761
103762@@ -896,7 +895,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
103763 table[i].data += (void *)net - (void *)&init_net;
103764 }
103765
103766- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103767+ if (!net_eq(net, &init_net))
103768+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103769+ else
103770+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
103771 if (net->ipv4.ipv4_hdr == NULL)
103772 goto err_reg;
103773
103774diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
103775index 3075723..aa6f6e5 100644
103776--- a/net/ipv4/tcp.c
103777+++ b/net/ipv4/tcp.c
103778@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
103779
103780 /* Race breaker. If space is freed after
103781 * wspace test but before the flags are set,
103782- * IO signal will be lost.
103783+ * IO signal will be lost. Memory barrier
103784+ * pairs with the input side.
103785 */
103786+ smp_mb__after_atomic();
103787 if (sk_stream_is_writeable(sk))
103788 mask |= POLLOUT | POLLWRNORM;
103789 }
103790diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
103791index 08ccca6..28e7ce6 100644
103792--- a/net/ipv4/tcp_input.c
103793+++ b/net/ipv4/tcp_input.c
103794@@ -766,7 +766,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
103795 * without any lock. We want to make sure compiler wont store
103796 * intermediate values in this location.
103797 */
103798- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
103799+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
103800 sk->sk_max_pacing_rate);
103801 }
103802
103803@@ -4529,7 +4529,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
103804 * simplifies code)
103805 */
103806 static void
103807-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103808+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103809 struct sk_buff *head, struct sk_buff *tail,
103810 u32 start, u32 end)
103811 {
103812@@ -4787,6 +4787,8 @@ static void tcp_check_space(struct sock *sk)
103813 {
103814 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
103815 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
103816+ /* pairs with tcp_poll() */
103817+ smp_mb__after_atomic();
103818 if (sk->sk_socket &&
103819 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
103820 tcp_new_space(sk);
103821@@ -5507,6 +5509,7 @@ discard:
103822 tcp_paws_reject(&tp->rx_opt, 0))
103823 goto discard_and_undo;
103824
103825+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
103826 if (th->syn) {
103827 /* We see SYN without ACK. It is attempt of
103828 * simultaneous connect with crossed SYNs.
103829@@ -5557,6 +5560,7 @@ discard:
103830 goto discard;
103831 #endif
103832 }
103833+#endif
103834 /* "fifth, if neither of the SYN or RST bits is set then
103835 * drop the segment and return."
103836 */
103837@@ -5603,7 +5607,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
103838 goto discard;
103839
103840 if (th->syn) {
103841- if (th->fin)
103842+ if (th->fin || th->urg || th->psh)
103843 goto discard;
103844 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
103845 return 1;
103846diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
103847index 982347e..aba8ca8 100644
103848--- a/net/ipv4/tcp_ipv4.c
103849+++ b/net/ipv4/tcp_ipv4.c
103850@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
103851 int sysctl_tcp_low_latency __read_mostly;
103852 EXPORT_SYMBOL(sysctl_tcp_low_latency);
103853
103854+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103855+extern int grsec_enable_blackhole;
103856+#endif
103857+
103858 #ifdef CONFIG_TCP_MD5SIG
103859 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
103860 __be32 daddr, __be32 saddr, const struct tcphdr *th);
103861@@ -1473,6 +1477,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
103862 return 0;
103863
103864 reset:
103865+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103866+ if (!grsec_enable_blackhole)
103867+#endif
103868 tcp_v4_send_reset(rsk, skb);
103869 discard:
103870 kfree_skb(skb);
103871@@ -1637,12 +1644,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
103872 TCP_SKB_CB(skb)->sacked = 0;
103873
103874 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
103875- if (!sk)
103876+ if (!sk) {
103877+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103878+ ret = 1;
103879+#endif
103880 goto no_tcp_socket;
103881-
103882+ }
103883 process:
103884- if (sk->sk_state == TCP_TIME_WAIT)
103885+ if (sk->sk_state == TCP_TIME_WAIT) {
103886+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103887+ ret = 2;
103888+#endif
103889 goto do_time_wait;
103890+ }
103891
103892 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
103893 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103894@@ -1698,6 +1712,10 @@ csum_error:
103895 bad_packet:
103896 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103897 } else {
103898+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103899+ if (!grsec_enable_blackhole || (ret == 1 &&
103900+ (skb->dev->flags & IFF_LOOPBACK)))
103901+#endif
103902 tcp_v4_send_reset(NULL, skb);
103903 }
103904
103905diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
103906index 63d2680..2db9d6b 100644
103907--- a/net/ipv4/tcp_minisocks.c
103908+++ b/net/ipv4/tcp_minisocks.c
103909@@ -27,6 +27,10 @@
103910 #include <net/inet_common.h>
103911 #include <net/xfrm.h>
103912
103913+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103914+extern int grsec_enable_blackhole;
103915+#endif
103916+
103917 int sysctl_tcp_syncookies __read_mostly = 1;
103918 EXPORT_SYMBOL(sysctl_tcp_syncookies);
103919
103920@@ -739,7 +743,10 @@ embryonic_reset:
103921 * avoid becoming vulnerable to outside attack aiming at
103922 * resetting legit local connections.
103923 */
103924- req->rsk_ops->send_reset(sk, skb);
103925+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103926+ if (!grsec_enable_blackhole)
103927+#endif
103928+ req->rsk_ops->send_reset(sk, skb);
103929 } else if (fastopen) { /* received a valid RST pkt */
103930 reqsk_fastopen_remove(sk, req, true);
103931 tcp_reset(sk);
103932diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
103933index ebf5ff5..4d1ff32 100644
103934--- a/net/ipv4/tcp_probe.c
103935+++ b/net/ipv4/tcp_probe.c
103936@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
103937 if (cnt + width >= len)
103938 break;
103939
103940- if (copy_to_user(buf + cnt, tbuf, width))
103941+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
103942 return -EFAULT;
103943 cnt += width;
103944 }
103945diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
103946index 1829c7f..c0b3d52 100644
103947--- a/net/ipv4/tcp_timer.c
103948+++ b/net/ipv4/tcp_timer.c
103949@@ -22,6 +22,10 @@
103950 #include <linux/gfp.h>
103951 #include <net/tcp.h>
103952
103953+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103954+extern int grsec_lastack_retries;
103955+#endif
103956+
103957 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
103958 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
103959 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
103960@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
103961 }
103962 }
103963
103964+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103965+ if ((sk->sk_state == TCP_LAST_ACK) &&
103966+ (grsec_lastack_retries > 0) &&
103967+ (grsec_lastack_retries < retry_until))
103968+ retry_until = grsec_lastack_retries;
103969+#endif
103970+
103971 if (retransmits_timed_out(sk, retry_until,
103972 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
103973 /* Has it gone just too far? */
103974diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
103975index 13b4dcf..b866a2a 100644
103976--- a/net/ipv4/udp.c
103977+++ b/net/ipv4/udp.c
103978@@ -87,6 +87,7 @@
103979 #include <linux/types.h>
103980 #include <linux/fcntl.h>
103981 #include <linux/module.h>
103982+#include <linux/security.h>
103983 #include <linux/socket.h>
103984 #include <linux/sockios.h>
103985 #include <linux/igmp.h>
103986@@ -114,6 +115,10 @@
103987 #include <net/busy_poll.h>
103988 #include "udp_impl.h"
103989
103990+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103991+extern int grsec_enable_blackhole;
103992+#endif
103993+
103994 struct udp_table udp_table __read_mostly;
103995 EXPORT_SYMBOL(udp_table);
103996
103997@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
103998 return true;
103999 }
104000
104001+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
104002+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
104003+
104004 /*
104005 * This routine is called by the ICMP module when it gets some
104006 * sort of error condition. If err < 0 then the socket should
104007@@ -945,9 +953,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
104008 dport = usin->sin_port;
104009 if (dport == 0)
104010 return -EINVAL;
104011+
104012+ err = gr_search_udp_sendmsg(sk, usin);
104013+ if (err)
104014+ return err;
104015 } else {
104016 if (sk->sk_state != TCP_ESTABLISHED)
104017 return -EDESTADDRREQ;
104018+
104019+ err = gr_search_udp_sendmsg(sk, NULL);
104020+ if (err)
104021+ return err;
104022+
104023 daddr = inet->inet_daddr;
104024 dport = inet->inet_dport;
104025 /* Open fast path for connected socket.
104026@@ -1195,7 +1212,7 @@ static unsigned int first_packet_length(struct sock *sk)
104027 IS_UDPLITE(sk));
104028 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104029 IS_UDPLITE(sk));
104030- atomic_inc(&sk->sk_drops);
104031+ atomic_inc_unchecked(&sk->sk_drops);
104032 __skb_unlink(skb, rcvq);
104033 __skb_queue_tail(&list_kill, skb);
104034 }
104035@@ -1275,6 +1292,10 @@ try_again:
104036 if (!skb)
104037 goto out;
104038
104039+ err = gr_search_udp_recvmsg(sk, skb);
104040+ if (err)
104041+ goto out_free;
104042+
104043 ulen = skb->len - sizeof(struct udphdr);
104044 copied = len;
104045 if (copied > ulen)
104046@@ -1307,7 +1328,7 @@ try_again:
104047 if (unlikely(err)) {
104048 trace_kfree_skb(skb, udp_recvmsg);
104049 if (!peeked) {
104050- atomic_inc(&sk->sk_drops);
104051+ atomic_inc_unchecked(&sk->sk_drops);
104052 UDP_INC_STATS_USER(sock_net(sk),
104053 UDP_MIB_INERRORS, is_udplite);
104054 }
104055@@ -1605,7 +1626,7 @@ csum_error:
104056 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104057 drop:
104058 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104059- atomic_inc(&sk->sk_drops);
104060+ atomic_inc_unchecked(&sk->sk_drops);
104061 kfree_skb(skb);
104062 return -1;
104063 }
104064@@ -1624,7 +1645,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104065 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104066
104067 if (!skb1) {
104068- atomic_inc(&sk->sk_drops);
104069+ atomic_inc_unchecked(&sk->sk_drops);
104070 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104071 IS_UDPLITE(sk));
104072 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104073@@ -1830,6 +1851,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104074 goto csum_error;
104075
104076 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104077+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104078+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104079+#endif
104080 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
104081
104082 /*
104083@@ -2416,7 +2440,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
104084 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
104085 0, sock_i_ino(sp),
104086 atomic_read(&sp->sk_refcnt), sp,
104087- atomic_read(&sp->sk_drops));
104088+ atomic_read_unchecked(&sp->sk_drops));
104089 }
104090
104091 int udp4_seq_show(struct seq_file *seq, void *v)
104092diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
104093index 6156f68..d6ab46d 100644
104094--- a/net/ipv4/xfrm4_policy.c
104095+++ b/net/ipv4/xfrm4_policy.c
104096@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
104097 fl4->flowi4_tos = iph->tos;
104098 }
104099
104100-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
104101+static int xfrm4_garbage_collect(struct dst_ops *ops)
104102 {
104103 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
104104
104105- xfrm4_policy_afinfo.garbage_collect(net);
104106+ xfrm_garbage_collect_deferred(net);
104107 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
104108 }
104109
104110@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
104111
104112 static int __net_init xfrm4_net_init(struct net *net)
104113 {
104114- struct ctl_table *table;
104115+ ctl_table_no_const *table = NULL;
104116 struct ctl_table_header *hdr;
104117
104118- table = xfrm4_policy_table;
104119 if (!net_eq(net, &init_net)) {
104120- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104121+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104122 if (!table)
104123 goto err_alloc;
104124
104125 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
104126- }
104127-
104128- hdr = register_net_sysctl(net, "net/ipv4", table);
104129+ hdr = register_net_sysctl(net, "net/ipv4", table);
104130+ } else
104131+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
104132 if (!hdr)
104133 goto err_reg;
104134
104135@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
104136 return 0;
104137
104138 err_reg:
104139- if (!net_eq(net, &init_net))
104140- kfree(table);
104141+ kfree(table);
104142 err_alloc:
104143 return -ENOMEM;
104144 }
104145diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104146index dac9419..534fa31 100644
104147--- a/net/ipv6/addrconf.c
104148+++ b/net/ipv6/addrconf.c
104149@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
104150 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
104151 .mtu6 = IPV6_MIN_MTU,
104152 .accept_ra = 1,
104153- .accept_redirects = 1,
104154+ .accept_redirects = 0,
104155 .autoconf = 1,
104156 .force_mld_version = 0,
104157 .mldv1_unsolicited_report_interval = 10 * HZ,
104158@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
104159 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
104160 .mtu6 = IPV6_MIN_MTU,
104161 .accept_ra = 1,
104162- .accept_redirects = 1,
104163+ .accept_redirects = 0,
104164 .autoconf = 1,
104165 .force_mld_version = 0,
104166 .mldv1_unsolicited_report_interval = 10 * HZ,
104167@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
104168 idx = 0;
104169 head = &net->dev_index_head[h];
104170 rcu_read_lock();
104171- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
104172+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
104173 net->dev_base_seq;
104174 hlist_for_each_entry_rcu(dev, head, index_hlist) {
104175 if (idx < s_idx)
104176@@ -2420,7 +2420,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
104177 p.iph.ihl = 5;
104178 p.iph.protocol = IPPROTO_IPV6;
104179 p.iph.ttl = 64;
104180- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
104181+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
104182
104183 if (ops->ndo_do_ioctl) {
104184 mm_segment_t oldfs = get_fs();
104185@@ -3569,16 +3569,23 @@ static const struct file_operations if6_fops = {
104186 .release = seq_release_net,
104187 };
104188
104189+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
104190+extern void unregister_ipv6_seq_ops_addr(void);
104191+
104192 static int __net_init if6_proc_net_init(struct net *net)
104193 {
104194- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
104195+ register_ipv6_seq_ops_addr(&if6_seq_ops);
104196+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
104197+ unregister_ipv6_seq_ops_addr();
104198 return -ENOMEM;
104199+ }
104200 return 0;
104201 }
104202
104203 static void __net_exit if6_proc_net_exit(struct net *net)
104204 {
104205 remove_proc_entry("if_inet6", net->proc_net);
104206+ unregister_ipv6_seq_ops_addr();
104207 }
104208
104209 static struct pernet_operations if6_proc_net_ops = {
104210@@ -4194,7 +4201,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
104211 s_ip_idx = ip_idx = cb->args[2];
104212
104213 rcu_read_lock();
104214- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104215+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104216 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
104217 idx = 0;
104218 head = &net->dev_index_head[h];
104219@@ -4840,7 +4847,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104220 rt_genid_bump_ipv6(net);
104221 break;
104222 }
104223- atomic_inc(&net->ipv6.dev_addr_genid);
104224+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
104225 }
104226
104227 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104228@@ -4860,7 +4867,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
104229 int *valp = ctl->data;
104230 int val = *valp;
104231 loff_t pos = *ppos;
104232- struct ctl_table lctl;
104233+ ctl_table_no_const lctl;
104234 int ret;
104235
104236 /*
104237@@ -4945,7 +4952,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
104238 int *valp = ctl->data;
104239 int val = *valp;
104240 loff_t pos = *ppos;
104241- struct ctl_table lctl;
104242+ ctl_table_no_const lctl;
104243 int ret;
104244
104245 /*
104246diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
104247index e8c4400..a4cd5da 100644
104248--- a/net/ipv6/af_inet6.c
104249+++ b/net/ipv6/af_inet6.c
104250@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
104251 net->ipv6.sysctl.icmpv6_time = 1*HZ;
104252 net->ipv6.sysctl.flowlabel_consistency = 1;
104253 net->ipv6.sysctl.auto_flowlabels = 0;
104254- atomic_set(&net->ipv6.fib6_sernum, 1);
104255+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
104256
104257 err = ipv6_init_mibs(net);
104258 if (err)
104259diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
104260index 49f5e73..ae02d54 100644
104261--- a/net/ipv6/datagram.c
104262+++ b/net/ipv6/datagram.c
104263@@ -941,5 +941,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
104264 0,
104265 sock_i_ino(sp),
104266 atomic_read(&sp->sk_refcnt), sp,
104267- atomic_read(&sp->sk_drops));
104268+ atomic_read_unchecked(&sp->sk_drops));
104269 }
104270diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
104271index d674152..fb5a01d 100644
104272--- a/net/ipv6/icmp.c
104273+++ b/net/ipv6/icmp.c
104274@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
104275
104276 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
104277 {
104278- struct ctl_table *table;
104279+ ctl_table_no_const *table;
104280
104281 table = kmemdup(ipv6_icmp_table_template,
104282 sizeof(ipv6_icmp_table_template),
104283diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
104284index f1c6d5e..faabef6 100644
104285--- a/net/ipv6/ip6_fib.c
104286+++ b/net/ipv6/ip6_fib.c
104287@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
104288 int new, old;
104289
104290 do {
104291- old = atomic_read(&net->ipv6.fib6_sernum);
104292+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
104293 new = old < INT_MAX ? old + 1 : 1;
104294- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
104295+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
104296 old, new) != old);
104297 return new;
104298 }
104299diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
104300index 01ccc28..66861c7 100644
104301--- a/net/ipv6/ip6_gre.c
104302+++ b/net/ipv6/ip6_gre.c
104303@@ -71,8 +71,8 @@ struct ip6gre_net {
104304 struct net_device *fb_tunnel_dev;
104305 };
104306
104307-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
104308-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
104309+static struct rtnl_link_ops ip6gre_link_ops;
104310+static struct rtnl_link_ops ip6gre_tap_ops;
104311 static int ip6gre_tunnel_init(struct net_device *dev);
104312 static void ip6gre_tunnel_setup(struct net_device *dev);
104313 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
104314@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
104315 }
104316
104317
104318-static struct inet6_protocol ip6gre_protocol __read_mostly = {
104319+static struct inet6_protocol ip6gre_protocol = {
104320 .handler = ip6gre_rcv,
104321 .err_handler = ip6gre_err,
104322 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
104323@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
104324 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
104325 };
104326
104327-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
104328+static struct rtnl_link_ops ip6gre_link_ops = {
104329 .kind = "ip6gre",
104330 .maxtype = IFLA_GRE_MAX,
104331 .policy = ip6gre_policy,
104332@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
104333 .fill_info = ip6gre_fill_info,
104334 };
104335
104336-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
104337+static struct rtnl_link_ops ip6gre_tap_ops = {
104338 .kind = "ip6gretap",
104339 .maxtype = IFLA_GRE_MAX,
104340 .policy = ip6gre_policy,
104341diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
104342index 92b3da5..77837b8 100644
104343--- a/net/ipv6/ip6_tunnel.c
104344+++ b/net/ipv6/ip6_tunnel.c
104345@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
104346
104347 static int ip6_tnl_dev_init(struct net_device *dev);
104348 static void ip6_tnl_dev_setup(struct net_device *dev);
104349-static struct rtnl_link_ops ip6_link_ops __read_mostly;
104350+static struct rtnl_link_ops ip6_link_ops;
104351
104352 static int ip6_tnl_net_id __read_mostly;
104353 struct ip6_tnl_net {
104354@@ -1771,7 +1771,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
104355 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
104356 };
104357
104358-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
104359+static struct rtnl_link_ops ip6_link_ops = {
104360 .kind = "ip6tnl",
104361 .maxtype = IFLA_IPTUN_MAX,
104362 .policy = ip6_tnl_policy,
104363diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
104364index ace10d0..97a8b49 100644
104365--- a/net/ipv6/ip6_vti.c
104366+++ b/net/ipv6/ip6_vti.c
104367@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
104368
104369 static int vti6_dev_init(struct net_device *dev);
104370 static void vti6_dev_setup(struct net_device *dev);
104371-static struct rtnl_link_ops vti6_link_ops __read_mostly;
104372+static struct rtnl_link_ops vti6_link_ops;
104373
104374 static int vti6_net_id __read_mostly;
104375 struct vti6_net {
104376@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
104377 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
104378 };
104379
104380-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
104381+static struct rtnl_link_ops vti6_link_ops = {
104382 .kind = "vti6",
104383 .maxtype = IFLA_VTI_MAX,
104384 .policy = vti6_policy,
104385diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
104386index 66980d8d..8aef0d1 100644
104387--- a/net/ipv6/ipv6_sockglue.c
104388+++ b/net/ipv6/ipv6_sockglue.c
104389@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
104390 if (sk->sk_type != SOCK_STREAM)
104391 return -ENOPROTOOPT;
104392
104393- msg.msg_control = optval;
104394+ msg.msg_control = (void __force_kernel *)optval;
104395 msg.msg_controllen = len;
104396 msg.msg_flags = flags;
104397
104398diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
104399index e080fbb..412b3cf 100644
104400--- a/net/ipv6/netfilter/ip6_tables.c
104401+++ b/net/ipv6/netfilter/ip6_tables.c
104402@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
104403 #endif
104404
104405 static int get_info(struct net *net, void __user *user,
104406- const int *len, int compat)
104407+ int len, int compat)
104408 {
104409 char name[XT_TABLE_MAXNAMELEN];
104410 struct xt_table *t;
104411 int ret;
104412
104413- if (*len != sizeof(struct ip6t_getinfo)) {
104414- duprintf("length %u != %zu\n", *len,
104415+ if (len != sizeof(struct ip6t_getinfo)) {
104416+ duprintf("length %u != %zu\n", len,
104417 sizeof(struct ip6t_getinfo));
104418 return -EINVAL;
104419 }
104420@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
104421 info.size = private->size;
104422 strcpy(info.name, name);
104423
104424- if (copy_to_user(user, &info, *len) != 0)
104425+ if (copy_to_user(user, &info, len) != 0)
104426 ret = -EFAULT;
104427 else
104428 ret = 0;
104429@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
104430
104431 switch (cmd) {
104432 case IP6T_SO_GET_INFO:
104433- ret = get_info(sock_net(sk), user, len, 1);
104434+ ret = get_info(sock_net(sk), user, *len, 1);
104435 break;
104436 case IP6T_SO_GET_ENTRIES:
104437 ret = compat_get_entries(sock_net(sk), user, len);
104438@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
104439
104440 switch (cmd) {
104441 case IP6T_SO_GET_INFO:
104442- ret = get_info(sock_net(sk), user, len, 0);
104443+ ret = get_info(sock_net(sk), user, *len, 0);
104444 break;
104445
104446 case IP6T_SO_GET_ENTRIES:
104447diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
104448index 6f187c8..34b367f 100644
104449--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
104450+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
104451@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
104452
104453 static int nf_ct_frag6_sysctl_register(struct net *net)
104454 {
104455- struct ctl_table *table;
104456+ ctl_table_no_const *table = NULL;
104457 struct ctl_table_header *hdr;
104458
104459- table = nf_ct_frag6_sysctl_table;
104460 if (!net_eq(net, &init_net)) {
104461- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
104462+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
104463 GFP_KERNEL);
104464 if (table == NULL)
104465 goto err_alloc;
104466@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
104467 table[2].data = &net->nf_frag.frags.high_thresh;
104468 table[2].extra1 = &net->nf_frag.frags.low_thresh;
104469 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
104470- }
104471-
104472- hdr = register_net_sysctl(net, "net/netfilter", table);
104473+ hdr = register_net_sysctl(net, "net/netfilter", table);
104474+ } else
104475+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
104476 if (hdr == NULL)
104477 goto err_reg;
104478
104479@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
104480 return 0;
104481
104482 err_reg:
104483- if (!net_eq(net, &init_net))
104484- kfree(table);
104485+ kfree(table);
104486 err_alloc:
104487 return -ENOMEM;
104488 }
104489diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
104490index fe7e3e4..47aba96 100644
104491--- a/net/ipv6/ping.c
104492+++ b/net/ipv6/ping.c
104493@@ -242,6 +242,24 @@ static struct pernet_operations ping_v6_net_ops = {
104494 };
104495 #endif
104496
104497+static struct pingv6_ops real_pingv6_ops = {
104498+ .ipv6_recv_error = ipv6_recv_error,
104499+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
104500+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
104501+ .icmpv6_err_convert = icmpv6_err_convert,
104502+ .ipv6_icmp_error = ipv6_icmp_error,
104503+ .ipv6_chk_addr = ipv6_chk_addr,
104504+};
104505+
104506+static struct pingv6_ops dummy_pingv6_ops = {
104507+ .ipv6_recv_error = dummy_ipv6_recv_error,
104508+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
104509+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
104510+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
104511+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
104512+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
104513+};
104514+
104515 int __init pingv6_init(void)
104516 {
104517 #ifdef CONFIG_PROC_FS
104518@@ -249,13 +267,7 @@ int __init pingv6_init(void)
104519 if (ret)
104520 return ret;
104521 #endif
104522- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
104523- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
104524- pingv6_ops.ip6_datagram_recv_specific_ctl =
104525- ip6_datagram_recv_specific_ctl;
104526- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
104527- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
104528- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
104529+ pingv6_ops = &real_pingv6_ops;
104530 return inet6_register_protosw(&pingv6_protosw);
104531 }
104532
104533@@ -264,14 +276,9 @@ int __init pingv6_init(void)
104534 */
104535 void pingv6_exit(void)
104536 {
104537- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
104538- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
104539- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
104540- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
104541- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
104542- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
104543 #ifdef CONFIG_PROC_FS
104544 unregister_pernet_subsys(&ping_v6_net_ops);
104545 #endif
104546+ pingv6_ops = &dummy_pingv6_ops;
104547 inet6_unregister_protosw(&pingv6_protosw);
104548 }
104549diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
104550index 679253d0..70b653c 100644
104551--- a/net/ipv6/proc.c
104552+++ b/net/ipv6/proc.c
104553@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
104554 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
104555 goto proc_snmp6_fail;
104556
104557- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
104558+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
104559 if (!net->mib.proc_net_devsnmp6)
104560 goto proc_dev_snmp6_fail;
104561 return 0;
104562diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
104563index ee25631..3c3ac5d 100644
104564--- a/net/ipv6/raw.c
104565+++ b/net/ipv6/raw.c
104566@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
104567 {
104568 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
104569 skb_checksum_complete(skb)) {
104570- atomic_inc(&sk->sk_drops);
104571+ atomic_inc_unchecked(&sk->sk_drops);
104572 kfree_skb(skb);
104573 return NET_RX_DROP;
104574 }
104575@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
104576 struct raw6_sock *rp = raw6_sk(sk);
104577
104578 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
104579- atomic_inc(&sk->sk_drops);
104580+ atomic_inc_unchecked(&sk->sk_drops);
104581 kfree_skb(skb);
104582 return NET_RX_DROP;
104583 }
104584@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
104585
104586 if (inet->hdrincl) {
104587 if (skb_checksum_complete(skb)) {
104588- atomic_inc(&sk->sk_drops);
104589+ atomic_inc_unchecked(&sk->sk_drops);
104590 kfree_skb(skb);
104591 return NET_RX_DROP;
104592 }
104593@@ -609,7 +609,7 @@ out:
104594 return err;
104595 }
104596
104597-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
104598+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
104599 struct flowi6 *fl6, struct dst_entry **dstp,
104600 unsigned int flags)
104601 {
104602@@ -916,12 +916,15 @@ do_confirm:
104603 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
104604 char __user *optval, int optlen)
104605 {
104606+ struct icmp6_filter filter;
104607+
104608 switch (optname) {
104609 case ICMPV6_FILTER:
104610 if (optlen > sizeof(struct icmp6_filter))
104611 optlen = sizeof(struct icmp6_filter);
104612- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
104613+ if (copy_from_user(&filter, optval, optlen))
104614 return -EFAULT;
104615+ raw6_sk(sk)->filter = filter;
104616 return 0;
104617 default:
104618 return -ENOPROTOOPT;
104619@@ -934,6 +937,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
104620 char __user *optval, int __user *optlen)
104621 {
104622 int len;
104623+ struct icmp6_filter filter;
104624
104625 switch (optname) {
104626 case ICMPV6_FILTER:
104627@@ -945,7 +949,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
104628 len = sizeof(struct icmp6_filter);
104629 if (put_user(len, optlen))
104630 return -EFAULT;
104631- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
104632+ filter = raw6_sk(sk)->filter;
104633+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
104634 return -EFAULT;
104635 return 0;
104636 default:
104637diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
104638index d7d70e6..bd5e9fc 100644
104639--- a/net/ipv6/reassembly.c
104640+++ b/net/ipv6/reassembly.c
104641@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
104642
104643 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104644 {
104645- struct ctl_table *table;
104646+ ctl_table_no_const *table = NULL;
104647 struct ctl_table_header *hdr;
104648
104649- table = ip6_frags_ns_ctl_table;
104650 if (!net_eq(net, &init_net)) {
104651- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
104652+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
104653 if (table == NULL)
104654 goto err_alloc;
104655
104656@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104657 /* Don't export sysctls to unprivileged users */
104658 if (net->user_ns != &init_user_ns)
104659 table[0].procname = NULL;
104660- }
104661+ hdr = register_net_sysctl(net, "net/ipv6", table);
104662+ } else
104663+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
104664
104665- hdr = register_net_sysctl(net, "net/ipv6", table);
104666 if (hdr == NULL)
104667 goto err_reg;
104668
104669@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104670 return 0;
104671
104672 err_reg:
104673- if (!net_eq(net, &init_net))
104674- kfree(table);
104675+ kfree(table);
104676 err_alloc:
104677 return -ENOMEM;
104678 }
104679diff --git a/net/ipv6/route.c b/net/ipv6/route.c
104680index 1528d84..f393960 100644
104681--- a/net/ipv6/route.c
104682+++ b/net/ipv6/route.c
104683@@ -2978,7 +2978,7 @@ struct ctl_table ipv6_route_table_template[] = {
104684
104685 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
104686 {
104687- struct ctl_table *table;
104688+ ctl_table_no_const *table;
104689
104690 table = kmemdup(ipv6_route_table_template,
104691 sizeof(ipv6_route_table_template),
104692diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
104693index cdbfe5a..e13eb31 100644
104694--- a/net/ipv6/sit.c
104695+++ b/net/ipv6/sit.c
104696@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
104697 static void ipip6_dev_free(struct net_device *dev);
104698 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
104699 __be32 *v4dst);
104700-static struct rtnl_link_ops sit_link_ops __read_mostly;
104701+static struct rtnl_link_ops sit_link_ops;
104702
104703 static int sit_net_id __read_mostly;
104704 struct sit_net {
104705@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
104706 unregister_netdevice_queue(dev, head);
104707 }
104708
104709-static struct rtnl_link_ops sit_link_ops __read_mostly = {
104710+static struct rtnl_link_ops sit_link_ops = {
104711 .kind = "sit",
104712 .maxtype = IFLA_IPTUN_MAX,
104713 .policy = ipip6_policy,
104714diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
104715index c5c10fa..2577d51 100644
104716--- a/net/ipv6/sysctl_net_ipv6.c
104717+++ b/net/ipv6/sysctl_net_ipv6.c
104718@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
104719
104720 static int __net_init ipv6_sysctl_net_init(struct net *net)
104721 {
104722- struct ctl_table *ipv6_table;
104723+ ctl_table_no_const *ipv6_table;
104724 struct ctl_table *ipv6_route_table;
104725 struct ctl_table *ipv6_icmp_table;
104726 int err;
104727diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
104728index b899793..b783604 100644
104729--- a/net/ipv6/tcp_ipv6.c
104730+++ b/net/ipv6/tcp_ipv6.c
104731@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
104732 }
104733 }
104734
104735+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104736+extern int grsec_enable_blackhole;
104737+#endif
104738+
104739 static void tcp_v6_hash(struct sock *sk)
104740 {
104741 if (sk->sk_state != TCP_CLOSE) {
104742@@ -1343,6 +1347,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
104743 return 0;
104744
104745 reset:
104746+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104747+ if (!grsec_enable_blackhole)
104748+#endif
104749 tcp_v6_send_reset(sk, skb);
104750 discard:
104751 if (opt_skb)
104752@@ -1452,12 +1459,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
104753
104754 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
104755 inet6_iif(skb));
104756- if (!sk)
104757+ if (!sk) {
104758+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104759+ ret = 1;
104760+#endif
104761 goto no_tcp_socket;
104762+ }
104763
104764 process:
104765- if (sk->sk_state == TCP_TIME_WAIT)
104766+ if (sk->sk_state == TCP_TIME_WAIT) {
104767+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104768+ ret = 2;
104769+#endif
104770 goto do_time_wait;
104771+ }
104772
104773 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
104774 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
104775@@ -1508,6 +1523,10 @@ csum_error:
104776 bad_packet:
104777 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
104778 } else {
104779+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104780+ if (!grsec_enable_blackhole || (ret == 1 &&
104781+ (skb->dev->flags & IFF_LOOPBACK)))
104782+#endif
104783 tcp_v6_send_reset(NULL, skb);
104784 }
104785
104786diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
104787index 189dc4a..458bec0 100644
104788--- a/net/ipv6/udp.c
104789+++ b/net/ipv6/udp.c
104790@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
104791 udp_ipv6_hash_secret + net_hash_mix(net));
104792 }
104793
104794+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104795+extern int grsec_enable_blackhole;
104796+#endif
104797+
104798 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
104799 {
104800 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
104801@@ -448,7 +452,7 @@ try_again:
104802 if (unlikely(err)) {
104803 trace_kfree_skb(skb, udpv6_recvmsg);
104804 if (!peeked) {
104805- atomic_inc(&sk->sk_drops);
104806+ atomic_inc_unchecked(&sk->sk_drops);
104807 if (is_udp4)
104808 UDP_INC_STATS_USER(sock_net(sk),
104809 UDP_MIB_INERRORS,
104810@@ -714,7 +718,7 @@ csum_error:
104811 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104812 drop:
104813 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104814- atomic_inc(&sk->sk_drops);
104815+ atomic_inc_unchecked(&sk->sk_drops);
104816 kfree_skb(skb);
104817 return -1;
104818 }
104819@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104820 if (likely(skb1 == NULL))
104821 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104822 if (!skb1) {
104823- atomic_inc(&sk->sk_drops);
104824+ atomic_inc_unchecked(&sk->sk_drops);
104825 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104826 IS_UDPLITE(sk));
104827 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104828@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104829 goto csum_error;
104830
104831 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104832+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104833+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104834+#endif
104835 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
104836
104837 kfree_skb(skb);
104838diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
104839index 48bf5a0..691985a 100644
104840--- a/net/ipv6/xfrm6_policy.c
104841+++ b/net/ipv6/xfrm6_policy.c
104842@@ -223,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
104843 }
104844 }
104845
104846-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
104847+static int xfrm6_garbage_collect(struct dst_ops *ops)
104848 {
104849 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
104850
104851- xfrm6_policy_afinfo.garbage_collect(net);
104852+ xfrm_garbage_collect_deferred(net);
104853 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
104854 }
104855
104856@@ -340,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
104857
104858 static int __net_init xfrm6_net_init(struct net *net)
104859 {
104860- struct ctl_table *table;
104861+ ctl_table_no_const *table = NULL;
104862 struct ctl_table_header *hdr;
104863
104864- table = xfrm6_policy_table;
104865 if (!net_eq(net, &init_net)) {
104866- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104867+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104868 if (!table)
104869 goto err_alloc;
104870
104871 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
104872- }
104873+ hdr = register_net_sysctl(net, "net/ipv6", table);
104874+ } else
104875+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
104876
104877- hdr = register_net_sysctl(net, "net/ipv6", table);
104878 if (!hdr)
104879 goto err_reg;
104880
104881@@ -360,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
104882 return 0;
104883
104884 err_reg:
104885- if (!net_eq(net, &init_net))
104886- kfree(table);
104887+ kfree(table);
104888 err_alloc:
104889 return -ENOMEM;
104890 }
104891diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
104892index c1d247e..9e5949d 100644
104893--- a/net/ipx/ipx_proc.c
104894+++ b/net/ipx/ipx_proc.c
104895@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
104896 struct proc_dir_entry *p;
104897 int rc = -ENOMEM;
104898
104899- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
104900+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
104901
104902 if (!ipx_proc_dir)
104903 goto out;
104904diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
104905index 4efe486..dee966e 100644
104906--- a/net/irda/ircomm/ircomm_tty.c
104907+++ b/net/irda/ircomm/ircomm_tty.c
104908@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104909 add_wait_queue(&port->open_wait, &wait);
104910
104911 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
104912- __FILE__, __LINE__, tty->driver->name, port->count);
104913+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104914
104915 spin_lock_irqsave(&port->lock, flags);
104916- port->count--;
104917+ atomic_dec(&port->count);
104918 port->blocked_open++;
104919 spin_unlock_irqrestore(&port->lock, flags);
104920
104921@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104922 }
104923
104924 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
104925- __FILE__, __LINE__, tty->driver->name, port->count);
104926+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104927
104928 schedule();
104929 }
104930@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104931
104932 spin_lock_irqsave(&port->lock, flags);
104933 if (!tty_hung_up_p(filp))
104934- port->count++;
104935+ atomic_inc(&port->count);
104936 port->blocked_open--;
104937 spin_unlock_irqrestore(&port->lock, flags);
104938
104939 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
104940- __FILE__, __LINE__, tty->driver->name, port->count);
104941+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104942
104943 if (!retval)
104944 port->flags |= ASYNC_NORMAL_ACTIVE;
104945@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
104946
104947 /* ++ is not atomic, so this should be protected - Jean II */
104948 spin_lock_irqsave(&self->port.lock, flags);
104949- self->port.count++;
104950+ atomic_inc(&self->port.count);
104951 spin_unlock_irqrestore(&self->port.lock, flags);
104952 tty_port_tty_set(&self->port, tty);
104953
104954 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
104955- self->line, self->port.count);
104956+ self->line, atomic_read(&self->port.count));
104957
104958 /* Not really used by us, but lets do it anyway */
104959 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
104960@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
104961 tty_kref_put(port->tty);
104962 }
104963 port->tty = NULL;
104964- port->count = 0;
104965+ atomic_set(&port->count, 0);
104966 spin_unlock_irqrestore(&port->lock, flags);
104967
104968 wake_up_interruptible(&port->open_wait);
104969@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
104970 seq_putc(m, '\n');
104971
104972 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
104973- seq_printf(m, "Open count: %d\n", self->port.count);
104974+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
104975 seq_printf(m, "Max data size: %d\n", self->max_data_size);
104976 seq_printf(m, "Max header size: %d\n", self->max_header_size);
104977
104978diff --git a/net/irda/irproc.c b/net/irda/irproc.c
104979index b9ac598..f88cc56 100644
104980--- a/net/irda/irproc.c
104981+++ b/net/irda/irproc.c
104982@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
104983 {
104984 int i;
104985
104986- proc_irda = proc_mkdir("irda", init_net.proc_net);
104987+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
104988 if (proc_irda == NULL)
104989 return;
104990
104991diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
104992index 2e9953b..ed06350 100644
104993--- a/net/iucv/af_iucv.c
104994+++ b/net/iucv/af_iucv.c
104995@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
104996 {
104997 char name[12];
104998
104999- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
105000+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
105001 while (__iucv_get_sock_by_name(name)) {
105002 sprintf(name, "%08x",
105003- atomic_inc_return(&iucv_sk_list.autobind_name));
105004+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
105005 }
105006 memcpy(iucv->src_name, name, 8);
105007 }
105008diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
105009index 2a6a1fd..6c112b0 100644
105010--- a/net/iucv/iucv.c
105011+++ b/net/iucv/iucv.c
105012@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
105013 return NOTIFY_OK;
105014 }
105015
105016-static struct notifier_block __refdata iucv_cpu_notifier = {
105017+static struct notifier_block iucv_cpu_notifier = {
105018 .notifier_call = iucv_cpu_notify,
105019 };
105020
105021diff --git a/net/key/af_key.c b/net/key/af_key.c
105022index f8ac939..1e189bf 100644
105023--- a/net/key/af_key.c
105024+++ b/net/key/af_key.c
105025@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
105026 static u32 get_acqseq(void)
105027 {
105028 u32 res;
105029- static atomic_t acqseq;
105030+ static atomic_unchecked_t acqseq;
105031
105032 do {
105033- res = atomic_inc_return(&acqseq);
105034+ res = atomic_inc_return_unchecked(&acqseq);
105035 } while (!res);
105036 return res;
105037 }
105038diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
105039index 781b3a2..73a7434 100644
105040--- a/net/l2tp/l2tp_eth.c
105041+++ b/net/l2tp/l2tp_eth.c
105042@@ -42,12 +42,12 @@ struct l2tp_eth {
105043 struct sock *tunnel_sock;
105044 struct l2tp_session *session;
105045 struct list_head list;
105046- atomic_long_t tx_bytes;
105047- atomic_long_t tx_packets;
105048- atomic_long_t tx_dropped;
105049- atomic_long_t rx_bytes;
105050- atomic_long_t rx_packets;
105051- atomic_long_t rx_errors;
105052+ atomic_long_unchecked_t tx_bytes;
105053+ atomic_long_unchecked_t tx_packets;
105054+ atomic_long_unchecked_t tx_dropped;
105055+ atomic_long_unchecked_t rx_bytes;
105056+ atomic_long_unchecked_t rx_packets;
105057+ atomic_long_unchecked_t rx_errors;
105058 };
105059
105060 /* via l2tp_session_priv() */
105061@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
105062 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
105063
105064 if (likely(ret == NET_XMIT_SUCCESS)) {
105065- atomic_long_add(len, &priv->tx_bytes);
105066- atomic_long_inc(&priv->tx_packets);
105067+ atomic_long_add_unchecked(len, &priv->tx_bytes);
105068+ atomic_long_inc_unchecked(&priv->tx_packets);
105069 } else {
105070- atomic_long_inc(&priv->tx_dropped);
105071+ atomic_long_inc_unchecked(&priv->tx_dropped);
105072 }
105073 return NETDEV_TX_OK;
105074 }
105075@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
105076 {
105077 struct l2tp_eth *priv = netdev_priv(dev);
105078
105079- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
105080- stats->tx_packets = atomic_long_read(&priv->tx_packets);
105081- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
105082- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
105083- stats->rx_packets = atomic_long_read(&priv->rx_packets);
105084- stats->rx_errors = atomic_long_read(&priv->rx_errors);
105085+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
105086+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
105087+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
105088+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
105089+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
105090+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
105091 return stats;
105092 }
105093
105094@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
105095 nf_reset(skb);
105096
105097 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
105098- atomic_long_inc(&priv->rx_packets);
105099- atomic_long_add(data_len, &priv->rx_bytes);
105100+ atomic_long_inc_unchecked(&priv->rx_packets);
105101+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
105102 } else {
105103- atomic_long_inc(&priv->rx_errors);
105104+ atomic_long_inc_unchecked(&priv->rx_errors);
105105 }
105106 return;
105107
105108 error:
105109- atomic_long_inc(&priv->rx_errors);
105110+ atomic_long_inc_unchecked(&priv->rx_errors);
105111 kfree_skb(skb);
105112 }
105113
105114diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
105115index 05dfc8aa..df6cfd7 100644
105116--- a/net/l2tp/l2tp_ip.c
105117+++ b/net/l2tp/l2tp_ip.c
105118@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
105119 .ops = &l2tp_ip_ops,
105120 };
105121
105122-static struct net_protocol l2tp_ip_protocol __read_mostly = {
105123+static const struct net_protocol l2tp_ip_protocol = {
105124 .handler = l2tp_ip_recv,
105125 .netns_ok = 1,
105126 };
105127diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
105128index 8611f1b..bc60a2d 100644
105129--- a/net/l2tp/l2tp_ip6.c
105130+++ b/net/l2tp/l2tp_ip6.c
105131@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
105132 .ops = &l2tp_ip6_ops,
105133 };
105134
105135-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
105136+static const struct inet6_protocol l2tp_ip6_protocol = {
105137 .handler = l2tp_ip6_recv,
105138 };
105139
105140diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
105141index 1a3c7e0..80f8b0c 100644
105142--- a/net/llc/llc_proc.c
105143+++ b/net/llc/llc_proc.c
105144@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
105145 int rc = -ENOMEM;
105146 struct proc_dir_entry *p;
105147
105148- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
105149+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
105150 if (!llc_proc_dir)
105151 goto out;
105152
105153diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
105154index e75d5c5..429fc95 100644
105155--- a/net/mac80211/cfg.c
105156+++ b/net/mac80211/cfg.c
105157@@ -543,7 +543,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
105158 ret = ieee80211_vif_use_channel(sdata, chandef,
105159 IEEE80211_CHANCTX_EXCLUSIVE);
105160 }
105161- } else if (local->open_count == local->monitors) {
105162+ } else if (local_read(&local->open_count) == local->monitors) {
105163 local->_oper_chandef = *chandef;
105164 ieee80211_hw_config(local, 0);
105165 }
105166@@ -3416,7 +3416,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
105167 else
105168 local->probe_req_reg--;
105169
105170- if (!local->open_count)
105171+ if (!local_read(&local->open_count))
105172 break;
105173
105174 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
105175@@ -3551,8 +3551,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
105176 if (chanctx_conf) {
105177 *chandef = sdata->vif.bss_conf.chandef;
105178 ret = 0;
105179- } else if (local->open_count > 0 &&
105180- local->open_count == local->monitors &&
105181+ } else if (local_read(&local->open_count) > 0 &&
105182+ local_read(&local->open_count) == local->monitors &&
105183 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
105184 if (local->use_chanctx)
105185 *chandef = local->monitor_chandef;
105186diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
105187index fa7568c..74c815c 100644
105188--- a/net/mac80211/ieee80211_i.h
105189+++ b/net/mac80211/ieee80211_i.h
105190@@ -29,6 +29,7 @@
105191 #include <net/ieee80211_radiotap.h>
105192 #include <net/cfg80211.h>
105193 #include <net/mac80211.h>
105194+#include <asm/local.h>
105195 #include "key.h"
105196 #include "sta_info.h"
105197 #include "debug.h"
105198@@ -1125,7 +1126,7 @@ struct ieee80211_local {
105199 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
105200 spinlock_t queue_stop_reason_lock;
105201
105202- int open_count;
105203+ local_t open_count;
105204 int monitors, cooked_mntrs;
105205 /* number of interfaces with corresponding FIF_ flags */
105206 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
105207diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
105208index 4173553..e3b5a3f 100644
105209--- a/net/mac80211/iface.c
105210+++ b/net/mac80211/iface.c
105211@@ -543,7 +543,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105212 break;
105213 }
105214
105215- if (local->open_count == 0) {
105216+ if (local_read(&local->open_count) == 0) {
105217 res = drv_start(local);
105218 if (res)
105219 goto err_del_bss;
105220@@ -590,7 +590,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105221 res = drv_add_interface(local, sdata);
105222 if (res)
105223 goto err_stop;
105224- } else if (local->monitors == 0 && local->open_count == 0) {
105225+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
105226 res = ieee80211_add_virtual_monitor(local);
105227 if (res)
105228 goto err_stop;
105229@@ -700,7 +700,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105230 atomic_inc(&local->iff_promiscs);
105231
105232 if (coming_up)
105233- local->open_count++;
105234+ local_inc(&local->open_count);
105235
105236 if (hw_reconf_flags)
105237 ieee80211_hw_config(local, hw_reconf_flags);
105238@@ -738,7 +738,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105239 err_del_interface:
105240 drv_remove_interface(local, sdata);
105241 err_stop:
105242- if (!local->open_count)
105243+ if (!local_read(&local->open_count))
105244 drv_stop(local);
105245 err_del_bss:
105246 sdata->bss = NULL;
105247@@ -906,7 +906,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105248 }
105249
105250 if (going_down)
105251- local->open_count--;
105252+ local_dec(&local->open_count);
105253
105254 switch (sdata->vif.type) {
105255 case NL80211_IFTYPE_AP_VLAN:
105256@@ -968,7 +968,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105257 }
105258 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
105259
105260- if (local->open_count == 0)
105261+ if (local_read(&local->open_count) == 0)
105262 ieee80211_clear_tx_pending(local);
105263
105264 /*
105265@@ -1011,7 +1011,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105266 if (cancel_scan)
105267 flush_delayed_work(&local->scan_work);
105268
105269- if (local->open_count == 0) {
105270+ if (local_read(&local->open_count) == 0) {
105271 ieee80211_stop_device(local);
105272
105273 /* no reconfiguring after stop! */
105274@@ -1022,7 +1022,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105275 ieee80211_configure_filter(local);
105276 ieee80211_hw_config(local, hw_reconf_flags);
105277
105278- if (local->monitors == local->open_count)
105279+ if (local->monitors == local_read(&local->open_count))
105280 ieee80211_add_virtual_monitor(local);
105281 }
105282
105283diff --git a/net/mac80211/main.c b/net/mac80211/main.c
105284index 6ab99da..f9502d4 100644
105285--- a/net/mac80211/main.c
105286+++ b/net/mac80211/main.c
105287@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
105288 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
105289 IEEE80211_CONF_CHANGE_POWER);
105290
105291- if (changed && local->open_count) {
105292+ if (changed && local_read(&local->open_count)) {
105293 ret = drv_config(local, changed);
105294 /*
105295 * Goal:
105296diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
105297index 4a95fe3..0bfd713 100644
105298--- a/net/mac80211/pm.c
105299+++ b/net/mac80211/pm.c
105300@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105301 struct ieee80211_sub_if_data *sdata;
105302 struct sta_info *sta;
105303
105304- if (!local->open_count)
105305+ if (!local_read(&local->open_count))
105306 goto suspend;
105307
105308 ieee80211_scan_cancel(local);
105309@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105310 cancel_work_sync(&local->dynamic_ps_enable_work);
105311 del_timer_sync(&local->dynamic_ps_timer);
105312
105313- local->wowlan = wowlan && local->open_count;
105314+ local->wowlan = wowlan && local_read(&local->open_count);
105315 if (local->wowlan) {
105316 int err = drv_suspend(local, wowlan);
105317 if (err < 0) {
105318@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105319 WARN_ON(!list_empty(&local->chanctx_list));
105320
105321 /* stop hardware - this must stop RX */
105322- if (local->open_count)
105323+ if (local_read(&local->open_count))
105324 ieee80211_stop_device(local);
105325
105326 suspend:
105327diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
105328index d53355b..21f583a 100644
105329--- a/net/mac80211/rate.c
105330+++ b/net/mac80211/rate.c
105331@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
105332
105333 ASSERT_RTNL();
105334
105335- if (local->open_count)
105336+ if (local_read(&local->open_count))
105337 return -EBUSY;
105338
105339 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
105340diff --git a/net/mac80211/util.c b/net/mac80211/util.c
105341index 1ce38e7..77267ad 100644
105342--- a/net/mac80211/util.c
105343+++ b/net/mac80211/util.c
105344@@ -1757,7 +1757,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
105345 }
105346 #endif
105347 /* everything else happens only if HW was up & running */
105348- if (!local->open_count)
105349+ if (!local_read(&local->open_count))
105350 goto wake_up;
105351
105352 /*
105353@@ -1987,7 +1987,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
105354 local->in_reconfig = false;
105355 barrier();
105356
105357- if (local->monitors == local->open_count && local->monitors > 0)
105358+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
105359 ieee80211_add_virtual_monitor(local);
105360
105361 /*
105362diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
105363index b02660f..c0f791c 100644
105364--- a/net/netfilter/Kconfig
105365+++ b/net/netfilter/Kconfig
105366@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
105367
105368 To compile it as a module, choose M here. If unsure, say N.
105369
105370+config NETFILTER_XT_MATCH_GRADM
105371+ tristate '"gradm" match support'
105372+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
105373+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
105374+ ---help---
105375+ The gradm match allows to match on grsecurity RBAC being enabled.
105376+ It is useful when iptables rules are applied early on bootup to
105377+ prevent connections to the machine (except from a trusted host)
105378+ while the RBAC system is disabled.
105379+
105380 config NETFILTER_XT_MATCH_HASHLIMIT
105381 tristate '"hashlimit" match support'
105382 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
105383diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
105384index 89f73a9..e4e5bd9 100644
105385--- a/net/netfilter/Makefile
105386+++ b/net/netfilter/Makefile
105387@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
105388 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
105389 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
105390 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
105391+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
105392 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
105393 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
105394 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
105395diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
105396index d259da3..6a32b2c 100644
105397--- a/net/netfilter/ipset/ip_set_core.c
105398+++ b/net/netfilter/ipset/ip_set_core.c
105399@@ -1952,7 +1952,7 @@ done:
105400 return ret;
105401 }
105402
105403-static struct nf_sockopt_ops so_set __read_mostly = {
105404+static struct nf_sockopt_ops so_set = {
105405 .pf = PF_INET,
105406 .get_optmin = SO_IP_SET,
105407 .get_optmax = SO_IP_SET + 1,
105408diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
105409index b0f7b62..0541842 100644
105410--- a/net/netfilter/ipvs/ip_vs_conn.c
105411+++ b/net/netfilter/ipvs/ip_vs_conn.c
105412@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
105413 /* Increase the refcnt counter of the dest */
105414 ip_vs_dest_hold(dest);
105415
105416- conn_flags = atomic_read(&dest->conn_flags);
105417+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
105418 if (cp->protocol != IPPROTO_UDP)
105419 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
105420 flags = cp->flags;
105421@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
105422
105423 cp->control = NULL;
105424 atomic_set(&cp->n_control, 0);
105425- atomic_set(&cp->in_pkts, 0);
105426+ atomic_set_unchecked(&cp->in_pkts, 0);
105427
105428 cp->packet_xmit = NULL;
105429 cp->app = NULL;
105430@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
105431
105432 /* Don't drop the entry if its number of incoming packets is not
105433 located in [0, 8] */
105434- i = atomic_read(&cp->in_pkts);
105435+ i = atomic_read_unchecked(&cp->in_pkts);
105436 if (i > 8 || i < 0) return 0;
105437
105438 if (!todrop_rate[i]) return 0;
105439diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
105440index b87ca32..76c7799 100644
105441--- a/net/netfilter/ipvs/ip_vs_core.c
105442+++ b/net/netfilter/ipvs/ip_vs_core.c
105443@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
105444 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
105445 /* do not touch skb anymore */
105446
105447- atomic_inc(&cp->in_pkts);
105448+ atomic_inc_unchecked(&cp->in_pkts);
105449 ip_vs_conn_put(cp);
105450 return ret;
105451 }
105452@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
105453 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
105454 pkts = sysctl_sync_threshold(ipvs);
105455 else
105456- pkts = atomic_add_return(1, &cp->in_pkts);
105457+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
105458
105459 if (ipvs->sync_state & IP_VS_STATE_MASTER)
105460 ip_vs_sync_conn(net, cp, pkts);
105461diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
105462index fdcda8b..dbc1979 100644
105463--- a/net/netfilter/ipvs/ip_vs_ctl.c
105464+++ b/net/netfilter/ipvs/ip_vs_ctl.c
105465@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
105466 */
105467 ip_vs_rs_hash(ipvs, dest);
105468 }
105469- atomic_set(&dest->conn_flags, conn_flags);
105470+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
105471
105472 /* bind the service */
105473 old_svc = rcu_dereference_protected(dest->svc, 1);
105474@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
105475 * align with netns init in ip_vs_control_net_init()
105476 */
105477
105478-static struct ctl_table vs_vars[] = {
105479+static ctl_table_no_const vs_vars[] __read_only = {
105480 {
105481 .procname = "amemthresh",
105482 .maxlen = sizeof(int),
105483@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
105484 " %-7s %-6d %-10d %-10d\n",
105485 &dest->addr.in6,
105486 ntohs(dest->port),
105487- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
105488+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
105489 atomic_read(&dest->weight),
105490 atomic_read(&dest->activeconns),
105491 atomic_read(&dest->inactconns));
105492@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
105493 "%-7s %-6d %-10d %-10d\n",
105494 ntohl(dest->addr.ip),
105495 ntohs(dest->port),
105496- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
105497+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
105498 atomic_read(&dest->weight),
105499 atomic_read(&dest->activeconns),
105500 atomic_read(&dest->inactconns));
105501@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
105502
105503 entry.addr = dest->addr.ip;
105504 entry.port = dest->port;
105505- entry.conn_flags = atomic_read(&dest->conn_flags);
105506+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
105507 entry.weight = atomic_read(&dest->weight);
105508 entry.u_threshold = dest->u_threshold;
105509 entry.l_threshold = dest->l_threshold;
105510@@ -3039,7 +3039,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
105511 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
105512 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
105513 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
105514- (atomic_read(&dest->conn_flags) &
105515+ (atomic_read_unchecked(&dest->conn_flags) &
105516 IP_VS_CONN_F_FWD_MASK)) ||
105517 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
105518 atomic_read(&dest->weight)) ||
105519@@ -3672,7 +3672,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
105520 {
105521 int idx;
105522 struct netns_ipvs *ipvs = net_ipvs(net);
105523- struct ctl_table *tbl;
105524+ ctl_table_no_const *tbl;
105525
105526 atomic_set(&ipvs->dropentry, 0);
105527 spin_lock_init(&ipvs->dropentry_lock);
105528diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
105529index 127f140..553d652 100644
105530--- a/net/netfilter/ipvs/ip_vs_lblc.c
105531+++ b/net/netfilter/ipvs/ip_vs_lblc.c
105532@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
105533 * IPVS LBLC sysctl table
105534 */
105535 #ifdef CONFIG_SYSCTL
105536-static struct ctl_table vs_vars_table[] = {
105537+static ctl_table_no_const vs_vars_table[] __read_only = {
105538 {
105539 .procname = "lblc_expiration",
105540 .data = NULL,
105541diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
105542index 2229d2d..b32b785 100644
105543--- a/net/netfilter/ipvs/ip_vs_lblcr.c
105544+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
105545@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
105546 * IPVS LBLCR sysctl table
105547 */
105548
105549-static struct ctl_table vs_vars_table[] = {
105550+static ctl_table_no_const vs_vars_table[] __read_only = {
105551 {
105552 .procname = "lblcr_expiration",
105553 .data = NULL,
105554diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
105555index d93ceeb..4556144 100644
105556--- a/net/netfilter/ipvs/ip_vs_sync.c
105557+++ b/net/netfilter/ipvs/ip_vs_sync.c
105558@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
105559 cp = cp->control;
105560 if (cp) {
105561 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
105562- pkts = atomic_add_return(1, &cp->in_pkts);
105563+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
105564 else
105565 pkts = sysctl_sync_threshold(ipvs);
105566 ip_vs_sync_conn(net, cp->control, pkts);
105567@@ -771,7 +771,7 @@ control:
105568 if (!cp)
105569 return;
105570 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
105571- pkts = atomic_add_return(1, &cp->in_pkts);
105572+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
105573 else
105574 pkts = sysctl_sync_threshold(ipvs);
105575 goto sloop;
105576@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
105577
105578 if (opt)
105579 memcpy(&cp->in_seq, opt, sizeof(*opt));
105580- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
105581+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
105582 cp->state = state;
105583 cp->old_state = cp->state;
105584 /*
105585diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
105586index 3aedbda..6a63567 100644
105587--- a/net/netfilter/ipvs/ip_vs_xmit.c
105588+++ b/net/netfilter/ipvs/ip_vs_xmit.c
105589@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
105590 else
105591 rc = NF_ACCEPT;
105592 /* do not touch skb anymore */
105593- atomic_inc(&cp->in_pkts);
105594+ atomic_inc_unchecked(&cp->in_pkts);
105595 goto out;
105596 }
105597
105598@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
105599 else
105600 rc = NF_ACCEPT;
105601 /* do not touch skb anymore */
105602- atomic_inc(&cp->in_pkts);
105603+ atomic_inc_unchecked(&cp->in_pkts);
105604 goto out;
105605 }
105606
105607diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
105608index a4b5e2a..13b1de3 100644
105609--- a/net/netfilter/nf_conntrack_acct.c
105610+++ b/net/netfilter/nf_conntrack_acct.c
105611@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
105612 #ifdef CONFIG_SYSCTL
105613 static int nf_conntrack_acct_init_sysctl(struct net *net)
105614 {
105615- struct ctl_table *table;
105616+ ctl_table_no_const *table;
105617
105618 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
105619 GFP_KERNEL);
105620diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
105621index 46d1b26..b7f3b76 100644
105622--- a/net/netfilter/nf_conntrack_core.c
105623+++ b/net/netfilter/nf_conntrack_core.c
105624@@ -1734,6 +1734,10 @@ void nf_conntrack_init_end(void)
105625 #define DYING_NULLS_VAL ((1<<30)+1)
105626 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
105627
105628+#ifdef CONFIG_GRKERNSEC_HIDESYM
105629+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
105630+#endif
105631+
105632 int nf_conntrack_init_net(struct net *net)
105633 {
105634 int ret = -ENOMEM;
105635@@ -1759,7 +1763,11 @@ int nf_conntrack_init_net(struct net *net)
105636 if (!net->ct.stat)
105637 goto err_pcpu_lists;
105638
105639+#ifdef CONFIG_GRKERNSEC_HIDESYM
105640+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
105641+#else
105642 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
105643+#endif
105644 if (!net->ct.slabname)
105645 goto err_slabname;
105646
105647diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
105648index 4e78c57..ec8fb74 100644
105649--- a/net/netfilter/nf_conntrack_ecache.c
105650+++ b/net/netfilter/nf_conntrack_ecache.c
105651@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
105652 #ifdef CONFIG_SYSCTL
105653 static int nf_conntrack_event_init_sysctl(struct net *net)
105654 {
105655- struct ctl_table *table;
105656+ ctl_table_no_const *table;
105657
105658 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
105659 GFP_KERNEL);
105660diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
105661index bd9d315..989947e 100644
105662--- a/net/netfilter/nf_conntrack_helper.c
105663+++ b/net/netfilter/nf_conntrack_helper.c
105664@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
105665
105666 static int nf_conntrack_helper_init_sysctl(struct net *net)
105667 {
105668- struct ctl_table *table;
105669+ ctl_table_no_const *table;
105670
105671 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
105672 GFP_KERNEL);
105673diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
105674index b65d586..beec902 100644
105675--- a/net/netfilter/nf_conntrack_proto.c
105676+++ b/net/netfilter/nf_conntrack_proto.c
105677@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
105678
105679 static void
105680 nf_ct_unregister_sysctl(struct ctl_table_header **header,
105681- struct ctl_table **table,
105682+ ctl_table_no_const **table,
105683 unsigned int users)
105684 {
105685 if (users > 0)
105686diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
105687index fc823fa..8311af3 100644
105688--- a/net/netfilter/nf_conntrack_standalone.c
105689+++ b/net/netfilter/nf_conntrack_standalone.c
105690@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
105691
105692 static int nf_conntrack_standalone_init_sysctl(struct net *net)
105693 {
105694- struct ctl_table *table;
105695+ ctl_table_no_const *table;
105696
105697 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
105698 GFP_KERNEL);
105699diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
105700index 7a394df..bd91a8a 100644
105701--- a/net/netfilter/nf_conntrack_timestamp.c
105702+++ b/net/netfilter/nf_conntrack_timestamp.c
105703@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
105704 #ifdef CONFIG_SYSCTL
105705 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
105706 {
105707- struct ctl_table *table;
105708+ ctl_table_no_const *table;
105709
105710 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
105711 GFP_KERNEL);
105712diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
105713index 43c926c..a5731d8 100644
105714--- a/net/netfilter/nf_log.c
105715+++ b/net/netfilter/nf_log.c
105716@@ -362,7 +362,7 @@ static const struct file_operations nflog_file_ops = {
105717
105718 #ifdef CONFIG_SYSCTL
105719 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
105720-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
105721+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
105722
105723 static int nf_log_proc_dostring(struct ctl_table *table, int write,
105724 void __user *buffer, size_t *lenp, loff_t *ppos)
105725@@ -393,13 +393,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
105726 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
105727 mutex_unlock(&nf_log_mutex);
105728 } else {
105729+ ctl_table_no_const nf_log_table = *table;
105730+
105731 mutex_lock(&nf_log_mutex);
105732 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
105733 if (!logger)
105734- table->data = "NONE";
105735+ nf_log_table.data = "NONE";
105736 else
105737- table->data = logger->name;
105738- r = proc_dostring(table, write, buffer, lenp, ppos);
105739+ nf_log_table.data = logger->name;
105740+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
105741 mutex_unlock(&nf_log_mutex);
105742 }
105743
105744diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
105745index c68c1e5..8b5d670 100644
105746--- a/net/netfilter/nf_sockopt.c
105747+++ b/net/netfilter/nf_sockopt.c
105748@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
105749 }
105750 }
105751
105752- list_add(&reg->list, &nf_sockopts);
105753+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
105754 out:
105755 mutex_unlock(&nf_sockopt_mutex);
105756 return ret;
105757@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
105758 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
105759 {
105760 mutex_lock(&nf_sockopt_mutex);
105761- list_del(&reg->list);
105762+ pax_list_del((struct list_head *)&reg->list);
105763 mutex_unlock(&nf_sockopt_mutex);
105764 }
105765 EXPORT_SYMBOL(nf_unregister_sockopt);
105766diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
105767index 11d85b3..7fcc420 100644
105768--- a/net/netfilter/nfnetlink_log.c
105769+++ b/net/netfilter/nfnetlink_log.c
105770@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
105771 struct nfnl_log_net {
105772 spinlock_t instances_lock;
105773 struct hlist_head instance_table[INSTANCE_BUCKETS];
105774- atomic_t global_seq;
105775+ atomic_unchecked_t global_seq;
105776 };
105777
105778 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
105779@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
105780 /* global sequence number */
105781 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
105782 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
105783- htonl(atomic_inc_return(&log->global_seq))))
105784+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
105785 goto nla_put_failure;
105786
105787 if (data_len) {
105788diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
105789index b636486..9898807 100644
105790--- a/net/netfilter/nft_compat.c
105791+++ b/net/netfilter/nft_compat.c
105792@@ -274,14 +274,7 @@ static void nft_match_eval(const struct nft_expr *expr,
105793 return;
105794 }
105795
105796- switch(ret) {
105797- case true:
105798- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
105799- break;
105800- case false:
105801- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
105802- break;
105803- }
105804+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
105805 }
105806
105807 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
105808diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
105809new file mode 100644
105810index 0000000..c566332
105811--- /dev/null
105812+++ b/net/netfilter/xt_gradm.c
105813@@ -0,0 +1,51 @@
105814+/*
105815+ * gradm match for netfilter
105816