]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-3.19.6-201505021013.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-201505021013.patch
CommitLineData
1c0d7847
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-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42167index c13fb5b..55a3802 100644
42168--- a/drivers/hid/hid-wiimote-debug.c
42169+++ b/drivers/hid/hid-wiimote-debug.c
42170@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42171 else if (size == 0)
42172 return -EIO;
42173
42174- if (copy_to_user(u, buf, size))
42175+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42176 return -EFAULT;
42177
42178 *off += size;
42179diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42180index 433f72a..2926005 100644
42181--- a/drivers/hv/channel.c
42182+++ b/drivers/hv/channel.c
42183@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42184 unsigned long flags;
42185 int ret = 0;
42186
42187- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42188- atomic_inc(&vmbus_connection.next_gpadl_handle);
42189+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42190+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42191
42192 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42193 if (ret)
42194diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42195index 3e4235c..877d0e5 100644
42196--- a/drivers/hv/hv.c
42197+++ b/drivers/hv/hv.c
42198@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42199 u64 output_address = (output) ? virt_to_phys(output) : 0;
42200 u32 output_address_hi = output_address >> 32;
42201 u32 output_address_lo = output_address & 0xFFFFFFFF;
42202- void *hypercall_page = hv_context.hypercall_page;
42203+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42204
42205 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42206 "=a"(hv_status_lo) : "d" (control_hi),
42207@@ -156,7 +156,7 @@ int hv_init(void)
42208 /* See if the hypercall page is already set */
42209 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42210
42211- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42212+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42213
42214 if (!virtaddr)
42215 goto cleanup;
42216diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42217index b958ded..b2452bb 100644
42218--- a/drivers/hv/hv_balloon.c
42219+++ b/drivers/hv/hv_balloon.c
42220@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42221
42222 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42223 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42224-static atomic_t trans_id = ATOMIC_INIT(0);
42225+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42226
42227 static int dm_ring_size = (5 * PAGE_SIZE);
42228
42229@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42230 pr_info("Memory hot add failed\n");
42231
42232 dm->state = DM_INITIALIZED;
42233- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42234+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42235 vmbus_sendpacket(dm->dev->channel, &resp,
42236 sizeof(struct dm_hot_add_response),
42237 (unsigned long)NULL,
42238@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42239 memset(&status, 0, sizeof(struct dm_status));
42240 status.hdr.type = DM_STATUS_REPORT;
42241 status.hdr.size = sizeof(struct dm_status);
42242- status.hdr.trans_id = atomic_inc_return(&trans_id);
42243+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42244
42245 /*
42246 * The host expects the guest to report free memory.
42247@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42248 * send the status. This can happen if we were interrupted
42249 * after we picked our transaction ID.
42250 */
42251- if (status.hdr.trans_id != atomic_read(&trans_id))
42252+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42253 return;
42254
42255 /*
42256@@ -1133,7 +1133,7 @@ static void balloon_up(struct work_struct *dummy)
42257 */
42258
42259 do {
42260- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42261+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42262 ret = vmbus_sendpacket(dm_device.dev->channel,
42263 bl_resp,
42264 bl_resp->hdr.size,
42265@@ -1179,7 +1179,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42266
42267 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42268 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42269- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42270+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42271 resp.hdr.size = sizeof(struct dm_unballoon_response);
42272
42273 vmbus_sendpacket(dm_device.dev->channel, &resp,
42274@@ -1243,7 +1243,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42275 memset(&version_req, 0, sizeof(struct dm_version_request));
42276 version_req.hdr.type = DM_VERSION_REQUEST;
42277 version_req.hdr.size = sizeof(struct dm_version_request);
42278- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42279+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42280 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42281 version_req.is_last_attempt = 1;
42282
42283@@ -1413,7 +1413,7 @@ static int balloon_probe(struct hv_device *dev,
42284 memset(&version_req, 0, sizeof(struct dm_version_request));
42285 version_req.hdr.type = DM_VERSION_REQUEST;
42286 version_req.hdr.size = sizeof(struct dm_version_request);
42287- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42288+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42289 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42290 version_req.is_last_attempt = 0;
42291
42292@@ -1444,7 +1444,7 @@ static int balloon_probe(struct hv_device *dev,
42293 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42294 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42295 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42296- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42297+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42298
42299 cap_msg.caps.cap_bits.balloon = 1;
42300 cap_msg.caps.cap_bits.hot_add = 1;
42301diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42302index c386d8d..d6004c4 100644
42303--- a/drivers/hv/hyperv_vmbus.h
42304+++ b/drivers/hv/hyperv_vmbus.h
42305@@ -611,7 +611,7 @@ enum vmbus_connect_state {
42306 struct vmbus_connection {
42307 enum vmbus_connect_state conn_state;
42308
42309- atomic_t next_gpadl_handle;
42310+ atomic_unchecked_t next_gpadl_handle;
42311
42312 /*
42313 * Represents channel interrupts. Each bit position represents a
42314diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42315index 4d6b269..2e23b86 100644
42316--- a/drivers/hv/vmbus_drv.c
42317+++ b/drivers/hv/vmbus_drv.c
42318@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42319 {
42320 int ret = 0;
42321
42322- static atomic_t device_num = ATOMIC_INIT(0);
42323+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42324
42325 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42326- atomic_inc_return(&device_num));
42327+ atomic_inc_return_unchecked(&device_num));
42328
42329 child_device_obj->device.bus = &hv_bus;
42330 child_device_obj->device.parent = &hv_acpi_dev->dev;
42331diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42332index 579bdf9..0dac21d5 100644
42333--- a/drivers/hwmon/acpi_power_meter.c
42334+++ b/drivers/hwmon/acpi_power_meter.c
42335@@ -116,7 +116,7 @@ struct sensor_template {
42336 struct device_attribute *devattr,
42337 const char *buf, size_t count);
42338 int index;
42339-};
42340+} __do_const;
42341
42342 /* Averaging interval */
42343 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42344@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42345 struct sensor_template *attrs)
42346 {
42347 struct device *dev = &resource->acpi_dev->dev;
42348- struct sensor_device_attribute *sensors =
42349+ sensor_device_attribute_no_const *sensors =
42350 &resource->sensors[resource->num_sensors];
42351 int res = 0;
42352
42353@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42354 return 0;
42355 }
42356
42357-static struct dmi_system_id __initdata pm_dmi_table[] = {
42358+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42359 {
42360 enable_cap_knobs, "IBM Active Energy Manager",
42361 {
42362diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42363index 0af63da..05a183a 100644
42364--- a/drivers/hwmon/applesmc.c
42365+++ b/drivers/hwmon/applesmc.c
42366@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42367 {
42368 struct applesmc_node_group *grp;
42369 struct applesmc_dev_attr *node;
42370- struct attribute *attr;
42371+ attribute_no_const *attr;
42372 int ret, i;
42373
42374 for (grp = groups; grp->format; grp++) {
42375diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42376index cccef87..06ce8ec 100644
42377--- a/drivers/hwmon/asus_atk0110.c
42378+++ b/drivers/hwmon/asus_atk0110.c
42379@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42380 struct atk_sensor_data {
42381 struct list_head list;
42382 struct atk_data *data;
42383- struct device_attribute label_attr;
42384- struct device_attribute input_attr;
42385- struct device_attribute limit1_attr;
42386- struct device_attribute limit2_attr;
42387+ device_attribute_no_const label_attr;
42388+ device_attribute_no_const input_attr;
42389+ device_attribute_no_const limit1_attr;
42390+ device_attribute_no_const limit2_attr;
42391 char label_attr_name[ATTR_NAME_SIZE];
42392 char input_attr_name[ATTR_NAME_SIZE];
42393 char limit1_attr_name[ATTR_NAME_SIZE];
42394@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42395 static struct device_attribute atk_name_attr =
42396 __ATTR(name, 0444, atk_name_show, NULL);
42397
42398-static void atk_init_attribute(struct device_attribute *attr, char *name,
42399+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42400 sysfs_show_func show)
42401 {
42402 sysfs_attr_init(&attr->attr);
42403diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42404index 5b7fec8..05c957a 100644
42405--- a/drivers/hwmon/coretemp.c
42406+++ b/drivers/hwmon/coretemp.c
42407@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42408 return NOTIFY_OK;
42409 }
42410
42411-static struct notifier_block coretemp_cpu_notifier __refdata = {
42412+static struct notifier_block coretemp_cpu_notifier = {
42413 .notifier_call = coretemp_cpu_callback,
42414 };
42415
42416diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42417index 7a8a6fb..015c1fd 100644
42418--- a/drivers/hwmon/ibmaem.c
42419+++ b/drivers/hwmon/ibmaem.c
42420@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42421 struct aem_rw_sensor_template *rw)
42422 {
42423 struct device *dev = &data->pdev->dev;
42424- struct sensor_device_attribute *sensors = data->sensors;
42425+ sensor_device_attribute_no_const *sensors = data->sensors;
42426 int err;
42427
42428 /* Set up read-only sensors */
42429diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42430index 17ae2eb..21b71dd 100644
42431--- a/drivers/hwmon/iio_hwmon.c
42432+++ b/drivers/hwmon/iio_hwmon.c
42433@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42434 {
42435 struct device *dev = &pdev->dev;
42436 struct iio_hwmon_state *st;
42437- struct sensor_device_attribute *a;
42438+ sensor_device_attribute_no_const *a;
42439 int ret, i;
42440 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42441 enum iio_chan_type type;
42442diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42443index f3830db..9f4d6d5 100644
42444--- a/drivers/hwmon/nct6683.c
42445+++ b/drivers/hwmon/nct6683.c
42446@@ -397,11 +397,11 @@ static struct attribute_group *
42447 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42448 int repeat)
42449 {
42450- struct sensor_device_attribute_2 *a2;
42451- struct sensor_device_attribute *a;
42452+ sensor_device_attribute_2_no_const *a2;
42453+ sensor_device_attribute_no_const *a;
42454 struct sensor_device_template **t;
42455 struct sensor_device_attr_u *su;
42456- struct attribute_group *group;
42457+ attribute_group_no_const *group;
42458 struct attribute **attrs;
42459 int i, j, count;
42460
42461diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42462index 1be4117..88ae1e1 100644
42463--- a/drivers/hwmon/nct6775.c
42464+++ b/drivers/hwmon/nct6775.c
42465@@ -952,10 +952,10 @@ static struct attribute_group *
42466 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42467 int repeat)
42468 {
42469- struct attribute_group *group;
42470+ attribute_group_no_const *group;
42471 struct sensor_device_attr_u *su;
42472- struct sensor_device_attribute *a;
42473- struct sensor_device_attribute_2 *a2;
42474+ sensor_device_attribute_no_const *a;
42475+ sensor_device_attribute_2_no_const *a2;
42476 struct attribute **attrs;
42477 struct sensor_device_template **t;
42478 int i, count;
42479diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42480index f2e47c7..45d7941 100644
42481--- a/drivers/hwmon/pmbus/pmbus_core.c
42482+++ b/drivers/hwmon/pmbus/pmbus_core.c
42483@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42484 return 0;
42485 }
42486
42487-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42488+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42489 const char *name,
42490 umode_t mode,
42491 ssize_t (*show)(struct device *dev,
42492@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42493 dev_attr->store = store;
42494 }
42495
42496-static void pmbus_attr_init(struct sensor_device_attribute *a,
42497+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42498 const char *name,
42499 umode_t mode,
42500 ssize_t (*show)(struct device *dev,
42501@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42502 u16 reg, u8 mask)
42503 {
42504 struct pmbus_boolean *boolean;
42505- struct sensor_device_attribute *a;
42506+ sensor_device_attribute_no_const *a;
42507
42508 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42509 if (!boolean)
42510@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42511 bool update, bool readonly)
42512 {
42513 struct pmbus_sensor *sensor;
42514- struct device_attribute *a;
42515+ device_attribute_no_const *a;
42516
42517 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42518 if (!sensor)
42519@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42520 const char *lstring, int index)
42521 {
42522 struct pmbus_label *label;
42523- struct device_attribute *a;
42524+ device_attribute_no_const *a;
42525
42526 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42527 if (!label)
42528diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42529index d4f0935..7420593 100644
42530--- a/drivers/hwmon/sht15.c
42531+++ b/drivers/hwmon/sht15.c
42532@@ -169,7 +169,7 @@ struct sht15_data {
42533 int supply_uv;
42534 bool supply_uv_valid;
42535 struct work_struct update_supply_work;
42536- atomic_t interrupt_handled;
42537+ atomic_unchecked_t interrupt_handled;
42538 };
42539
42540 /**
42541@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42542 ret = gpio_direction_input(data->pdata->gpio_data);
42543 if (ret)
42544 return ret;
42545- atomic_set(&data->interrupt_handled, 0);
42546+ atomic_set_unchecked(&data->interrupt_handled, 0);
42547
42548 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42549 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42550 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42551 /* Only relevant if the interrupt hasn't occurred. */
42552- if (!atomic_read(&data->interrupt_handled))
42553+ if (!atomic_read_unchecked(&data->interrupt_handled))
42554 schedule_work(&data->read_work);
42555 }
42556 ret = wait_event_timeout(data->wait_queue,
42557@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42558
42559 /* First disable the interrupt */
42560 disable_irq_nosync(irq);
42561- atomic_inc(&data->interrupt_handled);
42562+ atomic_inc_unchecked(&data->interrupt_handled);
42563 /* Then schedule a reading work struct */
42564 if (data->state != SHT15_READING_NOTHING)
42565 schedule_work(&data->read_work);
42566@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42567 * If not, then start the interrupt again - care here as could
42568 * have gone low in meantime so verify it hasn't!
42569 */
42570- atomic_set(&data->interrupt_handled, 0);
42571+ atomic_set_unchecked(&data->interrupt_handled, 0);
42572 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42573 /* If still not occurred or another handler was scheduled */
42574 if (gpio_get_value(data->pdata->gpio_data)
42575- || atomic_read(&data->interrupt_handled))
42576+ || atomic_read_unchecked(&data->interrupt_handled))
42577 return;
42578 }
42579
42580diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42581index ac91c07..8e69663 100644
42582--- a/drivers/hwmon/via-cputemp.c
42583+++ b/drivers/hwmon/via-cputemp.c
42584@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42585 return NOTIFY_OK;
42586 }
42587
42588-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42589+static struct notifier_block via_cputemp_cpu_notifier = {
42590 .notifier_call = via_cputemp_cpu_callback,
42591 };
42592
42593diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42594index 65e3240..e6c511d 100644
42595--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42596+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42597@@ -39,7 +39,7 @@
42598 extern struct i2c_adapter amd756_smbus;
42599
42600 static struct i2c_adapter *s4882_adapter;
42601-static struct i2c_algorithm *s4882_algo;
42602+static i2c_algorithm_no_const *s4882_algo;
42603
42604 /* Wrapper access functions for multiplexed SMBus */
42605 static DEFINE_MUTEX(amd756_lock);
42606diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42607index b19a310..d6eece0 100644
42608--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42609+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42610@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42611 /* usb layer */
42612
42613 /* Send command to device, and get response. */
42614-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42615+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42616 {
42617 int ret = 0;
42618 int actual;
42619diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42620index 88eda09..cf40434 100644
42621--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42622+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42623@@ -37,7 +37,7 @@
42624 extern struct i2c_adapter *nforce2_smbus;
42625
42626 static struct i2c_adapter *s4985_adapter;
42627-static struct i2c_algorithm *s4985_algo;
42628+static i2c_algorithm_no_const *s4985_algo;
42629
42630 /* Wrapper access functions for multiplexed SMBus */
42631 static DEFINE_MUTEX(nforce2_lock);
42632diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42633index 71c7a39..71dd3e0 100644
42634--- a/drivers/i2c/i2c-dev.c
42635+++ b/drivers/i2c/i2c-dev.c
42636@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42637 break;
42638 }
42639
42640- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42641+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42642 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42643 if (IS_ERR(rdwr_pa[i].buf)) {
42644 res = PTR_ERR(rdwr_pa[i].buf);
42645diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42646index 0b510ba..4fbb5085 100644
42647--- a/drivers/ide/ide-cd.c
42648+++ b/drivers/ide/ide-cd.c
42649@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42650 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42651 if ((unsigned long)buf & alignment
42652 || blk_rq_bytes(rq) & q->dma_pad_mask
42653- || object_is_on_stack(buf))
42654+ || object_starts_on_stack(buf))
42655 drive->dma = 0;
42656 }
42657 }
42658diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42659index f009d05..d95b613 100644
42660--- a/drivers/iio/industrialio-core.c
42661+++ b/drivers/iio/industrialio-core.c
42662@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42663 }
42664
42665 static
42666-int __iio_device_attr_init(struct device_attribute *dev_attr,
42667+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42668 const char *postfix,
42669 struct iio_chan_spec const *chan,
42670 ssize_t (*readfunc)(struct device *dev,
42671diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42672index e28a494..f7c2671 100644
42673--- a/drivers/infiniband/core/cm.c
42674+++ b/drivers/infiniband/core/cm.c
42675@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42676
42677 struct cm_counter_group {
42678 struct kobject obj;
42679- atomic_long_t counter[CM_ATTR_COUNT];
42680+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42681 };
42682
42683 struct cm_counter_attribute {
42684@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42685 struct ib_mad_send_buf *msg = NULL;
42686 int ret;
42687
42688- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42689+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42690 counter[CM_REQ_COUNTER]);
42691
42692 /* Quick state check to discard duplicate REQs. */
42693@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42694 if (!cm_id_priv)
42695 return;
42696
42697- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42698+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42699 counter[CM_REP_COUNTER]);
42700 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42701 if (ret)
42702@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42703 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42704 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42705 spin_unlock_irq(&cm_id_priv->lock);
42706- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42707+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42708 counter[CM_RTU_COUNTER]);
42709 goto out;
42710 }
42711@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42712 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42713 dreq_msg->local_comm_id);
42714 if (!cm_id_priv) {
42715- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42716+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42717 counter[CM_DREQ_COUNTER]);
42718 cm_issue_drep(work->port, work->mad_recv_wc);
42719 return -EINVAL;
42720@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42721 case IB_CM_MRA_REP_RCVD:
42722 break;
42723 case IB_CM_TIMEWAIT:
42724- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42725+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42726 counter[CM_DREQ_COUNTER]);
42727 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42728 goto unlock;
42729@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42730 cm_free_msg(msg);
42731 goto deref;
42732 case IB_CM_DREQ_RCVD:
42733- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42734+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42735 counter[CM_DREQ_COUNTER]);
42736 goto unlock;
42737 default:
42738@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42739 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42740 cm_id_priv->msg, timeout)) {
42741 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42742- atomic_long_inc(&work->port->
42743+ atomic_long_inc_unchecked(&work->port->
42744 counter_group[CM_RECV_DUPLICATES].
42745 counter[CM_MRA_COUNTER]);
42746 goto out;
42747@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42748 break;
42749 case IB_CM_MRA_REQ_RCVD:
42750 case IB_CM_MRA_REP_RCVD:
42751- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42752+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42753 counter[CM_MRA_COUNTER]);
42754 /* fall through */
42755 default:
42756@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42757 case IB_CM_LAP_IDLE:
42758 break;
42759 case IB_CM_MRA_LAP_SENT:
42760- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42761+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42762 counter[CM_LAP_COUNTER]);
42763 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42764 goto unlock;
42765@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42766 cm_free_msg(msg);
42767 goto deref;
42768 case IB_CM_LAP_RCVD:
42769- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42770+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42771 counter[CM_LAP_COUNTER]);
42772 goto unlock;
42773 default:
42774@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42775 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42776 if (cur_cm_id_priv) {
42777 spin_unlock_irq(&cm.lock);
42778- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42779+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42780 counter[CM_SIDR_REQ_COUNTER]);
42781 goto out; /* Duplicate message. */
42782 }
42783@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42784 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42785 msg->retries = 1;
42786
42787- atomic_long_add(1 + msg->retries,
42788+ atomic_long_add_unchecked(1 + msg->retries,
42789 &port->counter_group[CM_XMIT].counter[attr_index]);
42790 if (msg->retries)
42791- atomic_long_add(msg->retries,
42792+ atomic_long_add_unchecked(msg->retries,
42793 &port->counter_group[CM_XMIT_RETRIES].
42794 counter[attr_index]);
42795
42796@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42797 }
42798
42799 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42800- atomic_long_inc(&port->counter_group[CM_RECV].
42801+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42802 counter[attr_id - CM_ATTR_ID_OFFSET]);
42803
42804 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42805@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42806 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42807
42808 return sprintf(buf, "%ld\n",
42809- atomic_long_read(&group->counter[cm_attr->index]));
42810+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42811 }
42812
42813 static const struct sysfs_ops cm_counter_ops = {
42814diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42815index 9f5ad7c..588cd84 100644
42816--- a/drivers/infiniband/core/fmr_pool.c
42817+++ b/drivers/infiniband/core/fmr_pool.c
42818@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42819
42820 struct task_struct *thread;
42821
42822- atomic_t req_ser;
42823- atomic_t flush_ser;
42824+ atomic_unchecked_t req_ser;
42825+ atomic_unchecked_t flush_ser;
42826
42827 wait_queue_head_t force_wait;
42828 };
42829@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42830 struct ib_fmr_pool *pool = pool_ptr;
42831
42832 do {
42833- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42834+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42835 ib_fmr_batch_release(pool);
42836
42837- atomic_inc(&pool->flush_ser);
42838+ atomic_inc_unchecked(&pool->flush_ser);
42839 wake_up_interruptible(&pool->force_wait);
42840
42841 if (pool->flush_function)
42842@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42843 }
42844
42845 set_current_state(TASK_INTERRUPTIBLE);
42846- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42847+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42848 !kthread_should_stop())
42849 schedule();
42850 __set_current_state(TASK_RUNNING);
42851@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42852 pool->dirty_watermark = params->dirty_watermark;
42853 pool->dirty_len = 0;
42854 spin_lock_init(&pool->pool_lock);
42855- atomic_set(&pool->req_ser, 0);
42856- atomic_set(&pool->flush_ser, 0);
42857+ atomic_set_unchecked(&pool->req_ser, 0);
42858+ atomic_set_unchecked(&pool->flush_ser, 0);
42859 init_waitqueue_head(&pool->force_wait);
42860
42861 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42862@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42863 }
42864 spin_unlock_irq(&pool->pool_lock);
42865
42866- serial = atomic_inc_return(&pool->req_ser);
42867+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42868 wake_up_process(pool->thread);
42869
42870 if (wait_event_interruptible(pool->force_wait,
42871- atomic_read(&pool->flush_ser) - serial >= 0))
42872+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42873 return -EINTR;
42874
42875 return 0;
42876@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42877 } else {
42878 list_add_tail(&fmr->list, &pool->dirty_list);
42879 if (++pool->dirty_len >= pool->dirty_watermark) {
42880- atomic_inc(&pool->req_ser);
42881+ atomic_inc_unchecked(&pool->req_ser);
42882 wake_up_process(pool->thread);
42883 }
42884 }
42885diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
42886index 6c52e72..6303e3f 100644
42887--- a/drivers/infiniband/core/uverbs_cmd.c
42888+++ b/drivers/infiniband/core/uverbs_cmd.c
42889@@ -945,6 +945,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
42890 if (copy_from_user(&cmd, buf, sizeof cmd))
42891 return -EFAULT;
42892
42893+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
42894+ return -EFAULT;
42895+
42896 INIT_UDATA(&udata, buf + sizeof cmd,
42897 (unsigned long) cmd.response + sizeof resp,
42898 in_len - sizeof cmd, out_len - sizeof resp);
42899diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42900index cb43c22..2e12dd7 100644
42901--- a/drivers/infiniband/hw/cxgb4/mem.c
42902+++ b/drivers/infiniband/hw/cxgb4/mem.c
42903@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42904 int err;
42905 struct fw_ri_tpte tpt;
42906 u32 stag_idx;
42907- static atomic_t key;
42908+ static atomic_unchecked_t key;
42909
42910 if (c4iw_fatal_error(rdev))
42911 return -EIO;
42912@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42913 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42914 rdev->stats.stag.max = rdev->stats.stag.cur;
42915 mutex_unlock(&rdev->stats.lock);
42916- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42917+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42918 }
42919 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42920 __func__, stag_state, type, pdid, stag_idx);
42921diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42922index 79b3dbc..96e5fcc 100644
42923--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42924+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42925@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42926 struct ib_atomic_eth *ateth;
42927 struct ipath_ack_entry *e;
42928 u64 vaddr;
42929- atomic64_t *maddr;
42930+ atomic64_unchecked_t *maddr;
42931 u64 sdata;
42932 u32 rkey;
42933 u8 next;
42934@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42935 IB_ACCESS_REMOTE_ATOMIC)))
42936 goto nack_acc_unlck;
42937 /* Perform atomic OP and save result. */
42938- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42939+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42940 sdata = be64_to_cpu(ateth->swap_data);
42941 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42942 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42943- (u64) atomic64_add_return(sdata, maddr) - sdata :
42944+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42945 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42946 be64_to_cpu(ateth->compare_data),
42947 sdata);
42948diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42949index 1f95bba..9530f87 100644
42950--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42951+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42952@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42953 unsigned long flags;
42954 struct ib_wc wc;
42955 u64 sdata;
42956- atomic64_t *maddr;
42957+ atomic64_unchecked_t *maddr;
42958 enum ib_wc_status send_status;
42959
42960 /*
42961@@ -382,11 +382,11 @@ again:
42962 IB_ACCESS_REMOTE_ATOMIC)))
42963 goto acc_err;
42964 /* Perform atomic OP and save result. */
42965- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42966+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42967 sdata = wqe->wr.wr.atomic.compare_add;
42968 *(u64 *) sqp->s_sge.sge.vaddr =
42969 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42970- (u64) atomic64_add_return(sdata, maddr) - sdata :
42971+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42972 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42973 sdata, wqe->wr.wr.atomic.swap);
42974 goto send_comp;
42975diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42976index 729382c..2f82b8d 100644
42977--- a/drivers/infiniband/hw/mlx4/mad.c
42978+++ b/drivers/infiniband/hw/mlx4/mad.c
42979@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42980
42981 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42982 {
42983- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42984+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42985 cpu_to_be64(0xff00000000000000LL);
42986 }
42987
42988diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42989index ed327e6..ca1739e0 100644
42990--- a/drivers/infiniband/hw/mlx4/mcg.c
42991+++ b/drivers/infiniband/hw/mlx4/mcg.c
42992@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42993 {
42994 char name[20];
42995
42996- atomic_set(&ctx->tid, 0);
42997+ atomic_set_unchecked(&ctx->tid, 0);
42998 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42999 ctx->mcg_wq = create_singlethread_workqueue(name);
43000 if (!ctx->mcg_wq)
43001diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43002index 6eb743f..a7b0f6d 100644
43003--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43004+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43005@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
43006 struct list_head mcg_mgid0_list;
43007 struct workqueue_struct *mcg_wq;
43008 struct mlx4_ib_demux_pv_ctx **tun;
43009- atomic_t tid;
43010+ atomic_unchecked_t tid;
43011 int flushing; /* flushing the work queue */
43012 };
43013
43014diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43015index 9d3e5c1..6f166df 100644
43016--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43017+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43018@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43019 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43020 }
43021
43022-int mthca_QUERY_FW(struct mthca_dev *dev)
43023+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43024 {
43025 struct mthca_mailbox *mailbox;
43026 u32 *outbox;
43027@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43028 CMD_TIME_CLASS_B);
43029 }
43030
43031-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43032+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43033 int num_mtt)
43034 {
43035 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43036@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43037 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43038 }
43039
43040-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43041+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43042 int eq_num)
43043 {
43044 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43045@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43046 CMD_TIME_CLASS_B);
43047 }
43048
43049-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43050+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43051 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43052 void *in_mad, void *response_mad)
43053 {
43054diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43055index ded76c1..0cf0a08 100644
43056--- a/drivers/infiniband/hw/mthca/mthca_main.c
43057+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43058@@ -692,7 +692,7 @@ err_close:
43059 return err;
43060 }
43061
43062-static int mthca_setup_hca(struct mthca_dev *dev)
43063+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43064 {
43065 int err;
43066
43067diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43068index ed9a989..6aa5dc2 100644
43069--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43070+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43071@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43072 * through the bitmaps)
43073 */
43074
43075-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43076+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43077 {
43078 int o;
43079 int m;
43080@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43081 return key;
43082 }
43083
43084-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43085+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43086 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43087 {
43088 struct mthca_mailbox *mailbox;
43089@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43090 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43091 }
43092
43093-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43094+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43095 u64 *buffer_list, int buffer_size_shift,
43096 int list_len, u64 iova, u64 total_size,
43097 u32 access, struct mthca_mr *mr)
43098diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43099index 415f8e1..e34214e 100644
43100--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43101+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43102@@ -764,7 +764,7 @@ unlock:
43103 return 0;
43104 }
43105
43106-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43107+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43108 {
43109 struct mthca_dev *dev = to_mdev(ibcq->device);
43110 struct mthca_cq *cq = to_mcq(ibcq);
43111diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43112index 3b2a6dc..bce26ff 100644
43113--- a/drivers/infiniband/hw/nes/nes.c
43114+++ b/drivers/infiniband/hw/nes/nes.c
43115@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43116 LIST_HEAD(nes_adapter_list);
43117 static LIST_HEAD(nes_dev_list);
43118
43119-atomic_t qps_destroyed;
43120+atomic_unchecked_t qps_destroyed;
43121
43122 static unsigned int ee_flsh_adapter;
43123 static unsigned int sysfs_nonidx_addr;
43124@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43125 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43126 struct nes_adapter *nesadapter = nesdev->nesadapter;
43127
43128- atomic_inc(&qps_destroyed);
43129+ atomic_inc_unchecked(&qps_destroyed);
43130
43131 /* Free the control structures */
43132
43133diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43134index bd9d132..70d84f4 100644
43135--- a/drivers/infiniband/hw/nes/nes.h
43136+++ b/drivers/infiniband/hw/nes/nes.h
43137@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43138 extern unsigned int wqm_quanta;
43139 extern struct list_head nes_adapter_list;
43140
43141-extern atomic_t cm_connects;
43142-extern atomic_t cm_accepts;
43143-extern atomic_t cm_disconnects;
43144-extern atomic_t cm_closes;
43145-extern atomic_t cm_connecteds;
43146-extern atomic_t cm_connect_reqs;
43147-extern atomic_t cm_rejects;
43148-extern atomic_t mod_qp_timouts;
43149-extern atomic_t qps_created;
43150-extern atomic_t qps_destroyed;
43151-extern atomic_t sw_qps_destroyed;
43152+extern atomic_unchecked_t cm_connects;
43153+extern atomic_unchecked_t cm_accepts;
43154+extern atomic_unchecked_t cm_disconnects;
43155+extern atomic_unchecked_t cm_closes;
43156+extern atomic_unchecked_t cm_connecteds;
43157+extern atomic_unchecked_t cm_connect_reqs;
43158+extern atomic_unchecked_t cm_rejects;
43159+extern atomic_unchecked_t mod_qp_timouts;
43160+extern atomic_unchecked_t qps_created;
43161+extern atomic_unchecked_t qps_destroyed;
43162+extern atomic_unchecked_t sw_qps_destroyed;
43163 extern u32 mh_detected;
43164 extern u32 mh_pauses_sent;
43165 extern u32 cm_packets_sent;
43166@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43167 extern u32 cm_packets_received;
43168 extern u32 cm_packets_dropped;
43169 extern u32 cm_packets_retrans;
43170-extern atomic_t cm_listens_created;
43171-extern atomic_t cm_listens_destroyed;
43172+extern atomic_unchecked_t cm_listens_created;
43173+extern atomic_unchecked_t cm_listens_destroyed;
43174 extern u32 cm_backlog_drops;
43175-extern atomic_t cm_loopbacks;
43176-extern atomic_t cm_nodes_created;
43177-extern atomic_t cm_nodes_destroyed;
43178-extern atomic_t cm_accel_dropped_pkts;
43179-extern atomic_t cm_resets_recvd;
43180-extern atomic_t pau_qps_created;
43181-extern atomic_t pau_qps_destroyed;
43182+extern atomic_unchecked_t cm_loopbacks;
43183+extern atomic_unchecked_t cm_nodes_created;
43184+extern atomic_unchecked_t cm_nodes_destroyed;
43185+extern atomic_unchecked_t cm_accel_dropped_pkts;
43186+extern atomic_unchecked_t cm_resets_recvd;
43187+extern atomic_unchecked_t pau_qps_created;
43188+extern atomic_unchecked_t pau_qps_destroyed;
43189
43190 extern u32 int_mod_timer_init;
43191 extern u32 int_mod_cq_depth_256;
43192diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43193index 6f09a72..cf4399d 100644
43194--- a/drivers/infiniband/hw/nes/nes_cm.c
43195+++ b/drivers/infiniband/hw/nes/nes_cm.c
43196@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43197 u32 cm_packets_retrans;
43198 u32 cm_packets_created;
43199 u32 cm_packets_received;
43200-atomic_t cm_listens_created;
43201-atomic_t cm_listens_destroyed;
43202+atomic_unchecked_t cm_listens_created;
43203+atomic_unchecked_t cm_listens_destroyed;
43204 u32 cm_backlog_drops;
43205-atomic_t cm_loopbacks;
43206-atomic_t cm_nodes_created;
43207-atomic_t cm_nodes_destroyed;
43208-atomic_t cm_accel_dropped_pkts;
43209-atomic_t cm_resets_recvd;
43210+atomic_unchecked_t cm_loopbacks;
43211+atomic_unchecked_t cm_nodes_created;
43212+atomic_unchecked_t cm_nodes_destroyed;
43213+atomic_unchecked_t cm_accel_dropped_pkts;
43214+atomic_unchecked_t cm_resets_recvd;
43215
43216 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43217 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43218@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43219 /* instance of function pointers for client API */
43220 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43221 static struct nes_cm_ops nes_cm_api = {
43222- mini_cm_accelerated,
43223- mini_cm_listen,
43224- mini_cm_del_listen,
43225- mini_cm_connect,
43226- mini_cm_close,
43227- mini_cm_accept,
43228- mini_cm_reject,
43229- mini_cm_recv_pkt,
43230- mini_cm_dealloc_core,
43231- mini_cm_get,
43232- mini_cm_set
43233+ .accelerated = mini_cm_accelerated,
43234+ .listen = mini_cm_listen,
43235+ .stop_listener = mini_cm_del_listen,
43236+ .connect = mini_cm_connect,
43237+ .close = mini_cm_close,
43238+ .accept = mini_cm_accept,
43239+ .reject = mini_cm_reject,
43240+ .recv_pkt = mini_cm_recv_pkt,
43241+ .destroy_cm_core = mini_cm_dealloc_core,
43242+ .get = mini_cm_get,
43243+ .set = mini_cm_set
43244 };
43245
43246 static struct nes_cm_core *g_cm_core;
43247
43248-atomic_t cm_connects;
43249-atomic_t cm_accepts;
43250-atomic_t cm_disconnects;
43251-atomic_t cm_closes;
43252-atomic_t cm_connecteds;
43253-atomic_t cm_connect_reqs;
43254-atomic_t cm_rejects;
43255+atomic_unchecked_t cm_connects;
43256+atomic_unchecked_t cm_accepts;
43257+atomic_unchecked_t cm_disconnects;
43258+atomic_unchecked_t cm_closes;
43259+atomic_unchecked_t cm_connecteds;
43260+atomic_unchecked_t cm_connect_reqs;
43261+atomic_unchecked_t cm_rejects;
43262
43263 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43264 {
43265@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43266 kfree(listener);
43267 listener = NULL;
43268 ret = 0;
43269- atomic_inc(&cm_listens_destroyed);
43270+ atomic_inc_unchecked(&cm_listens_destroyed);
43271 } else {
43272 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43273 }
43274@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43275 cm_node->rem_mac);
43276
43277 add_hte_node(cm_core, cm_node);
43278- atomic_inc(&cm_nodes_created);
43279+ atomic_inc_unchecked(&cm_nodes_created);
43280
43281 return cm_node;
43282 }
43283@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43284 }
43285
43286 atomic_dec(&cm_core->node_cnt);
43287- atomic_inc(&cm_nodes_destroyed);
43288+ atomic_inc_unchecked(&cm_nodes_destroyed);
43289 nesqp = cm_node->nesqp;
43290 if (nesqp) {
43291 nesqp->cm_node = NULL;
43292@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43293
43294 static void drop_packet(struct sk_buff *skb)
43295 {
43296- atomic_inc(&cm_accel_dropped_pkts);
43297+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43298 dev_kfree_skb_any(skb);
43299 }
43300
43301@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43302 {
43303
43304 int reset = 0; /* whether to send reset in case of err.. */
43305- atomic_inc(&cm_resets_recvd);
43306+ atomic_inc_unchecked(&cm_resets_recvd);
43307 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43308 " refcnt=%d\n", cm_node, cm_node->state,
43309 atomic_read(&cm_node->ref_count));
43310@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43311 rem_ref_cm_node(cm_node->cm_core, cm_node);
43312 return NULL;
43313 }
43314- atomic_inc(&cm_loopbacks);
43315+ atomic_inc_unchecked(&cm_loopbacks);
43316 loopbackremotenode->loopbackpartner = cm_node;
43317 loopbackremotenode->tcp_cntxt.rcv_wscale =
43318 NES_CM_DEFAULT_RCV_WND_SCALE;
43319@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43320 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43321 else {
43322 rem_ref_cm_node(cm_core, cm_node);
43323- atomic_inc(&cm_accel_dropped_pkts);
43324+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43325 dev_kfree_skb_any(skb);
43326 }
43327 break;
43328@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43329
43330 if ((cm_id) && (cm_id->event_handler)) {
43331 if (issue_disconn) {
43332- atomic_inc(&cm_disconnects);
43333+ atomic_inc_unchecked(&cm_disconnects);
43334 cm_event.event = IW_CM_EVENT_DISCONNECT;
43335 cm_event.status = disconn_status;
43336 cm_event.local_addr = cm_id->local_addr;
43337@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43338 }
43339
43340 if (issue_close) {
43341- atomic_inc(&cm_closes);
43342+ atomic_inc_unchecked(&cm_closes);
43343 nes_disconnect(nesqp, 1);
43344
43345 cm_id->provider_data = nesqp;
43346@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43347
43348 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43349 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43350- atomic_inc(&cm_accepts);
43351+ atomic_inc_unchecked(&cm_accepts);
43352
43353 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43354 netdev_refcnt_read(nesvnic->netdev));
43355@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43356 struct nes_cm_core *cm_core;
43357 u8 *start_buff;
43358
43359- atomic_inc(&cm_rejects);
43360+ atomic_inc_unchecked(&cm_rejects);
43361 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43362 loopback = cm_node->loopbackpartner;
43363 cm_core = cm_node->cm_core;
43364@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43365 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43366 ntohs(laddr->sin_port));
43367
43368- atomic_inc(&cm_connects);
43369+ atomic_inc_unchecked(&cm_connects);
43370 nesqp->active_conn = 1;
43371
43372 /* cache the cm_id in the qp */
43373@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43374 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43375 return err;
43376 }
43377- atomic_inc(&cm_listens_created);
43378+ atomic_inc_unchecked(&cm_listens_created);
43379 }
43380
43381 cm_id->add_ref(cm_id);
43382@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43383
43384 if (nesqp->destroyed)
43385 return;
43386- atomic_inc(&cm_connecteds);
43387+ atomic_inc_unchecked(&cm_connecteds);
43388 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43389 " local port 0x%04X. jiffies = %lu.\n",
43390 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43391@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43392
43393 cm_id->add_ref(cm_id);
43394 ret = cm_id->event_handler(cm_id, &cm_event);
43395- atomic_inc(&cm_closes);
43396+ atomic_inc_unchecked(&cm_closes);
43397 cm_event.event = IW_CM_EVENT_CLOSE;
43398 cm_event.status = 0;
43399 cm_event.provider_data = cm_id->provider_data;
43400@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43401 return;
43402 cm_id = cm_node->cm_id;
43403
43404- atomic_inc(&cm_connect_reqs);
43405+ atomic_inc_unchecked(&cm_connect_reqs);
43406 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43407 cm_node, cm_id, jiffies);
43408
43409@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43410 return;
43411 cm_id = cm_node->cm_id;
43412
43413- atomic_inc(&cm_connect_reqs);
43414+ atomic_inc_unchecked(&cm_connect_reqs);
43415 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43416 cm_node, cm_id, jiffies);
43417
43418diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43419index 4166452..fc952c3 100644
43420--- a/drivers/infiniband/hw/nes/nes_mgt.c
43421+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43422@@ -40,8 +40,8 @@
43423 #include "nes.h"
43424 #include "nes_mgt.h"
43425
43426-atomic_t pau_qps_created;
43427-atomic_t pau_qps_destroyed;
43428+atomic_unchecked_t pau_qps_created;
43429+atomic_unchecked_t pau_qps_destroyed;
43430
43431 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43432 {
43433@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43434 {
43435 struct sk_buff *skb;
43436 unsigned long flags;
43437- atomic_inc(&pau_qps_destroyed);
43438+ atomic_inc_unchecked(&pau_qps_destroyed);
43439
43440 /* Free packets that have not yet been forwarded */
43441 /* Lock is acquired by skb_dequeue when removing the skb */
43442@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43443 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43444 skb_queue_head_init(&nesqp->pau_list);
43445 spin_lock_init(&nesqp->pau_lock);
43446- atomic_inc(&pau_qps_created);
43447+ atomic_inc_unchecked(&pau_qps_created);
43448 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43449 }
43450
43451diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43452index 49eb511..a774366 100644
43453--- a/drivers/infiniband/hw/nes/nes_nic.c
43454+++ b/drivers/infiniband/hw/nes/nes_nic.c
43455@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43456 target_stat_values[++index] = mh_detected;
43457 target_stat_values[++index] = mh_pauses_sent;
43458 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43459- target_stat_values[++index] = atomic_read(&cm_connects);
43460- target_stat_values[++index] = atomic_read(&cm_accepts);
43461- target_stat_values[++index] = atomic_read(&cm_disconnects);
43462- target_stat_values[++index] = atomic_read(&cm_connecteds);
43463- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43464- target_stat_values[++index] = atomic_read(&cm_rejects);
43465- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43466- target_stat_values[++index] = atomic_read(&qps_created);
43467- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43468- target_stat_values[++index] = atomic_read(&qps_destroyed);
43469- target_stat_values[++index] = atomic_read(&cm_closes);
43470+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43471+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43472+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43473+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43474+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43475+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43476+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43477+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43478+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43479+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43480+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43481 target_stat_values[++index] = cm_packets_sent;
43482 target_stat_values[++index] = cm_packets_bounced;
43483 target_stat_values[++index] = cm_packets_created;
43484 target_stat_values[++index] = cm_packets_received;
43485 target_stat_values[++index] = cm_packets_dropped;
43486 target_stat_values[++index] = cm_packets_retrans;
43487- target_stat_values[++index] = atomic_read(&cm_listens_created);
43488- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43489+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43490+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43491 target_stat_values[++index] = cm_backlog_drops;
43492- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43493- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43494- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43495- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43496- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43497+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43498+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43499+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43500+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43501+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43502 target_stat_values[++index] = nesadapter->free_4kpbl;
43503 target_stat_values[++index] = nesadapter->free_256pbl;
43504 target_stat_values[++index] = int_mod_timer_init;
43505 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43506 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43507 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43508- target_stat_values[++index] = atomic_read(&pau_qps_created);
43509- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43510+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43511+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43512 }
43513
43514 /**
43515diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43516index c0d0296..3185f57 100644
43517--- a/drivers/infiniband/hw/nes/nes_verbs.c
43518+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43519@@ -46,9 +46,9 @@
43520
43521 #include <rdma/ib_umem.h>
43522
43523-atomic_t mod_qp_timouts;
43524-atomic_t qps_created;
43525-atomic_t sw_qps_destroyed;
43526+atomic_unchecked_t mod_qp_timouts;
43527+atomic_unchecked_t qps_created;
43528+atomic_unchecked_t sw_qps_destroyed;
43529
43530 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43531
43532@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43533 if (init_attr->create_flags)
43534 return ERR_PTR(-EINVAL);
43535
43536- atomic_inc(&qps_created);
43537+ atomic_inc_unchecked(&qps_created);
43538 switch (init_attr->qp_type) {
43539 case IB_QPT_RC:
43540 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43541@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43542 struct iw_cm_event cm_event;
43543 int ret = 0;
43544
43545- atomic_inc(&sw_qps_destroyed);
43546+ atomic_inc_unchecked(&sw_qps_destroyed);
43547 nesqp->destroyed = 1;
43548
43549 /* Blow away the connection if it exists. */
43550diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43551index b218254..1d1aa3c 100644
43552--- a/drivers/infiniband/hw/qib/qib.h
43553+++ b/drivers/infiniband/hw/qib/qib.h
43554@@ -52,6 +52,7 @@
43555 #include <linux/kref.h>
43556 #include <linux/sched.h>
43557 #include <linux/kthread.h>
43558+#include <linux/slab.h>
43559
43560 #include "qib_common.h"
43561 #include "qib_verbs.h"
43562diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43563index cdc7df4..a2fdfdb 100644
43564--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43565+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43566@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43567 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43568 }
43569
43570-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43571+static struct rtnl_link_ops ipoib_link_ops = {
43572 .kind = "ipoib",
43573 .maxtype = IFLA_IPOIB_MAX,
43574 .policy = ipoib_policy,
43575diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43576index e853a21..56fc5a8 100644
43577--- a/drivers/input/gameport/gameport.c
43578+++ b/drivers/input/gameport/gameport.c
43579@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43580 */
43581 static void gameport_init_port(struct gameport *gameport)
43582 {
43583- static atomic_t gameport_no = ATOMIC_INIT(-1);
43584+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43585
43586 __module_get(THIS_MODULE);
43587
43588 mutex_init(&gameport->drv_mutex);
43589 device_initialize(&gameport->dev);
43590 dev_set_name(&gameport->dev, "gameport%lu",
43591- (unsigned long)atomic_inc_return(&gameport_no));
43592+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43593 gameport->dev.bus = &gameport_bus;
43594 gameport->dev.release = gameport_release_port;
43595 if (gameport->parent)
43596diff --git a/drivers/input/input.c b/drivers/input/input.c
43597index 213e3a1..4fea837 100644
43598--- a/drivers/input/input.c
43599+++ b/drivers/input/input.c
43600@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43601 */
43602 struct input_dev *input_allocate_device(void)
43603 {
43604- static atomic_t input_no = ATOMIC_INIT(-1);
43605+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43606 struct input_dev *dev;
43607
43608 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43609@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43610 INIT_LIST_HEAD(&dev->node);
43611
43612 dev_set_name(&dev->dev, "input%lu",
43613- (unsigned long)atomic_inc_return(&input_no));
43614+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43615
43616 __module_get(THIS_MODULE);
43617 }
43618diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43619index 4a95b22..874c182 100644
43620--- a/drivers/input/joystick/sidewinder.c
43621+++ b/drivers/input/joystick/sidewinder.c
43622@@ -30,6 +30,7 @@
43623 #include <linux/kernel.h>
43624 #include <linux/module.h>
43625 #include <linux/slab.h>
43626+#include <linux/sched.h>
43627 #include <linux/input.h>
43628 #include <linux/gameport.h>
43629 #include <linux/jiffies.h>
43630diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43631index 3aa2f3f..53c00ea 100644
43632--- a/drivers/input/joystick/xpad.c
43633+++ b/drivers/input/joystick/xpad.c
43634@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43635
43636 static int xpad_led_probe(struct usb_xpad *xpad)
43637 {
43638- static atomic_t led_seq = ATOMIC_INIT(-1);
43639+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43640 unsigned long led_no;
43641 struct xpad_led *led;
43642 struct led_classdev *led_cdev;
43643@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43644 if (!led)
43645 return -ENOMEM;
43646
43647- led_no = atomic_inc_return(&led_seq);
43648+ led_no = atomic_inc_return_unchecked(&led_seq);
43649
43650 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43651 led->xpad = xpad;
43652diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43653index ac1fa5f..5f7502c 100644
43654--- a/drivers/input/misc/ims-pcu.c
43655+++ b/drivers/input/misc/ims-pcu.c
43656@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43657
43658 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43659 {
43660- static atomic_t device_no = ATOMIC_INIT(-1);
43661+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43662
43663 const struct ims_pcu_device_info *info;
43664 int error;
43665@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43666 }
43667
43668 /* Device appears to be operable, complete initialization */
43669- pcu->device_no = atomic_inc_return(&device_no);
43670+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43671
43672 /*
43673 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43674diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43675index f4cf664..3204fda 100644
43676--- a/drivers/input/mouse/psmouse.h
43677+++ b/drivers/input/mouse/psmouse.h
43678@@ -117,7 +117,7 @@ struct psmouse_attribute {
43679 ssize_t (*set)(struct psmouse *psmouse, void *data,
43680 const char *buf, size_t count);
43681 bool protect;
43682-};
43683+} __do_const;
43684 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43685
43686 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43687diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43688index b604564..3f14ae4 100644
43689--- a/drivers/input/mousedev.c
43690+++ b/drivers/input/mousedev.c
43691@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43692
43693 spin_unlock_irq(&client->packet_lock);
43694
43695- if (copy_to_user(buffer, data, count))
43696+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43697 return -EFAULT;
43698
43699 return count;
43700diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43701index a05a517..323a2fd 100644
43702--- a/drivers/input/serio/serio.c
43703+++ b/drivers/input/serio/serio.c
43704@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43705 */
43706 static void serio_init_port(struct serio *serio)
43707 {
43708- static atomic_t serio_no = ATOMIC_INIT(-1);
43709+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43710
43711 __module_get(THIS_MODULE);
43712
43713@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43714 mutex_init(&serio->drv_mutex);
43715 device_initialize(&serio->dev);
43716 dev_set_name(&serio->dev, "serio%lu",
43717- (unsigned long)atomic_inc_return(&serio_no));
43718+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43719 serio->dev.bus = &serio_bus;
43720 serio->dev.release = serio_release_port;
43721 serio->dev.groups = serio_device_attr_groups;
43722diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43723index 71ef5d6..93380a9 100644
43724--- a/drivers/input/serio/serio_raw.c
43725+++ b/drivers/input/serio/serio_raw.c
43726@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43727
43728 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43729 {
43730- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43731+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43732 struct serio_raw *serio_raw;
43733 int err;
43734
43735@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43736 }
43737
43738 snprintf(serio_raw->name, sizeof(serio_raw->name),
43739- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43740+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43741 kref_init(&serio_raw->kref);
43742 INIT_LIST_HEAD(&serio_raw->client_list);
43743 init_waitqueue_head(&serio_raw->wait);
43744diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43745index 92e2243..8fd9092 100644
43746--- a/drivers/input/touchscreen/htcpen.c
43747+++ b/drivers/input/touchscreen/htcpen.c
43748@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43749 }
43750 };
43751
43752-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43753+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43754 {
43755 .ident = "Shift",
43756 .matches = {
43757diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43758index 9802485..2e9941d 100644
43759--- a/drivers/iommu/amd_iommu.c
43760+++ b/drivers/iommu/amd_iommu.c
43761@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43762
43763 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43764 {
43765+ phys_addr_t physaddr;
43766 WARN_ON(address & 0x7ULL);
43767
43768 memset(cmd, 0, sizeof(*cmd));
43769- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43770- cmd->data[1] = upper_32_bits(__pa(address));
43771+
43772+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43773+ if (object_starts_on_stack((void *)address)) {
43774+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43775+ physaddr = __pa((u64)adjbuf);
43776+ } else
43777+#endif
43778+ physaddr = __pa(address);
43779+
43780+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43781+ cmd->data[1] = upper_32_bits(physaddr);
43782 cmd->data[2] = 1;
43783 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43784 }
43785diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43786index 6cd47b7..264d14a 100644
43787--- a/drivers/iommu/arm-smmu.c
43788+++ b/drivers/iommu/arm-smmu.c
43789@@ -968,7 +968,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43790 cfg->irptndx = cfg->cbndx;
43791 }
43792
43793- ACCESS_ONCE(smmu_domain->smmu) = smmu;
43794+ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43795 arm_smmu_init_context_bank(smmu_domain);
43796 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43797
43798diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43799index f7718d7..3ef740b 100644
43800--- a/drivers/iommu/iommu.c
43801+++ b/drivers/iommu/iommu.c
43802@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43803 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43804 {
43805 int err;
43806- struct notifier_block *nb;
43807+ notifier_block_no_const *nb;
43808 struct iommu_callback_data cb = {
43809 .ops = ops,
43810 };
43811diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43812index 89c4846..1de796f 100644
43813--- a/drivers/iommu/irq_remapping.c
43814+++ b/drivers/iommu/irq_remapping.c
43815@@ -353,7 +353,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43816 void panic_if_irq_remap(const char *msg)
43817 {
43818 if (irq_remapping_enabled)
43819- panic(msg);
43820+ panic("%s", msg);
43821 }
43822
43823 static void ir_ack_apic_edge(struct irq_data *data)
43824@@ -374,10 +374,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43825
43826 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43827 {
43828- chip->irq_print_chip = ir_print_prefix;
43829- chip->irq_ack = ir_ack_apic_edge;
43830- chip->irq_eoi = ir_ack_apic_level;
43831- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43832+ pax_open_kernel();
43833+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43834+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43835+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43836+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43837+ pax_close_kernel();
43838 }
43839
43840 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43841diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43842index d617ee5..df8be8b 100644
43843--- a/drivers/irqchip/irq-gic.c
43844+++ b/drivers/irqchip/irq-gic.c
43845@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43846 * Supported arch specific GIC irq extension.
43847 * Default make them NULL.
43848 */
43849-struct irq_chip gic_arch_extn = {
43850+irq_chip_no_const gic_arch_extn = {
43851 .irq_eoi = NULL,
43852 .irq_mask = NULL,
43853 .irq_unmask = NULL,
43854@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43855 chained_irq_exit(chip, desc);
43856 }
43857
43858-static struct irq_chip gic_chip = {
43859+static irq_chip_no_const gic_chip __read_only = {
43860 .name = "GIC",
43861 .irq_mask = gic_mask_irq,
43862 .irq_unmask = gic_unmask_irq,
43863diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
43864index 078cac5..fb0f846 100644
43865--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
43866+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
43867@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
43868 struct intc_irqpin_iomem *i;
43869 struct resource *io[INTC_IRQPIN_REG_NR];
43870 struct resource *irq;
43871- struct irq_chip *irq_chip;
43872+ irq_chip_no_const *irq_chip;
43873 void (*enable_fn)(struct irq_data *d);
43874 void (*disable_fn)(struct irq_data *d);
43875 const char *name = dev_name(dev);
43876diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43877index 384e6ed..7a771b2 100644
43878--- a/drivers/irqchip/irq-renesas-irqc.c
43879+++ b/drivers/irqchip/irq-renesas-irqc.c
43880@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43881 struct irqc_priv *p;
43882 struct resource *io;
43883 struct resource *irq;
43884- struct irq_chip *irq_chip;
43885+ irq_chip_no_const *irq_chip;
43886 const char *name = dev_name(&pdev->dev);
43887 int ret;
43888 int k;
43889diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43890index 6a2df32..dc962f1 100644
43891--- a/drivers/isdn/capi/capi.c
43892+++ b/drivers/isdn/capi/capi.c
43893@@ -81,8 +81,8 @@ struct capiminor {
43894
43895 struct capi20_appl *ap;
43896 u32 ncci;
43897- atomic_t datahandle;
43898- atomic_t msgid;
43899+ atomic_unchecked_t datahandle;
43900+ atomic_unchecked_t msgid;
43901
43902 struct tty_port port;
43903 int ttyinstop;
43904@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43905 capimsg_setu16(s, 2, mp->ap->applid);
43906 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43907 capimsg_setu8 (s, 5, CAPI_RESP);
43908- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43909+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43910 capimsg_setu32(s, 8, mp->ncci);
43911 capimsg_setu16(s, 12, datahandle);
43912 }
43913@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43914 mp->outbytes -= len;
43915 spin_unlock_bh(&mp->outlock);
43916
43917- datahandle = atomic_inc_return(&mp->datahandle);
43918+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43919 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43920 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43921 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43922 capimsg_setu16(skb->data, 2, mp->ap->applid);
43923 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43924 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43925- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43926+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43927 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43928 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43929 capimsg_setu16(skb->data, 16, len); /* Data length */
43930diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43931index aecec6d..11e13c5 100644
43932--- a/drivers/isdn/gigaset/bas-gigaset.c
43933+++ b/drivers/isdn/gigaset/bas-gigaset.c
43934@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43935
43936
43937 static const struct gigaset_ops gigops = {
43938- gigaset_write_cmd,
43939- gigaset_write_room,
43940- gigaset_chars_in_buffer,
43941- gigaset_brkchars,
43942- gigaset_init_bchannel,
43943- gigaset_close_bchannel,
43944- gigaset_initbcshw,
43945- gigaset_freebcshw,
43946- gigaset_reinitbcshw,
43947- gigaset_initcshw,
43948- gigaset_freecshw,
43949- gigaset_set_modem_ctrl,
43950- gigaset_baud_rate,
43951- gigaset_set_line_ctrl,
43952- gigaset_isoc_send_skb,
43953- gigaset_isoc_input,
43954+ .write_cmd = gigaset_write_cmd,
43955+ .write_room = gigaset_write_room,
43956+ .chars_in_buffer = gigaset_chars_in_buffer,
43957+ .brkchars = gigaset_brkchars,
43958+ .init_bchannel = gigaset_init_bchannel,
43959+ .close_bchannel = gigaset_close_bchannel,
43960+ .initbcshw = gigaset_initbcshw,
43961+ .freebcshw = gigaset_freebcshw,
43962+ .reinitbcshw = gigaset_reinitbcshw,
43963+ .initcshw = gigaset_initcshw,
43964+ .freecshw = gigaset_freecshw,
43965+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43966+ .baud_rate = gigaset_baud_rate,
43967+ .set_line_ctrl = gigaset_set_line_ctrl,
43968+ .send_skb = gigaset_isoc_send_skb,
43969+ .handle_input = gigaset_isoc_input,
43970 };
43971
43972 /* bas_gigaset_init
43973diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43974index 600c79b..3752bab 100644
43975--- a/drivers/isdn/gigaset/interface.c
43976+++ b/drivers/isdn/gigaset/interface.c
43977@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43978 }
43979 tty->driver_data = cs;
43980
43981- ++cs->port.count;
43982+ atomic_inc(&cs->port.count);
43983
43984- if (cs->port.count == 1) {
43985+ if (atomic_read(&cs->port.count) == 1) {
43986 tty_port_tty_set(&cs->port, tty);
43987 cs->port.low_latency = 1;
43988 }
43989@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43990
43991 if (!cs->connected)
43992 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43993- else if (!cs->port.count)
43994+ else if (!atomic_read(&cs->port.count))
43995 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43996- else if (!--cs->port.count)
43997+ else if (!atomic_dec_return(&cs->port.count))
43998 tty_port_tty_set(&cs->port, NULL);
43999
44000 mutex_unlock(&cs->mutex);
44001diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44002index 8c91fd5..14f13ce 100644
44003--- a/drivers/isdn/gigaset/ser-gigaset.c
44004+++ b/drivers/isdn/gigaset/ser-gigaset.c
44005@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44006 }
44007
44008 static const struct gigaset_ops ops = {
44009- gigaset_write_cmd,
44010- gigaset_write_room,
44011- gigaset_chars_in_buffer,
44012- gigaset_brkchars,
44013- gigaset_init_bchannel,
44014- gigaset_close_bchannel,
44015- gigaset_initbcshw,
44016- gigaset_freebcshw,
44017- gigaset_reinitbcshw,
44018- gigaset_initcshw,
44019- gigaset_freecshw,
44020- gigaset_set_modem_ctrl,
44021- gigaset_baud_rate,
44022- gigaset_set_line_ctrl,
44023- gigaset_m10x_send_skb, /* asyncdata.c */
44024- gigaset_m10x_input, /* asyncdata.c */
44025+ .write_cmd = gigaset_write_cmd,
44026+ .write_room = gigaset_write_room,
44027+ .chars_in_buffer = gigaset_chars_in_buffer,
44028+ .brkchars = gigaset_brkchars,
44029+ .init_bchannel = gigaset_init_bchannel,
44030+ .close_bchannel = gigaset_close_bchannel,
44031+ .initbcshw = gigaset_initbcshw,
44032+ .freebcshw = gigaset_freebcshw,
44033+ .reinitbcshw = gigaset_reinitbcshw,
44034+ .initcshw = gigaset_initcshw,
44035+ .freecshw = gigaset_freecshw,
44036+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44037+ .baud_rate = gigaset_baud_rate,
44038+ .set_line_ctrl = gigaset_set_line_ctrl,
44039+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44040+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44041 };
44042
44043
44044diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44045index 5f306e2..5342f88 100644
44046--- a/drivers/isdn/gigaset/usb-gigaset.c
44047+++ b/drivers/isdn/gigaset/usb-gigaset.c
44048@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44049 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44050 memcpy(cs->hw.usb->bchars, buf, 6);
44051 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44052- 0, 0, &buf, 6, 2000);
44053+ 0, 0, buf, 6, 2000);
44054 }
44055
44056 static void gigaset_freebcshw(struct bc_state *bcs)
44057@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44058 }
44059
44060 static const struct gigaset_ops ops = {
44061- gigaset_write_cmd,
44062- gigaset_write_room,
44063- gigaset_chars_in_buffer,
44064- gigaset_brkchars,
44065- gigaset_init_bchannel,
44066- gigaset_close_bchannel,
44067- gigaset_initbcshw,
44068- gigaset_freebcshw,
44069- gigaset_reinitbcshw,
44070- gigaset_initcshw,
44071- gigaset_freecshw,
44072- gigaset_set_modem_ctrl,
44073- gigaset_baud_rate,
44074- gigaset_set_line_ctrl,
44075- gigaset_m10x_send_skb,
44076- gigaset_m10x_input,
44077+ .write_cmd = gigaset_write_cmd,
44078+ .write_room = gigaset_write_room,
44079+ .chars_in_buffer = gigaset_chars_in_buffer,
44080+ .brkchars = gigaset_brkchars,
44081+ .init_bchannel = gigaset_init_bchannel,
44082+ .close_bchannel = gigaset_close_bchannel,
44083+ .initbcshw = gigaset_initbcshw,
44084+ .freebcshw = gigaset_freebcshw,
44085+ .reinitbcshw = gigaset_reinitbcshw,
44086+ .initcshw = gigaset_initcshw,
44087+ .freecshw = gigaset_freecshw,
44088+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44089+ .baud_rate = gigaset_baud_rate,
44090+ .set_line_ctrl = gigaset_set_line_ctrl,
44091+ .send_skb = gigaset_m10x_send_skb,
44092+ .handle_input = gigaset_m10x_input,
44093 };
44094
44095 /*
44096diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44097index 4d9b195..455075c 100644
44098--- a/drivers/isdn/hardware/avm/b1.c
44099+++ b/drivers/isdn/hardware/avm/b1.c
44100@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44101 }
44102 if (left) {
44103 if (t4file->user) {
44104- if (copy_from_user(buf, dp, left))
44105+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44106 return -EFAULT;
44107 } else {
44108 memcpy(buf, dp, left);
44109@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44110 }
44111 if (left) {
44112 if (config->user) {
44113- if (copy_from_user(buf, dp, left))
44114+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44115 return -EFAULT;
44116 } else {
44117 memcpy(buf, dp, left);
44118diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44119index 9b856e1..fa03c92 100644
44120--- a/drivers/isdn/i4l/isdn_common.c
44121+++ b/drivers/isdn/i4l/isdn_common.c
44122@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44123 } else
44124 return -EINVAL;
44125 case IIOCDBGVAR:
44126+ if (!capable(CAP_SYS_RAWIO))
44127+ return -EPERM;
44128 if (arg) {
44129 if (copy_to_user(argp, &dev, sizeof(ulong)))
44130 return -EFAULT;
44131diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44132index 91d5730..336523e 100644
44133--- a/drivers/isdn/i4l/isdn_concap.c
44134+++ b/drivers/isdn/i4l/isdn_concap.c
44135@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44136 }
44137
44138 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44139- &isdn_concap_dl_data_req,
44140- &isdn_concap_dl_connect_req,
44141- &isdn_concap_dl_disconn_req
44142+ .data_req = &isdn_concap_dl_data_req,
44143+ .connect_req = &isdn_concap_dl_connect_req,
44144+ .disconn_req = &isdn_concap_dl_disconn_req
44145 };
44146
44147 /* The following should better go into a dedicated source file such that
44148diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44149index bc91261..2ef7e36 100644
44150--- a/drivers/isdn/i4l/isdn_tty.c
44151+++ b/drivers/isdn/i4l/isdn_tty.c
44152@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44153
44154 #ifdef ISDN_DEBUG_MODEM_OPEN
44155 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44156- port->count);
44157+ atomic_read(&port->count));
44158 #endif
44159- port->count++;
44160+ atomic_inc(&port->count);
44161 port->tty = tty;
44162 /*
44163 * Start up serial port
44164@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44165 #endif
44166 return;
44167 }
44168- if ((tty->count == 1) && (port->count != 1)) {
44169+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44170 /*
44171 * Uh, oh. tty->count is 1, which means that the tty
44172 * structure will be freed. Info->count should always
44173@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44174 * serial port won't be shutdown.
44175 */
44176 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44177- "info->count is %d\n", port->count);
44178- port->count = 1;
44179+ "info->count is %d\n", atomic_read(&port->count));
44180+ atomic_set(&port->count, 1);
44181 }
44182- if (--port->count < 0) {
44183+ if (atomic_dec_return(&port->count) < 0) {
44184 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44185- info->line, port->count);
44186- port->count = 0;
44187+ info->line, atomic_read(&port->count));
44188+ atomic_set(&port->count, 0);
44189 }
44190- if (port->count) {
44191+ if (atomic_read(&port->count)) {
44192 #ifdef ISDN_DEBUG_MODEM_OPEN
44193 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44194 #endif
44195@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44196 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44197 return;
44198 isdn_tty_shutdown(info);
44199- port->count = 0;
44200+ atomic_set(&port->count, 0);
44201 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44202 port->tty = NULL;
44203 wake_up_interruptible(&port->open_wait);
44204@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44205 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44206 modem_info *info = &dev->mdm.info[i];
44207
44208- if (info->port.count == 0)
44209+ if (atomic_read(&info->port.count) == 0)
44210 continue;
44211 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44212 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44213diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44214index e2d4e58..40cd045 100644
44215--- a/drivers/isdn/i4l/isdn_x25iface.c
44216+++ b/drivers/isdn/i4l/isdn_x25iface.c
44217@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44218
44219
44220 static struct concap_proto_ops ix25_pops = {
44221- &isdn_x25iface_proto_new,
44222- &isdn_x25iface_proto_del,
44223- &isdn_x25iface_proto_restart,
44224- &isdn_x25iface_proto_close,
44225- &isdn_x25iface_xmit,
44226- &isdn_x25iface_receive,
44227- &isdn_x25iface_connect_ind,
44228- &isdn_x25iface_disconn_ind
44229+ .proto_new = &isdn_x25iface_proto_new,
44230+ .proto_del = &isdn_x25iface_proto_del,
44231+ .restart = &isdn_x25iface_proto_restart,
44232+ .close = &isdn_x25iface_proto_close,
44233+ .encap_and_xmit = &isdn_x25iface_xmit,
44234+ .data_ind = &isdn_x25iface_receive,
44235+ .connect_ind = &isdn_x25iface_connect_ind,
44236+ .disconn_ind = &isdn_x25iface_disconn_ind
44237 };
44238
44239 /* error message helper function */
44240diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44241index 6a7447c..b4987ea 100644
44242--- a/drivers/isdn/icn/icn.c
44243+++ b/drivers/isdn/icn/icn.c
44244@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44245 if (count > len)
44246 count = len;
44247 if (user) {
44248- if (copy_from_user(msg, buf, count))
44249+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44250 return -EFAULT;
44251 } else
44252 memcpy(msg, buf, count);
44253@@ -1609,7 +1609,7 @@ icn_setup(char *line)
44254 if (ints[0] > 1)
44255 membase = (unsigned long)ints[2];
44256 if (str && *str) {
44257- strcpy(sid, str);
44258+ strlcpy(sid, str, sizeof(sid));
44259 icn_id = sid;
44260 if ((p = strchr(sid, ','))) {
44261 *p++ = 0;
44262diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44263index 87f7dff..7300125 100644
44264--- a/drivers/isdn/mISDN/dsp_cmx.c
44265+++ b/drivers/isdn/mISDN/dsp_cmx.c
44266@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44267 static u16 dsp_count; /* last sample count */
44268 static int dsp_count_valid; /* if we have last sample count */
44269
44270-void
44271+void __intentional_overflow(-1)
44272 dsp_cmx_send(void *arg)
44273 {
44274 struct dsp_conf *conf;
44275diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44276index 0f9ed1e..2715d6f 100644
44277--- a/drivers/leds/leds-clevo-mail.c
44278+++ b/drivers/leds/leds-clevo-mail.c
44279@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44280 * detected as working, but in reality it is not) as low as
44281 * possible.
44282 */
44283-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44284+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44285 {
44286 .callback = clevo_mail_led_dmi_callback,
44287 .ident = "Clevo D410J",
44288diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44289index 046cb70..6b20d39 100644
44290--- a/drivers/leds/leds-ss4200.c
44291+++ b/drivers/leds/leds-ss4200.c
44292@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44293 * detected as working, but in reality it is not) as low as
44294 * possible.
44295 */
44296-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44297+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44298 {
44299 .callback = ss4200_led_dmi_callback,
44300 .ident = "Intel SS4200-E",
44301diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44302index 6590558..a74c5dd 100644
44303--- a/drivers/lguest/core.c
44304+++ b/drivers/lguest/core.c
44305@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44306 * The end address needs +1 because __get_vm_area allocates an
44307 * extra guard page, so we need space for that.
44308 */
44309+
44310+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44311+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44312+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44313+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44314+#else
44315 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44316 VM_ALLOC, switcher_addr, switcher_addr
44317 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44318+#endif
44319+
44320 if (!switcher_vma) {
44321 err = -ENOMEM;
44322 printk("lguest: could not map switcher pages high\n");
44323@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44324 * Now the Switcher is mapped at the right address, we can't fail!
44325 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44326 */
44327- memcpy(switcher_vma->addr, start_switcher_text,
44328+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44329 end_switcher_text - start_switcher_text);
44330
44331 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44332diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44333index e8b55c3..3514c37 100644
44334--- a/drivers/lguest/page_tables.c
44335+++ b/drivers/lguest/page_tables.c
44336@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44337 /*:*/
44338
44339 #ifdef CONFIG_X86_PAE
44340-static void release_pmd(pmd_t *spmd)
44341+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44342 {
44343 /* If the entry's not present, there's nothing to release. */
44344 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44345diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44346index 922a1ac..9dd0c2a 100644
44347--- a/drivers/lguest/x86/core.c
44348+++ b/drivers/lguest/x86/core.c
44349@@ -59,7 +59,7 @@ static struct {
44350 /* Offset from where switcher.S was compiled to where we've copied it */
44351 static unsigned long switcher_offset(void)
44352 {
44353- return switcher_addr - (unsigned long)start_switcher_text;
44354+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44355 }
44356
44357 /* This cpu's struct lguest_pages (after the Switcher text page) */
44358@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44359 * These copies are pretty cheap, so we do them unconditionally: */
44360 /* Save the current Host top-level page directory.
44361 */
44362+
44363+#ifdef CONFIG_PAX_PER_CPU_PGD
44364+ pages->state.host_cr3 = read_cr3();
44365+#else
44366 pages->state.host_cr3 = __pa(current->mm->pgd);
44367+#endif
44368+
44369 /*
44370 * Set up the Guest's page tables to see this CPU's pages (and no
44371 * other CPU's pages).
44372@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44373 * compiled-in switcher code and the high-mapped copy we just made.
44374 */
44375 for (i = 0; i < IDT_ENTRIES; i++)
44376- default_idt_entries[i] += switcher_offset();
44377+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44378
44379 /*
44380 * Set up the Switcher's per-cpu areas.
44381@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44382 * it will be undisturbed when we switch. To change %cs and jump we
44383 * need this structure to feed to Intel's "lcall" instruction.
44384 */
44385- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44386+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44387 lguest_entry.segment = LGUEST_CS;
44388
44389 /*
44390diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44391index 40634b0..4f5855e 100644
44392--- a/drivers/lguest/x86/switcher_32.S
44393+++ b/drivers/lguest/x86/switcher_32.S
44394@@ -87,6 +87,7 @@
44395 #include <asm/page.h>
44396 #include <asm/segment.h>
44397 #include <asm/lguest.h>
44398+#include <asm/processor-flags.h>
44399
44400 // We mark the start of the code to copy
44401 // It's placed in .text tho it's never run here
44402@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44403 // Changes type when we load it: damn Intel!
44404 // For after we switch over our page tables
44405 // That entry will be read-only: we'd crash.
44406+
44407+#ifdef CONFIG_PAX_KERNEXEC
44408+ mov %cr0, %edx
44409+ xor $X86_CR0_WP, %edx
44410+ mov %edx, %cr0
44411+#endif
44412+
44413 movl $(GDT_ENTRY_TSS*8), %edx
44414 ltr %dx
44415
44416@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44417 // Let's clear it again for our return.
44418 // The GDT descriptor of the Host
44419 // Points to the table after two "size" bytes
44420- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44421+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44422 // Clear "used" from type field (byte 5, bit 2)
44423- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44424+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44425+
44426+#ifdef CONFIG_PAX_KERNEXEC
44427+ mov %cr0, %eax
44428+ xor $X86_CR0_WP, %eax
44429+ mov %eax, %cr0
44430+#endif
44431
44432 // Once our page table's switched, the Guest is live!
44433 // The Host fades as we run this final step.
44434@@ -295,13 +309,12 @@ deliver_to_host:
44435 // I consulted gcc, and it gave
44436 // These instructions, which I gladly credit:
44437 leal (%edx,%ebx,8), %eax
44438- movzwl (%eax),%edx
44439- movl 4(%eax), %eax
44440- xorw %ax, %ax
44441- orl %eax, %edx
44442+ movl 4(%eax), %edx
44443+ movw (%eax), %dx
44444 // Now the address of the handler's in %edx
44445 // We call it now: its "iret" drops us home.
44446- jmp *%edx
44447+ ljmp $__KERNEL_CS, $1f
44448+1: jmp *%edx
44449
44450 // Every interrupt can come to us here
44451 // But we must truly tell each apart.
44452diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44453index a08e3ee..df8ade2 100644
44454--- a/drivers/md/bcache/closure.h
44455+++ b/drivers/md/bcache/closure.h
44456@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44457 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44458 struct workqueue_struct *wq)
44459 {
44460- BUG_ON(object_is_on_stack(cl));
44461+ BUG_ON(object_starts_on_stack(cl));
44462 closure_set_ip(cl);
44463 cl->fn = fn;
44464 cl->wq = wq;
44465diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44466index 1695ee5..89f18ab 100644
44467--- a/drivers/md/bitmap.c
44468+++ b/drivers/md/bitmap.c
44469@@ -1784,7 +1784,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44470 chunk_kb ? "KB" : "B");
44471 if (bitmap->storage.file) {
44472 seq_printf(seq, ", file: ");
44473- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44474+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44475 }
44476
44477 seq_printf(seq, "\n");
44478diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44479index 73f791b..8c5d3ac 100644
44480--- a/drivers/md/dm-ioctl.c
44481+++ b/drivers/md/dm-ioctl.c
44482@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44483 cmd == DM_LIST_VERSIONS_CMD)
44484 return 0;
44485
44486- if ((cmd == DM_DEV_CREATE_CMD)) {
44487+ if (cmd == DM_DEV_CREATE_CMD) {
44488 if (!*param->name) {
44489 DMWARN("name not supplied when creating device");
44490 return -EINVAL;
44491diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44492index 089d627..ef7352e 100644
44493--- a/drivers/md/dm-raid1.c
44494+++ b/drivers/md/dm-raid1.c
44495@@ -40,7 +40,7 @@ enum dm_raid1_error {
44496
44497 struct mirror {
44498 struct mirror_set *ms;
44499- atomic_t error_count;
44500+ atomic_unchecked_t error_count;
44501 unsigned long error_type;
44502 struct dm_dev *dev;
44503 sector_t offset;
44504@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44505 struct mirror *m;
44506
44507 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44508- if (!atomic_read(&m->error_count))
44509+ if (!atomic_read_unchecked(&m->error_count))
44510 return m;
44511
44512 return NULL;
44513@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44514 * simple way to tell if a device has encountered
44515 * errors.
44516 */
44517- atomic_inc(&m->error_count);
44518+ atomic_inc_unchecked(&m->error_count);
44519
44520 if (test_and_set_bit(error_type, &m->error_type))
44521 return;
44522@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44523 struct mirror *m = get_default_mirror(ms);
44524
44525 do {
44526- if (likely(!atomic_read(&m->error_count)))
44527+ if (likely(!atomic_read_unchecked(&m->error_count)))
44528 return m;
44529
44530 if (m-- == ms->mirror)
44531@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44532 {
44533 struct mirror *default_mirror = get_default_mirror(m->ms);
44534
44535- return !atomic_read(&default_mirror->error_count);
44536+ return !atomic_read_unchecked(&default_mirror->error_count);
44537 }
44538
44539 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44540@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44541 */
44542 if (likely(region_in_sync(ms, region, 1)))
44543 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44544- else if (m && atomic_read(&m->error_count))
44545+ else if (m && atomic_read_unchecked(&m->error_count))
44546 m = NULL;
44547
44548 if (likely(m))
44549@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44550 }
44551
44552 ms->mirror[mirror].ms = ms;
44553- atomic_set(&(ms->mirror[mirror].error_count), 0);
44554+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44555 ms->mirror[mirror].error_type = 0;
44556 ms->mirror[mirror].offset = offset;
44557
44558@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
44559 */
44560 static char device_status_char(struct mirror *m)
44561 {
44562- if (!atomic_read(&(m->error_count)))
44563+ if (!atomic_read_unchecked(&(m->error_count)))
44564 return 'A';
44565
44566 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44567diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44568index f478a4c..4b8e5ef 100644
44569--- a/drivers/md/dm-stats.c
44570+++ b/drivers/md/dm-stats.c
44571@@ -382,7 +382,7 @@ do_sync_free:
44572 synchronize_rcu_expedited();
44573 dm_stat_free(&s->rcu_head);
44574 } else {
44575- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44576+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44577 call_rcu(&s->rcu_head, dm_stat_free);
44578 }
44579 return 0;
44580@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44581 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44582 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44583 ));
44584- ACCESS_ONCE(last->last_sector) = end_sector;
44585- ACCESS_ONCE(last->last_rw) = bi_rw;
44586+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
44587+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44588 }
44589
44590 rcu_read_lock();
44591diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44592index f8b37d4..5c5cafd 100644
44593--- a/drivers/md/dm-stripe.c
44594+++ b/drivers/md/dm-stripe.c
44595@@ -21,7 +21,7 @@ struct stripe {
44596 struct dm_dev *dev;
44597 sector_t physical_start;
44598
44599- atomic_t error_count;
44600+ atomic_unchecked_t error_count;
44601 };
44602
44603 struct stripe_c {
44604@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44605 kfree(sc);
44606 return r;
44607 }
44608- atomic_set(&(sc->stripe[i].error_count), 0);
44609+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44610 }
44611
44612 ti->private = sc;
44613@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44614 DMEMIT("%d ", sc->stripes);
44615 for (i = 0; i < sc->stripes; i++) {
44616 DMEMIT("%s ", sc->stripe[i].dev->name);
44617- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44618+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44619 'D' : 'A';
44620 }
44621 buffer[i] = '\0';
44622@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44623 */
44624 for (i = 0; i < sc->stripes; i++)
44625 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44626- atomic_inc(&(sc->stripe[i].error_count));
44627- if (atomic_read(&(sc->stripe[i].error_count)) <
44628+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
44629+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44630 DM_IO_ERROR_THRESHOLD)
44631 schedule_work(&sc->trigger_event);
44632 }
44633diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44634index 3afae9e..4e1c954 100644
44635--- a/drivers/md/dm-table.c
44636+++ b/drivers/md/dm-table.c
44637@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44638 if (!dev_size)
44639 return 0;
44640
44641- if ((start >= dev_size) || (start + len > dev_size)) {
44642+ if ((start >= dev_size) || (len > dev_size - start)) {
44643 DMWARN("%s: %s too small for target: "
44644 "start=%llu, len=%llu, dev_size=%llu",
44645 dm_device_name(ti->table->md), bdevname(bdev, b),
44646diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44647index 43adbb8..7b34305 100644
44648--- a/drivers/md/dm-thin-metadata.c
44649+++ b/drivers/md/dm-thin-metadata.c
44650@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44651 {
44652 pmd->info.tm = pmd->tm;
44653 pmd->info.levels = 2;
44654- pmd->info.value_type.context = pmd->data_sm;
44655+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44656 pmd->info.value_type.size = sizeof(__le64);
44657 pmd->info.value_type.inc = data_block_inc;
44658 pmd->info.value_type.dec = data_block_dec;
44659@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44660
44661 pmd->bl_info.tm = pmd->tm;
44662 pmd->bl_info.levels = 1;
44663- pmd->bl_info.value_type.context = pmd->data_sm;
44664+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44665 pmd->bl_info.value_type.size = sizeof(__le64);
44666 pmd->bl_info.value_type.inc = data_block_inc;
44667 pmd->bl_info.value_type.dec = data_block_dec;
44668diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44669index b71c600..d0b85b3 100644
44670--- a/drivers/md/dm.c
44671+++ b/drivers/md/dm.c
44672@@ -185,9 +185,9 @@ struct mapped_device {
44673 /*
44674 * Event handling.
44675 */
44676- atomic_t event_nr;
44677+ atomic_unchecked_t event_nr;
44678 wait_queue_head_t eventq;
44679- atomic_t uevent_seq;
44680+ atomic_unchecked_t uevent_seq;
44681 struct list_head uevent_list;
44682 spinlock_t uevent_lock; /* Protect access to uevent_list */
44683
44684@@ -2070,8 +2070,8 @@ static struct mapped_device *alloc_dev(int minor)
44685 spin_lock_init(&md->deferred_lock);
44686 atomic_set(&md->holders, 1);
44687 atomic_set(&md->open_count, 0);
44688- atomic_set(&md->event_nr, 0);
44689- atomic_set(&md->uevent_seq, 0);
44690+ atomic_set_unchecked(&md->event_nr, 0);
44691+ atomic_set_unchecked(&md->uevent_seq, 0);
44692 INIT_LIST_HEAD(&md->uevent_list);
44693 INIT_LIST_HEAD(&md->table_devices);
44694 spin_lock_init(&md->uevent_lock);
44695@@ -2227,7 +2227,7 @@ static void event_callback(void *context)
44696
44697 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44698
44699- atomic_inc(&md->event_nr);
44700+ atomic_inc_unchecked(&md->event_nr);
44701 wake_up(&md->eventq);
44702 }
44703
44704@@ -3055,18 +3055,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44705
44706 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44707 {
44708- return atomic_add_return(1, &md->uevent_seq);
44709+ return atomic_add_return_unchecked(1, &md->uevent_seq);
44710 }
44711
44712 uint32_t dm_get_event_nr(struct mapped_device *md)
44713 {
44714- return atomic_read(&md->event_nr);
44715+ return atomic_read_unchecked(&md->event_nr);
44716 }
44717
44718 int dm_wait_event(struct mapped_device *md, int event_nr)
44719 {
44720 return wait_event_interruptible(md->eventq,
44721- (event_nr != atomic_read(&md->event_nr)));
44722+ (event_nr != atomic_read_unchecked(&md->event_nr)));
44723 }
44724
44725 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44726diff --git a/drivers/md/md.c b/drivers/md/md.c
44727index 709755f..5bc3fa4 100644
44728--- a/drivers/md/md.c
44729+++ b/drivers/md/md.c
44730@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44731 * start build, activate spare
44732 */
44733 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44734-static atomic_t md_event_count;
44735+static atomic_unchecked_t md_event_count;
44736 void md_new_event(struct mddev *mddev)
44737 {
44738- atomic_inc(&md_event_count);
44739+ atomic_inc_unchecked(&md_event_count);
44740 wake_up(&md_event_waiters);
44741 }
44742 EXPORT_SYMBOL_GPL(md_new_event);
44743@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44744 */
44745 static void md_new_event_inintr(struct mddev *mddev)
44746 {
44747- atomic_inc(&md_event_count);
44748+ atomic_inc_unchecked(&md_event_count);
44749 wake_up(&md_event_waiters);
44750 }
44751
44752@@ -1422,7 +1422,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44753 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44754 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44755 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44756- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44757+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44758
44759 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44760 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44761@@ -1673,7 +1673,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44762 else
44763 sb->resync_offset = cpu_to_le64(0);
44764
44765- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44766+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44767
44768 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44769 sb->size = cpu_to_le64(mddev->dev_sectors);
44770@@ -2543,7 +2543,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44771 static ssize_t
44772 errors_show(struct md_rdev *rdev, char *page)
44773 {
44774- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44775+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44776 }
44777
44778 static ssize_t
44779@@ -2552,7 +2552,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44780 char *e;
44781 unsigned long n = simple_strtoul(buf, &e, 10);
44782 if (*buf && (*e == 0 || *e == '\n')) {
44783- atomic_set(&rdev->corrected_errors, n);
44784+ atomic_set_unchecked(&rdev->corrected_errors, n);
44785 return len;
44786 }
44787 return -EINVAL;
44788@@ -2997,8 +2997,8 @@ int md_rdev_init(struct md_rdev *rdev)
44789 rdev->sb_loaded = 0;
44790 rdev->bb_page = NULL;
44791 atomic_set(&rdev->nr_pending, 0);
44792- atomic_set(&rdev->read_errors, 0);
44793- atomic_set(&rdev->corrected_errors, 0);
44794+ atomic_set_unchecked(&rdev->read_errors, 0);
44795+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44796
44797 INIT_LIST_HEAD(&rdev->same_set);
44798 init_waitqueue_head(&rdev->blocked_wait);
44799@@ -6865,7 +6865,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44800
44801 spin_unlock(&pers_lock);
44802 seq_printf(seq, "\n");
44803- seq->poll_event = atomic_read(&md_event_count);
44804+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44805 return 0;
44806 }
44807 if (v == (void*)2) {
44808@@ -6968,7 +6968,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44809 return error;
44810
44811 seq = file->private_data;
44812- seq->poll_event = atomic_read(&md_event_count);
44813+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44814 return error;
44815 }
44816
44817@@ -6985,7 +6985,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44818 /* always allow read */
44819 mask = POLLIN | POLLRDNORM;
44820
44821- if (seq->poll_event != atomic_read(&md_event_count))
44822+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44823 mask |= POLLERR | POLLPRI;
44824 return mask;
44825 }
44826@@ -7032,7 +7032,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44827 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44828 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44829 (int)part_stat_read(&disk->part0, sectors[1]) -
44830- atomic_read(&disk->sync_io);
44831+ atomic_read_unchecked(&disk->sync_io);
44832 /* sync IO will cause sync_io to increase before the disk_stats
44833 * as sync_io is counted when a request starts, and
44834 * disk_stats is counted when it completes.
44835diff --git a/drivers/md/md.h b/drivers/md/md.h
44836index 03cec5b..0a658c1 100644
44837--- a/drivers/md/md.h
44838+++ b/drivers/md/md.h
44839@@ -94,13 +94,13 @@ struct md_rdev {
44840 * only maintained for arrays that
44841 * support hot removal
44842 */
44843- atomic_t read_errors; /* number of consecutive read errors that
44844+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44845 * we have tried to ignore.
44846 */
44847 struct timespec last_read_error; /* monotonic time since our
44848 * last read error
44849 */
44850- atomic_t corrected_errors; /* number of corrected read errors,
44851+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44852 * for reporting to userspace and storing
44853 * in superblock.
44854 */
44855@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44856
44857 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44858 {
44859- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44860+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44861 }
44862
44863 struct md_personality
44864diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44865index e8a9042..35bd145 100644
44866--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44867+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44868@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44869 * Flick into a mode where all blocks get allocated in the new area.
44870 */
44871 smm->begin = old_len;
44872- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44873+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44874
44875 /*
44876 * Extend.
44877@@ -714,7 +714,7 @@ out:
44878 /*
44879 * Switch back to normal behaviour.
44880 */
44881- memcpy(sm, &ops, sizeof(*sm));
44882+ memcpy((void *)sm, &ops, sizeof(*sm));
44883 return r;
44884 }
44885
44886diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44887index 3e6d115..ffecdeb 100644
44888--- a/drivers/md/persistent-data/dm-space-map.h
44889+++ b/drivers/md/persistent-data/dm-space-map.h
44890@@ -71,6 +71,7 @@ struct dm_space_map {
44891 dm_sm_threshold_fn fn,
44892 void *context);
44893 };
44894+typedef struct dm_space_map __no_const dm_space_map_no_const;
44895
44896 /*----------------------------------------------------------------*/
44897
44898diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44899index 2f2f38f..f6a8ebe 100644
44900--- a/drivers/md/raid1.c
44901+++ b/drivers/md/raid1.c
44902@@ -1932,7 +1932,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44903 if (r1_sync_page_io(rdev, sect, s,
44904 bio->bi_io_vec[idx].bv_page,
44905 READ) != 0)
44906- atomic_add(s, &rdev->corrected_errors);
44907+ atomic_add_unchecked(s, &rdev->corrected_errors);
44908 }
44909 sectors -= s;
44910 sect += s;
44911@@ -2165,7 +2165,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44912 !test_bit(Faulty, &rdev->flags)) {
44913 if (r1_sync_page_io(rdev, sect, s,
44914 conf->tmppage, READ)) {
44915- atomic_add(s, &rdev->corrected_errors);
44916+ atomic_add_unchecked(s, &rdev->corrected_errors);
44917 printk(KERN_INFO
44918 "md/raid1:%s: read error corrected "
44919 "(%d sectors at %llu on %s)\n",
44920diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44921index 32e282f..5cec803 100644
44922--- a/drivers/md/raid10.c
44923+++ b/drivers/md/raid10.c
44924@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44925 /* The write handler will notice the lack of
44926 * R10BIO_Uptodate and record any errors etc
44927 */
44928- atomic_add(r10_bio->sectors,
44929+ atomic_add_unchecked(r10_bio->sectors,
44930 &conf->mirrors[d].rdev->corrected_errors);
44931
44932 /* for reconstruct, we always reschedule after a read.
44933@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44934 {
44935 struct timespec cur_time_mon;
44936 unsigned long hours_since_last;
44937- unsigned int read_errors = atomic_read(&rdev->read_errors);
44938+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44939
44940 ktime_get_ts(&cur_time_mon);
44941
44942@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44943 * overflowing the shift of read_errors by hours_since_last.
44944 */
44945 if (hours_since_last >= 8 * sizeof(read_errors))
44946- atomic_set(&rdev->read_errors, 0);
44947+ atomic_set_unchecked(&rdev->read_errors, 0);
44948 else
44949- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44950+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44951 }
44952
44953 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44954@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44955 return;
44956
44957 check_decay_read_errors(mddev, rdev);
44958- atomic_inc(&rdev->read_errors);
44959- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44960+ atomic_inc_unchecked(&rdev->read_errors);
44961+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44962 char b[BDEVNAME_SIZE];
44963 bdevname(rdev->bdev, b);
44964
44965@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44966 "md/raid10:%s: %s: Raid device exceeded "
44967 "read_error threshold [cur %d:max %d]\n",
44968 mdname(mddev), b,
44969- atomic_read(&rdev->read_errors), max_read_errors);
44970+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44971 printk(KERN_NOTICE
44972 "md/raid10:%s: %s: Failing raid device\n",
44973 mdname(mddev), b);
44974@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44975 sect +
44976 choose_data_offset(r10_bio, rdev)),
44977 bdevname(rdev->bdev, b));
44978- atomic_add(s, &rdev->corrected_errors);
44979+ atomic_add_unchecked(s, &rdev->corrected_errors);
44980 }
44981
44982 rdev_dec_pending(rdev, mddev);
44983diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44984index 8577cc7..5779d5b 100644
44985--- a/drivers/md/raid5.c
44986+++ b/drivers/md/raid5.c
44987@@ -950,23 +950,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
44988 struct bio_vec bvl;
44989 struct bvec_iter iter;
44990 struct page *bio_page;
44991- int page_offset;
44992+ s64 page_offset;
44993 struct async_submit_ctl submit;
44994 enum async_tx_flags flags = 0;
44995
44996 if (bio->bi_iter.bi_sector >= sector)
44997- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
44998+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
44999 else
45000- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45001+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45002
45003 if (frombio)
45004 flags |= ASYNC_TX_FENCE;
45005 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45006
45007 bio_for_each_segment(bvl, bio, iter) {
45008- int len = bvl.bv_len;
45009- int clen;
45010- int b_offset = 0;
45011+ s64 len = bvl.bv_len;
45012+ s64 clen;
45013+ s64 b_offset = 0;
45014
45015 if (page_offset < 0) {
45016 b_offset = -page_offset;
45017@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45018 return 1;
45019 }
45020
45021+#ifdef CONFIG_GRKERNSEC_HIDESYM
45022+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45023+#endif
45024+
45025 static int grow_stripes(struct r5conf *conf, int num)
45026 {
45027 struct kmem_cache *sc;
45028@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45029 "raid%d-%s", conf->level, mdname(conf->mddev));
45030 else
45031 sprintf(conf->cache_name[0],
45032+#ifdef CONFIG_GRKERNSEC_HIDESYM
45033+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45034+#else
45035 "raid%d-%p", conf->level, conf->mddev);
45036+#endif
45037 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45038
45039 conf->active_name = 0;
45040@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45041 mdname(conf->mddev), STRIPE_SECTORS,
45042 (unsigned long long)s,
45043 bdevname(rdev->bdev, b));
45044- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45045+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45046 clear_bit(R5_ReadError, &sh->dev[i].flags);
45047 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45048 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45049 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45050
45051- if (atomic_read(&rdev->read_errors))
45052- atomic_set(&rdev->read_errors, 0);
45053+ if (atomic_read_unchecked(&rdev->read_errors))
45054+ atomic_set_unchecked(&rdev->read_errors, 0);
45055 } else {
45056 const char *bdn = bdevname(rdev->bdev, b);
45057 int retry = 0;
45058 int set_bad = 0;
45059
45060 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45061- atomic_inc(&rdev->read_errors);
45062+ atomic_inc_unchecked(&rdev->read_errors);
45063 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45064 printk_ratelimited(
45065 KERN_WARNING
45066@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45067 mdname(conf->mddev),
45068 (unsigned long long)s,
45069 bdn);
45070- } else if (atomic_read(&rdev->read_errors)
45071+ } else if (atomic_read_unchecked(&rdev->read_errors)
45072 > conf->max_nr_stripes)
45073 printk(KERN_WARNING
45074 "md/raid:%s: Too many read errors, failing device %s.\n",
45075diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45076index 983db75..ef9248c 100644
45077--- a/drivers/media/dvb-core/dvbdev.c
45078+++ b/drivers/media/dvb-core/dvbdev.c
45079@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45080 const struct dvb_device *template, void *priv, int type)
45081 {
45082 struct dvb_device *dvbdev;
45083- struct file_operations *dvbdevfops;
45084+ file_operations_no_const *dvbdevfops;
45085 struct device *clsdev;
45086 int minor;
45087 int id;
45088diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45089index 6ad22b6..6e90e2a 100644
45090--- a/drivers/media/dvb-frontends/af9033.h
45091+++ b/drivers/media/dvb-frontends/af9033.h
45092@@ -96,6 +96,6 @@ struct af9033_ops {
45093 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45094 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45095 int onoff);
45096-};
45097+} __no_const;
45098
45099 #endif /* AF9033_H */
45100diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45101index 9b6c3bb..baeb5c7 100644
45102--- a/drivers/media/dvb-frontends/dib3000.h
45103+++ b/drivers/media/dvb-frontends/dib3000.h
45104@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45105 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45106 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45107 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45108-};
45109+} __no_const;
45110
45111 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
45112 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45113diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45114index 1fea0e9..321ce8f 100644
45115--- a/drivers/media/dvb-frontends/dib7000p.h
45116+++ b/drivers/media/dvb-frontends/dib7000p.h
45117@@ -64,7 +64,7 @@ struct dib7000p_ops {
45118 int (*get_adc_power)(struct dvb_frontend *fe);
45119 int (*slave_reset)(struct dvb_frontend *fe);
45120 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45121-};
45122+} __no_const;
45123
45124 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
45125 void *dib7000p_attach(struct dib7000p_ops *ops);
45126diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45127index 84cc103..5780c54 100644
45128--- a/drivers/media/dvb-frontends/dib8000.h
45129+++ b/drivers/media/dvb-frontends/dib8000.h
45130@@ -61,7 +61,7 @@ struct dib8000_ops {
45131 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45132 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45133 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45134-};
45135+} __no_const;
45136
45137 #if IS_ENABLED(CONFIG_DVB_DIB8000)
45138 void *dib8000_attach(struct dib8000_ops *ops);
45139diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45140index 860c98fc..497fa25 100644
45141--- a/drivers/media/pci/cx88/cx88-video.c
45142+++ b/drivers/media/pci/cx88/cx88-video.c
45143@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45144
45145 /* ------------------------------------------------------------------ */
45146
45147-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45148-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45149-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45150+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45151+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45152+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45153
45154 module_param_array(video_nr, int, NULL, 0444);
45155 module_param_array(vbi_nr, int, NULL, 0444);
45156diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45157index 802642d..5534900 100644
45158--- a/drivers/media/pci/ivtv/ivtv-driver.c
45159+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45160@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45161 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45162
45163 /* ivtv instance counter */
45164-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45165+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45166
45167 /* Parameter declarations */
45168 static int cardtype[IVTV_MAX_CARDS];
45169diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45170index 8cbe6b4..ea3601c 100644
45171--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45172+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45173@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45174
45175 static int solo_sysfs_init(struct solo_dev *solo_dev)
45176 {
45177- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45178+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45179 struct device *dev = &solo_dev->dev;
45180 const char *driver;
45181 int i;
45182diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45183index c7141f2..5301fec 100644
45184--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45185+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45186@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45187
45188 int solo_g723_init(struct solo_dev *solo_dev)
45189 {
45190- static struct snd_device_ops ops = { NULL };
45191+ static struct snd_device_ops ops = { };
45192 struct snd_card *card;
45193 struct snd_kcontrol_new kctl;
45194 char name[32];
45195diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45196index 8c84846..27b4f83 100644
45197--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45198+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45199@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45200
45201 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45202 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45203- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45204+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45205 if (p2m_id < 0)
45206 p2m_id = -p2m_id;
45207 }
45208diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45209index bd8edfa..e82ed85 100644
45210--- a/drivers/media/pci/solo6x10/solo6x10.h
45211+++ b/drivers/media/pci/solo6x10/solo6x10.h
45212@@ -220,7 +220,7 @@ struct solo_dev {
45213
45214 /* P2M DMA Engine */
45215 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45216- atomic_t p2m_count;
45217+ atomic_unchecked_t p2m_count;
45218 int p2m_jiffies;
45219 unsigned int p2m_timeouts;
45220
45221diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45222index c135165..dc69499 100644
45223--- a/drivers/media/pci/tw68/tw68-core.c
45224+++ b/drivers/media/pci/tw68/tw68-core.c
45225@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45226 module_param_array(card, int, NULL, 0444);
45227 MODULE_PARM_DESC(card, "card type");
45228
45229-static atomic_t tw68_instance = ATOMIC_INIT(0);
45230+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45231
45232 /* ------------------------------------------------------------------ */
45233
45234diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45235index ba2d8f9..1566684 100644
45236--- a/drivers/media/platform/omap/omap_vout.c
45237+++ b/drivers/media/platform/omap/omap_vout.c
45238@@ -63,7 +63,6 @@ enum omap_vout_channels {
45239 OMAP_VIDEO2,
45240 };
45241
45242-static struct videobuf_queue_ops video_vbq_ops;
45243 /* Variables configurable through module params*/
45244 static u32 video1_numbuffers = 3;
45245 static u32 video2_numbuffers = 3;
45246@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45247 {
45248 struct videobuf_queue *q;
45249 struct omap_vout_device *vout = NULL;
45250+ static struct videobuf_queue_ops video_vbq_ops = {
45251+ .buf_setup = omap_vout_buffer_setup,
45252+ .buf_prepare = omap_vout_buffer_prepare,
45253+ .buf_release = omap_vout_buffer_release,
45254+ .buf_queue = omap_vout_buffer_queue,
45255+ };
45256
45257 vout = video_drvdata(file);
45258 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45259@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45260 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45261
45262 q = &vout->vbq;
45263- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45264- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45265- video_vbq_ops.buf_release = omap_vout_buffer_release;
45266- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45267 spin_lock_init(&vout->vbq_lock);
45268
45269 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45270diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45271index fb2acc5..a2fcbdc4 100644
45272--- a/drivers/media/platform/s5p-tv/mixer.h
45273+++ b/drivers/media/platform/s5p-tv/mixer.h
45274@@ -156,7 +156,7 @@ struct mxr_layer {
45275 /** layer index (unique identifier) */
45276 int idx;
45277 /** callbacks for layer methods */
45278- struct mxr_layer_ops ops;
45279+ struct mxr_layer_ops *ops;
45280 /** format array */
45281 const struct mxr_format **fmt_array;
45282 /** size of format array */
45283diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45284index 74344c7..a39e70e 100644
45285--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45286+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45287@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45288 {
45289 struct mxr_layer *layer;
45290 int ret;
45291- struct mxr_layer_ops ops = {
45292+ static struct mxr_layer_ops ops = {
45293 .release = mxr_graph_layer_release,
45294 .buffer_set = mxr_graph_buffer_set,
45295 .stream_set = mxr_graph_stream_set,
45296diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45297index b713403..53cb5ad 100644
45298--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45299+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45300@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45301 layer->update_buf = next;
45302 }
45303
45304- layer->ops.buffer_set(layer, layer->update_buf);
45305+ layer->ops->buffer_set(layer, layer->update_buf);
45306
45307 if (done && done != layer->shadow_buf)
45308 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45309diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45310index b4d2696..91df48e 100644
45311--- a/drivers/media/platform/s5p-tv/mixer_video.c
45312+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45313@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45314 layer->geo.src.height = layer->geo.src.full_height;
45315
45316 mxr_geometry_dump(mdev, &layer->geo);
45317- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45318+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45319 mxr_geometry_dump(mdev, &layer->geo);
45320 }
45321
45322@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45323 layer->geo.dst.full_width = mbus_fmt.width;
45324 layer->geo.dst.full_height = mbus_fmt.height;
45325 layer->geo.dst.field = mbus_fmt.field;
45326- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45327+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45328
45329 mxr_geometry_dump(mdev, &layer->geo);
45330 }
45331@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45332 /* set source size to highest accepted value */
45333 geo->src.full_width = max(geo->dst.full_width, pix->width);
45334 geo->src.full_height = max(geo->dst.full_height, pix->height);
45335- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45336+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45337 mxr_geometry_dump(mdev, &layer->geo);
45338 /* set cropping to total visible screen */
45339 geo->src.width = pix->width;
45340@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45341 geo->src.x_offset = 0;
45342 geo->src.y_offset = 0;
45343 /* assure consistency of geometry */
45344- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45345+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45346 mxr_geometry_dump(mdev, &layer->geo);
45347 /* set full size to lowest possible value */
45348 geo->src.full_width = 0;
45349 geo->src.full_height = 0;
45350- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45351+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45352 mxr_geometry_dump(mdev, &layer->geo);
45353
45354 /* returning results */
45355@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45356 target->width = s->r.width;
45357 target->height = s->r.height;
45358
45359- layer->ops.fix_geometry(layer, stage, s->flags);
45360+ layer->ops->fix_geometry(layer, stage, s->flags);
45361
45362 /* retrieve update selection rectangle */
45363 res.left = target->x_offset;
45364@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45365 mxr_output_get(mdev);
45366
45367 mxr_layer_update_output(layer);
45368- layer->ops.format_set(layer);
45369+ layer->ops->format_set(layer);
45370 /* enabling layer in hardware */
45371 spin_lock_irqsave(&layer->enq_slock, flags);
45372 layer->state = MXR_LAYER_STREAMING;
45373 spin_unlock_irqrestore(&layer->enq_slock, flags);
45374
45375- layer->ops.stream_set(layer, MXR_ENABLE);
45376+ layer->ops->stream_set(layer, MXR_ENABLE);
45377 mxr_streamer_get(mdev);
45378
45379 return 0;
45380@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45381 spin_unlock_irqrestore(&layer->enq_slock, flags);
45382
45383 /* disabling layer in hardware */
45384- layer->ops.stream_set(layer, MXR_DISABLE);
45385+ layer->ops->stream_set(layer, MXR_DISABLE);
45386 /* remove one streamer */
45387 mxr_streamer_put(mdev);
45388 /* allow changes in output configuration */
45389@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45390
45391 void mxr_layer_release(struct mxr_layer *layer)
45392 {
45393- if (layer->ops.release)
45394- layer->ops.release(layer);
45395+ if (layer->ops->release)
45396+ layer->ops->release(layer);
45397 }
45398
45399 void mxr_base_layer_release(struct mxr_layer *layer)
45400@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45401
45402 layer->mdev = mdev;
45403 layer->idx = idx;
45404- layer->ops = *ops;
45405+ layer->ops = ops;
45406
45407 spin_lock_init(&layer->enq_slock);
45408 INIT_LIST_HEAD(&layer->enq_list);
45409diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45410index c9388c4..ce71ece 100644
45411--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45412+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45413@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45414 {
45415 struct mxr_layer *layer;
45416 int ret;
45417- struct mxr_layer_ops ops = {
45418+ static struct mxr_layer_ops ops = {
45419 .release = mxr_vp_layer_release,
45420 .buffer_set = mxr_vp_buffer_set,
45421 .stream_set = mxr_vp_stream_set,
45422diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45423index 82affae..42833ec 100644
45424--- a/drivers/media/radio/radio-cadet.c
45425+++ b/drivers/media/radio/radio-cadet.c
45426@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45427 unsigned char readbuf[RDS_BUFFER];
45428 int i = 0;
45429
45430+ if (count > RDS_BUFFER)
45431+ return -EFAULT;
45432 mutex_lock(&dev->lock);
45433 if (dev->rdsstat == 0)
45434 cadet_start_rds(dev);
45435@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45436 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45437 mutex_unlock(&dev->lock);
45438
45439- if (i && copy_to_user(data, readbuf, i))
45440- return -EFAULT;
45441+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45442+ i = -EFAULT;
45443+
45444 return i;
45445 }
45446
45447diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45448index 5236035..c622c74 100644
45449--- a/drivers/media/radio/radio-maxiradio.c
45450+++ b/drivers/media/radio/radio-maxiradio.c
45451@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45452 /* TEA5757 pin mappings */
45453 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45454
45455-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45456+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45457
45458 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45459 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45460diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45461index 050b3bb..79f62b9 100644
45462--- a/drivers/media/radio/radio-shark.c
45463+++ b/drivers/media/radio/radio-shark.c
45464@@ -79,7 +79,7 @@ struct shark_device {
45465 u32 last_val;
45466 };
45467
45468-static atomic_t shark_instance = ATOMIC_INIT(0);
45469+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45470
45471 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45472 {
45473diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45474index 8654e0d..0608a64 100644
45475--- a/drivers/media/radio/radio-shark2.c
45476+++ b/drivers/media/radio/radio-shark2.c
45477@@ -74,7 +74,7 @@ struct shark_device {
45478 u8 *transfer_buffer;
45479 };
45480
45481-static atomic_t shark_instance = ATOMIC_INIT(0);
45482+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45483
45484 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45485 {
45486diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45487index dccf586..d5db411 100644
45488--- a/drivers/media/radio/radio-si476x.c
45489+++ b/drivers/media/radio/radio-si476x.c
45490@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45491 struct si476x_radio *radio;
45492 struct v4l2_ctrl *ctrl;
45493
45494- static atomic_t instance = ATOMIC_INIT(0);
45495+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45496
45497 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45498 if (!radio)
45499diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
45500index 704397f..4d05977 100644
45501--- a/drivers/media/radio/wl128x/fmdrv_common.c
45502+++ b/drivers/media/radio/wl128x/fmdrv_common.c
45503@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
45504 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
45505
45506 /* Radio Nr */
45507-static u32 radio_nr = -1;
45508+static int radio_nr = -1;
45509 module_param(radio_nr, int, 0444);
45510 MODULE_PARM_DESC(radio_nr, "Radio Nr");
45511
45512diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45513index 9fd1527..8927230 100644
45514--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45515+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45516@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45517
45518 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45519 {
45520- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45521- char result[64];
45522- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45523- sizeof(result), 0);
45524+ char *buf;
45525+ char *result;
45526+ int retval;
45527+
45528+ buf = kmalloc(2, GFP_KERNEL);
45529+ if (buf == NULL)
45530+ return -ENOMEM;
45531+ result = kmalloc(64, GFP_KERNEL);
45532+ if (result == NULL) {
45533+ kfree(buf);
45534+ return -ENOMEM;
45535+ }
45536+
45537+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45538+ buf[1] = enable ? 1 : 0;
45539+
45540+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45541+
45542+ kfree(buf);
45543+ kfree(result);
45544+ return retval;
45545 }
45546
45547 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45548 {
45549- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45550- char state[3];
45551- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45552+ char *buf;
45553+ char *state;
45554+ int retval;
45555+
45556+ buf = kmalloc(2, GFP_KERNEL);
45557+ if (buf == NULL)
45558+ return -ENOMEM;
45559+ state = kmalloc(3, GFP_KERNEL);
45560+ if (state == NULL) {
45561+ kfree(buf);
45562+ return -ENOMEM;
45563+ }
45564+
45565+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45566+ buf[1] = enable ? 1 : 0;
45567+
45568+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45569+
45570+ kfree(buf);
45571+ kfree(state);
45572+ return retval;
45573 }
45574
45575 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45576 {
45577- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45578- char state[3];
45579+ char *query;
45580+ char *state;
45581 int ret;
45582+ query = kmalloc(1, GFP_KERNEL);
45583+ if (query == NULL)
45584+ return -ENOMEM;
45585+ state = kmalloc(3, GFP_KERNEL);
45586+ if (state == NULL) {
45587+ kfree(query);
45588+ return -ENOMEM;
45589+ }
45590+
45591+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45592
45593 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45594
45595- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45596- sizeof(state), 0);
45597+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45598 if (ret < 0) {
45599 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45600 "state info\n");
45601@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45602
45603 /* Copy this pointer as we are gonna need it in the release phase */
45604 cinergyt2_usb_device = adap->dev;
45605-
45606+ kfree(query);
45607+ kfree(state);
45608 return 0;
45609 }
45610
45611@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45612 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45613 {
45614 struct cinergyt2_state *st = d->priv;
45615- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45616+ u8 *key, *cmd;
45617 int i;
45618
45619+ cmd = kmalloc(1, GFP_KERNEL);
45620+ if (cmd == NULL)
45621+ return -EINVAL;
45622+ key = kzalloc(5, GFP_KERNEL);
45623+ if (key == NULL) {
45624+ kfree(cmd);
45625+ return -EINVAL;
45626+ }
45627+
45628+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45629+
45630 *state = REMOTE_NO_KEY_PRESSED;
45631
45632- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45633+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45634 if (key[4] == 0xff) {
45635 /* key repeat */
45636 st->rc_counter++;
45637@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45638 *event = d->last_event;
45639 deb_rc("repeat key, event %x\n",
45640 *event);
45641- return 0;
45642+ goto out;
45643 }
45644 }
45645 deb_rc("repeated key (non repeatable)\n");
45646 }
45647- return 0;
45648+ goto out;
45649 }
45650
45651 /* hack to pass checksum on the custom field */
45652@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45653
45654 deb_rc("key: %*ph\n", 5, key);
45655 }
45656+out:
45657+ kfree(cmd);
45658+ kfree(key);
45659 return 0;
45660 }
45661
45662diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45663index c890fe4..f9b2ae6 100644
45664--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45665+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45666@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45667 fe_status_t *status)
45668 {
45669 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45670- struct dvbt_get_status_msg result;
45671- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45672+ struct dvbt_get_status_msg *result;
45673+ u8 *cmd;
45674 int ret;
45675
45676- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45677- sizeof(result), 0);
45678+ cmd = kmalloc(1, GFP_KERNEL);
45679+ if (cmd == NULL)
45680+ return -ENOMEM;
45681+ result = kmalloc(sizeof(*result), GFP_KERNEL);
45682+ if (result == NULL) {
45683+ kfree(cmd);
45684+ return -ENOMEM;
45685+ }
45686+
45687+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45688+
45689+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45690+ sizeof(*result), 0);
45691 if (ret < 0)
45692- return ret;
45693+ goto out;
45694
45695 *status = 0;
45696
45697- if (0xffff - le16_to_cpu(result.gain) > 30)
45698+ if (0xffff - le16_to_cpu(result->gain) > 30)
45699 *status |= FE_HAS_SIGNAL;
45700- if (result.lock_bits & (1 << 6))
45701+ if (result->lock_bits & (1 << 6))
45702 *status |= FE_HAS_LOCK;
45703- if (result.lock_bits & (1 << 5))
45704+ if (result->lock_bits & (1 << 5))
45705 *status |= FE_HAS_SYNC;
45706- if (result.lock_bits & (1 << 4))
45707+ if (result->lock_bits & (1 << 4))
45708 *status |= FE_HAS_CARRIER;
45709- if (result.lock_bits & (1 << 1))
45710+ if (result->lock_bits & (1 << 1))
45711 *status |= FE_HAS_VITERBI;
45712
45713 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45714 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45715 *status &= ~FE_HAS_LOCK;
45716
45717- return 0;
45718+out:
45719+ kfree(cmd);
45720+ kfree(result);
45721+ return ret;
45722 }
45723
45724 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45725 {
45726 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45727- struct dvbt_get_status_msg status;
45728- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45729+ struct dvbt_get_status_msg *status;
45730+ char *cmd;
45731 int ret;
45732
45733- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45734- sizeof(status), 0);
45735+ cmd = kmalloc(1, GFP_KERNEL);
45736+ if (cmd == NULL)
45737+ return -ENOMEM;
45738+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45739+ if (status == NULL) {
45740+ kfree(cmd);
45741+ return -ENOMEM;
45742+ }
45743+
45744+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45745+
45746+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45747+ sizeof(*status), 0);
45748 if (ret < 0)
45749- return ret;
45750+ goto out;
45751
45752- *ber = le32_to_cpu(status.viterbi_error_rate);
45753+ *ber = le32_to_cpu(status->viterbi_error_rate);
45754+out:
45755+ kfree(cmd);
45756+ kfree(status);
45757 return 0;
45758 }
45759
45760 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45761 {
45762 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45763- struct dvbt_get_status_msg status;
45764- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45765+ struct dvbt_get_status_msg *status;
45766+ u8 *cmd;
45767 int ret;
45768
45769- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45770- sizeof(status), 0);
45771+ cmd = kmalloc(1, GFP_KERNEL);
45772+ if (cmd == NULL)
45773+ return -ENOMEM;
45774+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45775+ if (status == NULL) {
45776+ kfree(cmd);
45777+ return -ENOMEM;
45778+ }
45779+
45780+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45781+
45782+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45783+ sizeof(*status), 0);
45784 if (ret < 0) {
45785 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45786 ret);
45787- return ret;
45788+ goto out;
45789 }
45790- *unc = le32_to_cpu(status.uncorrected_block_count);
45791- return 0;
45792+ *unc = le32_to_cpu(status->uncorrected_block_count);
45793+
45794+out:
45795+ kfree(cmd);
45796+ kfree(status);
45797+ return ret;
45798 }
45799
45800 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45801 u16 *strength)
45802 {
45803 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45804- struct dvbt_get_status_msg status;
45805- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45806+ struct dvbt_get_status_msg *status;
45807+ char *cmd;
45808 int ret;
45809
45810- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45811- sizeof(status), 0);
45812+ cmd = kmalloc(1, GFP_KERNEL);
45813+ if (cmd == NULL)
45814+ return -ENOMEM;
45815+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45816+ if (status == NULL) {
45817+ kfree(cmd);
45818+ return -ENOMEM;
45819+ }
45820+
45821+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45822+
45823+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45824+ sizeof(*status), 0);
45825 if (ret < 0) {
45826 err("cinergyt2_fe_read_signal_strength() Failed!"
45827 " (Error=%d)\n", ret);
45828- return ret;
45829+ goto out;
45830 }
45831- *strength = (0xffff - le16_to_cpu(status.gain));
45832+ *strength = (0xffff - le16_to_cpu(status->gain));
45833+
45834+out:
45835+ kfree(cmd);
45836+ kfree(status);
45837 return 0;
45838 }
45839
45840 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45841 {
45842 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45843- struct dvbt_get_status_msg status;
45844- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45845+ struct dvbt_get_status_msg *status;
45846+ char *cmd;
45847 int ret;
45848
45849- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45850- sizeof(status), 0);
45851+ cmd = kmalloc(1, GFP_KERNEL);
45852+ if (cmd == NULL)
45853+ return -ENOMEM;
45854+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45855+ if (status == NULL) {
45856+ kfree(cmd);
45857+ return -ENOMEM;
45858+ }
45859+
45860+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45861+
45862+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45863+ sizeof(*status), 0);
45864 if (ret < 0) {
45865 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45866- return ret;
45867+ goto out;
45868 }
45869- *snr = (status.snr << 8) | status.snr;
45870- return 0;
45871+ *snr = (status->snr << 8) | status->snr;
45872+
45873+out:
45874+ kfree(cmd);
45875+ kfree(status);
45876+ return ret;
45877 }
45878
45879 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45880@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45881 {
45882 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45883 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45884- struct dvbt_set_parameters_msg param;
45885- char result[2];
45886+ struct dvbt_set_parameters_msg *param;
45887+ char *result;
45888 int err;
45889
45890- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45891- param.tps = cpu_to_le16(compute_tps(fep));
45892- param.freq = cpu_to_le32(fep->frequency / 1000);
45893- param.flags = 0;
45894+ result = kmalloc(2, GFP_KERNEL);
45895+ if (result == NULL)
45896+ return -ENOMEM;
45897+ param = kmalloc(sizeof(*param), GFP_KERNEL);
45898+ if (param == NULL) {
45899+ kfree(result);
45900+ return -ENOMEM;
45901+ }
45902+
45903+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45904+ param->tps = cpu_to_le16(compute_tps(fep));
45905+ param->freq = cpu_to_le32(fep->frequency / 1000);
45906+ param->flags = 0;
45907
45908 switch (fep->bandwidth_hz) {
45909 default:
45910 case 8000000:
45911- param.bandwidth = 8;
45912+ param->bandwidth = 8;
45913 break;
45914 case 7000000:
45915- param.bandwidth = 7;
45916+ param->bandwidth = 7;
45917 break;
45918 case 6000000:
45919- param.bandwidth = 6;
45920+ param->bandwidth = 6;
45921 break;
45922 }
45923
45924 err = dvb_usb_generic_rw(state->d,
45925- (char *)&param, sizeof(param),
45926- result, sizeof(result), 0);
45927+ (char *)param, sizeof(*param),
45928+ result, 2, 0);
45929 if (err < 0)
45930 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45931
45932- return (err < 0) ? err : 0;
45933+ kfree(result);
45934+ kfree(param);
45935+ return err;
45936 }
45937
45938 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45939diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45940index 733a7ff..f8b52e3 100644
45941--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45942+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45943@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45944
45945 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45946 {
45947- struct hexline hx;
45948- u8 reset;
45949+ struct hexline *hx;
45950+ u8 *reset;
45951 int ret,pos=0;
45952
45953+ reset = kmalloc(1, GFP_KERNEL);
45954+ if (reset == NULL)
45955+ return -ENOMEM;
45956+
45957+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45958+ if (hx == NULL) {
45959+ kfree(reset);
45960+ return -ENOMEM;
45961+ }
45962+
45963 /* stop the CPU */
45964- reset = 1;
45965- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45966+ reset[0] = 1;
45967+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45968 err("could not stop the USB controller CPU.");
45969
45970- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45971- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45972- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45973+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45974+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45975+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45976
45977- if (ret != hx.len) {
45978+ if (ret != hx->len) {
45979 err("error while transferring firmware "
45980 "(transferred size: %d, block size: %d)",
45981- ret,hx.len);
45982+ ret,hx->len);
45983 ret = -EINVAL;
45984 break;
45985 }
45986 }
45987 if (ret < 0) {
45988 err("firmware download failed at %d with %d",pos,ret);
45989+ kfree(reset);
45990+ kfree(hx);
45991 return ret;
45992 }
45993
45994 if (ret == 0) {
45995 /* restart the CPU */
45996- reset = 0;
45997- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45998+ reset[0] = 0;
45999+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46000 err("could not restart the USB controller CPU.");
46001 ret = -EINVAL;
46002 }
46003 } else
46004 ret = -EIO;
46005
46006+ kfree(reset);
46007+ kfree(hx);
46008+
46009 return ret;
46010 }
46011 EXPORT_SYMBOL(usb_cypress_load_firmware);
46012diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46013index 1a3df10..57997a5 100644
46014--- a/drivers/media/usb/dvb-usb/dw2102.c
46015+++ b/drivers/media/usb/dvb-usb/dw2102.c
46016@@ -118,7 +118,7 @@ struct su3000_state {
46017
46018 struct s6x0_state {
46019 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46020-};
46021+} __no_const;
46022
46023 /* debug */
46024 static int dvb_usb_dw2102_debug;
46025diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46026index 5801ae7..83f71fa 100644
46027--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46028+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46029@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46030 static int technisat_usb2_i2c_access(struct usb_device *udev,
46031 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46032 {
46033- u8 b[64];
46034- int ret, actual_length;
46035+ u8 *b = kmalloc(64, GFP_KERNEL);
46036+ int ret, actual_length, error = 0;
46037+
46038+ if (b == NULL)
46039+ return -ENOMEM;
46040
46041 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46042 debug_dump(tx, txlen, deb_i2c);
46043@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46044
46045 if (ret < 0) {
46046 err("i2c-error: out failed %02x = %d", device_addr, ret);
46047- return -ENODEV;
46048+ error = -ENODEV;
46049+ goto out;
46050 }
46051
46052 ret = usb_bulk_msg(udev,
46053@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46054 b, 64, &actual_length, 1000);
46055 if (ret < 0) {
46056 err("i2c-error: in failed %02x = %d", device_addr, ret);
46057- return -ENODEV;
46058+ error = -ENODEV;
46059+ goto out;
46060 }
46061
46062 if (b[0] != I2C_STATUS_OK) {
46063@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46064 /* handle tuner-i2c-nak */
46065 if (!(b[0] == I2C_STATUS_NAK &&
46066 device_addr == 0x60
46067- /* && device_is_technisat_usb2 */))
46068- return -ENODEV;
46069+ /* && device_is_technisat_usb2 */)) {
46070+ error = -ENODEV;
46071+ goto out;
46072+ }
46073 }
46074
46075 deb_i2c("status: %d, ", b[0]);
46076@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46077
46078 deb_i2c("\n");
46079
46080- return 0;
46081+out:
46082+ kfree(b);
46083+ return error;
46084 }
46085
46086 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46087@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46088 {
46089 int ret;
46090
46091- u8 led[8] = {
46092- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46093- 0
46094- };
46095+ u8 *led = kzalloc(8, GFP_KERNEL);
46096+
46097+ if (led == NULL)
46098+ return -ENOMEM;
46099
46100 if (disable_led_control && state != TECH_LED_OFF)
46101 return 0;
46102
46103+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46104+
46105 switch (state) {
46106 case TECH_LED_ON:
46107 led[1] = 0x82;
46108@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46109 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46110 USB_TYPE_VENDOR | USB_DIR_OUT,
46111 0, 0,
46112- led, sizeof(led), 500);
46113+ led, 8, 500);
46114
46115 mutex_unlock(&d->i2c_mutex);
46116+
46117+ kfree(led);
46118+
46119 return ret;
46120 }
46121
46122 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46123 {
46124 int ret;
46125- u8 b = 0;
46126+ u8 *b = kzalloc(1, GFP_KERNEL);
46127+
46128+ if (b == NULL)
46129+ return -ENOMEM;
46130
46131 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46132 return -EAGAIN;
46133@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46134 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46135 USB_TYPE_VENDOR | USB_DIR_OUT,
46136 (red << 8) | green, 0,
46137- &b, 1, 500);
46138+ b, 1, 500);
46139
46140 mutex_unlock(&d->i2c_mutex);
46141
46142+ kfree(b);
46143+
46144 return ret;
46145 }
46146
46147@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46148 struct dvb_usb_device_description **desc, int *cold)
46149 {
46150 int ret;
46151- u8 version[3];
46152+ u8 *version = kmalloc(3, GFP_KERNEL);
46153
46154 /* first select the interface */
46155 if (usb_set_interface(udev, 0, 1) != 0)
46156@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46157
46158 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46159
46160+ if (version == NULL)
46161+ return 0;
46162+
46163 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46164 GET_VERSION_INFO_VENDOR_REQUEST,
46165 USB_TYPE_VENDOR | USB_DIR_IN,
46166 0, 0,
46167- version, sizeof(version), 500);
46168+ version, 3, 500);
46169
46170 if (ret < 0)
46171 *cold = 1;
46172@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46173 *cold = 0;
46174 }
46175
46176+ kfree(version);
46177+
46178 return 0;
46179 }
46180
46181@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46182
46183 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46184 {
46185- u8 buf[62], *b;
46186+ u8 *buf, *b;
46187 int ret;
46188 struct ir_raw_event ev;
46189
46190+ buf = kmalloc(62, GFP_KERNEL);
46191+
46192+ if (buf == NULL)
46193+ return -ENOMEM;
46194+
46195 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46196 buf[1] = 0x08;
46197 buf[2] = 0x8f;
46198@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46199 GET_IR_DATA_VENDOR_REQUEST,
46200 USB_TYPE_VENDOR | USB_DIR_IN,
46201 0x8080, 0,
46202- buf, sizeof(buf), 500);
46203+ buf, 62, 500);
46204
46205 unlock:
46206 mutex_unlock(&d->i2c_mutex);
46207
46208- if (ret < 0)
46209+ if (ret < 0) {
46210+ kfree(buf);
46211 return ret;
46212+ }
46213
46214- if (ret == 1)
46215+ if (ret == 1) {
46216+ kfree(buf);
46217 return 0; /* no key pressed */
46218+ }
46219
46220 /* decoding */
46221 b = buf+1;
46222@@ -656,6 +689,8 @@ unlock:
46223
46224 ir_raw_event_handle(d->rc_dev);
46225
46226+ kfree(buf);
46227+
46228 return 1;
46229 }
46230
46231diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46232index af63543..0436f20 100644
46233--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46234+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46235@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46236 * by passing a very big num_planes value */
46237 uplane = compat_alloc_user_space(num_planes *
46238 sizeof(struct v4l2_plane));
46239- kp->m.planes = (__force struct v4l2_plane *)uplane;
46240+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46241
46242 while (--num_planes >= 0) {
46243 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46244@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46245 if (num_planes == 0)
46246 return 0;
46247
46248- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46249+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46250 if (get_user(p, &up->m.planes))
46251 return -EFAULT;
46252 uplane32 = compat_ptr(p);
46253@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46254 get_user(kp->flags, &up->flags) ||
46255 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46256 return -EFAULT;
46257- kp->base = (__force void *)compat_ptr(tmp);
46258+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46259 return 0;
46260 }
46261
46262@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46263 n * sizeof(struct v4l2_ext_control32)))
46264 return -EFAULT;
46265 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46266- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46267+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46268 while (--n >= 0) {
46269 u32 id;
46270
46271@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46272 {
46273 struct v4l2_ext_control32 __user *ucontrols;
46274 struct v4l2_ext_control __user *kcontrols =
46275- (__force struct v4l2_ext_control __user *)kp->controls;
46276+ (struct v4l2_ext_control __force_user *)kp->controls;
46277 int n = kp->count;
46278 compat_caddr_t p;
46279
46280@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46281 get_user(tmp, &up->edid) ||
46282 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46283 return -EFAULT;
46284- kp->edid = (__force u8 *)compat_ptr(tmp);
46285+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46286 return 0;
46287 }
46288
46289diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46290index 015f92a..59e311e 100644
46291--- a/drivers/media/v4l2-core/v4l2-device.c
46292+++ b/drivers/media/v4l2-core/v4l2-device.c
46293@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46294 EXPORT_SYMBOL_GPL(v4l2_device_put);
46295
46296 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46297- atomic_t *instance)
46298+ atomic_unchecked_t *instance)
46299 {
46300- int num = atomic_inc_return(instance) - 1;
46301+ int num = atomic_inc_return_unchecked(instance) - 1;
46302 int len = strlen(basename);
46303
46304 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46305diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46306index faac2f4..e39dcd9 100644
46307--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46308+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46309@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
46310 struct file *file, void *fh, void *p);
46311 } u;
46312 void (*debug)(const void *arg, bool write_only);
46313-};
46314+} __do_const;
46315+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46316
46317 /* This control needs a priority check */
46318 #define INFO_FL_PRIO (1 << 0)
46319@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
46320 struct video_device *vfd = video_devdata(file);
46321 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46322 bool write_only = false;
46323- struct v4l2_ioctl_info default_info;
46324+ v4l2_ioctl_info_no_const default_info;
46325 const struct v4l2_ioctl_info *info;
46326 void *fh = file->private_data;
46327 struct v4l2_fh *vfh = NULL;
46328@@ -2422,7 +2423,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46329 ret = -EINVAL;
46330 break;
46331 }
46332- *user_ptr = (void __user *)buf->m.planes;
46333+ *user_ptr = (void __force_user *)buf->m.planes;
46334 *kernel_ptr = (void **)&buf->m.planes;
46335 *array_size = sizeof(struct v4l2_plane) * buf->length;
46336 ret = 1;
46337@@ -2439,7 +2440,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46338 ret = -EINVAL;
46339 break;
46340 }
46341- *user_ptr = (void __user *)edid->edid;
46342+ *user_ptr = (void __force_user *)edid->edid;
46343 *kernel_ptr = (void **)&edid->edid;
46344 *array_size = edid->blocks * 128;
46345 ret = 1;
46346@@ -2457,7 +2458,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46347 ret = -EINVAL;
46348 break;
46349 }
46350- *user_ptr = (void __user *)ctrls->controls;
46351+ *user_ptr = (void __force_user *)ctrls->controls;
46352 *kernel_ptr = (void **)&ctrls->controls;
46353 *array_size = sizeof(struct v4l2_ext_control)
46354 * ctrls->count;
46355@@ -2558,7 +2559,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46356 }
46357
46358 if (has_array_args) {
46359- *kernel_ptr = (void __force *)user_ptr;
46360+ *kernel_ptr = (void __force_kernel *)user_ptr;
46361 if (copy_to_user(user_ptr, mbuf, array_size))
46362 err = -EFAULT;
46363 goto out_array_args;
46364diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
46365index 24696f5..3637780 100644
46366--- a/drivers/memory/omap-gpmc.c
46367+++ b/drivers/memory/omap-gpmc.c
46368@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
46369 };
46370
46371 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
46372-static struct irq_chip gpmc_irq_chip;
46373 static int gpmc_irq_start;
46374
46375 static struct resource gpmc_mem_root;
46376@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
46377
46378 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
46379
46380+static struct irq_chip gpmc_irq_chip = {
46381+ .name = "gpmc",
46382+ .irq_startup = gpmc_irq_noop_ret,
46383+ .irq_enable = gpmc_irq_enable,
46384+ .irq_disable = gpmc_irq_disable,
46385+ .irq_shutdown = gpmc_irq_noop,
46386+ .irq_ack = gpmc_irq_noop,
46387+ .irq_mask = gpmc_irq_noop,
46388+ .irq_unmask = gpmc_irq_noop,
46389+};
46390+
46391 static int gpmc_setup_irq(void)
46392 {
46393 int i;
46394@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
46395 return gpmc_irq_start;
46396 }
46397
46398- gpmc_irq_chip.name = "gpmc";
46399- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
46400- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
46401- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
46402- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
46403- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
46404- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
46405- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
46406-
46407 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
46408 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
46409
46410diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46411index 187f836..679544b 100644
46412--- a/drivers/message/fusion/mptbase.c
46413+++ b/drivers/message/fusion/mptbase.c
46414@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46415 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46416 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46417
46418+#ifdef CONFIG_GRKERNSEC_HIDESYM
46419+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46420+#else
46421 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46422 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46423+#endif
46424+
46425 /*
46426 * Rounding UP to nearest 4-kB boundary here...
46427 */
46428@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46429 ioc->facts.GlobalCredits);
46430
46431 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46432+#ifdef CONFIG_GRKERNSEC_HIDESYM
46433+ NULL, NULL);
46434+#else
46435 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46436+#endif
46437 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46438 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46439 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46440diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46441index 5bdaae1..eced16f 100644
46442--- a/drivers/message/fusion/mptsas.c
46443+++ b/drivers/message/fusion/mptsas.c
46444@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46445 return 0;
46446 }
46447
46448+static inline void
46449+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46450+{
46451+ if (phy_info->port_details) {
46452+ phy_info->port_details->rphy = rphy;
46453+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46454+ ioc->name, rphy));
46455+ }
46456+
46457+ if (rphy) {
46458+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46459+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46460+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46461+ ioc->name, rphy, rphy->dev.release));
46462+ }
46463+}
46464+
46465 /* no mutex */
46466 static void
46467 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46468@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46469 return NULL;
46470 }
46471
46472-static inline void
46473-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46474-{
46475- if (phy_info->port_details) {
46476- phy_info->port_details->rphy = rphy;
46477- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46478- ioc->name, rphy));
46479- }
46480-
46481- if (rphy) {
46482- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46483- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46484- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46485- ioc->name, rphy, rphy->dev.release));
46486- }
46487-}
46488-
46489 static inline struct sas_port *
46490 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46491 {
46492diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46493index b7d87cd..3fb36da 100644
46494--- a/drivers/message/i2o/i2o_proc.c
46495+++ b/drivers/message/i2o/i2o_proc.c
46496@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46497 "Array Controller Device"
46498 };
46499
46500-static char *chtostr(char *tmp, u8 *chars, int n)
46501-{
46502- tmp[0] = 0;
46503- return strncat(tmp, (char *)chars, n);
46504-}
46505-
46506 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46507 char *group)
46508 {
46509@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46510 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46511 {
46512 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46513- static u32 work32[5];
46514- static u8 *work8 = (u8 *) work32;
46515- static u16 *work16 = (u16 *) work32;
46516+ u32 work32[5];
46517+ u8 *work8 = (u8 *) work32;
46518+ u16 *work16 = (u16 *) work32;
46519 int token;
46520 u32 hwcap;
46521
46522@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46523 } *result;
46524
46525 i2o_exec_execute_ddm_table ddm_table;
46526- char tmp[28 + 1];
46527
46528 result = kmalloc(sizeof(*result), GFP_KERNEL);
46529 if (!result)
46530@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46531
46532 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46533 seq_printf(seq, "%-#8x", ddm_table.module_id);
46534- seq_printf(seq, "%-29s",
46535- chtostr(tmp, ddm_table.module_name_version, 28));
46536+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46537 seq_printf(seq, "%9d ", ddm_table.data_size);
46538 seq_printf(seq, "%8d", ddm_table.code_size);
46539
46540@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46541
46542 i2o_driver_result_table *result;
46543 i2o_driver_store_table *dst;
46544- char tmp[28 + 1];
46545
46546 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46547 if (result == NULL)
46548@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46549
46550 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46551 seq_printf(seq, "%-#8x", dst->module_id);
46552- seq_printf(seq, "%-29s",
46553- chtostr(tmp, dst->module_name_version, 28));
46554- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46555+ seq_printf(seq, "%-.28s", dst->module_name_version);
46556+ seq_printf(seq, "%-.8s", dst->date);
46557 seq_printf(seq, "%8d ", dst->module_size);
46558 seq_printf(seq, "%8d ", dst->mpb_size);
46559 seq_printf(seq, "0x%04x", dst->module_flags);
46560@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46561 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46562 {
46563 struct i2o_device *d = (struct i2o_device *)seq->private;
46564- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46565+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46566 // == (allow) 512d bytes (max)
46567- static u16 *work16 = (u16 *) work32;
46568+ u16 *work16 = (u16 *) work32;
46569 int token;
46570- char tmp[16 + 1];
46571
46572 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46573
46574@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46575 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46576 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46577 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46578- seq_printf(seq, "Vendor info : %s\n",
46579- chtostr(tmp, (u8 *) (work32 + 2), 16));
46580- seq_printf(seq, "Product info : %s\n",
46581- chtostr(tmp, (u8 *) (work32 + 6), 16));
46582- seq_printf(seq, "Description : %s\n",
46583- chtostr(tmp, (u8 *) (work32 + 10), 16));
46584- seq_printf(seq, "Product rev. : %s\n",
46585- chtostr(tmp, (u8 *) (work32 + 14), 8));
46586+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46587+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46588+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46589+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46590
46591 seq_printf(seq, "Serial number : ");
46592 print_serial_number(seq, (u8 *) (work32 + 16),
46593@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46594 u8 pad[256]; // allow up to 256 byte (max) serial number
46595 } result;
46596
46597- char tmp[24 + 1];
46598-
46599 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46600
46601 if (token < 0) {
46602@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46603 }
46604
46605 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46606- seq_printf(seq, "Module name : %s\n",
46607- chtostr(tmp, result.module_name, 24));
46608- seq_printf(seq, "Module revision : %s\n",
46609- chtostr(tmp, result.module_rev, 8));
46610+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
46611+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46612
46613 seq_printf(seq, "Serial number : ");
46614 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46615@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46616 u8 instance_number[4];
46617 } result;
46618
46619- char tmp[64 + 1];
46620-
46621 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46622
46623 if (token < 0) {
46624@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46625 return 0;
46626 }
46627
46628- seq_printf(seq, "Device name : %s\n",
46629- chtostr(tmp, result.device_name, 64));
46630- seq_printf(seq, "Service name : %s\n",
46631- chtostr(tmp, result.service_name, 64));
46632- seq_printf(seq, "Physical name : %s\n",
46633- chtostr(tmp, result.physical_location, 64));
46634- seq_printf(seq, "Instance number : %s\n",
46635- chtostr(tmp, result.instance_number, 4));
46636+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
46637+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
46638+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46639+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46640
46641 return 0;
46642 }
46643@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46644 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46645 {
46646 struct i2o_device *d = (struct i2o_device *)seq->private;
46647- static u32 work32[12];
46648- static u16 *work16 = (u16 *) work32;
46649- static u8 *work8 = (u8 *) work32;
46650+ u32 work32[12];
46651+ u16 *work16 = (u16 *) work32;
46652+ u8 *work8 = (u8 *) work32;
46653 int token;
46654
46655 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46656diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46657index 92752fb..a7494f6 100644
46658--- a/drivers/message/i2o/iop.c
46659+++ b/drivers/message/i2o/iop.c
46660@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46661
46662 spin_lock_irqsave(&c->context_list_lock, flags);
46663
46664- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46665- atomic_inc(&c->context_list_counter);
46666+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46667+ atomic_inc_unchecked(&c->context_list_counter);
46668
46669- entry->context = atomic_read(&c->context_list_counter);
46670+ entry->context = atomic_read_unchecked(&c->context_list_counter);
46671
46672 list_add(&entry->list, &c->context_list);
46673
46674@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46675
46676 #if BITS_PER_LONG == 64
46677 spin_lock_init(&c->context_list_lock);
46678- atomic_set(&c->context_list_counter, 0);
46679+ atomic_set_unchecked(&c->context_list_counter, 0);
46680 INIT_LIST_HEAD(&c->context_list);
46681 #endif
46682
46683diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46684index 9a8e185..27ff17d 100644
46685--- a/drivers/mfd/ab8500-debugfs.c
46686+++ b/drivers/mfd/ab8500-debugfs.c
46687@@ -100,7 +100,7 @@ static int irq_last;
46688 static u32 *irq_count;
46689 static int num_irqs;
46690
46691-static struct device_attribute **dev_attr;
46692+static device_attribute_no_const **dev_attr;
46693 static char **event_name;
46694
46695 static u8 avg_sample = SAMPLE_16;
46696diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
46697index 5615522..1eb6f3dc 100644
46698--- a/drivers/mfd/kempld-core.c
46699+++ b/drivers/mfd/kempld-core.c
46700@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
46701 .remove = kempld_remove,
46702 };
46703
46704-static struct dmi_system_id kempld_dmi_table[] __initdata = {
46705+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
46706 {
46707 .ident = "BHL6",
46708 .matches = {
46709diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46710index c880c89..45a7c68 100644
46711--- a/drivers/mfd/max8925-i2c.c
46712+++ b/drivers/mfd/max8925-i2c.c
46713@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46714 const struct i2c_device_id *id)
46715 {
46716 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46717- static struct max8925_chip *chip;
46718+ struct max8925_chip *chip;
46719 struct device_node *node = client->dev.of_node;
46720
46721 if (node && !pdata) {
46722diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46723index 7612d89..70549c2 100644
46724--- a/drivers/mfd/tps65910.c
46725+++ b/drivers/mfd/tps65910.c
46726@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46727 struct tps65910_platform_data *pdata)
46728 {
46729 int ret = 0;
46730- static struct regmap_irq_chip *tps6591x_irqs_chip;
46731+ struct regmap_irq_chip *tps6591x_irqs_chip;
46732
46733 if (!irq) {
46734 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46735diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46736index 1b772ef..01e77d33 100644
46737--- a/drivers/mfd/twl4030-irq.c
46738+++ b/drivers/mfd/twl4030-irq.c
46739@@ -34,6 +34,7 @@
46740 #include <linux/of.h>
46741 #include <linux/irqdomain.h>
46742 #include <linux/i2c/twl.h>
46743+#include <asm/pgtable.h>
46744
46745 #include "twl-core.h"
46746
46747@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46748 * Install an irq handler for each of the SIH modules;
46749 * clone dummy irq_chip since PIH can't *do* anything
46750 */
46751- twl4030_irq_chip = dummy_irq_chip;
46752- twl4030_irq_chip.name = "twl4030";
46753+ pax_open_kernel();
46754+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46755+ *(const char **)&twl4030_irq_chip.name = "twl4030";
46756
46757- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46758+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46759+ pax_close_kernel();
46760
46761 for (i = irq_base; i < irq_end; i++) {
46762 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46763diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46764index 464419b..64bae8d 100644
46765--- a/drivers/misc/c2port/core.c
46766+++ b/drivers/misc/c2port/core.c
46767@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46768 goto error_idr_alloc;
46769 c2dev->id = ret;
46770
46771- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46772+ pax_open_kernel();
46773+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46774+ pax_close_kernel();
46775
46776 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46777 "c2port%d", c2dev->id);
46778diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46779index 8385177..2f54635 100644
46780--- a/drivers/misc/eeprom/sunxi_sid.c
46781+++ b/drivers/misc/eeprom/sunxi_sid.c
46782@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46783
46784 platform_set_drvdata(pdev, sid_data);
46785
46786- sid_bin_attr.size = sid_data->keysize;
46787+ pax_open_kernel();
46788+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46789+ pax_close_kernel();
46790 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46791 return -ENODEV;
46792
46793diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46794index 36f5d52..32311c3 100644
46795--- a/drivers/misc/kgdbts.c
46796+++ b/drivers/misc/kgdbts.c
46797@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46798 char before[BREAK_INSTR_SIZE];
46799 char after[BREAK_INSTR_SIZE];
46800
46801- probe_kernel_read(before, (char *)kgdbts_break_test,
46802+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46803 BREAK_INSTR_SIZE);
46804 init_simple_test();
46805 ts.tst = plant_and_detach_test;
46806@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46807 /* Activate test with initial breakpoint */
46808 if (!is_early)
46809 kgdb_breakpoint();
46810- probe_kernel_read(after, (char *)kgdbts_break_test,
46811+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46812 BREAK_INSTR_SIZE);
46813 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46814 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46815diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46816index 3ef4627..8d00486 100644
46817--- a/drivers/misc/lis3lv02d/lis3lv02d.c
46818+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46819@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46820 * the lid is closed. This leads to interrupts as soon as a little move
46821 * is done.
46822 */
46823- atomic_inc(&lis3->count);
46824+ atomic_inc_unchecked(&lis3->count);
46825
46826 wake_up_interruptible(&lis3->misc_wait);
46827 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46828@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46829 if (lis3->pm_dev)
46830 pm_runtime_get_sync(lis3->pm_dev);
46831
46832- atomic_set(&lis3->count, 0);
46833+ atomic_set_unchecked(&lis3->count, 0);
46834 return 0;
46835 }
46836
46837@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46838 add_wait_queue(&lis3->misc_wait, &wait);
46839 while (true) {
46840 set_current_state(TASK_INTERRUPTIBLE);
46841- data = atomic_xchg(&lis3->count, 0);
46842+ data = atomic_xchg_unchecked(&lis3->count, 0);
46843 if (data)
46844 break;
46845
46846@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46847 struct lis3lv02d, miscdev);
46848
46849 poll_wait(file, &lis3->misc_wait, wait);
46850- if (atomic_read(&lis3->count))
46851+ if (atomic_read_unchecked(&lis3->count))
46852 return POLLIN | POLLRDNORM;
46853 return 0;
46854 }
46855diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46856index c439c82..1f20f57 100644
46857--- a/drivers/misc/lis3lv02d/lis3lv02d.h
46858+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46859@@ -297,7 +297,7 @@ struct lis3lv02d {
46860 struct input_polled_dev *idev; /* input device */
46861 struct platform_device *pdev; /* platform device */
46862 struct regulator_bulk_data regulators[2];
46863- atomic_t count; /* interrupt count after last read */
46864+ atomic_unchecked_t count; /* interrupt count after last read */
46865 union axis_conversion ac; /* hw -> logical axis */
46866 int mapped_btns[3];
46867
46868diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46869index 2f30bad..c4c13d0 100644
46870--- a/drivers/misc/sgi-gru/gruhandles.c
46871+++ b/drivers/misc/sgi-gru/gruhandles.c
46872@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46873 unsigned long nsec;
46874
46875 nsec = CLKS2NSEC(clks);
46876- atomic_long_inc(&mcs_op_statistics[op].count);
46877- atomic_long_add(nsec, &mcs_op_statistics[op].total);
46878+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46879+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46880 if (mcs_op_statistics[op].max < nsec)
46881 mcs_op_statistics[op].max = nsec;
46882 }
46883diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46884index 4f76359..cdfcb2e 100644
46885--- a/drivers/misc/sgi-gru/gruprocfs.c
46886+++ b/drivers/misc/sgi-gru/gruprocfs.c
46887@@ -32,9 +32,9 @@
46888
46889 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46890
46891-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46892+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46893 {
46894- unsigned long val = atomic_long_read(v);
46895+ unsigned long val = atomic_long_read_unchecked(v);
46896
46897 seq_printf(s, "%16lu %s\n", val, id);
46898 }
46899@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46900
46901 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46902 for (op = 0; op < mcsop_last; op++) {
46903- count = atomic_long_read(&mcs_op_statistics[op].count);
46904- total = atomic_long_read(&mcs_op_statistics[op].total);
46905+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46906+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46907 max = mcs_op_statistics[op].max;
46908 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46909 count ? total / count : 0, max);
46910diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46911index 5c3ce24..4915ccb 100644
46912--- a/drivers/misc/sgi-gru/grutables.h
46913+++ b/drivers/misc/sgi-gru/grutables.h
46914@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46915 * GRU statistics.
46916 */
46917 struct gru_stats_s {
46918- atomic_long_t vdata_alloc;
46919- atomic_long_t vdata_free;
46920- atomic_long_t gts_alloc;
46921- atomic_long_t gts_free;
46922- atomic_long_t gms_alloc;
46923- atomic_long_t gms_free;
46924- atomic_long_t gts_double_allocate;
46925- atomic_long_t assign_context;
46926- atomic_long_t assign_context_failed;
46927- atomic_long_t free_context;
46928- atomic_long_t load_user_context;
46929- atomic_long_t load_kernel_context;
46930- atomic_long_t lock_kernel_context;
46931- atomic_long_t unlock_kernel_context;
46932- atomic_long_t steal_user_context;
46933- atomic_long_t steal_kernel_context;
46934- atomic_long_t steal_context_failed;
46935- atomic_long_t nopfn;
46936- atomic_long_t asid_new;
46937- atomic_long_t asid_next;
46938- atomic_long_t asid_wrap;
46939- atomic_long_t asid_reuse;
46940- atomic_long_t intr;
46941- atomic_long_t intr_cbr;
46942- atomic_long_t intr_tfh;
46943- atomic_long_t intr_spurious;
46944- atomic_long_t intr_mm_lock_failed;
46945- atomic_long_t call_os;
46946- atomic_long_t call_os_wait_queue;
46947- atomic_long_t user_flush_tlb;
46948- atomic_long_t user_unload_context;
46949- atomic_long_t user_exception;
46950- atomic_long_t set_context_option;
46951- atomic_long_t check_context_retarget_intr;
46952- atomic_long_t check_context_unload;
46953- atomic_long_t tlb_dropin;
46954- atomic_long_t tlb_preload_page;
46955- atomic_long_t tlb_dropin_fail_no_asid;
46956- atomic_long_t tlb_dropin_fail_upm;
46957- atomic_long_t tlb_dropin_fail_invalid;
46958- atomic_long_t tlb_dropin_fail_range_active;
46959- atomic_long_t tlb_dropin_fail_idle;
46960- atomic_long_t tlb_dropin_fail_fmm;
46961- atomic_long_t tlb_dropin_fail_no_exception;
46962- atomic_long_t tfh_stale_on_fault;
46963- atomic_long_t mmu_invalidate_range;
46964- atomic_long_t mmu_invalidate_page;
46965- atomic_long_t flush_tlb;
46966- atomic_long_t flush_tlb_gru;
46967- atomic_long_t flush_tlb_gru_tgh;
46968- atomic_long_t flush_tlb_gru_zero_asid;
46969+ atomic_long_unchecked_t vdata_alloc;
46970+ atomic_long_unchecked_t vdata_free;
46971+ atomic_long_unchecked_t gts_alloc;
46972+ atomic_long_unchecked_t gts_free;
46973+ atomic_long_unchecked_t gms_alloc;
46974+ atomic_long_unchecked_t gms_free;
46975+ atomic_long_unchecked_t gts_double_allocate;
46976+ atomic_long_unchecked_t assign_context;
46977+ atomic_long_unchecked_t assign_context_failed;
46978+ atomic_long_unchecked_t free_context;
46979+ atomic_long_unchecked_t load_user_context;
46980+ atomic_long_unchecked_t load_kernel_context;
46981+ atomic_long_unchecked_t lock_kernel_context;
46982+ atomic_long_unchecked_t unlock_kernel_context;
46983+ atomic_long_unchecked_t steal_user_context;
46984+ atomic_long_unchecked_t steal_kernel_context;
46985+ atomic_long_unchecked_t steal_context_failed;
46986+ atomic_long_unchecked_t nopfn;
46987+ atomic_long_unchecked_t asid_new;
46988+ atomic_long_unchecked_t asid_next;
46989+ atomic_long_unchecked_t asid_wrap;
46990+ atomic_long_unchecked_t asid_reuse;
46991+ atomic_long_unchecked_t intr;
46992+ atomic_long_unchecked_t intr_cbr;
46993+ atomic_long_unchecked_t intr_tfh;
46994+ atomic_long_unchecked_t intr_spurious;
46995+ atomic_long_unchecked_t intr_mm_lock_failed;
46996+ atomic_long_unchecked_t call_os;
46997+ atomic_long_unchecked_t call_os_wait_queue;
46998+ atomic_long_unchecked_t user_flush_tlb;
46999+ atomic_long_unchecked_t user_unload_context;
47000+ atomic_long_unchecked_t user_exception;
47001+ atomic_long_unchecked_t set_context_option;
47002+ atomic_long_unchecked_t check_context_retarget_intr;
47003+ atomic_long_unchecked_t check_context_unload;
47004+ atomic_long_unchecked_t tlb_dropin;
47005+ atomic_long_unchecked_t tlb_preload_page;
47006+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47007+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47008+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47009+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47010+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47011+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47012+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47013+ atomic_long_unchecked_t tfh_stale_on_fault;
47014+ atomic_long_unchecked_t mmu_invalidate_range;
47015+ atomic_long_unchecked_t mmu_invalidate_page;
47016+ atomic_long_unchecked_t flush_tlb;
47017+ atomic_long_unchecked_t flush_tlb_gru;
47018+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47019+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47020
47021- atomic_long_t copy_gpa;
47022- atomic_long_t read_gpa;
47023+ atomic_long_unchecked_t copy_gpa;
47024+ atomic_long_unchecked_t read_gpa;
47025
47026- atomic_long_t mesq_receive;
47027- atomic_long_t mesq_receive_none;
47028- atomic_long_t mesq_send;
47029- atomic_long_t mesq_send_failed;
47030- atomic_long_t mesq_noop;
47031- atomic_long_t mesq_send_unexpected_error;
47032- atomic_long_t mesq_send_lb_overflow;
47033- atomic_long_t mesq_send_qlimit_reached;
47034- atomic_long_t mesq_send_amo_nacked;
47035- atomic_long_t mesq_send_put_nacked;
47036- atomic_long_t mesq_page_overflow;
47037- atomic_long_t mesq_qf_locked;
47038- atomic_long_t mesq_qf_noop_not_full;
47039- atomic_long_t mesq_qf_switch_head_failed;
47040- atomic_long_t mesq_qf_unexpected_error;
47041- atomic_long_t mesq_noop_unexpected_error;
47042- atomic_long_t mesq_noop_lb_overflow;
47043- atomic_long_t mesq_noop_qlimit_reached;
47044- atomic_long_t mesq_noop_amo_nacked;
47045- atomic_long_t mesq_noop_put_nacked;
47046- atomic_long_t mesq_noop_page_overflow;
47047+ atomic_long_unchecked_t mesq_receive;
47048+ atomic_long_unchecked_t mesq_receive_none;
47049+ atomic_long_unchecked_t mesq_send;
47050+ atomic_long_unchecked_t mesq_send_failed;
47051+ atomic_long_unchecked_t mesq_noop;
47052+ atomic_long_unchecked_t mesq_send_unexpected_error;
47053+ atomic_long_unchecked_t mesq_send_lb_overflow;
47054+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47055+ atomic_long_unchecked_t mesq_send_amo_nacked;
47056+ atomic_long_unchecked_t mesq_send_put_nacked;
47057+ atomic_long_unchecked_t mesq_page_overflow;
47058+ atomic_long_unchecked_t mesq_qf_locked;
47059+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47060+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47061+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47062+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47063+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47064+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47065+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47066+ atomic_long_unchecked_t mesq_noop_put_nacked;
47067+ atomic_long_unchecked_t mesq_noop_page_overflow;
47068
47069 };
47070
47071@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47072 tghop_invalidate, mcsop_last};
47073
47074 struct mcs_op_statistic {
47075- atomic_long_t count;
47076- atomic_long_t total;
47077+ atomic_long_unchecked_t count;
47078+ atomic_long_unchecked_t total;
47079 unsigned long max;
47080 };
47081
47082@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47083
47084 #define STAT(id) do { \
47085 if (gru_options & OPT_STATS) \
47086- atomic_long_inc(&gru_stats.id); \
47087+ atomic_long_inc_unchecked(&gru_stats.id); \
47088 } while (0)
47089
47090 #ifdef CONFIG_SGI_GRU_DEBUG
47091diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47092index c862cd4..0d176fe 100644
47093--- a/drivers/misc/sgi-xp/xp.h
47094+++ b/drivers/misc/sgi-xp/xp.h
47095@@ -288,7 +288,7 @@ struct xpc_interface {
47096 xpc_notify_func, void *);
47097 void (*received) (short, int, void *);
47098 enum xp_retval (*partid_to_nasids) (short, void *);
47099-};
47100+} __no_const;
47101
47102 extern struct xpc_interface xpc_interface;
47103
47104diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47105index 01be66d..e3a0c7e 100644
47106--- a/drivers/misc/sgi-xp/xp_main.c
47107+++ b/drivers/misc/sgi-xp/xp_main.c
47108@@ -78,13 +78,13 @@ xpc_notloaded(void)
47109 }
47110
47111 struct xpc_interface xpc_interface = {
47112- (void (*)(int))xpc_notloaded,
47113- (void (*)(int))xpc_notloaded,
47114- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47115- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47116+ .connect = (void (*)(int))xpc_notloaded,
47117+ .disconnect = (void (*)(int))xpc_notloaded,
47118+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47119+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47120 void *))xpc_notloaded,
47121- (void (*)(short, int, void *))xpc_notloaded,
47122- (enum xp_retval(*)(short, void *))xpc_notloaded
47123+ .received = (void (*)(short, int, void *))xpc_notloaded,
47124+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47125 };
47126 EXPORT_SYMBOL_GPL(xpc_interface);
47127
47128diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47129index b94d5f7..7f494c5 100644
47130--- a/drivers/misc/sgi-xp/xpc.h
47131+++ b/drivers/misc/sgi-xp/xpc.h
47132@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47133 void (*received_payload) (struct xpc_channel *, void *);
47134 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47135 };
47136+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47137
47138 /* struct xpc_partition act_state values (for XPC HB) */
47139
47140@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47141 /* found in xpc_main.c */
47142 extern struct device *xpc_part;
47143 extern struct device *xpc_chan;
47144-extern struct xpc_arch_operations xpc_arch_ops;
47145+extern xpc_arch_operations_no_const xpc_arch_ops;
47146 extern int xpc_disengage_timelimit;
47147 extern int xpc_disengage_timedout;
47148 extern int xpc_activate_IRQ_rcvd;
47149diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47150index 82dc574..8539ab2 100644
47151--- a/drivers/misc/sgi-xp/xpc_main.c
47152+++ b/drivers/misc/sgi-xp/xpc_main.c
47153@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47154 .notifier_call = xpc_system_die,
47155 };
47156
47157-struct xpc_arch_operations xpc_arch_ops;
47158+xpc_arch_operations_no_const xpc_arch_ops;
47159
47160 /*
47161 * Timer function to enforce the timelimit on the partition disengage.
47162@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47163
47164 if (((die_args->trapnr == X86_TRAP_MF) ||
47165 (die_args->trapnr == X86_TRAP_XF)) &&
47166- !user_mode_vm(die_args->regs))
47167+ !user_mode(die_args->regs))
47168 xpc_die_deactivate();
47169
47170 break;
47171diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47172index 4409d79..d7766d0 100644
47173--- a/drivers/mmc/card/block.c
47174+++ b/drivers/mmc/card/block.c
47175@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47176 if (idata->ic.postsleep_min_us)
47177 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47178
47179- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47180+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47181 err = -EFAULT;
47182 goto cmd_rel_host;
47183 }
47184diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47185index 0d0f7a2..45b8d60 100644
47186--- a/drivers/mmc/host/dw_mmc.h
47187+++ b/drivers/mmc/host/dw_mmc.h
47188@@ -276,5 +276,5 @@ struct dw_mci_drv_data {
47189 int (*parse_dt)(struct dw_mci *host);
47190 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
47191 struct dw_mci_tuning_data *tuning_data);
47192-};
47193+} __do_const;
47194 #endif /* _DW_MMC_H_ */
47195diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47196index 8232e9a..7776006 100644
47197--- a/drivers/mmc/host/mmci.c
47198+++ b/drivers/mmc/host/mmci.c
47199@@ -1635,7 +1635,9 @@ static int mmci_probe(struct amba_device *dev,
47200 mmc->caps |= MMC_CAP_CMD23;
47201
47202 if (variant->busy_detect) {
47203- mmci_ops.card_busy = mmci_card_busy;
47204+ pax_open_kernel();
47205+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47206+ pax_close_kernel();
47207 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47208 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47209 mmc->max_busy_timeout = 0;
47210diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47211index 7c71dcd..74cb746 100644
47212--- a/drivers/mmc/host/omap_hsmmc.c
47213+++ b/drivers/mmc/host/omap_hsmmc.c
47214@@ -2120,7 +2120,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47215
47216 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47217 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47218- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47219+ pax_open_kernel();
47220+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47221+ pax_close_kernel();
47222 }
47223
47224 pm_runtime_enable(host->dev);
47225diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47226index af1f7c0..00d368a 100644
47227--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47228+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47229@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47230 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47231 }
47232
47233- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47234- sdhci_esdhc_ops.platform_execute_tuning =
47235+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47236+ pax_open_kernel();
47237+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47238 esdhc_executing_tuning;
47239+ pax_close_kernel();
47240+ }
47241
47242 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47243 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47244diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47245index c45b893..fba0144 100644
47246--- a/drivers/mmc/host/sdhci-s3c.c
47247+++ b/drivers/mmc/host/sdhci-s3c.c
47248@@ -590,9 +590,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47249 * we can use overriding functions instead of default.
47250 */
47251 if (sc->no_divider) {
47252- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47253- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47254- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47255+ pax_open_kernel();
47256+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47257+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47258+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47259+ pax_close_kernel();
47260 }
47261
47262 /* It supports additional host capabilities if needed */
47263diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47264index 423666b..81ff5eb 100644
47265--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47266+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47267@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47268 size_t totlen = 0, thislen;
47269 int ret = 0;
47270 size_t buflen = 0;
47271- static char *buffer;
47272+ char *buffer;
47273
47274 if (!ECCBUF_SIZE) {
47275 /* We should fall back to a general writev implementation.
47276diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47277index b3b7ca1..5dd4634 100644
47278--- a/drivers/mtd/nand/denali.c
47279+++ b/drivers/mtd/nand/denali.c
47280@@ -24,6 +24,7 @@
47281 #include <linux/slab.h>
47282 #include <linux/mtd/mtd.h>
47283 #include <linux/module.h>
47284+#include <linux/slab.h>
47285
47286 #include "denali.h"
47287
47288diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47289index 4f3851a..f477a23 100644
47290--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47291+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47292@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47293
47294 /* first try to map the upper buffer directly */
47295 if (virt_addr_valid(this->upper_buf) &&
47296- !object_is_on_stack(this->upper_buf)) {
47297+ !object_starts_on_stack(this->upper_buf)) {
47298 sg_init_one(sgl, this->upper_buf, this->upper_len);
47299 ret = dma_map_sg(this->dev, sgl, 1, dr);
47300 if (ret == 0)
47301diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47302index 51b9d6a..52af9a7 100644
47303--- a/drivers/mtd/nftlmount.c
47304+++ b/drivers/mtd/nftlmount.c
47305@@ -24,6 +24,7 @@
47306 #include <asm/errno.h>
47307 #include <linux/delay.h>
47308 #include <linux/slab.h>
47309+#include <linux/sched.h>
47310 #include <linux/mtd/mtd.h>
47311 #include <linux/mtd/nand.h>
47312 #include <linux/mtd/nftl.h>
47313diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47314index c23184a..4115c41 100644
47315--- a/drivers/mtd/sm_ftl.c
47316+++ b/drivers/mtd/sm_ftl.c
47317@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47318 #define SM_CIS_VENDOR_OFFSET 0x59
47319 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47320 {
47321- struct attribute_group *attr_group;
47322+ attribute_group_no_const *attr_group;
47323 struct attribute **attributes;
47324 struct sm_sysfs_attribute *vendor_attribute;
47325 char *vendor;
47326diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47327index 7b11243..b3278a3 100644
47328--- a/drivers/net/bonding/bond_netlink.c
47329+++ b/drivers/net/bonding/bond_netlink.c
47330@@ -585,7 +585,7 @@ nla_put_failure:
47331 return -EMSGSIZE;
47332 }
47333
47334-struct rtnl_link_ops bond_link_ops __read_mostly = {
47335+struct rtnl_link_ops bond_link_ops = {
47336 .kind = "bond",
47337 .priv_size = sizeof(struct bonding),
47338 .setup = bond_setup,
47339diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47340index b3b922a..80bba38 100644
47341--- a/drivers/net/caif/caif_hsi.c
47342+++ b/drivers/net/caif/caif_hsi.c
47343@@ -1444,7 +1444,7 @@ err:
47344 return -ENODEV;
47345 }
47346
47347-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47348+static struct rtnl_link_ops caif_hsi_link_ops = {
47349 .kind = "cfhsi",
47350 .priv_size = sizeof(struct cfhsi),
47351 .setup = cfhsi_setup,
47352diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47353index 98d73aa..63ef9da 100644
47354--- a/drivers/net/can/Kconfig
47355+++ b/drivers/net/can/Kconfig
47356@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47357
47358 config CAN_FLEXCAN
47359 tristate "Support for Freescale FLEXCAN based chips"
47360- depends on ARM || PPC
47361+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47362 ---help---
47363 Say Y here if you want to support for Freescale FlexCAN.
47364
47365diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47366index 62ca0e8..3bed607 100644
47367--- a/drivers/net/can/dev.c
47368+++ b/drivers/net/can/dev.c
47369@@ -958,7 +958,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47370 return -EOPNOTSUPP;
47371 }
47372
47373-static struct rtnl_link_ops can_link_ops __read_mostly = {
47374+static struct rtnl_link_ops can_link_ops = {
47375 .kind = "can",
47376 .maxtype = IFLA_CAN_MAX,
47377 .policy = can_policy,
47378diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47379index 674f367..ec3a31f 100644
47380--- a/drivers/net/can/vcan.c
47381+++ b/drivers/net/can/vcan.c
47382@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47383 dev->destructor = free_netdev;
47384 }
47385
47386-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47387+static struct rtnl_link_ops vcan_link_ops = {
47388 .kind = "vcan",
47389 .setup = vcan_setup,
47390 };
47391diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47392index 49adbf1..fff7ff8 100644
47393--- a/drivers/net/dummy.c
47394+++ b/drivers/net/dummy.c
47395@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47396 return 0;
47397 }
47398
47399-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47400+static struct rtnl_link_ops dummy_link_ops = {
47401 .kind = DRV_NAME,
47402 .setup = dummy_setup,
47403 .validate = dummy_validate,
47404diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47405index 0443654..4f0aa18 100644
47406--- a/drivers/net/ethernet/8390/ax88796.c
47407+++ b/drivers/net/ethernet/8390/ax88796.c
47408@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47409 if (ax->plat->reg_offsets)
47410 ei_local->reg_offset = ax->plat->reg_offsets;
47411 else {
47412+ resource_size_t _mem_size = mem_size;
47413+ do_div(_mem_size, 0x18);
47414 ei_local->reg_offset = ax->reg_offsets;
47415 for (ret = 0; ret < 0x18; ret++)
47416- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47417+ ax->reg_offsets[ret] = _mem_size * ret;
47418 }
47419
47420 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47421diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47422index 760c72c..a99728c 100644
47423--- a/drivers/net/ethernet/altera/altera_tse_main.c
47424+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47425@@ -1217,7 +1217,7 @@ static int tse_shutdown(struct net_device *dev)
47426 return 0;
47427 }
47428
47429-static struct net_device_ops altera_tse_netdev_ops = {
47430+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47431 .ndo_open = tse_open,
47432 .ndo_stop = tse_shutdown,
47433 .ndo_start_xmit = tse_start_xmit,
47434@@ -1454,11 +1454,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47435 ndev->netdev_ops = &altera_tse_netdev_ops;
47436 altera_tse_set_ethtool_ops(ndev);
47437
47438+ pax_open_kernel();
47439 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47440
47441 if (priv->hash_filter)
47442 altera_tse_netdev_ops.ndo_set_rx_mode =
47443 tse_set_rx_mode_hashfilter;
47444+ pax_close_kernel();
47445
47446 /* Scatter/gather IO is not supported,
47447 * so it is turned off
47448diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47449index 29a0927..5a348e24 100644
47450--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47451+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47452@@ -1122,14 +1122,14 @@ do { \
47453 * operations, everything works on mask values.
47454 */
47455 #define XMDIO_READ(_pdata, _mmd, _reg) \
47456- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47457+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47458 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47459
47460 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47461 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47462
47463 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47464- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47465+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47466 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47467
47468 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47469diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47470index 8a50b01..39c1ad0 100644
47471--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47472+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47473@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47474
47475 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47476
47477- pdata->hw_if.config_dcb_tc(pdata);
47478+ pdata->hw_if->config_dcb_tc(pdata);
47479
47480 return 0;
47481 }
47482@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47483
47484 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47485
47486- pdata->hw_if.config_dcb_pfc(pdata);
47487+ pdata->hw_if->config_dcb_pfc(pdata);
47488
47489 return 0;
47490 }
47491diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47492index a50891f..b26fe24 100644
47493--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47494+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47495@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
47496
47497 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47498 {
47499- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47500+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47501 struct xgbe_channel *channel;
47502 struct xgbe_ring *ring;
47503 struct xgbe_ring_data *rdata;
47504@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47505
47506 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47507 {
47508- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47509+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47510 struct xgbe_channel *channel;
47511 struct xgbe_ring *ring;
47512 struct xgbe_ring_desc *rdesc;
47513@@ -624,7 +624,7 @@ err_out:
47514 static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
47515 {
47516 struct xgbe_prv_data *pdata = channel->pdata;
47517- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47518+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47519 struct xgbe_ring *ring = channel->rx_ring;
47520 struct xgbe_ring_data *rdata;
47521 int i;
47522@@ -650,17 +650,12 @@ static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
47523 DBGPR("<--xgbe_realloc_rx_buffer\n");
47524 }
47525
47526-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47527-{
47528- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47529-
47530- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47531- desc_if->free_ring_resources = xgbe_free_ring_resources;
47532- desc_if->map_tx_skb = xgbe_map_tx_skb;
47533- desc_if->realloc_rx_buffer = xgbe_realloc_rx_buffer;
47534- desc_if->unmap_rdata = xgbe_unmap_rdata;
47535- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47536- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47537-
47538- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47539-}
47540+const struct xgbe_desc_if default_xgbe_desc_if = {
47541+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47542+ .free_ring_resources = xgbe_free_ring_resources,
47543+ .map_tx_skb = xgbe_map_tx_skb,
47544+ .realloc_rx_buffer = xgbe_realloc_rx_buffer,
47545+ .unmap_rdata = xgbe_unmap_rdata,
47546+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47547+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47548+};
47549diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47550index 4c66cd1..1a20aab 100644
47551--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47552+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47553@@ -2703,7 +2703,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47554
47555 static int xgbe_init(struct xgbe_prv_data *pdata)
47556 {
47557- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47558+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47559 int ret;
47560
47561 DBGPR("-->xgbe_init\n");
47562@@ -2767,108 +2767,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47563 return 0;
47564 }
47565
47566-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47567-{
47568- DBGPR("-->xgbe_init_function_ptrs\n");
47569-
47570- hw_if->tx_complete = xgbe_tx_complete;
47571-
47572- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47573- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47574- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47575- hw_if->set_mac_address = xgbe_set_mac_address;
47576-
47577- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47578- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47579-
47580- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47581- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47582- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47583- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47584- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47585-
47586- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47587- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47588-
47589- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47590- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47591- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47592-
47593- hw_if->enable_tx = xgbe_enable_tx;
47594- hw_if->disable_tx = xgbe_disable_tx;
47595- hw_if->enable_rx = xgbe_enable_rx;
47596- hw_if->disable_rx = xgbe_disable_rx;
47597-
47598- hw_if->powerup_tx = xgbe_powerup_tx;
47599- hw_if->powerdown_tx = xgbe_powerdown_tx;
47600- hw_if->powerup_rx = xgbe_powerup_rx;
47601- hw_if->powerdown_rx = xgbe_powerdown_rx;
47602-
47603- hw_if->dev_xmit = xgbe_dev_xmit;
47604- hw_if->dev_read = xgbe_dev_read;
47605- hw_if->enable_int = xgbe_enable_int;
47606- hw_if->disable_int = xgbe_disable_int;
47607- hw_if->init = xgbe_init;
47608- hw_if->exit = xgbe_exit;
47609+const struct xgbe_hw_if default_xgbe_hw_if = {
47610+ .tx_complete = xgbe_tx_complete,
47611+
47612+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47613+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47614+ .add_mac_addresses = xgbe_add_mac_addresses,
47615+ .set_mac_address = xgbe_set_mac_address,
47616+
47617+ .enable_rx_csum = xgbe_enable_rx_csum,
47618+ .disable_rx_csum = xgbe_disable_rx_csum,
47619+
47620+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47621+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47622+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47623+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47624+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47625+
47626+ .read_mmd_regs = xgbe_read_mmd_regs,
47627+ .write_mmd_regs = xgbe_write_mmd_regs,
47628+
47629+ .set_gmii_speed = xgbe_set_gmii_speed,
47630+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47631+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47632+
47633+ .enable_tx = xgbe_enable_tx,
47634+ .disable_tx = xgbe_disable_tx,
47635+ .enable_rx = xgbe_enable_rx,
47636+ .disable_rx = xgbe_disable_rx,
47637+
47638+ .powerup_tx = xgbe_powerup_tx,
47639+ .powerdown_tx = xgbe_powerdown_tx,
47640+ .powerup_rx = xgbe_powerup_rx,
47641+ .powerdown_rx = xgbe_powerdown_rx,
47642+
47643+ .dev_xmit = xgbe_dev_xmit,
47644+ .dev_read = xgbe_dev_read,
47645+ .enable_int = xgbe_enable_int,
47646+ .disable_int = xgbe_disable_int,
47647+ .init = xgbe_init,
47648+ .exit = xgbe_exit,
47649
47650 /* Descriptor related Sequences have to be initialized here */
47651- hw_if->tx_desc_init = xgbe_tx_desc_init;
47652- hw_if->rx_desc_init = xgbe_rx_desc_init;
47653- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47654- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47655- hw_if->is_last_desc = xgbe_is_last_desc;
47656- hw_if->is_context_desc = xgbe_is_context_desc;
47657- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
47658+ .tx_desc_init = xgbe_tx_desc_init,
47659+ .rx_desc_init = xgbe_rx_desc_init,
47660+ .tx_desc_reset = xgbe_tx_desc_reset,
47661+ .rx_desc_reset = xgbe_rx_desc_reset,
47662+ .is_last_desc = xgbe_is_last_desc,
47663+ .is_context_desc = xgbe_is_context_desc,
47664+ .tx_start_xmit = xgbe_tx_start_xmit,
47665
47666 /* For FLOW ctrl */
47667- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47668- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47669+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47670+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47671
47672 /* For RX coalescing */
47673- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47674- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47675- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47676- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47677+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47678+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47679+ .usec_to_riwt = xgbe_usec_to_riwt,
47680+ .riwt_to_usec = xgbe_riwt_to_usec,
47681
47682 /* For RX and TX threshold config */
47683- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47684- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47685+ .config_rx_threshold = xgbe_config_rx_threshold,
47686+ .config_tx_threshold = xgbe_config_tx_threshold,
47687
47688 /* For RX and TX Store and Forward Mode config */
47689- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47690- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47691+ .config_rsf_mode = xgbe_config_rsf_mode,
47692+ .config_tsf_mode = xgbe_config_tsf_mode,
47693
47694 /* For TX DMA Operating on Second Frame config */
47695- hw_if->config_osp_mode = xgbe_config_osp_mode;
47696+ .config_osp_mode = xgbe_config_osp_mode,
47697
47698 /* For RX and TX PBL config */
47699- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47700- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47701- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47702- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47703- hw_if->config_pblx8 = xgbe_config_pblx8;
47704+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47705+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47706+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47707+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47708+ .config_pblx8 = xgbe_config_pblx8,
47709
47710 /* For MMC statistics support */
47711- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47712- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47713- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47714+ .tx_mmc_int = xgbe_tx_mmc_int,
47715+ .rx_mmc_int = xgbe_rx_mmc_int,
47716+ .read_mmc_stats = xgbe_read_mmc_stats,
47717
47718 /* For PTP config */
47719- hw_if->config_tstamp = xgbe_config_tstamp;
47720- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47721- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47722- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47723- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47724+ .config_tstamp = xgbe_config_tstamp,
47725+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47726+ .set_tstamp_time = xgbe_set_tstamp_time,
47727+ .get_tstamp_time = xgbe_get_tstamp_time,
47728+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47729
47730 /* For Data Center Bridging config */
47731- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47732- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47733+ .config_dcb_tc = xgbe_config_dcb_tc,
47734+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47735
47736 /* For Receive Side Scaling */
47737- hw_if->enable_rss = xgbe_enable_rss;
47738- hw_if->disable_rss = xgbe_disable_rss;
47739- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
47740- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
47741-
47742- DBGPR("<--xgbe_init_function_ptrs\n");
47743-}
47744+ .enable_rss = xgbe_enable_rss,
47745+ .disable_rss = xgbe_disable_rss,
47746+ .set_rss_hash_key = xgbe_set_rss_hash_key,
47747+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
47748+};
47749diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47750index e5ffb2c..e56d30b 100644
47751--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47752+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47753@@ -239,7 +239,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
47754 * support, tell it now
47755 */
47756 if (ring->tx.xmit_more)
47757- pdata->hw_if.tx_start_xmit(channel, ring);
47758+ pdata->hw_if->tx_start_xmit(channel, ring);
47759
47760 return NETDEV_TX_BUSY;
47761 }
47762@@ -267,7 +267,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47763
47764 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47765 {
47766- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47767+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47768 struct xgbe_channel *channel;
47769 enum xgbe_int int_id;
47770 unsigned int i;
47771@@ -289,7 +289,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47772
47773 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47774 {
47775- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47776+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47777 struct xgbe_channel *channel;
47778 enum xgbe_int int_id;
47779 unsigned int i;
47780@@ -312,7 +312,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47781 static irqreturn_t xgbe_isr(int irq, void *data)
47782 {
47783 struct xgbe_prv_data *pdata = data;
47784- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47785+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47786 struct xgbe_channel *channel;
47787 unsigned int dma_isr, dma_ch_isr;
47788 unsigned int mac_isr, mac_tssr;
47789@@ -611,7 +611,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47790
47791 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47792 {
47793- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47794+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47795
47796 DBGPR("-->xgbe_init_tx_coalesce\n");
47797
47798@@ -625,7 +625,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47799
47800 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47801 {
47802- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47803+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47804
47805 DBGPR("-->xgbe_init_rx_coalesce\n");
47806
47807@@ -639,7 +639,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47808
47809 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
47810 {
47811- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47812+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47813 struct xgbe_channel *channel;
47814 struct xgbe_ring *ring;
47815 struct xgbe_ring_data *rdata;
47816@@ -664,7 +664,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
47817
47818 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
47819 {
47820- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47821+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47822 struct xgbe_channel *channel;
47823 struct xgbe_ring *ring;
47824 struct xgbe_ring_data *rdata;
47825@@ -690,7 +690,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
47826 static void xgbe_adjust_link(struct net_device *netdev)
47827 {
47828 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47829- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47830+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47831 struct phy_device *phydev = pdata->phydev;
47832 int new_state = 0;
47833
47834@@ -798,7 +798,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47835 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47836 {
47837 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47838- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47839+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47840 unsigned long flags;
47841
47842 DBGPR("-->xgbe_powerdown\n");
47843@@ -836,7 +836,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47844 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47845 {
47846 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47847- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47848+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47849 unsigned long flags;
47850
47851 DBGPR("-->xgbe_powerup\n");
47852@@ -873,7 +873,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47853
47854 static int xgbe_start(struct xgbe_prv_data *pdata)
47855 {
47856- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47857+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47858 struct net_device *netdev = pdata->netdev;
47859
47860 DBGPR("-->xgbe_start\n");
47861@@ -899,7 +899,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47862
47863 static void xgbe_stop(struct xgbe_prv_data *pdata)
47864 {
47865- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47866+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47867 struct xgbe_channel *channel;
47868 struct net_device *netdev = pdata->netdev;
47869 struct netdev_queue *txq;
47870@@ -932,7 +932,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47871 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47872 {
47873 struct xgbe_channel *channel;
47874- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47875+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47876 unsigned int i;
47877
47878 DBGPR("-->xgbe_restart_dev\n");
47879@@ -1135,7 +1135,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47880 return -ERANGE;
47881 }
47882
47883- pdata->hw_if.config_tstamp(pdata, mac_tscr);
47884+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
47885
47886 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47887
47888@@ -1284,8 +1284,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47889 static int xgbe_open(struct net_device *netdev)
47890 {
47891 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47892- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47893- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47894+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47895+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47896 struct xgbe_channel *channel = NULL;
47897 unsigned int i = 0;
47898 int ret;
47899@@ -1400,8 +1400,8 @@ err_phy_init:
47900 static int xgbe_close(struct net_device *netdev)
47901 {
47902 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47903- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47904- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47905+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47906+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47907 struct xgbe_channel *channel;
47908 unsigned int i;
47909
47910@@ -1442,8 +1442,8 @@ static int xgbe_close(struct net_device *netdev)
47911 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47912 {
47913 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47914- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47915- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47916+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47917+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47918 struct xgbe_channel *channel;
47919 struct xgbe_ring *ring;
47920 struct xgbe_packet_data *packet;
47921@@ -1518,7 +1518,7 @@ tx_netdev_return:
47922 static void xgbe_set_rx_mode(struct net_device *netdev)
47923 {
47924 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47925- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47926+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47927 unsigned int pr_mode, am_mode;
47928
47929 DBGPR("-->xgbe_set_rx_mode\n");
47930@@ -1537,7 +1537,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47931 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47932 {
47933 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47934- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47935+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47936 struct sockaddr *saddr = addr;
47937
47938 DBGPR("-->xgbe_set_mac_address\n");
47939@@ -1604,7 +1604,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47940
47941 DBGPR("-->%s\n", __func__);
47942
47943- pdata->hw_if.read_mmc_stats(pdata);
47944+ pdata->hw_if->read_mmc_stats(pdata);
47945
47946 s->rx_packets = pstats->rxframecount_gb;
47947 s->rx_bytes = pstats->rxoctetcount_gb;
47948@@ -1631,7 +1631,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47949 u16 vid)
47950 {
47951 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47952- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47953+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47954
47955 DBGPR("-->%s\n", __func__);
47956
47957@@ -1647,7 +1647,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47958 u16 vid)
47959 {
47960 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47961- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47962+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47963
47964 DBGPR("-->%s\n", __func__);
47965
47966@@ -1713,7 +1713,7 @@ static int xgbe_set_features(struct net_device *netdev,
47967 netdev_features_t features)
47968 {
47969 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47970- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47971+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47972 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
47973 int ret = 0;
47974
47975@@ -1778,7 +1778,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47976 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47977 {
47978 struct xgbe_prv_data *pdata = channel->pdata;
47979- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47980+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47981 struct xgbe_ring *ring = channel->rx_ring;
47982 struct xgbe_ring_data *rdata;
47983
47984@@ -1819,8 +1819,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
47985 static int xgbe_tx_poll(struct xgbe_channel *channel)
47986 {
47987 struct xgbe_prv_data *pdata = channel->pdata;
47988- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47989- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47990+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47991+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47992 struct xgbe_ring *ring = channel->tx_ring;
47993 struct xgbe_ring_data *rdata;
47994 struct xgbe_ring_desc *rdesc;
47995@@ -1891,7 +1891,7 @@ unlock:
47996 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47997 {
47998 struct xgbe_prv_data *pdata = channel->pdata;
47999- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48000+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48001 struct xgbe_ring *ring = channel->rx_ring;
48002 struct xgbe_ring_data *rdata;
48003 struct xgbe_packet_data *packet;
48004diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48005index ebf4893..28108c7 100644
48006--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48007+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48008@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48009
48010 DBGPR("-->%s\n", __func__);
48011
48012- pdata->hw_if.read_mmc_stats(pdata);
48013+ pdata->hw_if->read_mmc_stats(pdata);
48014 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48015 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48016 *data++ = *(u64 *)stat;
48017@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48018 struct ethtool_coalesce *ec)
48019 {
48020 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48021- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48022+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48023 unsigned int riwt;
48024
48025 DBGPR("-->xgbe_get_coalesce\n");
48026@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48027 struct ethtool_coalesce *ec)
48028 {
48029 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48030- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48031+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48032 unsigned int rx_frames, rx_riwt, rx_usecs;
48033 unsigned int tx_frames, tx_usecs;
48034
48035diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48036index dbd3850..4e31b38 100644
48037--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48038+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48039@@ -155,12 +155,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48040 DBGPR("<--xgbe_default_config\n");
48041 }
48042
48043-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48044-{
48045- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48046- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48047-}
48048-
48049 static int xgbe_probe(struct platform_device *pdev)
48050 {
48051 struct xgbe_prv_data *pdata;
48052@@ -281,9 +275,8 @@ static int xgbe_probe(struct platform_device *pdev)
48053 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
48054
48055 /* Set all the function pointers */
48056- xgbe_init_all_fptrs(pdata);
48057- hw_if = &pdata->hw_if;
48058- desc_if = &pdata->desc_if;
48059+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48060+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48061
48062 /* Issue software reset to device */
48063 hw_if->exit(pdata);
48064diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48065index 363b210..b241389 100644
48066--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48067+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48068@@ -126,7 +126,7 @@
48069 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48070 {
48071 struct xgbe_prv_data *pdata = mii->priv;
48072- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48073+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48074 int mmd_data;
48075
48076 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48077@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48078 u16 mmd_val)
48079 {
48080 struct xgbe_prv_data *pdata = mii->priv;
48081- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48082+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48083 int mmd_data = mmd_val;
48084
48085 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48086diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48087index a1bf9d1c..84adcab 100644
48088--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48089+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48090@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48091 tstamp_cc);
48092 u64 nsec;
48093
48094- nsec = pdata->hw_if.get_tstamp_time(pdata);
48095+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48096
48097 return nsec;
48098 }
48099@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48100
48101 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48102
48103- pdata->hw_if.update_tstamp_addend(pdata, addend);
48104+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48105
48106 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48107
48108diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48109index f9ec762..988c969 100644
48110--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48111+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48112@@ -668,8 +668,8 @@ struct xgbe_prv_data {
48113 int dev_irq;
48114 unsigned int per_channel_irq;
48115
48116- struct xgbe_hw_if hw_if;
48117- struct xgbe_desc_if desc_if;
48118+ const struct xgbe_hw_if *hw_if;
48119+ const struct xgbe_desc_if *desc_if;
48120
48121 /* AXI DMA settings */
48122 unsigned int axdomain;
48123@@ -787,6 +787,9 @@ struct xgbe_prv_data {
48124 #endif
48125 };
48126
48127+extern const struct xgbe_hw_if default_xgbe_hw_if;
48128+extern const struct xgbe_desc_if default_xgbe_desc_if;
48129+
48130 /* Function prototypes*/
48131
48132 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48133diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48134index adcacda..fa6e0ae 100644
48135--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48136+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48137@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48138 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48139 {
48140 /* RX_MODE controlling object */
48141- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48142+ bnx2x_init_rx_mode_obj(bp);
48143
48144 /* multicast configuration controlling object */
48145 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48146diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48147index 07cdf9b..b08ecc7 100644
48148--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48149+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48150@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48151 return rc;
48152 }
48153
48154-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48155- struct bnx2x_rx_mode_obj *o)
48156+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48157 {
48158 if (CHIP_IS_E1x(bp)) {
48159- o->wait_comp = bnx2x_empty_rx_mode_wait;
48160- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48161+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48162+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48163 } else {
48164- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48165- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48166+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48167+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48168 }
48169 }
48170
48171diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48172index 86baecb..ff3bb46 100644
48173--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48174+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48175@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48176
48177 /********************* RX MODE ****************/
48178
48179-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48180- struct bnx2x_rx_mode_obj *o);
48181+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48182
48183 /**
48184 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48185diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48186index 31c9f82..e65e986 100644
48187--- a/drivers/net/ethernet/broadcom/tg3.h
48188+++ b/drivers/net/ethernet/broadcom/tg3.h
48189@@ -150,6 +150,7 @@
48190 #define CHIPREV_ID_5750_A0 0x4000
48191 #define CHIPREV_ID_5750_A1 0x4001
48192 #define CHIPREV_ID_5750_A3 0x4003
48193+#define CHIPREV_ID_5750_C1 0x4201
48194 #define CHIPREV_ID_5750_C2 0x4202
48195 #define CHIPREV_ID_5752_A0_HW 0x5000
48196 #define CHIPREV_ID_5752_A0 0x6000
48197diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48198index 903466e..b285864 100644
48199--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48200+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48201@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48202 }
48203
48204 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48205- bna_cb_ioceth_enable,
48206- bna_cb_ioceth_disable,
48207- bna_cb_ioceth_hbfail,
48208- bna_cb_ioceth_reset
48209+ .enable_cbfn = bna_cb_ioceth_enable,
48210+ .disable_cbfn = bna_cb_ioceth_disable,
48211+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48212+ .reset_cbfn = bna_cb_ioceth_reset
48213 };
48214
48215 static void bna_attr_init(struct bna_ioceth *ioceth)
48216diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48217index 8cffcdf..aadf043 100644
48218--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48219+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48220@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48221 */
48222 struct l2t_skb_cb {
48223 arp_failure_handler_func arp_failure_handler;
48224-};
48225+} __no_const;
48226
48227 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48228
48229diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48230index ccf3436..b720d77 100644
48231--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48232+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48233@@ -2277,7 +2277,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48234
48235 int i;
48236 struct adapter *ap = netdev2adap(dev);
48237- static const unsigned int *reg_ranges;
48238+ const unsigned int *reg_ranges;
48239 int arr_size = 0, buf_size = 0;
48240
48241 if (is_t4(ap->params.chip)) {
48242diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48243index badff18..e15c4ec 100644
48244--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48245+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48246@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48247 for (i=0; i<ETH_ALEN; i++) {
48248 tmp.addr[i] = dev->dev_addr[i];
48249 }
48250- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48251+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48252 break;
48253
48254 case DE4X5_SET_HWADDR: /* Set the hardware address */
48255@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48256 spin_lock_irqsave(&lp->lock, flags);
48257 memcpy(&statbuf, &lp->pktStats, ioc->len);
48258 spin_unlock_irqrestore(&lp->lock, flags);
48259- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48260+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48261 return -EFAULT;
48262 break;
48263 }
48264diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48265index d48806b..41cd80f 100644
48266--- a/drivers/net/ethernet/emulex/benet/be_main.c
48267+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48268@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48269
48270 if (wrapped)
48271 newacc += 65536;
48272- ACCESS_ONCE(*acc) = newacc;
48273+ ACCESS_ONCE_RW(*acc) = newacc;
48274 }
48275
48276 static void populate_erx_stats(struct be_adapter *adapter,
48277diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48278index 6d0c5d5..55be363 100644
48279--- a/drivers/net/ethernet/faraday/ftgmac100.c
48280+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48281@@ -30,6 +30,8 @@
48282 #include <linux/netdevice.h>
48283 #include <linux/phy.h>
48284 #include <linux/platform_device.h>
48285+#include <linux/interrupt.h>
48286+#include <linux/irqreturn.h>
48287 #include <net/ip.h>
48288
48289 #include "ftgmac100.h"
48290diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48291index dce5f7b..2433466 100644
48292--- a/drivers/net/ethernet/faraday/ftmac100.c
48293+++ b/drivers/net/ethernet/faraday/ftmac100.c
48294@@ -31,6 +31,8 @@
48295 #include <linux/module.h>
48296 #include <linux/netdevice.h>
48297 #include <linux/platform_device.h>
48298+#include <linux/interrupt.h>
48299+#include <linux/irqreturn.h>
48300
48301 #include "ftmac100.h"
48302
48303diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48304index 6d1ec92..4d5d97d 100644
48305--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48306+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48307@@ -407,7 +407,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48308 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48309
48310 /* Update the base adjustement value. */
48311- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48312+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48313 smp_mb(); /* Force the above update. */
48314 }
48315
48316diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48317index 5fd4b52..87aa34b 100644
48318--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48319+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48320@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48321 }
48322
48323 /* update the base incval used to calculate frequency adjustment */
48324- ACCESS_ONCE(adapter->base_incval) = incval;
48325+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48326 smp_mb();
48327
48328 /* need lock to prevent incorrect read while modifying cyclecounter */
48329diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48330index e3357bf..d4d5348 100644
48331--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48332+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48333@@ -466,8 +466,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48334 wmb();
48335
48336 /* we want to dirty this cache line once */
48337- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48338- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48339+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48340+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48341
48342 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48343
48344diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48345index 2bbd01f..e8baa64 100644
48346--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48347+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48348@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48349 struct __vxge_hw_fifo *fifo;
48350 struct vxge_hw_fifo_config *config;
48351 u32 txdl_size, txdl_per_memblock;
48352- struct vxge_hw_mempool_cbs fifo_mp_callback;
48353+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48354+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48355+ };
48356+
48357 struct __vxge_hw_virtualpath *vpath;
48358
48359 if ((vp == NULL) || (attr == NULL)) {
48360@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48361 goto exit;
48362 }
48363
48364- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48365-
48366 fifo->mempool =
48367 __vxge_hw_mempool_create(vpath->hldev,
48368 fifo->config->memblock_size,
48369diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48370index 2bb48d5..d1a865d 100644
48371--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48372+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48373@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48374 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48375 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48376 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48377- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48378+ pax_open_kernel();
48379+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48380+ pax_close_kernel();
48381 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48382 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48383 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48384diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48385index be7d7a6..a8983f8 100644
48386--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48387+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48388@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48389 case QLCNIC_NON_PRIV_FUNC:
48390 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48391 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48392- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48393+ pax_open_kernel();
48394+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48395+ pax_close_kernel();
48396 break;
48397 case QLCNIC_PRIV_FUNC:
48398 ahw->op_mode = QLCNIC_PRIV_FUNC;
48399 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48400- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48401+ pax_open_kernel();
48402+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48403+ pax_close_kernel();
48404 break;
48405 case QLCNIC_MGMT_FUNC:
48406 ahw->op_mode = QLCNIC_MGMT_FUNC;
48407 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48408- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48409+ pax_open_kernel();
48410+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48411+ pax_close_kernel();
48412 break;
48413 default:
48414 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48415diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48416index c9f57fb..208bdc1 100644
48417--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48418+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48419@@ -1285,7 +1285,7 @@ flash_temp:
48420 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48421 {
48422 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48423- static const struct qlcnic_dump_operations *fw_dump_ops;
48424+ const struct qlcnic_dump_operations *fw_dump_ops;
48425 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48426 u32 entry_offset, dump, no_entries, buf_offset = 0;
48427 int i, k, ops_cnt, ops_index, dump_size = 0;
48428diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48429index 2e2cf80..ebc796d 100644
48430--- a/drivers/net/ethernet/realtek/r8169.c
48431+++ b/drivers/net/ethernet/realtek/r8169.c
48432@@ -788,22 +788,22 @@ struct rtl8169_private {
48433 struct mdio_ops {
48434 void (*write)(struct rtl8169_private *, int, int);
48435 int (*read)(struct rtl8169_private *, int);
48436- } mdio_ops;
48437+ } __no_const mdio_ops;
48438
48439 struct pll_power_ops {
48440 void (*down)(struct rtl8169_private *);
48441 void (*up)(struct rtl8169_private *);
48442- } pll_power_ops;
48443+ } __no_const pll_power_ops;
48444
48445 struct jumbo_ops {
48446 void (*enable)(struct rtl8169_private *);
48447 void (*disable)(struct rtl8169_private *);
48448- } jumbo_ops;
48449+ } __no_const jumbo_ops;
48450
48451 struct csi_ops {
48452 void (*write)(struct rtl8169_private *, int, int);
48453 u32 (*read)(struct rtl8169_private *, int);
48454- } csi_ops;
48455+ } __no_const csi_ops;
48456
48457 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48458 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48459diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48460index 6b861e3..204ac86 100644
48461--- a/drivers/net/ethernet/sfc/ptp.c
48462+++ b/drivers/net/ethernet/sfc/ptp.c
48463@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48464 ptp->start.dma_addr);
48465
48466 /* Clear flag that signals MC ready */
48467- ACCESS_ONCE(*start) = 0;
48468+ ACCESS_ONCE_RW(*start) = 0;
48469 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48470 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48471 EFX_BUG_ON_PARANOID(rc);
48472diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
48473index 10b6173..b605dfd5 100644
48474--- a/drivers/net/ethernet/sfc/selftest.c
48475+++ b/drivers/net/ethernet/sfc/selftest.c
48476@@ -46,7 +46,7 @@ struct efx_loopback_payload {
48477 struct iphdr ip;
48478 struct udphdr udp;
48479 __be16 iteration;
48480- const char msg[64];
48481+ char msg[64];
48482 } __packed;
48483
48484 /* Loopback test source MAC address */
48485diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48486index 08c483b..2c4a553 100644
48487--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48488+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48489@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48490
48491 writel(value, ioaddr + MMC_CNTRL);
48492
48493- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48494- MMC_CNTRL, value);
48495+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48496+// MMC_CNTRL, value);
48497 }
48498
48499 /* To mask all all interrupts.*/
48500diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
48501index a191afc..d218a12 100644
48502--- a/drivers/net/ethernet/via/via-rhine.c
48503+++ b/drivers/net/ethernet/via/via-rhine.c
48504@@ -2513,7 +2513,7 @@ static struct platform_driver rhine_driver_platform = {
48505 }
48506 };
48507
48508-static struct dmi_system_id rhine_dmi_table[] __initdata = {
48509+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
48510 {
48511 .ident = "EPIA-M",
48512 .matches = {
48513diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48514index 384ca4f..dd7d4f9 100644
48515--- a/drivers/net/hyperv/hyperv_net.h
48516+++ b/drivers/net/hyperv/hyperv_net.h
48517@@ -171,7 +171,7 @@ struct rndis_device {
48518 enum rndis_device_state state;
48519 bool link_state;
48520 bool link_change;
48521- atomic_t new_req_id;
48522+ atomic_unchecked_t new_req_id;
48523
48524 spinlock_t request_lock;
48525 struct list_head req_list;
48526diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48527index ec0c40a..c9e42eb 100644
48528--- a/drivers/net/hyperv/rndis_filter.c
48529+++ b/drivers/net/hyperv/rndis_filter.c
48530@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48531 * template
48532 */
48533 set = &rndis_msg->msg.set_req;
48534- set->req_id = atomic_inc_return(&dev->new_req_id);
48535+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48536
48537 /* Add to the request list */
48538 spin_lock_irqsave(&dev->request_lock, flags);
48539@@ -912,7 +912,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48540
48541 /* Setup the rndis set */
48542 halt = &request->request_msg.msg.halt_req;
48543- halt->req_id = atomic_inc_return(&dev->new_req_id);
48544+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48545
48546 /* Ignore return since this msg is optional. */
48547 rndis_filter_send_request(dev, request);
48548diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48549index 34f846b..4a0d5b1 100644
48550--- a/drivers/net/ifb.c
48551+++ b/drivers/net/ifb.c
48552@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48553 return 0;
48554 }
48555
48556-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48557+static struct rtnl_link_ops ifb_link_ops = {
48558 .kind = "ifb",
48559 .priv_size = sizeof(struct ifb_private),
48560 .setup = ifb_setup,
48561diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48562index 612e073..a9f5eda 100644
48563--- a/drivers/net/macvlan.c
48564+++ b/drivers/net/macvlan.c
48565@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48566 free_nskb:
48567 kfree_skb(nskb);
48568 err:
48569- atomic_long_inc(&skb->dev->rx_dropped);
48570+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48571 }
48572
48573 static void macvlan_flush_sources(struct macvlan_port *port,
48574@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48575 int macvlan_link_register(struct rtnl_link_ops *ops)
48576 {
48577 /* common fields */
48578- ops->priv_size = sizeof(struct macvlan_dev);
48579- ops->validate = macvlan_validate;
48580- ops->maxtype = IFLA_MACVLAN_MAX;
48581- ops->policy = macvlan_policy;
48582- ops->changelink = macvlan_changelink;
48583- ops->get_size = macvlan_get_size;
48584- ops->fill_info = macvlan_fill_info;
48585+ pax_open_kernel();
48586+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48587+ *(void **)&ops->validate = macvlan_validate;
48588+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48589+ *(const void **)&ops->policy = macvlan_policy;
48590+ *(void **)&ops->changelink = macvlan_changelink;
48591+ *(void **)&ops->get_size = macvlan_get_size;
48592+ *(void **)&ops->fill_info = macvlan_fill_info;
48593+ pax_close_kernel();
48594
48595 return rtnl_link_register(ops);
48596 };
48597@@ -1545,7 +1547,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48598 return NOTIFY_DONE;
48599 }
48600
48601-static struct notifier_block macvlan_notifier_block __read_mostly = {
48602+static struct notifier_block macvlan_notifier_block = {
48603 .notifier_call = macvlan_device_event,
48604 };
48605
48606diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48607index 4d050ee..012f6dd 100644
48608--- a/drivers/net/macvtap.c
48609+++ b/drivers/net/macvtap.c
48610@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
48611 dev->tx_queue_len = TUN_READQ_SIZE;
48612 }
48613
48614-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48615+static struct rtnl_link_ops macvtap_link_ops = {
48616 .kind = "macvtap",
48617 .setup = macvtap_setup,
48618 .newlink = macvtap_newlink,
48619@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48620
48621 ret = 0;
48622 u = q->flags;
48623- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48624+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48625 put_user(u, &ifr->ifr_flags))
48626 ret = -EFAULT;
48627 macvtap_put_vlan(vlan);
48628@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48629 return NOTIFY_DONE;
48630 }
48631
48632-static struct notifier_block macvtap_notifier_block __read_mostly = {
48633+static struct notifier_block macvtap_notifier_block = {
48634 .notifier_call = macvtap_device_event,
48635 };
48636
48637diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48638index 34924df..a747360 100644
48639--- a/drivers/net/nlmon.c
48640+++ b/drivers/net/nlmon.c
48641@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48642 return 0;
48643 }
48644
48645-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48646+static struct rtnl_link_ops nlmon_link_ops = {
48647 .kind = "nlmon",
48648 .priv_size = sizeof(struct nlmon),
48649 .setup = nlmon_setup,
48650diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
48651index 3fc91e8..6c36337 100644
48652--- a/drivers/net/phy/phy_device.c
48653+++ b/drivers/net/phy/phy_device.c
48654@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
48655 * zero on success.
48656 *
48657 */
48658-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48659+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
48660 struct phy_c45_device_ids *c45_ids) {
48661 int phy_reg;
48662 int i, reg_addr;
48663@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48664 * its return value is in turn returned.
48665 *
48666 */
48667-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48668+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
48669 bool is_c45, struct phy_c45_device_ids *c45_ids)
48670 {
48671 int phy_reg;
48672@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48673 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
48674 {
48675 struct phy_c45_device_ids c45_ids = {0};
48676- u32 phy_id = 0;
48677+ int phy_id = 0;
48678 int r;
48679
48680 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
48681diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48682index af034db..1611c0b2 100644
48683--- a/drivers/net/ppp/ppp_generic.c
48684+++ b/drivers/net/ppp/ppp_generic.c
48685@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48686 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48687 struct ppp_stats stats;
48688 struct ppp_comp_stats cstats;
48689- char *vers;
48690
48691 switch (cmd) {
48692 case SIOCGPPPSTATS:
48693@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48694 break;
48695
48696 case SIOCGPPPVER:
48697- vers = PPP_VERSION;
48698- if (copy_to_user(addr, vers, strlen(vers) + 1))
48699+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48700 break;
48701 err = 0;
48702 break;
48703diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48704index 079f7ad..b2a2bfa7 100644
48705--- a/drivers/net/slip/slhc.c
48706+++ b/drivers/net/slip/slhc.c
48707@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48708 register struct tcphdr *thp;
48709 register struct iphdr *ip;
48710 register struct cstate *cs;
48711- int len, hdrlen;
48712+ long len, hdrlen;
48713 unsigned char *cp = icp;
48714
48715 /* We've got a compressed packet; read the change byte */
48716diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48717index 2c087ef..4859007 100644
48718--- a/drivers/net/team/team.c
48719+++ b/drivers/net/team/team.c
48720@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
48721 return TEAM_DEFAULT_NUM_RX_QUEUES;
48722 }
48723
48724-static struct rtnl_link_ops team_link_ops __read_mostly = {
48725+static struct rtnl_link_ops team_link_ops = {
48726 .kind = DRV_NAME,
48727 .priv_size = sizeof(struct team),
48728 .setup = team_setup,
48729@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
48730 return NOTIFY_DONE;
48731 }
48732
48733-static struct notifier_block team_notifier_block __read_mostly = {
48734+static struct notifier_block team_notifier_block = {
48735 .notifier_call = team_device_event,
48736 };
48737
48738diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48739index 9a409a8..3d44477 100644
48740--- a/drivers/net/tun.c
48741+++ b/drivers/net/tun.c
48742@@ -1425,7 +1425,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48743 return -EINVAL;
48744 }
48745
48746-static struct rtnl_link_ops tun_link_ops __read_mostly = {
48747+static struct rtnl_link_ops tun_link_ops = {
48748 .kind = DRV_NAME,
48749 .priv_size = sizeof(struct tun_struct),
48750 .setup = tun_setup,
48751@@ -1827,7 +1827,7 @@ unlock:
48752 }
48753
48754 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48755- unsigned long arg, int ifreq_len)
48756+ unsigned long arg, size_t ifreq_len)
48757 {
48758 struct tun_file *tfile = file->private_data;
48759 struct tun_struct *tun;
48760@@ -1841,6 +1841,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48761 int le;
48762 int ret;
48763
48764+ if (ifreq_len > sizeof ifr)
48765+ return -EFAULT;
48766+
48767 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48768 if (copy_from_user(&ifr, argp, ifreq_len))
48769 return -EFAULT;
48770diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48771index 9c5aa92..8cd0405 100644
48772--- a/drivers/net/usb/hso.c
48773+++ b/drivers/net/usb/hso.c
48774@@ -71,7 +71,7 @@
48775 #include <asm/byteorder.h>
48776 #include <linux/serial_core.h>
48777 #include <linux/serial.h>
48778-
48779+#include <asm/local.h>
48780
48781 #define MOD_AUTHOR "Option Wireless"
48782 #define MOD_DESCRIPTION "USB High Speed Option driver"
48783@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48784 struct urb *urb;
48785
48786 urb = serial->rx_urb[0];
48787- if (serial->port.count > 0) {
48788+ if (atomic_read(&serial->port.count) > 0) {
48789 count = put_rxbuf_data(urb, serial);
48790 if (count == -1)
48791 return;
48792@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48793 DUMP1(urb->transfer_buffer, urb->actual_length);
48794
48795 /* Anyone listening? */
48796- if (serial->port.count == 0)
48797+ if (atomic_read(&serial->port.count) == 0)
48798 return;
48799
48800 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48801@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48802 tty_port_tty_set(&serial->port, tty);
48803
48804 /* check for port already opened, if not set the termios */
48805- serial->port.count++;
48806- if (serial->port.count == 1) {
48807+ if (atomic_inc_return(&serial->port.count) == 1) {
48808 serial->rx_state = RX_IDLE;
48809 /* Force default termio settings */
48810 _hso_serial_set_termios(tty, NULL);
48811@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48812 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48813 if (result) {
48814 hso_stop_serial_device(serial->parent);
48815- serial->port.count--;
48816+ atomic_dec(&serial->port.count);
48817 kref_put(&serial->parent->ref, hso_serial_ref_free);
48818 }
48819 } else {
48820@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48821
48822 /* reset the rts and dtr */
48823 /* do the actual close */
48824- serial->port.count--;
48825+ atomic_dec(&serial->port.count);
48826
48827- if (serial->port.count <= 0) {
48828- serial->port.count = 0;
48829+ if (atomic_read(&serial->port.count) <= 0) {
48830+ atomic_set(&serial->port.count, 0);
48831 tty_port_tty_set(&serial->port, NULL);
48832 if (!usb_gone)
48833 hso_stop_serial_device(serial->parent);
48834@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48835
48836 /* the actual setup */
48837 spin_lock_irqsave(&serial->serial_lock, flags);
48838- if (serial->port.count)
48839+ if (atomic_read(&serial->port.count))
48840 _hso_serial_set_termios(tty, old);
48841 else
48842 tty->termios = *old;
48843@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48844 D1("Pending read interrupt on port %d\n", i);
48845 spin_lock(&serial->serial_lock);
48846 if (serial->rx_state == RX_IDLE &&
48847- serial->port.count > 0) {
48848+ atomic_read(&serial->port.count) > 0) {
48849 /* Setup and send a ctrl req read on
48850 * port i */
48851 if (!serial->rx_urb_filled[0]) {
48852@@ -3046,7 +3045,7 @@ static int hso_resume(struct usb_interface *iface)
48853 /* Start all serial ports */
48854 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48855 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48856- if (dev2ser(serial_table[i])->port.count) {
48857+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48858 result =
48859 hso_start_serial_device(serial_table[i], GFP_NOIO);
48860 hso_kick_transmit(dev2ser(serial_table[i]));
48861diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48862index bf405f1..fd847ee 100644
48863--- a/drivers/net/usb/r8152.c
48864+++ b/drivers/net/usb/r8152.c
48865@@ -571,7 +571,7 @@ struct r8152 {
48866 void (*unload)(struct r8152 *);
48867 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48868 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48869- } rtl_ops;
48870+ } __no_const rtl_ops;
48871
48872 int intr_interval;
48873 u32 saved_wolopts;
48874diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48875index a2515887..6d13233 100644
48876--- a/drivers/net/usb/sierra_net.c
48877+++ b/drivers/net/usb/sierra_net.c
48878@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48879 /* atomic counter partially included in MAC address to make sure 2 devices
48880 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48881 */
48882-static atomic_t iface_counter = ATOMIC_INIT(0);
48883+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48884
48885 /*
48886 * SYNC Timer Delay definition used to set the expiry time
48887@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48888 dev->net->netdev_ops = &sierra_net_device_ops;
48889
48890 /* change MAC addr to include, ifacenum, and to be unique */
48891- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48892+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48893 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48894
48895 /* we will have to manufacture ethernet headers, prepare template */
48896diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48897index 0ad6c0c..4013638 100644
48898--- a/drivers/net/virtio_net.c
48899+++ b/drivers/net/virtio_net.c
48900@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48901 #define RECEIVE_AVG_WEIGHT 64
48902
48903 /* Minimum alignment for mergeable packet buffers. */
48904-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48905+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48906
48907 #define VIRTNET_DRIVER_VERSION "1.0.0"
48908
48909diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48910index 6c83846..215144b 100644
48911--- a/drivers/net/vxlan.c
48912+++ b/drivers/net/vxlan.c
48913@@ -2702,7 +2702,7 @@ nla_put_failure:
48914 return -EMSGSIZE;
48915 }
48916
48917-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48918+static struct rtnl_link_ops vxlan_link_ops = {
48919 .kind = "vxlan",
48920 .maxtype = IFLA_VXLAN_MAX,
48921 .policy = vxlan_policy,
48922@@ -2749,7 +2749,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48923 return NOTIFY_DONE;
48924 }
48925
48926-static struct notifier_block vxlan_notifier_block __read_mostly = {
48927+static struct notifier_block vxlan_notifier_block = {
48928 .notifier_call = vxlan_lowerdev_event,
48929 };
48930
48931diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48932index 5920c99..ff2e4a5 100644
48933--- a/drivers/net/wan/lmc/lmc_media.c
48934+++ b/drivers/net/wan/lmc/lmc_media.c
48935@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48936 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48937
48938 lmc_media_t lmc_ds3_media = {
48939- lmc_ds3_init, /* special media init stuff */
48940- lmc_ds3_default, /* reset to default state */
48941- lmc_ds3_set_status, /* reset status to state provided */
48942- lmc_dummy_set_1, /* set clock source */
48943- lmc_dummy_set2_1, /* set line speed */
48944- lmc_ds3_set_100ft, /* set cable length */
48945- lmc_ds3_set_scram, /* set scrambler */
48946- lmc_ds3_get_link_status, /* get link status */
48947- lmc_dummy_set_1, /* set link status */
48948- lmc_ds3_set_crc_length, /* set CRC length */
48949- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48950- lmc_ds3_watchdog
48951+ .init = lmc_ds3_init, /* special media init stuff */
48952+ .defaults = lmc_ds3_default, /* reset to default state */
48953+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
48954+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
48955+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48956+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48957+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48958+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
48959+ .set_link_status = lmc_dummy_set_1, /* set link status */
48960+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48961+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48962+ .watchdog = lmc_ds3_watchdog
48963 };
48964
48965 lmc_media_t lmc_hssi_media = {
48966- lmc_hssi_init, /* special media init stuff */
48967- lmc_hssi_default, /* reset to default state */
48968- lmc_hssi_set_status, /* reset status to state provided */
48969- lmc_hssi_set_clock, /* set clock source */
48970- lmc_dummy_set2_1, /* set line speed */
48971- lmc_dummy_set_1, /* set cable length */
48972- lmc_dummy_set_1, /* set scrambler */
48973- lmc_hssi_get_link_status, /* get link status */
48974- lmc_hssi_set_link_status, /* set link status */
48975- lmc_hssi_set_crc_length, /* set CRC length */
48976- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48977- lmc_hssi_watchdog
48978+ .init = lmc_hssi_init, /* special media init stuff */
48979+ .defaults = lmc_hssi_default, /* reset to default state */
48980+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
48981+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48982+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48983+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48984+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48985+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
48986+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
48987+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48988+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48989+ .watchdog = lmc_hssi_watchdog
48990 };
48991
48992-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48993- lmc_ssi_default, /* reset to default state */
48994- lmc_ssi_set_status, /* reset status to state provided */
48995- lmc_ssi_set_clock, /* set clock source */
48996- lmc_ssi_set_speed, /* set line speed */
48997- lmc_dummy_set_1, /* set cable length */
48998- lmc_dummy_set_1, /* set scrambler */
48999- lmc_ssi_get_link_status, /* get link status */
49000- lmc_ssi_set_link_status, /* set link status */
49001- lmc_ssi_set_crc_length, /* set CRC length */
49002- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49003- lmc_ssi_watchdog
49004+lmc_media_t lmc_ssi_media = {
49005+ .init = lmc_ssi_init, /* special media init stuff */
49006+ .defaults = lmc_ssi_default, /* reset to default state */
49007+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49008+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49009+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49010+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49011+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49012+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49013+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49014+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49015+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49016+ .watchdog = lmc_ssi_watchdog
49017 };
49018
49019 lmc_media_t lmc_t1_media = {
49020- lmc_t1_init, /* special media init stuff */
49021- lmc_t1_default, /* reset to default state */
49022- lmc_t1_set_status, /* reset status to state provided */
49023- lmc_t1_set_clock, /* set clock source */
49024- lmc_dummy_set2_1, /* set line speed */
49025- lmc_dummy_set_1, /* set cable length */
49026- lmc_dummy_set_1, /* set scrambler */
49027- lmc_t1_get_link_status, /* get link status */
49028- lmc_dummy_set_1, /* set link status */
49029- lmc_t1_set_crc_length, /* set CRC length */
49030- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49031- lmc_t1_watchdog
49032+ .init = lmc_t1_init, /* special media init stuff */
49033+ .defaults = lmc_t1_default, /* reset to default state */
49034+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49035+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49036+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49037+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49038+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49039+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49040+ .set_link_status = lmc_dummy_set_1, /* set link status */
49041+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49042+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49043+ .watchdog = lmc_t1_watchdog
49044 };
49045
49046 static void
49047diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49048index feacc3b..5bac0de 100644
49049--- a/drivers/net/wan/z85230.c
49050+++ b/drivers/net/wan/z85230.c
49051@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49052
49053 struct z8530_irqhandler z8530_sync =
49054 {
49055- z8530_rx,
49056- z8530_tx,
49057- z8530_status
49058+ .rx = z8530_rx,
49059+ .tx = z8530_tx,
49060+ .status = z8530_status
49061 };
49062
49063 EXPORT_SYMBOL(z8530_sync);
49064@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49065 }
49066
49067 static struct z8530_irqhandler z8530_dma_sync = {
49068- z8530_dma_rx,
49069- z8530_dma_tx,
49070- z8530_dma_status
49071+ .rx = z8530_dma_rx,
49072+ .tx = z8530_dma_tx,
49073+ .status = z8530_dma_status
49074 };
49075
49076 static struct z8530_irqhandler z8530_txdma_sync = {
49077- z8530_rx,
49078- z8530_dma_tx,
49079- z8530_dma_status
49080+ .rx = z8530_rx,
49081+ .tx = z8530_dma_tx,
49082+ .status = z8530_dma_status
49083 };
49084
49085 /**
49086@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49087
49088 struct z8530_irqhandler z8530_nop=
49089 {
49090- z8530_rx_clear,
49091- z8530_tx_clear,
49092- z8530_status_clear
49093+ .rx = z8530_rx_clear,
49094+ .tx = z8530_tx_clear,
49095+ .status = z8530_status_clear
49096 };
49097
49098
49099diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49100index 0b60295..b8bfa5b 100644
49101--- a/drivers/net/wimax/i2400m/rx.c
49102+++ b/drivers/net/wimax/i2400m/rx.c
49103@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49104 if (i2400m->rx_roq == NULL)
49105 goto error_roq_alloc;
49106
49107- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49108+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49109 GFP_KERNEL);
49110 if (rd == NULL) {
49111 result = -ENOMEM;
49112diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49113index e71a2ce..2268d61 100644
49114--- a/drivers/net/wireless/airo.c
49115+++ b/drivers/net/wireless/airo.c
49116@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49117 struct airo_info *ai = dev->ml_priv;
49118 int ridcode;
49119 int enabled;
49120- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49121+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49122 unsigned char *iobuf;
49123
49124 /* Only super-user can write RIDs */
49125diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49126index da92bfa..5a9001a 100644
49127--- a/drivers/net/wireless/at76c50x-usb.c
49128+++ b/drivers/net/wireless/at76c50x-usb.c
49129@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49130 }
49131
49132 /* Convert timeout from the DFU status to jiffies */
49133-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49134+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49135 {
49136 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49137 | (s->poll_timeout[1] << 8)
49138diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49139index f1946a6..cd367fb 100644
49140--- a/drivers/net/wireless/ath/ath10k/htc.c
49141+++ b/drivers/net/wireless/ath/ath10k/htc.c
49142@@ -851,7 +851,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49143 /* registered target arrival callback from the HIF layer */
49144 int ath10k_htc_init(struct ath10k *ar)
49145 {
49146- struct ath10k_hif_cb htc_callbacks;
49147+ static struct ath10k_hif_cb htc_callbacks = {
49148+ .rx_completion = ath10k_htc_rx_completion_handler,
49149+ .tx_completion = ath10k_htc_tx_completion_handler,
49150+ };
49151 struct ath10k_htc_ep *ep = NULL;
49152 struct ath10k_htc *htc = &ar->htc;
49153
49154@@ -860,8 +863,6 @@ int ath10k_htc_init(struct ath10k *ar)
49155 ath10k_htc_reset_endpoint_states(htc);
49156
49157 /* setup HIF layer callbacks */
49158- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49159- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49160 htc->ar = ar;
49161
49162 /* Get HIF default pipe for HTC message exchange */
49163diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49164index 527179c..a890150 100644
49165--- a/drivers/net/wireless/ath/ath10k/htc.h
49166+++ b/drivers/net/wireless/ath/ath10k/htc.h
49167@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49168
49169 struct ath10k_htc_ops {
49170 void (*target_send_suspend_complete)(struct ath10k *ar);
49171-};
49172+} __no_const;
49173
49174 struct ath10k_htc_ep_ops {
49175 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49176 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49177 void (*ep_tx_credits)(struct ath10k *);
49178-};
49179+} __no_const;
49180
49181 /* service connection information */
49182 struct ath10k_htc_svc_conn_req {
49183diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49184index f816909..e56cd8b 100644
49185--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49186+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49187@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49188 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49189 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49190
49191- ACCESS_ONCE(ads->ds_link) = i->link;
49192- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49193+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49194+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49195
49196 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49197 ctl6 = SM(i->keytype, AR_EncrType);
49198@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49199
49200 if ((i->is_first || i->is_last) &&
49201 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49202- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49203+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49204 | set11nTries(i->rates, 1)
49205 | set11nTries(i->rates, 2)
49206 | set11nTries(i->rates, 3)
49207 | (i->dur_update ? AR_DurUpdateEna : 0)
49208 | SM(0, AR_BurstDur);
49209
49210- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49211+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49212 | set11nRate(i->rates, 1)
49213 | set11nRate(i->rates, 2)
49214 | set11nRate(i->rates, 3);
49215 } else {
49216- ACCESS_ONCE(ads->ds_ctl2) = 0;
49217- ACCESS_ONCE(ads->ds_ctl3) = 0;
49218+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49219+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49220 }
49221
49222 if (!i->is_first) {
49223- ACCESS_ONCE(ads->ds_ctl0) = 0;
49224- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49225- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49226+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49227+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49228+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49229 return;
49230 }
49231
49232@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49233 break;
49234 }
49235
49236- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49237+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49238 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49239 | SM(i->txpower[0], AR_XmitPower0)
49240 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49241@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49242 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49243 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49244
49245- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49246- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49247+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49248+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49249
49250 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49251 return;
49252
49253- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49254+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49255 | set11nPktDurRTSCTS(i->rates, 1);
49256
49257- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49258+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49259 | set11nPktDurRTSCTS(i->rates, 3);
49260
49261- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49262+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49263 | set11nRateFlags(i->rates, 1)
49264 | set11nRateFlags(i->rates, 2)
49265 | set11nRateFlags(i->rates, 3)
49266 | SM(i->rtscts_rate, AR_RTSCTSRate);
49267
49268- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49269- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49270- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49271+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49272+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49273+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49274 }
49275
49276 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49277diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49278index da84b70..83e4978 100644
49279--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49280+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49281@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49282 (i->qcu << AR_TxQcuNum_S) | desc_len;
49283
49284 checksum += val;
49285- ACCESS_ONCE(ads->info) = val;
49286+ ACCESS_ONCE_RW(ads->info) = val;
49287
49288 checksum += i->link;
49289- ACCESS_ONCE(ads->link) = i->link;
49290+ ACCESS_ONCE_RW(ads->link) = i->link;
49291
49292 checksum += i->buf_addr[0];
49293- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49294+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49295 checksum += i->buf_addr[1];
49296- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49297+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49298 checksum += i->buf_addr[2];
49299- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49300+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49301 checksum += i->buf_addr[3];
49302- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49303+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49304
49305 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49306- ACCESS_ONCE(ads->ctl3) = val;
49307+ ACCESS_ONCE_RW(ads->ctl3) = val;
49308 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49309- ACCESS_ONCE(ads->ctl5) = val;
49310+ ACCESS_ONCE_RW(ads->ctl5) = val;
49311 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49312- ACCESS_ONCE(ads->ctl7) = val;
49313+ ACCESS_ONCE_RW(ads->ctl7) = val;
49314 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49315- ACCESS_ONCE(ads->ctl9) = val;
49316+ ACCESS_ONCE_RW(ads->ctl9) = val;
49317
49318 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49319- ACCESS_ONCE(ads->ctl10) = checksum;
49320+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49321
49322 if (i->is_first || i->is_last) {
49323- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49324+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49325 | set11nTries(i->rates, 1)
49326 | set11nTries(i->rates, 2)
49327 | set11nTries(i->rates, 3)
49328 | (i->dur_update ? AR_DurUpdateEna : 0)
49329 | SM(0, AR_BurstDur);
49330
49331- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49332+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49333 | set11nRate(i->rates, 1)
49334 | set11nRate(i->rates, 2)
49335 | set11nRate(i->rates, 3);
49336 } else {
49337- ACCESS_ONCE(ads->ctl13) = 0;
49338- ACCESS_ONCE(ads->ctl14) = 0;
49339+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49340+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49341 }
49342
49343 ads->ctl20 = 0;
49344@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49345
49346 ctl17 = SM(i->keytype, AR_EncrType);
49347 if (!i->is_first) {
49348- ACCESS_ONCE(ads->ctl11) = 0;
49349- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49350- ACCESS_ONCE(ads->ctl15) = 0;
49351- ACCESS_ONCE(ads->ctl16) = 0;
49352- ACCESS_ONCE(ads->ctl17) = ctl17;
49353- ACCESS_ONCE(ads->ctl18) = 0;
49354- ACCESS_ONCE(ads->ctl19) = 0;
49355+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49356+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49357+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49358+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49359+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49360+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49361+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49362 return;
49363 }
49364
49365- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49366+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49367 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49368 | SM(i->txpower[0], AR_XmitPower0)
49369 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49370@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49371 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49372 ctl12 |= SM(val, AR_PAPRDChainMask);
49373
49374- ACCESS_ONCE(ads->ctl12) = ctl12;
49375- ACCESS_ONCE(ads->ctl17) = ctl17;
49376+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49377+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49378
49379- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49380+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49381 | set11nPktDurRTSCTS(i->rates, 1);
49382
49383- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49384+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49385 | set11nPktDurRTSCTS(i->rates, 3);
49386
49387- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49388+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49389 | set11nRateFlags(i->rates, 1)
49390 | set11nRateFlags(i->rates, 2)
49391 | set11nRateFlags(i->rates, 3)
49392 | SM(i->rtscts_rate, AR_RTSCTSRate);
49393
49394- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49395+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49396
49397- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49398- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49399- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49400+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49401+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49402+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49403 }
49404
49405 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49406diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49407index 1cbd335..27dfb40 100644
49408--- a/drivers/net/wireless/ath/ath9k/hw.h
49409+++ b/drivers/net/wireless/ath/ath9k/hw.h
49410@@ -640,7 +640,7 @@ struct ath_hw_private_ops {
49411
49412 /* ANI */
49413 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49414-};
49415+} __no_const;
49416
49417 /**
49418 * struct ath_spec_scan - parameters for Atheros spectral scan
49419@@ -716,7 +716,7 @@ struct ath_hw_ops {
49420 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49421 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49422 #endif
49423-};
49424+} __no_const;
49425
49426 struct ath_nf_limits {
49427 s16 max;
49428diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49429index 62b0bf4..4ae094c 100644
49430--- a/drivers/net/wireless/ath/ath9k/main.c
49431+++ b/drivers/net/wireless/ath/ath9k/main.c
49432@@ -2546,16 +2546,18 @@ void ath9k_fill_chanctx_ops(void)
49433 if (!ath9k_is_chanctx_enabled())
49434 return;
49435
49436- ath9k_ops.hw_scan = ath9k_hw_scan;
49437- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49438- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49439- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49440- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49441- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49442- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49443- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49444- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49445- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49446+ pax_open_kernel();
49447+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49448+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49449+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49450+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49451+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49452+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49453+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49454+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49455+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49456+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49457+ pax_close_kernel();
49458 }
49459
49460 #endif
49461diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49462index 058a9f2..d5cb1ba 100644
49463--- a/drivers/net/wireless/b43/phy_lp.c
49464+++ b/drivers/net/wireless/b43/phy_lp.c
49465@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49466 {
49467 struct ssb_bus *bus = dev->dev->sdev->bus;
49468
49469- static const struct b206x_channel *chandata = NULL;
49470+ const struct b206x_channel *chandata = NULL;
49471 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49472 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49473 u16 old_comm15, scale;
49474diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49475index dc1d20c..f7a4f06 100644
49476--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49477+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49478@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49479 */
49480 if (il3945_mod_params.disable_hw_scan) {
49481 D_INFO("Disabling hw_scan\n");
49482- il3945_mac_ops.hw_scan = NULL;
49483+ pax_open_kernel();
49484+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49485+ pax_close_kernel();
49486 }
49487
49488 D_INFO("*** LOAD DRIVER ***\n");
49489diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49490index 0ffb6ff..c0b7f0e 100644
49491--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49492+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49493@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49494 {
49495 struct iwl_priv *priv = file->private_data;
49496 char buf[64];
49497- int buf_size;
49498+ size_t buf_size;
49499 u32 offset, len;
49500
49501 memset(buf, 0, sizeof(buf));
49502@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49503 struct iwl_priv *priv = file->private_data;
49504
49505 char buf[8];
49506- int buf_size;
49507+ size_t buf_size;
49508 u32 reset_flag;
49509
49510 memset(buf, 0, sizeof(buf));
49511@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49512 {
49513 struct iwl_priv *priv = file->private_data;
49514 char buf[8];
49515- int buf_size;
49516+ size_t buf_size;
49517 int ht40;
49518
49519 memset(buf, 0, sizeof(buf));
49520@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49521 {
49522 struct iwl_priv *priv = file->private_data;
49523 char buf[8];
49524- int buf_size;
49525+ size_t buf_size;
49526 int value;
49527
49528 memset(buf, 0, sizeof(buf));
49529@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49530 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49531 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49532
49533-static const char *fmt_value = " %-30s %10u\n";
49534-static const char *fmt_hex = " %-30s 0x%02X\n";
49535-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49536-static const char *fmt_header =
49537+static const char fmt_value[] = " %-30s %10u\n";
49538+static const char fmt_hex[] = " %-30s 0x%02X\n";
49539+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49540+static const char fmt_header[] =
49541 "%-32s current cumulative delta max\n";
49542
49543 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49544@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49545 {
49546 struct iwl_priv *priv = file->private_data;
49547 char buf[8];
49548- int buf_size;
49549+ size_t buf_size;
49550 int clear;
49551
49552 memset(buf, 0, sizeof(buf));
49553@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49554 {
49555 struct iwl_priv *priv = file->private_data;
49556 char buf[8];
49557- int buf_size;
49558+ size_t buf_size;
49559 int trace;
49560
49561 memset(buf, 0, sizeof(buf));
49562@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49563 {
49564 struct iwl_priv *priv = file->private_data;
49565 char buf[8];
49566- int buf_size;
49567+ size_t buf_size;
49568 int missed;
49569
49570 memset(buf, 0, sizeof(buf));
49571@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49572
49573 struct iwl_priv *priv = file->private_data;
49574 char buf[8];
49575- int buf_size;
49576+ size_t buf_size;
49577 int plcp;
49578
49579 memset(buf, 0, sizeof(buf));
49580@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49581
49582 struct iwl_priv *priv = file->private_data;
49583 char buf[8];
49584- int buf_size;
49585+ size_t buf_size;
49586 int flush;
49587
49588 memset(buf, 0, sizeof(buf));
49589@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49590
49591 struct iwl_priv *priv = file->private_data;
49592 char buf[8];
49593- int buf_size;
49594+ size_t buf_size;
49595 int rts;
49596
49597 if (!priv->cfg->ht_params)
49598@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49599 {
49600 struct iwl_priv *priv = file->private_data;
49601 char buf[8];
49602- int buf_size;
49603+ size_t buf_size;
49604
49605 memset(buf, 0, sizeof(buf));
49606 buf_size = min(count, sizeof(buf) - 1);
49607@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49608 struct iwl_priv *priv = file->private_data;
49609 u32 event_log_flag;
49610 char buf[8];
49611- int buf_size;
49612+ size_t buf_size;
49613
49614 /* check that the interface is up */
49615 if (!iwl_is_ready(priv))
49616@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49617 struct iwl_priv *priv = file->private_data;
49618 char buf[8];
49619 u32 calib_disabled;
49620- int buf_size;
49621+ size_t buf_size;
49622
49623 memset(buf, 0, sizeof(buf));
49624 buf_size = min(count, sizeof(buf) - 1);
49625diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49626index 523fe0c..0d9473b 100644
49627--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49628+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49629@@ -1781,7 +1781,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49630 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49631
49632 char buf[8];
49633- int buf_size;
49634+ size_t buf_size;
49635 u32 reset_flag;
49636
49637 memset(buf, 0, sizeof(buf));
49638@@ -1802,7 +1802,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49639 {
49640 struct iwl_trans *trans = file->private_data;
49641 char buf[8];
49642- int buf_size;
49643+ size_t buf_size;
49644 int csr;
49645
49646 memset(buf, 0, sizeof(buf));
49647diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49648index ef58a88..fafa731 100644
49649--- a/drivers/net/wireless/mac80211_hwsim.c
49650+++ b/drivers/net/wireless/mac80211_hwsim.c
49651@@ -3066,20 +3066,20 @@ static int __init init_mac80211_hwsim(void)
49652 if (channels < 1)
49653 return -EINVAL;
49654
49655- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49656- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49657- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49658- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49659- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49660- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49661- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49662- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49663- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49664- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49665- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49666- mac80211_hwsim_assign_vif_chanctx;
49667- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49668- mac80211_hwsim_unassign_vif_chanctx;
49669+ pax_open_kernel();
49670+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49671+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49672+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49673+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49674+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49675+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49676+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49677+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49678+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49679+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49680+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49681+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49682+ pax_close_kernel();
49683
49684 spin_lock_init(&hwsim_radio_lock);
49685 INIT_LIST_HEAD(&hwsim_radios);
49686diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49687index 1a4facd..a2ecbbd 100644
49688--- a/drivers/net/wireless/rndis_wlan.c
49689+++ b/drivers/net/wireless/rndis_wlan.c
49690@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49691
49692 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49693
49694- if (rts_threshold < 0 || rts_threshold > 2347)
49695+ if (rts_threshold > 2347)
49696 rts_threshold = 2347;
49697
49698 tmp = cpu_to_le32(rts_threshold);
49699diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49700index 9bb398b..b0cc047 100644
49701--- a/drivers/net/wireless/rt2x00/rt2x00.h
49702+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49703@@ -375,7 +375,7 @@ struct rt2x00_intf {
49704 * for hardware which doesn't support hardware
49705 * sequence counting.
49706 */
49707- atomic_t seqno;
49708+ atomic_unchecked_t seqno;
49709 };
49710
49711 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49712diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49713index 66ff364..3ce34f7 100644
49714--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49715+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49716@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49717 * sequence counter given by mac80211.
49718 */
49719 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49720- seqno = atomic_add_return(0x10, &intf->seqno);
49721+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49722 else
49723- seqno = atomic_read(&intf->seqno);
49724+ seqno = atomic_read_unchecked(&intf->seqno);
49725
49726 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49727 hdr->seq_ctrl |= cpu_to_le16(seqno);
49728diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49729index b661f896..ddf7d2b 100644
49730--- a/drivers/net/wireless/ti/wl1251/sdio.c
49731+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49732@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49733
49734 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49735
49736- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49737- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49738+ pax_open_kernel();
49739+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49740+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49741+ pax_close_kernel();
49742
49743 wl1251_info("using dedicated interrupt line");
49744 } else {
49745- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49746- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49747+ pax_open_kernel();
49748+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49749+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49750+ pax_close_kernel();
49751
49752 wl1251_info("using SDIO interrupt");
49753 }
49754diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49755index d6d0d6d..60c23a0 100644
49756--- a/drivers/net/wireless/ti/wl12xx/main.c
49757+++ b/drivers/net/wireless/ti/wl12xx/main.c
49758@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49759 sizeof(wl->conf.mem));
49760
49761 /* read data preparation is only needed by wl127x */
49762- wl->ops->prepare_read = wl127x_prepare_read;
49763+ pax_open_kernel();
49764+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49765+ pax_close_kernel();
49766
49767 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49768 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49769@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49770 sizeof(wl->conf.mem));
49771
49772 /* read data preparation is only needed by wl127x */
49773- wl->ops->prepare_read = wl127x_prepare_read;
49774+ pax_open_kernel();
49775+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49776+ pax_close_kernel();
49777
49778 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49779 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49780diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49781index 8e56261..9140678 100644
49782--- a/drivers/net/wireless/ti/wl18xx/main.c
49783+++ b/drivers/net/wireless/ti/wl18xx/main.c
49784@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49785 }
49786
49787 if (!checksum_param) {
49788- wl18xx_ops.set_rx_csum = NULL;
49789- wl18xx_ops.init_vif = NULL;
49790+ pax_open_kernel();
49791+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
49792+ *(void **)&wl18xx_ops.init_vif = NULL;
49793+ pax_close_kernel();
49794 }
49795
49796 /* Enable 11a Band only if we have 5G antennas */
49797diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49798index a912dc0..a8225ba 100644
49799--- a/drivers/net/wireless/zd1211rw/zd_usb.c
49800+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49801@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49802 {
49803 struct zd_usb *usb = urb->context;
49804 struct zd_usb_interrupt *intr = &usb->intr;
49805- int len;
49806+ unsigned int len;
49807 u16 int_num;
49808
49809 ZD_ASSERT(in_interrupt());
49810diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49811index ce2e2cf..f81e500 100644
49812--- a/drivers/nfc/nfcwilink.c
49813+++ b/drivers/nfc/nfcwilink.c
49814@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49815
49816 static int nfcwilink_probe(struct platform_device *pdev)
49817 {
49818- static struct nfcwilink *drv;
49819+ struct nfcwilink *drv;
49820 int rc;
49821 __u32 protocols;
49822
49823diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
49824index f2596c8..50d53af 100644
49825--- a/drivers/nfc/st21nfca/st21nfca.c
49826+++ b/drivers/nfc/st21nfca/st21nfca.c
49827@@ -559,7 +559,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
49828 goto exit;
49829 }
49830
49831- gate = uid_skb->data;
49832+ memcpy(gate, uid_skb->data, uid_skb->len);
49833 *len = uid_skb->len;
49834 exit:
49835 kfree_skb(uid_skb);
49836diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
49837index 5100742..6ad4e6d 100644
49838--- a/drivers/of/fdt.c
49839+++ b/drivers/of/fdt.c
49840@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
49841 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
49842 return 0;
49843 }
49844- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
49845+ pax_open_kernel();
49846+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
49847+ pax_close_kernel();
49848 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
49849 }
49850 late_initcall(of_fdt_raw_init);
49851diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49852index d93b2b6..ae50401 100644
49853--- a/drivers/oprofile/buffer_sync.c
49854+++ b/drivers/oprofile/buffer_sync.c
49855@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49856 if (cookie == NO_COOKIE)
49857 offset = pc;
49858 if (cookie == INVALID_COOKIE) {
49859- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49860+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49861 offset = pc;
49862 }
49863 if (cookie != last_cookie) {
49864@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49865 /* add userspace sample */
49866
49867 if (!mm) {
49868- atomic_inc(&oprofile_stats.sample_lost_no_mm);
49869+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49870 return 0;
49871 }
49872
49873 cookie = lookup_dcookie(mm, s->eip, &offset);
49874
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 return 0;
49879 }
49880
49881@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49882 /* ignore backtraces if failed to add a sample */
49883 if (state == sb_bt_start) {
49884 state = sb_bt_ignore;
49885- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49886+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49887 }
49888 }
49889 release_mm(mm);
49890diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49891index c0cc4e7..44d4e54 100644
49892--- a/drivers/oprofile/event_buffer.c
49893+++ b/drivers/oprofile/event_buffer.c
49894@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49895 }
49896
49897 if (buffer_pos == buffer_size) {
49898- atomic_inc(&oprofile_stats.event_lost_overflow);
49899+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49900 return;
49901 }
49902
49903diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49904index ed2c3ec..deda85a 100644
49905--- a/drivers/oprofile/oprof.c
49906+++ b/drivers/oprofile/oprof.c
49907@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49908 if (oprofile_ops.switch_events())
49909 return;
49910
49911- atomic_inc(&oprofile_stats.multiplex_counter);
49912+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49913 start_switch_worker();
49914 }
49915
49916diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49917index ee2cfce..7f8f699 100644
49918--- a/drivers/oprofile/oprofile_files.c
49919+++ b/drivers/oprofile/oprofile_files.c
49920@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49921
49922 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49923
49924-static ssize_t timeout_read(struct file *file, char __user *buf,
49925+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49926 size_t count, loff_t *offset)
49927 {
49928 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49929diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49930index 59659ce..6c860a0 100644
49931--- a/drivers/oprofile/oprofile_stats.c
49932+++ b/drivers/oprofile/oprofile_stats.c
49933@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49934 cpu_buf->sample_invalid_eip = 0;
49935 }
49936
49937- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49938- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49939- atomic_set(&oprofile_stats.event_lost_overflow, 0);
49940- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49941- atomic_set(&oprofile_stats.multiplex_counter, 0);
49942+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49943+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49944+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49945+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49946+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49947 }
49948
49949
49950diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49951index 1fc622b..8c48fc3 100644
49952--- a/drivers/oprofile/oprofile_stats.h
49953+++ b/drivers/oprofile/oprofile_stats.h
49954@@ -13,11 +13,11 @@
49955 #include <linux/atomic.h>
49956
49957 struct oprofile_stat_struct {
49958- atomic_t sample_lost_no_mm;
49959- atomic_t sample_lost_no_mapping;
49960- atomic_t bt_lost_no_mapping;
49961- atomic_t event_lost_overflow;
49962- atomic_t multiplex_counter;
49963+ atomic_unchecked_t sample_lost_no_mm;
49964+ atomic_unchecked_t sample_lost_no_mapping;
49965+ atomic_unchecked_t bt_lost_no_mapping;
49966+ atomic_unchecked_t event_lost_overflow;
49967+ atomic_unchecked_t multiplex_counter;
49968 };
49969
49970 extern struct oprofile_stat_struct oprofile_stats;
49971diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49972index 3f49345..c750d0b 100644
49973--- a/drivers/oprofile/oprofilefs.c
49974+++ b/drivers/oprofile/oprofilefs.c
49975@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49976
49977 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49978 {
49979- atomic_t *val = file->private_data;
49980- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49981+ atomic_unchecked_t *val = file->private_data;
49982+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49983 }
49984
49985
49986@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49987
49988
49989 int oprofilefs_create_ro_atomic(struct dentry *root,
49990- char const *name, atomic_t *val)
49991+ char const *name, atomic_unchecked_t *val)
49992 {
49993 return __oprofilefs_create_file(root, name,
49994 &atomic_ro_fops, 0444, val);
49995diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49996index bdef916..88c7dee 100644
49997--- a/drivers/oprofile/timer_int.c
49998+++ b/drivers/oprofile/timer_int.c
49999@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50000 return NOTIFY_OK;
50001 }
50002
50003-static struct notifier_block __refdata oprofile_cpu_notifier = {
50004+static struct notifier_block oprofile_cpu_notifier = {
50005 .notifier_call = oprofile_cpu_notify,
50006 };
50007
50008diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50009index 3b47080..6cd05dd 100644
50010--- a/drivers/parport/procfs.c
50011+++ b/drivers/parport/procfs.c
50012@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50013
50014 *ppos += len;
50015
50016- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50017+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50018 }
50019
50020 #ifdef CONFIG_PARPORT_1284
50021@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50022
50023 *ppos += len;
50024
50025- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50026+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50027 }
50028 #endif /* IEEE1284.3 support. */
50029
50030diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50031index 6ca2399..68d866b 100644
50032--- a/drivers/pci/hotplug/acpiphp_ibm.c
50033+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50034@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50035 goto init_cleanup;
50036 }
50037
50038- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50039+ pax_open_kernel();
50040+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50041+ pax_close_kernel();
50042 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50043
50044 return retval;
50045diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50046index 66b7bbe..26bee78 100644
50047--- a/drivers/pci/hotplug/cpcihp_generic.c
50048+++ b/drivers/pci/hotplug/cpcihp_generic.c
50049@@ -73,7 +73,6 @@ static u16 port;
50050 static unsigned int enum_bit;
50051 static u8 enum_mask;
50052
50053-static struct cpci_hp_controller_ops generic_hpc_ops;
50054 static struct cpci_hp_controller generic_hpc;
50055
50056 static int __init validate_parameters(void)
50057@@ -139,6 +138,10 @@ static int query_enum(void)
50058 return ((value & enum_mask) == enum_mask);
50059 }
50060
50061+static struct cpci_hp_controller_ops generic_hpc_ops = {
50062+ .query_enum = query_enum,
50063+};
50064+
50065 static int __init cpcihp_generic_init(void)
50066 {
50067 int status;
50068@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50069 pci_dev_put(dev);
50070
50071 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50072- generic_hpc_ops.query_enum = query_enum;
50073 generic_hpc.ops = &generic_hpc_ops;
50074
50075 status = cpci_hp_register_controller(&generic_hpc);
50076diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50077index 7ecf34e..effed62 100644
50078--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50079+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50080@@ -59,7 +59,6 @@
50081 /* local variables */
50082 static bool debug;
50083 static bool poll;
50084-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50085 static struct cpci_hp_controller zt5550_hpc;
50086
50087 /* Primary cPCI bus bridge device */
50088@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50089 return 0;
50090 }
50091
50092+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50093+ .query_enum = zt5550_hc_query_enum,
50094+};
50095+
50096 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50097 {
50098 int status;
50099@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50100 dbg("returned from zt5550_hc_config");
50101
50102 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50103- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50104 zt5550_hpc.ops = &zt5550_hpc_ops;
50105 if (!poll) {
50106 zt5550_hpc.irq = hc_dev->irq;
50107 zt5550_hpc.irq_flags = IRQF_SHARED;
50108 zt5550_hpc.dev_id = hc_dev;
50109
50110- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50111- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50112- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50113+ pax_open_kernel();
50114+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50115+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50116+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50117+ pax_open_kernel();
50118 } else {
50119 info("using ENUM# polling mode");
50120 }
50121diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50122index 1e08ff8c..3cd145f 100644
50123--- a/drivers/pci/hotplug/cpqphp_nvram.c
50124+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50125@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50126
50127 void compaq_nvram_init (void __iomem *rom_start)
50128 {
50129+#ifndef CONFIG_PAX_KERNEXEC
50130 if (rom_start)
50131 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50132+#endif
50133
50134 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50135
50136diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50137index 56d8486..f26113f 100644
50138--- a/drivers/pci/hotplug/pci_hotplug_core.c
50139+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50140@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50141 return -EINVAL;
50142 }
50143
50144- slot->ops->owner = owner;
50145- slot->ops->mod_name = mod_name;
50146+ pax_open_kernel();
50147+ *(struct module **)&slot->ops->owner = owner;
50148+ *(const char **)&slot->ops->mod_name = mod_name;
50149+ pax_close_kernel();
50150
50151 mutex_lock(&pci_hp_mutex);
50152 /*
50153diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50154index 07aa722..84514b4 100644
50155--- a/drivers/pci/hotplug/pciehp_core.c
50156+++ b/drivers/pci/hotplug/pciehp_core.c
50157@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50158 struct slot *slot = ctrl->slot;
50159 struct hotplug_slot *hotplug = NULL;
50160 struct hotplug_slot_info *info = NULL;
50161- struct hotplug_slot_ops *ops = NULL;
50162+ hotplug_slot_ops_no_const *ops = NULL;
50163 char name[SLOT_NAME_SIZE];
50164 int retval = -ENOMEM;
50165
50166diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50167index fd60806..ab6c565 100644
50168--- a/drivers/pci/msi.c
50169+++ b/drivers/pci/msi.c
50170@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
50171 {
50172 struct attribute **msi_attrs;
50173 struct attribute *msi_attr;
50174- struct device_attribute *msi_dev_attr;
50175- struct attribute_group *msi_irq_group;
50176+ device_attribute_no_const *msi_dev_attr;
50177+ attribute_group_no_const *msi_irq_group;
50178 const struct attribute_group **msi_irq_groups;
50179 struct msi_desc *entry;
50180 int ret = -ENOMEM;
50181@@ -573,7 +573,7 @@ error_attrs:
50182 count = 0;
50183 msi_attr = msi_attrs[count];
50184 while (msi_attr) {
50185- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
50186+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
50187 kfree(msi_attr->name);
50188 kfree(msi_dev_attr);
50189 ++count;
50190diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
50191index 312f23a..d21181c 100644
50192--- a/drivers/pci/pci-sysfs.c
50193+++ b/drivers/pci/pci-sysfs.c
50194@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50195 {
50196 /* allocate attribute structure, piggyback attribute name */
50197 int name_len = write_combine ? 13 : 10;
50198- struct bin_attribute *res_attr;
50199+ bin_attribute_no_const *res_attr;
50200 int retval;
50201
50202 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50203@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50204 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50205 {
50206 int retval;
50207- struct bin_attribute *attr;
50208+ bin_attribute_no_const *attr;
50209
50210 /* If the device has VPD, try to expose it in sysfs. */
50211 if (dev->vpd) {
50212@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50213 {
50214 int retval;
50215 int rom_size = 0;
50216- struct bin_attribute *attr;
50217+ bin_attribute_no_const *attr;
50218
50219 if (!sysfs_initialized)
50220 return -EACCES;
50221diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50222index d54632a..198c84d 100644
50223--- a/drivers/pci/pci.h
50224+++ b/drivers/pci/pci.h
50225@@ -93,7 +93,7 @@ struct pci_vpd_ops {
50226 struct pci_vpd {
50227 unsigned int len;
50228 const struct pci_vpd_ops *ops;
50229- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50230+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50231 };
50232
50233 int pci_vpd_pci22_init(struct pci_dev *dev);
50234diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50235index e1e7026..d28dd33 100644
50236--- a/drivers/pci/pcie/aspm.c
50237+++ b/drivers/pci/pcie/aspm.c
50238@@ -27,9 +27,9 @@
50239 #define MODULE_PARAM_PREFIX "pcie_aspm."
50240
50241 /* Note: those are not register definitions */
50242-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50243-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50244-#define ASPM_STATE_L1 (4) /* L1 state */
50245+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50246+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50247+#define ASPM_STATE_L1 (4U) /* L1 state */
50248 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50249 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50250
50251diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
50252index be35da2..ec16cdb 100644
50253--- a/drivers/pci/pcie/portdrv_pci.c
50254+++ b/drivers/pci/pcie/portdrv_pci.c
50255@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
50256 return 0;
50257 }
50258
50259-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
50260+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
50261 /*
50262 * Boxes that should not use MSI for PCIe PME signaling.
50263 */
50264diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50265index 23212f8..65e945b 100644
50266--- a/drivers/pci/probe.c
50267+++ b/drivers/pci/probe.c
50268@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50269 u16 orig_cmd;
50270 struct pci_bus_region region, inverted_region;
50271
50272- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50273+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50274
50275 /* No printks while decoding is disabled! */
50276 if (!dev->mmio_always_on) {
50277diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50278index 3f155e7..0f4b1f0 100644
50279--- a/drivers/pci/proc.c
50280+++ b/drivers/pci/proc.c
50281@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50282 static int __init pci_proc_init(void)
50283 {
50284 struct pci_dev *dev = NULL;
50285+
50286+#ifdef CONFIG_GRKERNSEC_PROC_ADD
50287+#ifdef CONFIG_GRKERNSEC_PROC_USER
50288+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50289+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50290+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50291+#endif
50292+#else
50293 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
50294+#endif
50295 proc_create("devices", 0, proc_bus_pci_dir,
50296 &proc_bus_pci_dev_operations);
50297 proc_initialized = 1;
50298diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
50299index b84fdd6..b89d829 100644
50300--- a/drivers/platform/chrome/chromeos_laptop.c
50301+++ b/drivers/platform/chrome/chromeos_laptop.c
50302@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50303 .callback = chromeos_laptop_dmi_matched, \
50304 .driver_data = (void *)&board_
50305
50306-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50307+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50308 {
50309 .ident = "Samsung Series 5 550",
50310 .matches = {
50311diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
50312index 3474920..acc9581 100644
50313--- a/drivers/platform/chrome/chromeos_pstore.c
50314+++ b/drivers/platform/chrome/chromeos_pstore.c
50315@@ -13,7 +13,7 @@
50316 #include <linux/platform_device.h>
50317 #include <linux/pstore_ram.h>
50318
50319-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
50320+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
50321 {
50322 /*
50323 * Today all Chromebooks/boxes ship with Google_* as version and
50324diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50325index 1e1e594..8fe59c5 100644
50326--- a/drivers/platform/x86/alienware-wmi.c
50327+++ b/drivers/platform/x86/alienware-wmi.c
50328@@ -150,7 +150,7 @@ struct wmax_led_args {
50329 } __packed;
50330
50331 static struct platform_device *platform_device;
50332-static struct device_attribute *zone_dev_attrs;
50333+static device_attribute_no_const *zone_dev_attrs;
50334 static struct attribute **zone_attrs;
50335 static struct platform_zone *zone_data;
50336
50337@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
50338 }
50339 };
50340
50341-static struct attribute_group zone_attribute_group = {
50342+static attribute_group_no_const zone_attribute_group = {
50343 .name = "rgb_zones",
50344 };
50345
50346diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50347index 7543a56..367ca8ed 100644
50348--- a/drivers/platform/x86/asus-wmi.c
50349+++ b/drivers/platform/x86/asus-wmi.c
50350@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
50351 int err;
50352 u32 retval = -1;
50353
50354+#ifdef CONFIG_GRKERNSEC_KMEM
50355+ return -EPERM;
50356+#endif
50357+
50358 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50359
50360 if (err < 0)
50361@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
50362 int err;
50363 u32 retval = -1;
50364
50365+#ifdef CONFIG_GRKERNSEC_KMEM
50366+ return -EPERM;
50367+#endif
50368+
50369 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50370 &retval);
50371
50372@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
50373 union acpi_object *obj;
50374 acpi_status status;
50375
50376+#ifdef CONFIG_GRKERNSEC_KMEM
50377+ return -EPERM;
50378+#endif
50379+
50380 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50381 1, asus->debug.method_id,
50382 &input, &output);
50383diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
50384index 15c0fab..f674006 100644
50385--- a/drivers/platform/x86/compal-laptop.c
50386+++ b/drivers/platform/x86/compal-laptop.c
50387@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
50388 return 1;
50389 }
50390
50391-static struct dmi_system_id __initdata compal_dmi_table[] = {
50392+static const struct dmi_system_id __initconst compal_dmi_table[] = {
50393 {
50394 .ident = "FL90/IFL90",
50395 .matches = {
50396diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
50397index 458e6c9..089aee7 100644
50398--- a/drivers/platform/x86/hdaps.c
50399+++ b/drivers/platform/x86/hdaps.c
50400@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
50401 "ThinkPad T42p", so the order of the entries matters.
50402 If your ThinkPad is not recognized, please update to latest
50403 BIOS. This is especially the case for some R52 ThinkPads. */
50404-static struct dmi_system_id __initdata hdaps_whitelist[] = {
50405+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
50406 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
50407 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
50408 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
50409diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
50410index 97c2be1..2ee50ce 100644
50411--- a/drivers/platform/x86/ibm_rtl.c
50412+++ b/drivers/platform/x86/ibm_rtl.c
50413@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
50414 }
50415
50416
50417-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
50418+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
50419 { \
50420 .matches = { \
50421 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
50422diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
50423index a4a4258..a58a04c 100644
50424--- a/drivers/platform/x86/intel_oaktrail.c
50425+++ b/drivers/platform/x86/intel_oaktrail.c
50426@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
50427 return 0;
50428 }
50429
50430-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
50431+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
50432 {
50433 .ident = "OakTrail platform",
50434 .matches = {
50435diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50436index 0859877..59d596d 100644
50437--- a/drivers/platform/x86/msi-laptop.c
50438+++ b/drivers/platform/x86/msi-laptop.c
50439@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
50440 return 1;
50441 }
50442
50443-static struct dmi_system_id __initdata msi_dmi_table[] = {
50444+static const struct dmi_system_id __initconst msi_dmi_table[] = {
50445 {
50446 .ident = "MSI S270",
50447 .matches = {
50448@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50449
50450 if (!quirks->ec_read_only) {
50451 /* allow userland write sysfs file */
50452- dev_attr_bluetooth.store = store_bluetooth;
50453- dev_attr_wlan.store = store_wlan;
50454- dev_attr_threeg.store = store_threeg;
50455- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50456- dev_attr_wlan.attr.mode |= S_IWUSR;
50457- dev_attr_threeg.attr.mode |= S_IWUSR;
50458+ pax_open_kernel();
50459+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50460+ *(void **)&dev_attr_wlan.store = store_wlan;
50461+ *(void **)&dev_attr_threeg.store = store_threeg;
50462+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50463+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50464+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50465+ pax_close_kernel();
50466 }
50467
50468 /* disable hardware control by fn key */
50469diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50470index 6d2bac0..ec2b029 100644
50471--- a/drivers/platform/x86/msi-wmi.c
50472+++ b/drivers/platform/x86/msi-wmi.c
50473@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50474 static void msi_wmi_notify(u32 value, void *context)
50475 {
50476 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50477- static struct key_entry *key;
50478+ struct key_entry *key;
50479 union acpi_object *obj;
50480 acpi_status status;
50481
50482diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
50483index ce364a4..5074643 100644
50484--- a/drivers/platform/x86/samsung-laptop.c
50485+++ b/drivers/platform/x86/samsung-laptop.c
50486@@ -1465,7 +1465,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
50487 return 0;
50488 }
50489
50490-static struct dmi_system_id __initdata samsung_dmi_table[] = {
50491+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
50492 {
50493 .matches = {
50494 DMI_MATCH(DMI_SYS_VENDOR,
50495diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
50496index e6aac72..e11ff24 100644
50497--- a/drivers/platform/x86/samsung-q10.c
50498+++ b/drivers/platform/x86/samsung-q10.c
50499@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
50500 return 1;
50501 }
50502
50503-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
50504+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
50505 {
50506 .ident = "Samsung Q10",
50507 .matches = {
50508diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50509index 6dd1c0e..78b9f0a 100644
50510--- a/drivers/platform/x86/sony-laptop.c
50511+++ b/drivers/platform/x86/sony-laptop.c
50512@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50513 }
50514
50515 /* High speed charging function */
50516-static struct device_attribute *hsc_handle;
50517+static device_attribute_no_const *hsc_handle;
50518
50519 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50520 struct device_attribute *attr,
50521@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50522 }
50523
50524 /* low battery function */
50525-static struct device_attribute *lowbatt_handle;
50526+static device_attribute_no_const *lowbatt_handle;
50527
50528 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50529 struct device_attribute *attr,
50530@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50531 }
50532
50533 /* fan speed function */
50534-static struct device_attribute *fan_handle, *hsf_handle;
50535+static device_attribute_no_const *fan_handle, *hsf_handle;
50536
50537 static ssize_t sony_nc_hsfan_store(struct device *dev,
50538 struct device_attribute *attr,
50539@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50540 }
50541
50542 /* USB charge function */
50543-static struct device_attribute *uc_handle;
50544+static device_attribute_no_const *uc_handle;
50545
50546 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50547 struct device_attribute *attr,
50548@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50549 }
50550
50551 /* Panel ID function */
50552-static struct device_attribute *panel_handle;
50553+static device_attribute_no_const *panel_handle;
50554
50555 static ssize_t sony_nc_panelid_show(struct device *dev,
50556 struct device_attribute *attr, char *buffer)
50557@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50558 }
50559
50560 /* smart connect function */
50561-static struct device_attribute *sc_handle;
50562+static device_attribute_no_const *sc_handle;
50563
50564 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50565 struct device_attribute *attr,
50566@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
50567 .drv.pm = &sony_pic_pm,
50568 };
50569
50570-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
50571+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
50572 {
50573 .ident = "Sony Vaio",
50574 .matches = {
50575diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50576index c3d11fa..f83cded 100644
50577--- a/drivers/platform/x86/thinkpad_acpi.c
50578+++ b/drivers/platform/x86/thinkpad_acpi.c
50579@@ -2092,7 +2092,7 @@ static int hotkey_mask_get(void)
50580 return 0;
50581 }
50582
50583-void static hotkey_mask_warn_incomplete_mask(void)
50584+static void hotkey_mask_warn_incomplete_mask(void)
50585 {
50586 /* log only what the user can fix... */
50587 const u32 wantedmask = hotkey_driver_mask &
50588@@ -2436,10 +2436,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50589 && !tp_features.bright_unkfw)
50590 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50591 }
50592+}
50593
50594 #undef TPACPI_COMPARE_KEY
50595 #undef TPACPI_MAY_SEND_KEY
50596-}
50597
50598 /*
50599 * Polling driver
50600diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50601index 438d4c7..ca8a2fb 100644
50602--- a/drivers/pnp/pnpbios/bioscalls.c
50603+++ b/drivers/pnp/pnpbios/bioscalls.c
50604@@ -59,7 +59,7 @@ do { \
50605 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50606 } while(0)
50607
50608-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50609+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50610 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50611
50612 /*
50613@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50614
50615 cpu = get_cpu();
50616 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50617+
50618+ pax_open_kernel();
50619 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50620+ pax_close_kernel();
50621
50622 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50623 spin_lock_irqsave(&pnp_bios_lock, flags);
50624@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50625 :"memory");
50626 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50627
50628+ pax_open_kernel();
50629 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50630+ pax_close_kernel();
50631+
50632 put_cpu();
50633
50634 /* If we get here and this is set then the PnP BIOS faulted on us. */
50635@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50636 return status;
50637 }
50638
50639-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50640+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50641 {
50642 int i;
50643
50644@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50645 pnp_bios_callpoint.offset = header->fields.pm16offset;
50646 pnp_bios_callpoint.segment = PNP_CS16;
50647
50648+ pax_open_kernel();
50649+
50650 for_each_possible_cpu(i) {
50651 struct desc_struct *gdt = get_cpu_gdt_table(i);
50652 if (!gdt)
50653@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50654 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50655 (unsigned long)__va(header->fields.pm16dseg));
50656 }
50657+
50658+ pax_close_kernel();
50659 }
50660diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
50661index 074569e..d807bef 100644
50662--- a/drivers/pnp/pnpbios/core.c
50663+++ b/drivers/pnp/pnpbios/core.c
50664@@ -493,7 +493,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
50665 return 0;
50666 }
50667
50668-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
50669+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
50670 { /* PnPBIOS GPF on boot */
50671 .callback = exploding_pnp_bios,
50672 .ident = "Higraded P14H",
50673diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50674index 0c52e2a..3421ab7 100644
50675--- a/drivers/power/pda_power.c
50676+++ b/drivers/power/pda_power.c
50677@@ -37,7 +37,11 @@ static int polling;
50678
50679 #if IS_ENABLED(CONFIG_USB_PHY)
50680 static struct usb_phy *transceiver;
50681-static struct notifier_block otg_nb;
50682+static int otg_handle_notification(struct notifier_block *nb,
50683+ unsigned long event, void *unused);
50684+static struct notifier_block otg_nb = {
50685+ .notifier_call = otg_handle_notification
50686+};
50687 #endif
50688
50689 static struct regulator *ac_draw;
50690@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50691
50692 #if IS_ENABLED(CONFIG_USB_PHY)
50693 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50694- otg_nb.notifier_call = otg_handle_notification;
50695 ret = usb_register_notifier(transceiver, &otg_nb);
50696 if (ret) {
50697 dev_err(dev, "failure to register otg notifier\n");
50698diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50699index cc439fd..8fa30df 100644
50700--- a/drivers/power/power_supply.h
50701+++ b/drivers/power/power_supply.h
50702@@ -16,12 +16,12 @@ struct power_supply;
50703
50704 #ifdef CONFIG_SYSFS
50705
50706-extern void power_supply_init_attrs(struct device_type *dev_type);
50707+extern void power_supply_init_attrs(void);
50708 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50709
50710 #else
50711
50712-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50713+static inline void power_supply_init_attrs(void) {}
50714 #define power_supply_uevent NULL
50715
50716 #endif /* CONFIG_SYSFS */
50717diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50718index 694e8cd..9f03483 100644
50719--- a/drivers/power/power_supply_core.c
50720+++ b/drivers/power/power_supply_core.c
50721@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50722 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50723 EXPORT_SYMBOL_GPL(power_supply_notifier);
50724
50725-static struct device_type power_supply_dev_type;
50726+extern const struct attribute_group *power_supply_attr_groups[];
50727+static struct device_type power_supply_dev_type = {
50728+ .groups = power_supply_attr_groups,
50729+};
50730
50731 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50732 struct power_supply *supply)
50733@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50734 return PTR_ERR(power_supply_class);
50735
50736 power_supply_class->dev_uevent = power_supply_uevent;
50737- power_supply_init_attrs(&power_supply_dev_type);
50738+ power_supply_init_attrs();
50739
50740 return 0;
50741 }
50742diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50743index 62653f5..d0bb485 100644
50744--- a/drivers/power/power_supply_sysfs.c
50745+++ b/drivers/power/power_supply_sysfs.c
50746@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50747 .is_visible = power_supply_attr_is_visible,
50748 };
50749
50750-static const struct attribute_group *power_supply_attr_groups[] = {
50751+const struct attribute_group *power_supply_attr_groups[] = {
50752 &power_supply_attr_group,
50753 NULL,
50754 };
50755
50756-void power_supply_init_attrs(struct device_type *dev_type)
50757+void power_supply_init_attrs(void)
50758 {
50759 int i;
50760
50761- dev_type->groups = power_supply_attr_groups;
50762-
50763 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50764 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50765 }
50766diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50767index 84419af..268ede8 100644
50768--- a/drivers/powercap/powercap_sys.c
50769+++ b/drivers/powercap/powercap_sys.c
50770@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50771 struct device_attribute name_attr;
50772 };
50773
50774+static ssize_t show_constraint_name(struct device *dev,
50775+ struct device_attribute *dev_attr,
50776+ char *buf);
50777+
50778 static struct powercap_constraint_attr
50779- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50780+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50781+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50782+ .power_limit_attr = {
50783+ .attr = {
50784+ .name = NULL,
50785+ .mode = S_IWUSR | S_IRUGO
50786+ },
50787+ .show = show_constraint_power_limit_uw,
50788+ .store = store_constraint_power_limit_uw
50789+ },
50790+
50791+ .time_window_attr = {
50792+ .attr = {
50793+ .name = NULL,
50794+ .mode = S_IWUSR | S_IRUGO
50795+ },
50796+ .show = show_constraint_time_window_us,
50797+ .store = store_constraint_time_window_us
50798+ },
50799+
50800+ .max_power_attr = {
50801+ .attr = {
50802+ .name = NULL,
50803+ .mode = S_IRUGO
50804+ },
50805+ .show = show_constraint_max_power_uw,
50806+ .store = NULL
50807+ },
50808+
50809+ .min_power_attr = {
50810+ .attr = {
50811+ .name = NULL,
50812+ .mode = S_IRUGO
50813+ },
50814+ .show = show_constraint_min_power_uw,
50815+ .store = NULL
50816+ },
50817+
50818+ .max_time_window_attr = {
50819+ .attr = {
50820+ .name = NULL,
50821+ .mode = S_IRUGO
50822+ },
50823+ .show = show_constraint_max_time_window_us,
50824+ .store = NULL
50825+ },
50826+
50827+ .min_time_window_attr = {
50828+ .attr = {
50829+ .name = NULL,
50830+ .mode = S_IRUGO
50831+ },
50832+ .show = show_constraint_min_time_window_us,
50833+ .store = NULL
50834+ },
50835+
50836+ .name_attr = {
50837+ .attr = {
50838+ .name = NULL,
50839+ .mode = S_IRUGO
50840+ },
50841+ .show = show_constraint_name,
50842+ .store = NULL
50843+ }
50844+ }
50845+};
50846
50847 /* A list of powercap control_types */
50848 static LIST_HEAD(powercap_cntrl_list);
50849@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50850 }
50851
50852 static int create_constraint_attribute(int id, const char *name,
50853- int mode,
50854- struct device_attribute *dev_attr,
50855- ssize_t (*show)(struct device *,
50856- struct device_attribute *, char *),
50857- ssize_t (*store)(struct device *,
50858- struct device_attribute *,
50859- const char *, size_t)
50860- )
50861+ struct device_attribute *dev_attr)
50862 {
50863+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50864
50865- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50866- id, name);
50867- if (!dev_attr->attr.name)
50868+ if (!name)
50869 return -ENOMEM;
50870- dev_attr->attr.mode = mode;
50871- dev_attr->show = show;
50872- dev_attr->store = store;
50873+
50874+ pax_open_kernel();
50875+ *(const char **)&dev_attr->attr.name = name;
50876+ pax_close_kernel();
50877
50878 return 0;
50879 }
50880@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50881
50882 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50883 ret = create_constraint_attribute(i, "power_limit_uw",
50884- S_IWUSR | S_IRUGO,
50885- &constraint_attrs[i].power_limit_attr,
50886- show_constraint_power_limit_uw,
50887- store_constraint_power_limit_uw);
50888+ &constraint_attrs[i].power_limit_attr);
50889 if (ret)
50890 goto err_alloc;
50891 ret = create_constraint_attribute(i, "time_window_us",
50892- S_IWUSR | S_IRUGO,
50893- &constraint_attrs[i].time_window_attr,
50894- show_constraint_time_window_us,
50895- store_constraint_time_window_us);
50896+ &constraint_attrs[i].time_window_attr);
50897 if (ret)
50898 goto err_alloc;
50899- ret = create_constraint_attribute(i, "name", S_IRUGO,
50900- &constraint_attrs[i].name_attr,
50901- show_constraint_name,
50902- NULL);
50903+ ret = create_constraint_attribute(i, "name",
50904+ &constraint_attrs[i].name_attr);
50905 if (ret)
50906 goto err_alloc;
50907- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50908- &constraint_attrs[i].max_power_attr,
50909- show_constraint_max_power_uw,
50910- NULL);
50911+ ret = create_constraint_attribute(i, "max_power_uw",
50912+ &constraint_attrs[i].max_power_attr);
50913 if (ret)
50914 goto err_alloc;
50915- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50916- &constraint_attrs[i].min_power_attr,
50917- show_constraint_min_power_uw,
50918- NULL);
50919+ ret = create_constraint_attribute(i, "min_power_uw",
50920+ &constraint_attrs[i].min_power_attr);
50921 if (ret)
50922 goto err_alloc;
50923 ret = create_constraint_attribute(i, "max_time_window_us",
50924- S_IRUGO,
50925- &constraint_attrs[i].max_time_window_attr,
50926- show_constraint_max_time_window_us,
50927- NULL);
50928+ &constraint_attrs[i].max_time_window_attr);
50929 if (ret)
50930 goto err_alloc;
50931 ret = create_constraint_attribute(i, "min_time_window_us",
50932- S_IRUGO,
50933- &constraint_attrs[i].min_time_window_attr,
50934- show_constraint_min_time_window_us,
50935- NULL);
50936+ &constraint_attrs[i].min_time_window_attr);
50937 if (ret)
50938 goto err_alloc;
50939
50940@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50941 power_zone->zone_dev_attrs[count++] =
50942 &dev_attr_max_energy_range_uj.attr;
50943 if (power_zone->ops->get_energy_uj) {
50944+ pax_open_kernel();
50945 if (power_zone->ops->reset_energy_uj)
50946- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50947+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50948 else
50949- dev_attr_energy_uj.attr.mode = S_IRUGO;
50950+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50951+ pax_close_kernel();
50952 power_zone->zone_dev_attrs[count++] =
50953 &dev_attr_energy_uj.attr;
50954 }
50955diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50956index 9c5d414..c7900ce 100644
50957--- a/drivers/ptp/ptp_private.h
50958+++ b/drivers/ptp/ptp_private.h
50959@@ -51,7 +51,7 @@ struct ptp_clock {
50960 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50961 wait_queue_head_t tsev_wq;
50962 int defunct; /* tells readers to go away when clock is being removed */
50963- struct device_attribute *pin_dev_attr;
50964+ device_attribute_no_const *pin_dev_attr;
50965 struct attribute **pin_attr;
50966 struct attribute_group pin_attr_group;
50967 };
50968diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50969index 302e626..12579af 100644
50970--- a/drivers/ptp/ptp_sysfs.c
50971+++ b/drivers/ptp/ptp_sysfs.c
50972@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50973 goto no_pin_attr;
50974
50975 for (i = 0; i < n_pins; i++) {
50976- struct device_attribute *da = &ptp->pin_dev_attr[i];
50977+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50978 sysfs_attr_init(&da->attr);
50979 da->attr.name = info->pin_config[i].name;
50980 da->attr.mode = 0644;
50981diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50982index a5761d0..a2a4540 100644
50983--- a/drivers/regulator/core.c
50984+++ b/drivers/regulator/core.c
50985@@ -3591,7 +3591,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50986 {
50987 const struct regulation_constraints *constraints = NULL;
50988 const struct regulator_init_data *init_data;
50989- static atomic_t regulator_no = ATOMIC_INIT(0);
50990+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50991 struct regulator_dev *rdev;
50992 struct device *dev;
50993 int ret, i;
50994@@ -3665,7 +3665,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50995 rdev->dev.class = &regulator_class;
50996 rdev->dev.parent = dev;
50997 dev_set_name(&rdev->dev, "regulator.%d",
50998- atomic_inc_return(&regulator_no) - 1);
50999+ atomic_inc_return_unchecked(&regulator_no) - 1);
51000 ret = device_register(&rdev->dev);
51001 if (ret != 0) {
51002 put_device(&rdev->dev);
51003diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51004index 7eee2ca..4024513 100644
51005--- a/drivers/regulator/max8660.c
51006+++ b/drivers/regulator/max8660.c
51007@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51008 max8660->shadow_regs[MAX8660_OVER1] = 5;
51009 } else {
51010 /* Otherwise devices can be toggled via software */
51011- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51012- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51013+ pax_open_kernel();
51014+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51015+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51016+ pax_close_kernel();
51017 }
51018
51019 /*
51020diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51021index c3d55c2..0dddfe6 100644
51022--- a/drivers/regulator/max8973-regulator.c
51023+++ b/drivers/regulator/max8973-regulator.c
51024@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51025 if (!pdata || !pdata->enable_ext_control) {
51026 max->desc.enable_reg = MAX8973_VOUT;
51027 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51028- max->ops.enable = regulator_enable_regmap;
51029- max->ops.disable = regulator_disable_regmap;
51030- max->ops.is_enabled = regulator_is_enabled_regmap;
51031+ pax_open_kernel();
51032+ *(void **)&max->ops.enable = regulator_enable_regmap;
51033+ *(void **)&max->ops.disable = regulator_disable_regmap;
51034+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51035+ pax_close_kernel();
51036 }
51037
51038 if (pdata) {
51039diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51040index 0d17c92..a29f627 100644
51041--- a/drivers/regulator/mc13892-regulator.c
51042+++ b/drivers/regulator/mc13892-regulator.c
51043@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51044 mc13xxx_unlock(mc13892);
51045
51046 /* update mc13892_vcam ops */
51047- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51048+ pax_open_kernel();
51049+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51050 sizeof(struct regulator_ops));
51051- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51052- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51053+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51054+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51055+ pax_close_kernel();
51056 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51057
51058 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51059diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51060index 5b2e761..c8c8a4a 100644
51061--- a/drivers/rtc/rtc-cmos.c
51062+++ b/drivers/rtc/rtc-cmos.c
51063@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51064 hpet_rtc_timer_init();
51065
51066 /* export at least the first block of NVRAM */
51067- nvram.size = address_space - NVRAM_OFFSET;
51068+ pax_open_kernel();
51069+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51070+ pax_close_kernel();
51071 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51072 if (retval < 0) {
51073 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51074diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51075index d049393..bb20be0 100644
51076--- a/drivers/rtc/rtc-dev.c
51077+++ b/drivers/rtc/rtc-dev.c
51078@@ -16,6 +16,7 @@
51079 #include <linux/module.h>
51080 #include <linux/rtc.h>
51081 #include <linux/sched.h>
51082+#include <linux/grsecurity.h>
51083 #include "rtc-core.h"
51084
51085 static dev_t rtc_devt;
51086@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51087 if (copy_from_user(&tm, uarg, sizeof(tm)))
51088 return -EFAULT;
51089
51090+ gr_log_timechange();
51091+
51092 return rtc_set_time(rtc, &tm);
51093
51094 case RTC_PIE_ON:
51095diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51096index 4ffabb3..1f87fca 100644
51097--- a/drivers/rtc/rtc-ds1307.c
51098+++ b/drivers/rtc/rtc-ds1307.c
51099@@ -107,7 +107,7 @@ struct ds1307 {
51100 u8 offset; /* register's offset */
51101 u8 regs[11];
51102 u16 nvram_offset;
51103- struct bin_attribute *nvram;
51104+ bin_attribute_no_const *nvram;
51105 enum ds_type type;
51106 unsigned long flags;
51107 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51108diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51109index 90abb5b..e0bf6dd 100644
51110--- a/drivers/rtc/rtc-m48t59.c
51111+++ b/drivers/rtc/rtc-m48t59.c
51112@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51113 if (IS_ERR(m48t59->rtc))
51114 return PTR_ERR(m48t59->rtc);
51115
51116- m48t59_nvram_attr.size = pdata->offset;
51117+ pax_open_kernel();
51118+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51119+ pax_close_kernel();
51120
51121 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51122 if (ret)
51123diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51124index e693af6..2e525b6 100644
51125--- a/drivers/scsi/bfa/bfa_fcpim.h
51126+++ b/drivers/scsi/bfa/bfa_fcpim.h
51127@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51128
51129 struct bfa_itn_s {
51130 bfa_isr_func_t isr;
51131-};
51132+} __no_const;
51133
51134 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51135 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51136diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51137index 0f19455..ef7adb5 100644
51138--- a/drivers/scsi/bfa/bfa_fcs.c
51139+++ b/drivers/scsi/bfa/bfa_fcs.c
51140@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51141 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51142
51143 static struct bfa_fcs_mod_s fcs_modules[] = {
51144- { bfa_fcs_port_attach, NULL, NULL },
51145- { bfa_fcs_uf_attach, NULL, NULL },
51146- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51147- bfa_fcs_fabric_modexit },
51148+ {
51149+ .attach = bfa_fcs_port_attach,
51150+ .modinit = NULL,
51151+ .modexit = NULL
51152+ },
51153+ {
51154+ .attach = bfa_fcs_uf_attach,
51155+ .modinit = NULL,
51156+ .modexit = NULL
51157+ },
51158+ {
51159+ .attach = bfa_fcs_fabric_attach,
51160+ .modinit = bfa_fcs_fabric_modinit,
51161+ .modexit = bfa_fcs_fabric_modexit
51162+ },
51163 };
51164
51165 /*
51166diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51167index ff75ef8..2dfe00a 100644
51168--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51169+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51170@@ -89,15 +89,26 @@ static struct {
51171 void (*offline) (struct bfa_fcs_lport_s *port);
51172 } __port_action[] = {
51173 {
51174- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51175- bfa_fcs_lport_unknown_offline}, {
51176- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51177- bfa_fcs_lport_fab_offline}, {
51178- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51179- bfa_fcs_lport_n2n_offline}, {
51180- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
51181- bfa_fcs_lport_loop_offline},
51182- };
51183+ .init = bfa_fcs_lport_unknown_init,
51184+ .online = bfa_fcs_lport_unknown_online,
51185+ .offline = bfa_fcs_lport_unknown_offline
51186+ },
51187+ {
51188+ .init = bfa_fcs_lport_fab_init,
51189+ .online = bfa_fcs_lport_fab_online,
51190+ .offline = bfa_fcs_lport_fab_offline
51191+ },
51192+ {
51193+ .init = bfa_fcs_lport_n2n_init,
51194+ .online = bfa_fcs_lport_n2n_online,
51195+ .offline = bfa_fcs_lport_n2n_offline
51196+ },
51197+ {
51198+ .init = bfa_fcs_lport_loop_init,
51199+ .online = bfa_fcs_lport_loop_online,
51200+ .offline = bfa_fcs_lport_loop_offline
51201+ },
51202+};
51203
51204 /*
51205 * fcs_port_sm FCS logical port state machine
51206diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
51207index a38aafa0..fe8f03b 100644
51208--- a/drivers/scsi/bfa/bfa_ioc.h
51209+++ b/drivers/scsi/bfa/bfa_ioc.h
51210@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
51211 bfa_ioc_disable_cbfn_t disable_cbfn;
51212 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
51213 bfa_ioc_reset_cbfn_t reset_cbfn;
51214-};
51215+} __no_const;
51216
51217 /*
51218 * IOC event notification mechanism.
51219@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
51220 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
51221 enum bfi_ioc_state fwstate);
51222 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
51223-};
51224+} __no_const;
51225
51226 /*
51227 * Queue element to wait for room in request queue. FIFO order is
51228diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
51229index a14c784..6de6790 100644
51230--- a/drivers/scsi/bfa/bfa_modules.h
51231+++ b/drivers/scsi/bfa/bfa_modules.h
51232@@ -78,12 +78,12 @@ enum {
51233 \
51234 extern struct bfa_module_s hal_mod_ ## __mod; \
51235 struct bfa_module_s hal_mod_ ## __mod = { \
51236- bfa_ ## __mod ## _meminfo, \
51237- bfa_ ## __mod ## _attach, \
51238- bfa_ ## __mod ## _detach, \
51239- bfa_ ## __mod ## _start, \
51240- bfa_ ## __mod ## _stop, \
51241- bfa_ ## __mod ## _iocdisable, \
51242+ .meminfo = bfa_ ## __mod ## _meminfo, \
51243+ .attach = bfa_ ## __mod ## _attach, \
51244+ .detach = bfa_ ## __mod ## _detach, \
51245+ .start = bfa_ ## __mod ## _start, \
51246+ .stop = bfa_ ## __mod ## _stop, \
51247+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
51248 }
51249
51250 #define BFA_CACHELINE_SZ (256)
51251diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
51252index 045c4e1..13de803 100644
51253--- a/drivers/scsi/fcoe/fcoe_sysfs.c
51254+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
51255@@ -33,8 +33,8 @@
51256 */
51257 #include "libfcoe.h"
51258
51259-static atomic_t ctlr_num;
51260-static atomic_t fcf_num;
51261+static atomic_unchecked_t ctlr_num;
51262+static atomic_unchecked_t fcf_num;
51263
51264 /*
51265 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
51266@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
51267 if (!ctlr)
51268 goto out;
51269
51270- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
51271+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
51272 ctlr->f = f;
51273 ctlr->mode = FIP_CONN_TYPE_FABRIC;
51274 INIT_LIST_HEAD(&ctlr->fcfs);
51275@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
51276 fcf->dev.parent = &ctlr->dev;
51277 fcf->dev.bus = &fcoe_bus_type;
51278 fcf->dev.type = &fcoe_fcf_device_type;
51279- fcf->id = atomic_inc_return(&fcf_num) - 1;
51280+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
51281 fcf->state = FCOE_FCF_STATE_UNKNOWN;
51282
51283 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
51284@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
51285 {
51286 int error;
51287
51288- atomic_set(&ctlr_num, 0);
51289- atomic_set(&fcf_num, 0);
51290+ atomic_set_unchecked(&ctlr_num, 0);
51291+ atomic_set_unchecked(&fcf_num, 0);
51292
51293 error = bus_register(&fcoe_bus_type);
51294 if (error)
51295diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
51296index 8bb173e..20236b4 100644
51297--- a/drivers/scsi/hosts.c
51298+++ b/drivers/scsi/hosts.c
51299@@ -42,7 +42,7 @@
51300 #include "scsi_logging.h"
51301
51302
51303-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51304+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51305
51306
51307 static void scsi_host_cls_release(struct device *dev)
51308@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
51309 * subtract one because we increment first then return, but we need to
51310 * know what the next host number was before increment
51311 */
51312- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
51313+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
51314 shost->dma_channel = 0xff;
51315
51316 /* These three are default values which can be overridden */
51317diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
51318index 6bb4611..0203251 100644
51319--- a/drivers/scsi/hpsa.c
51320+++ b/drivers/scsi/hpsa.c
51321@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
51322 struct reply_queue_buffer *rq = &h->reply_queue[q];
51323
51324 if (h->transMethod & CFGTBL_Trans_io_accel1)
51325- return h->access.command_completed(h, q);
51326+ return h->access->command_completed(h, q);
51327
51328 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
51329- return h->access.command_completed(h, q);
51330+ return h->access->command_completed(h, q);
51331
51332 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
51333 a = rq->head[rq->current_entry];
51334@@ -5360,7 +5360,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51335 while (!list_empty(&h->reqQ)) {
51336 c = list_entry(h->reqQ.next, struct CommandList, list);
51337 /* can't do anything if fifo is full */
51338- if ((h->access.fifo_full(h))) {
51339+ if ((h->access->fifo_full(h))) {
51340 h->fifo_recently_full = 1;
51341 dev_warn(&h->pdev->dev, "fifo full\n");
51342 break;
51343@@ -5376,7 +5376,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51344 atomic_inc(&h->commands_outstanding);
51345 spin_unlock_irqrestore(&h->lock, *flags);
51346 /* Tell the controller execute command */
51347- h->access.submit_command(h, c);
51348+ h->access->submit_command(h, c);
51349 spin_lock_irqsave(&h->lock, *flags);
51350 }
51351 }
51352@@ -5392,17 +5392,17 @@ static void lock_and_start_io(struct ctlr_info *h)
51353
51354 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
51355 {
51356- return h->access.command_completed(h, q);
51357+ return h->access->command_completed(h, q);
51358 }
51359
51360 static inline bool interrupt_pending(struct ctlr_info *h)
51361 {
51362- return h->access.intr_pending(h);
51363+ return h->access->intr_pending(h);
51364 }
51365
51366 static inline long interrupt_not_for_us(struct ctlr_info *h)
51367 {
51368- return (h->access.intr_pending(h) == 0) ||
51369+ return (h->access->intr_pending(h) == 0) ||
51370 (h->interrupts_enabled == 0);
51371 }
51372
51373@@ -6343,7 +6343,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
51374 if (prod_index < 0)
51375 return -ENODEV;
51376 h->product_name = products[prod_index].product_name;
51377- h->access = *(products[prod_index].access);
51378+ h->access = products[prod_index].access;
51379
51380 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
51381 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
51382@@ -6690,7 +6690,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
51383 unsigned long flags;
51384 u32 lockup_detected;
51385
51386- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51387+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51388 spin_lock_irqsave(&h->lock, flags);
51389 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
51390 if (!lockup_detected) {
51391@@ -6937,7 +6937,7 @@ reinit_after_soft_reset:
51392 }
51393
51394 /* make sure the board interrupts are off */
51395- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51396+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51397
51398 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
51399 goto clean2;
51400@@ -6972,7 +6972,7 @@ reinit_after_soft_reset:
51401 * fake ones to scoop up any residual completions.
51402 */
51403 spin_lock_irqsave(&h->lock, flags);
51404- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51405+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51406 spin_unlock_irqrestore(&h->lock, flags);
51407 free_irqs(h);
51408 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
51409@@ -6991,9 +6991,9 @@ reinit_after_soft_reset:
51410 dev_info(&h->pdev->dev, "Board READY.\n");
51411 dev_info(&h->pdev->dev,
51412 "Waiting for stale completions to drain.\n");
51413- h->access.set_intr_mask(h, HPSA_INTR_ON);
51414+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51415 msleep(10000);
51416- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51417+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51418
51419 rc = controller_reset_failed(h->cfgtable);
51420 if (rc)
51421@@ -7019,7 +7019,7 @@ reinit_after_soft_reset:
51422 h->drv_req_rescan = 0;
51423
51424 /* Turn the interrupts on so we can service requests */
51425- h->access.set_intr_mask(h, HPSA_INTR_ON);
51426+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51427
51428 hpsa_hba_inquiry(h);
51429 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51430@@ -7084,7 +7084,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51431 * To write all data in the battery backed cache to disks
51432 */
51433 hpsa_flush_cache(h);
51434- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51435+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51436 hpsa_free_irqs_and_disable_msix(h);
51437 }
51438
51439@@ -7202,7 +7202,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51440 CFGTBL_Trans_enable_directed_msix |
51441 (trans_support & (CFGTBL_Trans_io_accel1 |
51442 CFGTBL_Trans_io_accel2));
51443- struct access_method access = SA5_performant_access;
51444+ struct access_method *access = &SA5_performant_access;
51445
51446 /* This is a bit complicated. There are 8 registers on
51447 * the controller which we write to to tell it 8 different
51448@@ -7244,7 +7244,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51449 * perform the superfluous readl() after each command submission.
51450 */
51451 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51452- access = SA5_performant_access_no_read;
51453+ access = &SA5_performant_access_no_read;
51454
51455 /* Controller spec: zero out this buffer. */
51456 for (i = 0; i < h->nreply_queues; i++)
51457@@ -7274,12 +7274,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51458 * enable outbound interrupt coalescing in accelerator mode;
51459 */
51460 if (trans_support & CFGTBL_Trans_io_accel1) {
51461- access = SA5_ioaccel_mode1_access;
51462+ access = &SA5_ioaccel_mode1_access;
51463 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51464 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51465 } else {
51466 if (trans_support & CFGTBL_Trans_io_accel2) {
51467- access = SA5_ioaccel_mode2_access;
51468+ access = &SA5_ioaccel_mode2_access;
51469 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51470 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51471 }
51472diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51473index 8e06d9e..396e0a1 100644
51474--- a/drivers/scsi/hpsa.h
51475+++ b/drivers/scsi/hpsa.h
51476@@ -127,7 +127,7 @@ struct ctlr_info {
51477 unsigned int msix_vector;
51478 unsigned int msi_vector;
51479 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51480- struct access_method access;
51481+ struct access_method *access;
51482 char hba_mode_enabled;
51483
51484 /* queue and queue Info */
51485@@ -523,43 +523,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51486 }
51487
51488 static struct access_method SA5_access = {
51489- SA5_submit_command,
51490- SA5_intr_mask,
51491- SA5_fifo_full,
51492- SA5_intr_pending,
51493- SA5_completed,
51494+ .submit_command = SA5_submit_command,
51495+ .set_intr_mask = SA5_intr_mask,
51496+ .fifo_full = SA5_fifo_full,
51497+ .intr_pending = SA5_intr_pending,
51498+ .command_completed = SA5_completed,
51499 };
51500
51501 static struct access_method SA5_ioaccel_mode1_access = {
51502- SA5_submit_command,
51503- SA5_performant_intr_mask,
51504- SA5_fifo_full,
51505- SA5_ioaccel_mode1_intr_pending,
51506- SA5_ioaccel_mode1_completed,
51507+ .submit_command = SA5_submit_command,
51508+ .set_intr_mask = SA5_performant_intr_mask,
51509+ .fifo_full = SA5_fifo_full,
51510+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51511+ .command_completed = SA5_ioaccel_mode1_completed,
51512 };
51513
51514 static struct access_method SA5_ioaccel_mode2_access = {
51515- SA5_submit_command_ioaccel2,
51516- SA5_performant_intr_mask,
51517- SA5_fifo_full,
51518- SA5_performant_intr_pending,
51519- SA5_performant_completed,
51520+ .submit_command = SA5_submit_command_ioaccel2,
51521+ .set_intr_mask = SA5_performant_intr_mask,
51522+ .fifo_full = SA5_fifo_full,
51523+ .intr_pending = SA5_performant_intr_pending,
51524+ .command_completed = SA5_performant_completed,
51525 };
51526
51527 static struct access_method SA5_performant_access = {
51528- SA5_submit_command,
51529- SA5_performant_intr_mask,
51530- SA5_fifo_full,
51531- SA5_performant_intr_pending,
51532- SA5_performant_completed,
51533+ .submit_command = SA5_submit_command,
51534+ .set_intr_mask = SA5_performant_intr_mask,
51535+ .fifo_full = SA5_fifo_full,
51536+ .intr_pending = SA5_performant_intr_pending,
51537+ .command_completed = SA5_performant_completed,
51538 };
51539
51540 static struct access_method SA5_performant_access_no_read = {
51541- SA5_submit_command_no_read,
51542- SA5_performant_intr_mask,
51543- SA5_fifo_full,
51544- SA5_performant_intr_pending,
51545- SA5_performant_completed,
51546+ .submit_command = SA5_submit_command_no_read,
51547+ .set_intr_mask = SA5_performant_intr_mask,
51548+ .fifo_full = SA5_fifo_full,
51549+ .intr_pending = SA5_performant_intr_pending,
51550+ .command_completed = SA5_performant_completed,
51551 };
51552
51553 struct board_type {
51554diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51555index 1b3a094..068e683 100644
51556--- a/drivers/scsi/libfc/fc_exch.c
51557+++ b/drivers/scsi/libfc/fc_exch.c
51558@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51559 u16 pool_max_index;
51560
51561 struct {
51562- atomic_t no_free_exch;
51563- atomic_t no_free_exch_xid;
51564- atomic_t xid_not_found;
51565- atomic_t xid_busy;
51566- atomic_t seq_not_found;
51567- atomic_t non_bls_resp;
51568+ atomic_unchecked_t no_free_exch;
51569+ atomic_unchecked_t no_free_exch_xid;
51570+ atomic_unchecked_t xid_not_found;
51571+ atomic_unchecked_t xid_busy;
51572+ atomic_unchecked_t seq_not_found;
51573+ atomic_unchecked_t non_bls_resp;
51574 } stats;
51575 };
51576
51577@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51578 /* allocate memory for exchange */
51579 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51580 if (!ep) {
51581- atomic_inc(&mp->stats.no_free_exch);
51582+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51583 goto out;
51584 }
51585 memset(ep, 0, sizeof(*ep));
51586@@ -874,7 +874,7 @@ out:
51587 return ep;
51588 err:
51589 spin_unlock_bh(&pool->lock);
51590- atomic_inc(&mp->stats.no_free_exch_xid);
51591+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51592 mempool_free(ep, mp->ep_pool);
51593 return NULL;
51594 }
51595@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51596 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51597 ep = fc_exch_find(mp, xid);
51598 if (!ep) {
51599- atomic_inc(&mp->stats.xid_not_found);
51600+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51601 reject = FC_RJT_OX_ID;
51602 goto out;
51603 }
51604@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51605 ep = fc_exch_find(mp, xid);
51606 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51607 if (ep) {
51608- atomic_inc(&mp->stats.xid_busy);
51609+ atomic_inc_unchecked(&mp->stats.xid_busy);
51610 reject = FC_RJT_RX_ID;
51611 goto rel;
51612 }
51613@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51614 }
51615 xid = ep->xid; /* get our XID */
51616 } else if (!ep) {
51617- atomic_inc(&mp->stats.xid_not_found);
51618+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51619 reject = FC_RJT_RX_ID; /* XID not found */
51620 goto out;
51621 }
51622@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51623 } else {
51624 sp = &ep->seq;
51625 if (sp->id != fh->fh_seq_id) {
51626- atomic_inc(&mp->stats.seq_not_found);
51627+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51628 if (f_ctl & FC_FC_END_SEQ) {
51629 /*
51630 * Update sequence_id based on incoming last
51631@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51632
51633 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51634 if (!ep) {
51635- atomic_inc(&mp->stats.xid_not_found);
51636+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51637 goto out;
51638 }
51639 if (ep->esb_stat & ESB_ST_COMPLETE) {
51640- atomic_inc(&mp->stats.xid_not_found);
51641+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51642 goto rel;
51643 }
51644 if (ep->rxid == FC_XID_UNKNOWN)
51645 ep->rxid = ntohs(fh->fh_rx_id);
51646 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51647- atomic_inc(&mp->stats.xid_not_found);
51648+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51649 goto rel;
51650 }
51651 if (ep->did != ntoh24(fh->fh_s_id) &&
51652 ep->did != FC_FID_FLOGI) {
51653- atomic_inc(&mp->stats.xid_not_found);
51654+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51655 goto rel;
51656 }
51657 sof = fr_sof(fp);
51658@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51659 sp->ssb_stat |= SSB_ST_RESP;
51660 sp->id = fh->fh_seq_id;
51661 } else if (sp->id != fh->fh_seq_id) {
51662- atomic_inc(&mp->stats.seq_not_found);
51663+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51664 goto rel;
51665 }
51666
51667@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51668 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51669
51670 if (!sp)
51671- atomic_inc(&mp->stats.xid_not_found);
51672+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51673 else
51674- atomic_inc(&mp->stats.non_bls_resp);
51675+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51676
51677 fc_frame_free(fp);
51678 }
51679@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51680
51681 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51682 mp = ema->mp;
51683- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51684+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51685 st->fc_no_free_exch_xid +=
51686- atomic_read(&mp->stats.no_free_exch_xid);
51687- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51688- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51689- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51690- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51691+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51692+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51693+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51694+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51695+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51696 }
51697 }
51698 EXPORT_SYMBOL(fc_exch_update_stats);
51699diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51700index 932d9cc..50c7ee9 100644
51701--- a/drivers/scsi/libsas/sas_ata.c
51702+++ b/drivers/scsi/libsas/sas_ata.c
51703@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
51704 .postreset = ata_std_postreset,
51705 .error_handler = ata_std_error_handler,
51706 .post_internal_cmd = sas_ata_post_internal,
51707- .qc_defer = ata_std_qc_defer,
51708+ .qc_defer = ata_std_qc_defer,
51709 .qc_prep = ata_noop_qc_prep,
51710 .qc_issue = sas_ata_qc_issue,
51711 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51712diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51713index 434e903..5a4a79b 100644
51714--- a/drivers/scsi/lpfc/lpfc.h
51715+++ b/drivers/scsi/lpfc/lpfc.h
51716@@ -430,7 +430,7 @@ struct lpfc_vport {
51717 struct dentry *debug_nodelist;
51718 struct dentry *vport_debugfs_root;
51719 struct lpfc_debugfs_trc *disc_trc;
51720- atomic_t disc_trc_cnt;
51721+ atomic_unchecked_t disc_trc_cnt;
51722 #endif
51723 uint8_t stat_data_enabled;
51724 uint8_t stat_data_blocked;
51725@@ -880,8 +880,8 @@ struct lpfc_hba {
51726 struct timer_list fabric_block_timer;
51727 unsigned long bit_flags;
51728 #define FABRIC_COMANDS_BLOCKED 0
51729- atomic_t num_rsrc_err;
51730- atomic_t num_cmd_success;
51731+ atomic_unchecked_t num_rsrc_err;
51732+ atomic_unchecked_t num_cmd_success;
51733 unsigned long last_rsrc_error_time;
51734 unsigned long last_ramp_down_time;
51735 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51736@@ -916,7 +916,7 @@ struct lpfc_hba {
51737
51738 struct dentry *debug_slow_ring_trc;
51739 struct lpfc_debugfs_trc *slow_ring_trc;
51740- atomic_t slow_ring_trc_cnt;
51741+ atomic_unchecked_t slow_ring_trc_cnt;
51742 /* iDiag debugfs sub-directory */
51743 struct dentry *idiag_root;
51744 struct dentry *idiag_pci_cfg;
51745diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51746index 5633e7d..8272114 100644
51747--- a/drivers/scsi/lpfc/lpfc_debugfs.c
51748+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51749@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51750
51751 #include <linux/debugfs.h>
51752
51753-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51754+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51755 static unsigned long lpfc_debugfs_start_time = 0L;
51756
51757 /* iDiag */
51758@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51759 lpfc_debugfs_enable = 0;
51760
51761 len = 0;
51762- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51763+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51764 (lpfc_debugfs_max_disc_trc - 1);
51765 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51766 dtp = vport->disc_trc + i;
51767@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51768 lpfc_debugfs_enable = 0;
51769
51770 len = 0;
51771- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51772+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51773 (lpfc_debugfs_max_slow_ring_trc - 1);
51774 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51775 dtp = phba->slow_ring_trc + i;
51776@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51777 !vport || !vport->disc_trc)
51778 return;
51779
51780- index = atomic_inc_return(&vport->disc_trc_cnt) &
51781+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51782 (lpfc_debugfs_max_disc_trc - 1);
51783 dtp = vport->disc_trc + index;
51784 dtp->fmt = fmt;
51785 dtp->data1 = data1;
51786 dtp->data2 = data2;
51787 dtp->data3 = data3;
51788- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51789+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51790 dtp->jif = jiffies;
51791 #endif
51792 return;
51793@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51794 !phba || !phba->slow_ring_trc)
51795 return;
51796
51797- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51798+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51799 (lpfc_debugfs_max_slow_ring_trc - 1);
51800 dtp = phba->slow_ring_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@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51811 "slow_ring buffer\n");
51812 goto debug_failed;
51813 }
51814- atomic_set(&phba->slow_ring_trc_cnt, 0);
51815+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51816 memset(phba->slow_ring_trc, 0,
51817 (sizeof(struct lpfc_debugfs_trc) *
51818 lpfc_debugfs_max_slow_ring_trc));
51819@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51820 "buffer\n");
51821 goto debug_failed;
51822 }
51823- atomic_set(&vport->disc_trc_cnt, 0);
51824+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51825
51826 snprintf(name, sizeof(name), "discovery_trace");
51827 vport->debug_disc_trc =
51828diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51829index 0b2c53a..aec2b45 100644
51830--- a/drivers/scsi/lpfc/lpfc_init.c
51831+++ b/drivers/scsi/lpfc/lpfc_init.c
51832@@ -11290,8 +11290,10 @@ lpfc_init(void)
51833 "misc_register returned with status %d", error);
51834
51835 if (lpfc_enable_npiv) {
51836- lpfc_transport_functions.vport_create = lpfc_vport_create;
51837- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51838+ pax_open_kernel();
51839+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51840+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51841+ pax_close_kernel();
51842 }
51843 lpfc_transport_template =
51844 fc_attach_transport(&lpfc_transport_functions);
51845diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51846index 4f9222e..f1850e3 100644
51847--- a/drivers/scsi/lpfc/lpfc_scsi.c
51848+++ b/drivers/scsi/lpfc/lpfc_scsi.c
51849@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51850 unsigned long expires;
51851
51852 spin_lock_irqsave(&phba->hbalock, flags);
51853- atomic_inc(&phba->num_rsrc_err);
51854+ atomic_inc_unchecked(&phba->num_rsrc_err);
51855 phba->last_rsrc_error_time = jiffies;
51856
51857 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51858@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51859 unsigned long num_rsrc_err, num_cmd_success;
51860 int i;
51861
51862- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51863- num_cmd_success = atomic_read(&phba->num_cmd_success);
51864+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51865+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51866
51867 /*
51868 * The error and success command counters are global per
51869@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51870 }
51871 }
51872 lpfc_destroy_vport_work_array(phba, vports);
51873- atomic_set(&phba->num_rsrc_err, 0);
51874- atomic_set(&phba->num_cmd_success, 0);
51875+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
51876+ atomic_set_unchecked(&phba->num_cmd_success, 0);
51877 }
51878
51879 /**
51880diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51881index 6a1c036..38e0e8d 100644
51882--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51883+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51884@@ -1508,7 +1508,7 @@ _scsih_get_resync(struct device *dev)
51885 {
51886 struct scsi_device *sdev = to_scsi_device(dev);
51887 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51888- static struct _raid_device *raid_device;
51889+ struct _raid_device *raid_device;
51890 unsigned long flags;
51891 Mpi2RaidVolPage0_t vol_pg0;
51892 Mpi2ConfigReply_t mpi_reply;
51893@@ -1560,7 +1560,7 @@ _scsih_get_state(struct device *dev)
51894 {
51895 struct scsi_device *sdev = to_scsi_device(dev);
51896 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51897- static struct _raid_device *raid_device;
51898+ struct _raid_device *raid_device;
51899 unsigned long flags;
51900 Mpi2RaidVolPage0_t vol_pg0;
51901 Mpi2ConfigReply_t mpi_reply;
51902@@ -6602,7 +6602,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51903 Mpi2EventDataIrOperationStatus_t *event_data =
51904 (Mpi2EventDataIrOperationStatus_t *)
51905 fw_event->event_data;
51906- static struct _raid_device *raid_device;
51907+ struct _raid_device *raid_device;
51908 unsigned long flags;
51909 u16 handle;
51910
51911@@ -7073,7 +7073,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51912 u64 sas_address;
51913 struct _sas_device *sas_device;
51914 struct _sas_node *expander_device;
51915- static struct _raid_device *raid_device;
51916+ struct _raid_device *raid_device;
51917 u8 retry_count;
51918 unsigned long flags;
51919
51920diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51921index 8c27b6a..607f56e 100644
51922--- a/drivers/scsi/pmcraid.c
51923+++ b/drivers/scsi/pmcraid.c
51924@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51925 res->scsi_dev = scsi_dev;
51926 scsi_dev->hostdata = res;
51927 res->change_detected = 0;
51928- atomic_set(&res->read_failures, 0);
51929- atomic_set(&res->write_failures, 0);
51930+ atomic_set_unchecked(&res->read_failures, 0);
51931+ atomic_set_unchecked(&res->write_failures, 0);
51932 rc = 0;
51933 }
51934 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51935@@ -2646,9 +2646,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51936
51937 /* If this was a SCSI read/write command keep count of errors */
51938 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51939- atomic_inc(&res->read_failures);
51940+ atomic_inc_unchecked(&res->read_failures);
51941 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51942- atomic_inc(&res->write_failures);
51943+ atomic_inc_unchecked(&res->write_failures);
51944
51945 if (!RES_IS_GSCSI(res->cfg_entry) &&
51946 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51947@@ -3474,7 +3474,7 @@ static int pmcraid_queuecommand_lck(
51948 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51949 * hrrq_id assigned here in queuecommand
51950 */
51951- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51952+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51953 pinstance->num_hrrq;
51954 cmd->cmd_done = pmcraid_io_done;
51955
51956@@ -3788,7 +3788,7 @@ static long pmcraid_ioctl_passthrough(
51957 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51958 * hrrq_id assigned here in queuecommand
51959 */
51960- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51961+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51962 pinstance->num_hrrq;
51963
51964 if (request_size) {
51965@@ -4426,7 +4426,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51966
51967 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51968 /* add resources only after host is added into system */
51969- if (!atomic_read(&pinstance->expose_resources))
51970+ if (!atomic_read_unchecked(&pinstance->expose_resources))
51971 return;
51972
51973 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51974@@ -5243,8 +5243,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51975 init_waitqueue_head(&pinstance->reset_wait_q);
51976
51977 atomic_set(&pinstance->outstanding_cmds, 0);
51978- atomic_set(&pinstance->last_message_id, 0);
51979- atomic_set(&pinstance->expose_resources, 0);
51980+ atomic_set_unchecked(&pinstance->last_message_id, 0);
51981+ atomic_set_unchecked(&pinstance->expose_resources, 0);
51982
51983 INIT_LIST_HEAD(&pinstance->free_res_q);
51984 INIT_LIST_HEAD(&pinstance->used_res_q);
51985@@ -5957,7 +5957,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51986 /* Schedule worker thread to handle CCN and take care of adding and
51987 * removing devices to OS
51988 */
51989- atomic_set(&pinstance->expose_resources, 1);
51990+ atomic_set_unchecked(&pinstance->expose_resources, 1);
51991 schedule_work(&pinstance->worker_q);
51992 return rc;
51993
51994diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51995index e1d150f..6c6df44 100644
51996--- a/drivers/scsi/pmcraid.h
51997+++ b/drivers/scsi/pmcraid.h
51998@@ -748,7 +748,7 @@ struct pmcraid_instance {
51999 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52000
52001 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52002- atomic_t last_message_id;
52003+ atomic_unchecked_t last_message_id;
52004
52005 /* configuration table */
52006 struct pmcraid_config_table *cfg_table;
52007@@ -777,7 +777,7 @@ struct pmcraid_instance {
52008 atomic_t outstanding_cmds;
52009
52010 /* should add/delete resources to mid-layer now ?*/
52011- atomic_t expose_resources;
52012+ atomic_unchecked_t expose_resources;
52013
52014
52015
52016@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52017 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52018 };
52019 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52020- atomic_t read_failures; /* count of failed READ commands */
52021- atomic_t write_failures; /* count of failed WRITE commands */
52022+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52023+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52024
52025 /* To indicate add/delete/modify during CCN */
52026 u8 change_detected;
52027diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52028index 82b92c4..3178171 100644
52029--- a/drivers/scsi/qla2xxx/qla_attr.c
52030+++ b/drivers/scsi/qla2xxx/qla_attr.c
52031@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52032 return 0;
52033 }
52034
52035-struct fc_function_template qla2xxx_transport_functions = {
52036+fc_function_template_no_const qla2xxx_transport_functions = {
52037
52038 .show_host_node_name = 1,
52039 .show_host_port_name = 1,
52040@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52041 .bsg_timeout = qla24xx_bsg_timeout,
52042 };
52043
52044-struct fc_function_template qla2xxx_transport_vport_functions = {
52045+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52046
52047 .show_host_node_name = 1,
52048 .show_host_port_name = 1,
52049diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52050index 7686bfe..4710893 100644
52051--- a/drivers/scsi/qla2xxx/qla_gbl.h
52052+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52053@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52054 struct device_attribute;
52055 extern struct device_attribute *qla2x00_host_attrs[];
52056 struct fc_function_template;
52057-extern struct fc_function_template qla2xxx_transport_functions;
52058-extern struct fc_function_template qla2xxx_transport_vport_functions;
52059+extern fc_function_template_no_const qla2xxx_transport_functions;
52060+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52061 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52062 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52063 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52064diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52065index cce1cbc..5b9f0fe 100644
52066--- a/drivers/scsi/qla2xxx/qla_os.c
52067+++ b/drivers/scsi/qla2xxx/qla_os.c
52068@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52069 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52070 /* Ok, a 64bit DMA mask is applicable. */
52071 ha->flags.enable_64bit_addressing = 1;
52072- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52073- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52074+ pax_open_kernel();
52075+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52076+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52077+ pax_close_kernel();
52078 return;
52079 }
52080 }
52081diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52082index 8f6d0fb..1b21097 100644
52083--- a/drivers/scsi/qla4xxx/ql4_def.h
52084+++ b/drivers/scsi/qla4xxx/ql4_def.h
52085@@ -305,7 +305,7 @@ struct ddb_entry {
52086 * (4000 only) */
52087 atomic_t relogin_timer; /* Max Time to wait for
52088 * relogin to complete */
52089- atomic_t relogin_retry_count; /* Num of times relogin has been
52090+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52091 * retried */
52092 uint32_t default_time2wait; /* Default Min time between
52093 * relogins (+aens) */
52094diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52095index 6d25879..3031a9f 100644
52096--- a/drivers/scsi/qla4xxx/ql4_os.c
52097+++ b/drivers/scsi/qla4xxx/ql4_os.c
52098@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52099 */
52100 if (!iscsi_is_session_online(cls_sess)) {
52101 /* Reset retry relogin timer */
52102- atomic_inc(&ddb_entry->relogin_retry_count);
52103+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52104 DEBUG2(ql4_printk(KERN_INFO, ha,
52105 "%s: index[%d] relogin timed out-retrying"
52106 " relogin (%d), retry (%d)\n", __func__,
52107 ddb_entry->fw_ddb_index,
52108- atomic_read(&ddb_entry->relogin_retry_count),
52109+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52110 ddb_entry->default_time2wait + 4));
52111 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52112 atomic_set(&ddb_entry->retry_relogin_timer,
52113@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52114
52115 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52116 atomic_set(&ddb_entry->relogin_timer, 0);
52117- atomic_set(&ddb_entry->relogin_retry_count, 0);
52118+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52119 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52120 ddb_entry->default_relogin_timeout =
52121 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52122diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52123index 7129701..b49c4e5 100644
52124--- a/drivers/scsi/scsi_lib.c
52125+++ b/drivers/scsi/scsi_lib.c
52126@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52127 shost = sdev->host;
52128 scsi_init_cmd_errh(cmd);
52129 cmd->result = DID_NO_CONNECT << 16;
52130- atomic_inc(&cmd->device->iorequest_cnt);
52131+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52132
52133 /*
52134 * SCSI request completion path will do scsi_device_unbusy(),
52135@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52136
52137 INIT_LIST_HEAD(&cmd->eh_entry);
52138
52139- atomic_inc(&cmd->device->iodone_cnt);
52140+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52141 if (cmd->result)
52142- atomic_inc(&cmd->device->ioerr_cnt);
52143+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52144
52145 disposition = scsi_decide_disposition(cmd);
52146 if (disposition != SUCCESS &&
52147@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52148 struct Scsi_Host *host = cmd->device->host;
52149 int rtn = 0;
52150
52151- atomic_inc(&cmd->device->iorequest_cnt);
52152+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52153
52154 /* check if the device is still usable */
52155 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52156diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52157index 1ac38e7..6acc656 100644
52158--- a/drivers/scsi/scsi_sysfs.c
52159+++ b/drivers/scsi/scsi_sysfs.c
52160@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52161 char *buf) \
52162 { \
52163 struct scsi_device *sdev = to_scsi_device(dev); \
52164- unsigned long long count = atomic_read(&sdev->field); \
52165+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52166 return snprintf(buf, 20, "0x%llx\n", count); \
52167 } \
52168 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52169diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52170index 5d6f348..18778a6b 100644
52171--- a/drivers/scsi/scsi_transport_fc.c
52172+++ b/drivers/scsi/scsi_transport_fc.c
52173@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52174 * Netlink Infrastructure
52175 */
52176
52177-static atomic_t fc_event_seq;
52178+static atomic_unchecked_t fc_event_seq;
52179
52180 /**
52181 * fc_get_event_number - Obtain the next sequential FC event number
52182@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
52183 u32
52184 fc_get_event_number(void)
52185 {
52186- return atomic_add_return(1, &fc_event_seq);
52187+ return atomic_add_return_unchecked(1, &fc_event_seq);
52188 }
52189 EXPORT_SYMBOL(fc_get_event_number);
52190
52191@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
52192 {
52193 int error;
52194
52195- atomic_set(&fc_event_seq, 0);
52196+ atomic_set_unchecked(&fc_event_seq, 0);
52197
52198 error = transport_class_register(&fc_host_class);
52199 if (error)
52200@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
52201 char *cp;
52202
52203 *val = simple_strtoul(buf, &cp, 0);
52204- if ((*cp && (*cp != '\n')) || (*val < 0))
52205+ if (*cp && (*cp != '\n'))
52206 return -EINVAL;
52207 /*
52208 * Check for overflow; dev_loss_tmo is u32
52209diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
52210index 67d43e3..8cee73c 100644
52211--- a/drivers/scsi/scsi_transport_iscsi.c
52212+++ b/drivers/scsi/scsi_transport_iscsi.c
52213@@ -79,7 +79,7 @@ struct iscsi_internal {
52214 struct transport_container session_cont;
52215 };
52216
52217-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
52218+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
52219 static struct workqueue_struct *iscsi_eh_timer_workq;
52220
52221 static DEFINE_IDA(iscsi_sess_ida);
52222@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
52223 int err;
52224
52225 ihost = shost->shost_data;
52226- session->sid = atomic_add_return(1, &iscsi_session_nr);
52227+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
52228
52229 if (target_id == ISCSI_MAX_TARGET) {
52230 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
52231@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
52232 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
52233 ISCSI_TRANSPORT_VERSION);
52234
52235- atomic_set(&iscsi_session_nr, 0);
52236+ atomic_set_unchecked(&iscsi_session_nr, 0);
52237
52238 err = class_register(&iscsi_transport_class);
52239 if (err)
52240diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
52241index ae45bd9..c32a586 100644
52242--- a/drivers/scsi/scsi_transport_srp.c
52243+++ b/drivers/scsi/scsi_transport_srp.c
52244@@ -35,7 +35,7 @@
52245 #include "scsi_priv.h"
52246
52247 struct srp_host_attrs {
52248- atomic_t next_port_id;
52249+ atomic_unchecked_t next_port_id;
52250 };
52251 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
52252
52253@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
52254 struct Scsi_Host *shost = dev_to_shost(dev);
52255 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
52256
52257- atomic_set(&srp_host->next_port_id, 0);
52258+ atomic_set_unchecked(&srp_host->next_port_id, 0);
52259 return 0;
52260 }
52261
52262@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
52263 rport_fast_io_fail_timedout);
52264 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
52265
52266- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
52267+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
52268 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
52269
52270 transport_setup_device(&rport->dev);
52271diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
52272index 05ea0d4..5af8049 100644
52273--- a/drivers/scsi/sd.c
52274+++ b/drivers/scsi/sd.c
52275@@ -3006,7 +3006,7 @@ static int sd_probe(struct device *dev)
52276 sdkp->disk = gd;
52277 sdkp->index = index;
52278 atomic_set(&sdkp->openers, 0);
52279- atomic_set(&sdkp->device->ioerr_cnt, 0);
52280+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
52281
52282 if (!sdp->request_queue->rq_timeout) {
52283 if (sdp->type != TYPE_MOD)
52284diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
52285index dbf8e77..0d565c7 100644
52286--- a/drivers/scsi/sg.c
52287+++ b/drivers/scsi/sg.c
52288@@ -1098,7 +1098,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
52289 sdp->disk->disk_name,
52290 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
52291 NULL,
52292- (char *)arg);
52293+ (char __user *)arg);
52294 case BLKTRACESTART:
52295 return blk_trace_startstop(sdp->device->request_queue, 1);
52296 case BLKTRACESTOP:
52297diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
52298index 011a336..fb2b7a0 100644
52299--- a/drivers/soc/tegra/fuse/fuse-tegra.c
52300+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
52301@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
52302 return i;
52303 }
52304
52305-static struct bin_attribute fuse_bin_attr = {
52306+static bin_attribute_no_const fuse_bin_attr = {
52307 .attr = { .name = "fuse", .mode = S_IRUGO, },
52308 .read = fuse_read,
52309 };
52310diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
52311index a17f533..a2ff039 100644
52312--- a/drivers/spi/spi.c
52313+++ b/drivers/spi/spi.c
52314@@ -2239,7 +2239,7 @@ int spi_bus_unlock(struct spi_master *master)
52315 EXPORT_SYMBOL_GPL(spi_bus_unlock);
52316
52317 /* portable code must never pass more than 32 bytes */
52318-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
52319+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
52320
52321 static u8 *buf;
52322
52323diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
52324index b41429f..2de5373 100644
52325--- a/drivers/staging/android/timed_output.c
52326+++ b/drivers/staging/android/timed_output.c
52327@@ -25,7 +25,7 @@
52328 #include "timed_output.h"
52329
52330 static struct class *timed_output_class;
52331-static atomic_t device_count;
52332+static atomic_unchecked_t device_count;
52333
52334 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
52335 char *buf)
52336@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
52337 timed_output_class = class_create(THIS_MODULE, "timed_output");
52338 if (IS_ERR(timed_output_class))
52339 return PTR_ERR(timed_output_class);
52340- atomic_set(&device_count, 0);
52341+ atomic_set_unchecked(&device_count, 0);
52342 timed_output_class->dev_groups = timed_output_groups;
52343 }
52344
52345@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
52346 if (ret < 0)
52347 return ret;
52348
52349- tdev->index = atomic_inc_return(&device_count);
52350+ tdev->index = atomic_inc_return_unchecked(&device_count);
52351 tdev->dev = device_create(timed_output_class, NULL,
52352 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
52353 if (IS_ERR(tdev->dev))
52354diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
52355index f143cb6..6fb8255 100644
52356--- a/drivers/staging/comedi/comedi_fops.c
52357+++ b/drivers/staging/comedi/comedi_fops.c
52358@@ -273,8 +273,8 @@ static void comedi_file_reset(struct file *file)
52359 }
52360 cfp->last_attached = dev->attached;
52361 cfp->last_detach_count = dev->detach_count;
52362- ACCESS_ONCE(cfp->read_subdev) = read_s;
52363- ACCESS_ONCE(cfp->write_subdev) = write_s;
52364+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
52365+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
52366 }
52367
52368 static void comedi_file_check(struct file *file)
52369@@ -1885,7 +1885,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52370 !(s_old->async->cmd.flags & CMDF_WRITE))
52371 return -EBUSY;
52372
52373- ACCESS_ONCE(cfp->read_subdev) = s_new;
52374+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
52375 return 0;
52376 }
52377
52378@@ -1927,7 +1927,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52379 (s_old->async->cmd.flags & CMDF_WRITE))
52380 return -EBUSY;
52381
52382- ACCESS_ONCE(cfp->write_subdev) = s_new;
52383+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
52384 return 0;
52385 }
52386
52387diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
52388index 001348c..cfaac8a 100644
52389--- a/drivers/staging/gdm724x/gdm_tty.c
52390+++ b/drivers/staging/gdm724x/gdm_tty.c
52391@@ -44,7 +44,7 @@
52392 #define gdm_tty_send_control(n, r, v, d, l) (\
52393 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
52394
52395-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
52396+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
52397
52398 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
52399 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
52400diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
52401index 503b2d7..c904931 100644
52402--- a/drivers/staging/line6/driver.c
52403+++ b/drivers/staging/line6/driver.c
52404@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52405 {
52406 struct usb_device *usbdev = line6->usbdev;
52407 int ret;
52408- unsigned char len;
52409+ unsigned char *plen;
52410
52411 /* query the serial number: */
52412 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52413@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52414 return ret;
52415 }
52416
52417+ plen = kmalloc(1, GFP_KERNEL);
52418+ if (plen == NULL)
52419+ return -ENOMEM;
52420+
52421 /* Wait for data length. We'll get 0xff until length arrives. */
52422 do {
52423 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52424 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52425 USB_DIR_IN,
52426- 0x0012, 0x0000, &len, 1,
52427+ 0x0012, 0x0000, plen, 1,
52428 LINE6_TIMEOUT * HZ);
52429 if (ret < 0) {
52430 dev_err(line6->ifcdev,
52431 "receive length failed (error %d)\n", ret);
52432+ kfree(plen);
52433 return ret;
52434 }
52435- } while (len == 0xff);
52436+ } while (*plen == 0xff);
52437
52438- if (len != datalen) {
52439+ if (*plen != datalen) {
52440 /* should be equal or something went wrong */
52441 dev_err(line6->ifcdev,
52442 "length mismatch (expected %d, got %d)\n",
52443- (int)datalen, (int)len);
52444+ (int)datalen, (int)*plen);
52445+ kfree(plen);
52446 return -EINVAL;
52447 }
52448+ kfree(plen);
52449
52450 /* receive the result: */
52451 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52452@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52453 {
52454 struct usb_device *usbdev = line6->usbdev;
52455 int ret;
52456- unsigned char status;
52457+ unsigned char *status;
52458
52459 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52460 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
52461@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52462 return ret;
52463 }
52464
52465+ status = kmalloc(1, GFP_KERNEL);
52466+ if (status == NULL)
52467+ return -ENOMEM;
52468+
52469 do {
52470 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
52471 0x67,
52472 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52473 USB_DIR_IN,
52474 0x0012, 0x0000,
52475- &status, 1, LINE6_TIMEOUT * HZ);
52476+ status, 1, LINE6_TIMEOUT * HZ);
52477
52478 if (ret < 0) {
52479 dev_err(line6->ifcdev,
52480 "receiving status failed (error %d)\n", ret);
52481+ kfree(status);
52482 return ret;
52483 }
52484- } while (status == 0xff);
52485+ } while (*status == 0xff);
52486
52487- if (status != 0) {
52488+ if (*status != 0) {
52489 dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
52490+ kfree(status);
52491 return -EINVAL;
52492 }
52493
52494+ kfree(status);
52495+
52496 return 0;
52497 }
52498
52499diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
52500index 6943715..0a93632 100644
52501--- a/drivers/staging/line6/toneport.c
52502+++ b/drivers/staging/line6/toneport.c
52503@@ -11,6 +11,7 @@
52504 */
52505
52506 #include <linux/wait.h>
52507+#include <linux/slab.h>
52508 #include <sound/control.h>
52509
52510 #include "audio.h"
52511@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
52512 */
52513 static void toneport_setup(struct usb_line6_toneport *toneport)
52514 {
52515- int ticks;
52516+ int *ticks;
52517 struct usb_line6 *line6 = &toneport->line6;
52518 struct usb_device *usbdev = line6->usbdev;
52519 u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
52520
52521+ ticks = kmalloc(sizeof(int), GFP_KERNEL);
52522+ if (ticks == NULL)
52523+ return;
52524+
52525 /* sync time on device with host: */
52526- ticks = (int)get_seconds();
52527- line6_write_data(line6, 0x80c6, &ticks, 4);
52528+ *ticks = (int)get_seconds();
52529+ line6_write_data(line6, 0x80c6, ticks, sizeof(int));
52530+
52531+ kfree(ticks);
52532
52533 /* enable device: */
52534 toneport_send_cmd(usbdev, 0x0301, 0x0000);
52535diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52536index 463da07..e791ce9 100644
52537--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52538+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52539@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52540 return 0;
52541 }
52542
52543-sfw_test_client_ops_t brw_test_client;
52544-void brw_init_test_client(void)
52545-{
52546- brw_test_client.tso_init = brw_client_init;
52547- brw_test_client.tso_fini = brw_client_fini;
52548- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52549- brw_test_client.tso_done_rpc = brw_client_done_rpc;
52550+sfw_test_client_ops_t brw_test_client = {
52551+ .tso_init = brw_client_init,
52552+ .tso_fini = brw_client_fini,
52553+ .tso_prep_rpc = brw_client_prep_rpc,
52554+ .tso_done_rpc = brw_client_done_rpc,
52555 };
52556
52557 srpc_service_t brw_test_service;
52558diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52559index cc9d182..8fabce3 100644
52560--- a/drivers/staging/lustre/lnet/selftest/framework.c
52561+++ b/drivers/staging/lustre/lnet/selftest/framework.c
52562@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
52563
52564 extern sfw_test_client_ops_t ping_test_client;
52565 extern srpc_service_t ping_test_service;
52566-extern void ping_init_test_client(void);
52567 extern void ping_init_test_service(void);
52568
52569 extern sfw_test_client_ops_t brw_test_client;
52570 extern srpc_service_t brw_test_service;
52571-extern void brw_init_test_client(void);
52572 extern void brw_init_test_service(void);
52573
52574
52575@@ -1675,12 +1673,10 @@ sfw_startup (void)
52576 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52577 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52578
52579- brw_init_test_client();
52580 brw_init_test_service();
52581 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52582 LASSERT (rc == 0);
52583
52584- ping_init_test_client();
52585 ping_init_test_service();
52586 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52587 LASSERT (rc == 0);
52588diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52589index d8c0df6..5041cbb 100644
52590--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52591+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52592@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52593 return 0;
52594 }
52595
52596-sfw_test_client_ops_t ping_test_client;
52597-void ping_init_test_client(void)
52598-{
52599- ping_test_client.tso_init = ping_client_init;
52600- ping_test_client.tso_fini = ping_client_fini;
52601- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52602- ping_test_client.tso_done_rpc = ping_client_done_rpc;
52603-}
52604+sfw_test_client_ops_t ping_test_client = {
52605+ .tso_init = ping_client_init,
52606+ .tso_fini = ping_client_fini,
52607+ .tso_prep_rpc = ping_client_prep_rpc,
52608+ .tso_done_rpc = ping_client_done_rpc,
52609+};
52610
52611 srpc_service_t ping_test_service;
52612 void ping_init_test_service(void)
52613diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52614index 83bc0a9..12ba00a 100644
52615--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52616+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52617@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52618 ldlm_completion_callback lcs_completion;
52619 ldlm_blocking_callback lcs_blocking;
52620 ldlm_glimpse_callback lcs_glimpse;
52621-};
52622+} __no_const;
52623
52624 /* ldlm_lockd.c */
52625 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52626diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52627index 2a88b80..62e7e5f 100644
52628--- a/drivers/staging/lustre/lustre/include/obd.h
52629+++ b/drivers/staging/lustre/lustre/include/obd.h
52630@@ -1362,7 +1362,7 @@ struct md_ops {
52631 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52632 * wrapper function in include/linux/obd_class.h.
52633 */
52634-};
52635+} __no_const;
52636
52637 struct lsm_operations {
52638 void (*lsm_free)(struct lov_stripe_md *);
52639diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52640index a4c252f..b21acac 100644
52641--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52642+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52643@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52644 int added = (mode == LCK_NL);
52645 int overlaps = 0;
52646 int splitted = 0;
52647- const struct ldlm_callback_suite null_cbs = { NULL };
52648+ const struct ldlm_callback_suite null_cbs = { };
52649
52650 CDEBUG(D_DLMTRACE,
52651 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52652diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52653index 83d3f08..b03adad 100644
52654--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52655+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52656@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52657 void __user *buffer, size_t *lenp, loff_t *ppos)
52658 {
52659 int rc, max_delay_cs;
52660- struct ctl_table dummy = *table;
52661+ ctl_table_no_const dummy = *table;
52662 long d;
52663
52664 dummy.data = &max_delay_cs;
52665@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52666 void __user *buffer, size_t *lenp, loff_t *ppos)
52667 {
52668 int rc, min_delay_cs;
52669- struct ctl_table dummy = *table;
52670+ ctl_table_no_const dummy = *table;
52671 long d;
52672
52673 dummy.data = &min_delay_cs;
52674@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52675 void __user *buffer, size_t *lenp, loff_t *ppos)
52676 {
52677 int rc, backoff;
52678- struct ctl_table dummy = *table;
52679+ ctl_table_no_const dummy = *table;
52680
52681 dummy.data = &backoff;
52682 dummy.proc_handler = &proc_dointvec;
52683diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52684index 2c4fc74..b04ca79 100644
52685--- a/drivers/staging/lustre/lustre/libcfs/module.c
52686+++ b/drivers/staging/lustre/lustre/libcfs/module.c
52687@@ -315,11 +315,11 @@ out:
52688
52689
52690 struct cfs_psdev_ops libcfs_psdev_ops = {
52691- libcfs_psdev_open,
52692- libcfs_psdev_release,
52693- NULL,
52694- NULL,
52695- libcfs_ioctl
52696+ .p_open = libcfs_psdev_open,
52697+ .p_close = libcfs_psdev_release,
52698+ .p_read = NULL,
52699+ .p_write = NULL,
52700+ .p_ioctl = libcfs_ioctl
52701 };
52702
52703 extern int insert_proc(void);
52704diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52705index fcbe836..8a7ada4 100644
52706--- a/drivers/staging/octeon/ethernet-rx.c
52707+++ b/drivers/staging/octeon/ethernet-rx.c
52708@@ -352,14 +352,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52709 /* Increment RX stats for virtual ports */
52710 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52711 #ifdef CONFIG_64BIT
52712- atomic64_add(1,
52713+ atomic64_add_unchecked(1,
52714 (atomic64_t *)&priv->stats.rx_packets);
52715- atomic64_add(skb->len,
52716+ atomic64_add_unchecked(skb->len,
52717 (atomic64_t *)&priv->stats.rx_bytes);
52718 #else
52719- atomic_add(1,
52720+ atomic_add_unchecked(1,
52721 (atomic_t *)&priv->stats.rx_packets);
52722- atomic_add(skb->len,
52723+ atomic_add_unchecked(skb->len,
52724 (atomic_t *)&priv->stats.rx_bytes);
52725 #endif
52726 }
52727@@ -371,10 +371,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52728 dev->name);
52729 */
52730 #ifdef CONFIG_64BIT
52731- atomic64_add(1,
52732+ atomic64_add_unchecked(1,
52733 (atomic64_t *)&priv->stats.rx_dropped);
52734 #else
52735- atomic_add(1,
52736+ atomic_add_unchecked(1,
52737 (atomic_t *)&priv->stats.rx_dropped);
52738 #endif
52739 dev_kfree_skb_irq(skb);
52740diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52741index ee32149..052d1836 100644
52742--- a/drivers/staging/octeon/ethernet.c
52743+++ b/drivers/staging/octeon/ethernet.c
52744@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52745 * since the RX tasklet also increments it.
52746 */
52747 #ifdef CONFIG_64BIT
52748- atomic64_add(rx_status.dropped_packets,
52749- (atomic64_t *)&priv->stats.rx_dropped);
52750+ atomic64_add_unchecked(rx_status.dropped_packets,
52751+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52752 #else
52753- atomic_add(rx_status.dropped_packets,
52754- (atomic_t *)&priv->stats.rx_dropped);
52755+ atomic_add_unchecked(rx_status.dropped_packets,
52756+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
52757 #endif
52758 }
52759
52760diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52761index 3b476d8..f522d68 100644
52762--- a/drivers/staging/rtl8188eu/include/hal_intf.h
52763+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52764@@ -225,7 +225,7 @@ struct hal_ops {
52765
52766 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52767 void (*hal_reset_security_engine)(struct adapter *adapter);
52768-};
52769+} __no_const;
52770
52771 enum rt_eeprom_type {
52772 EEPROM_93C46,
52773diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52774index 070cc03..6806e37 100644
52775--- a/drivers/staging/rtl8712/rtl871x_io.h
52776+++ b/drivers/staging/rtl8712/rtl871x_io.h
52777@@ -108,7 +108,7 @@ struct _io_ops {
52778 u8 *pmem);
52779 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52780 u8 *pmem);
52781-};
52782+} __no_const;
52783
52784 struct io_req {
52785 struct list_head list;
52786diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52787index 46dad63..fe4acdc 100644
52788--- a/drivers/staging/unisys/visorchipset/visorchipset.h
52789+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52790@@ -226,7 +226,7 @@ struct visorchipset_busdev_notifiers {
52791 void (*device_resume)(ulong bus_no, ulong dev_no);
52792 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
52793 ulong *max_size);
52794-};
52795+} __no_const;
52796
52797 /* These functions live inside visorchipset, and will be called to indicate
52798 * responses to specific events (by code outside of visorchipset).
52799@@ -241,7 +241,7 @@ struct visorchipset_busdev_responders {
52800 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
52801 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
52802 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
52803-};
52804+} __no_const;
52805
52806 /** Register functions (in the bus driver) to get called by visorchipset
52807 * whenever a bus or device appears for which this service partition is
52808diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52809index 9512af6..045bf5a 100644
52810--- a/drivers/target/sbp/sbp_target.c
52811+++ b/drivers/target/sbp/sbp_target.c
52812@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52813
52814 #define SESSION_MAINTENANCE_INTERVAL HZ
52815
52816-static atomic_t login_id = ATOMIC_INIT(0);
52817+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52818
52819 static void session_maintenance_work(struct work_struct *);
52820 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52821@@ -444,7 +444,7 @@ static void sbp_management_request_login(
52822 login->lun = se_lun;
52823 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52824 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52825- login->login_id = atomic_inc_return(&login_id);
52826+ login->login_id = atomic_inc_return_unchecked(&login_id);
52827
52828 login->tgt_agt = sbp_target_agent_register(login);
52829 if (IS_ERR(login->tgt_agt)) {
52830diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52831index 54da2a4..3dd6f57 100644
52832--- a/drivers/target/target_core_device.c
52833+++ b/drivers/target/target_core_device.c
52834@@ -1469,7 +1469,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52835 spin_lock_init(&dev->se_tmr_lock);
52836 spin_lock_init(&dev->qf_cmd_lock);
52837 sema_init(&dev->caw_sem, 1);
52838- atomic_set(&dev->dev_ordered_id, 0);
52839+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
52840 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52841 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52842 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52843diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52844index ac3cbab..f0d1dd2 100644
52845--- a/drivers/target/target_core_transport.c
52846+++ b/drivers/target/target_core_transport.c
52847@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52848 * Used to determine when ORDERED commands should go from
52849 * Dormant to Active status.
52850 */
52851- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52852+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52853 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52854 cmd->se_ordered_id, cmd->sam_task_attr,
52855 dev->transport->name);
52856diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52857index 65a98a9..d93d3a8 100644
52858--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52859+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52860@@ -277,8 +277,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52861 platform_set_drvdata(pdev, priv);
52862
52863 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52864- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52865- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52866+ pax_open_kernel();
52867+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52868+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52869+ pax_close_kernel();
52870 }
52871 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52872 priv, &int3400_thermal_ops,
52873diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52874index d717f3d..cae1cc3e 100644
52875--- a/drivers/thermal/of-thermal.c
52876+++ b/drivers/thermal/of-thermal.c
52877@@ -31,6 +31,7 @@
52878 #include <linux/export.h>
52879 #include <linux/string.h>
52880 #include <linux/thermal.h>
52881+#include <linux/mm.h>
52882
52883 #include "thermal_core.h"
52884
52885@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52886 tz->ops = ops;
52887 tz->sensor_data = data;
52888
52889- tzd->ops->get_temp = of_thermal_get_temp;
52890- tzd->ops->get_trend = of_thermal_get_trend;
52891- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
52892+ pax_open_kernel();
52893+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52894+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52895+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
52896+ pax_close_kernel();
52897 mutex_unlock(&tzd->lock);
52898
52899 return tzd;
52900@@ -541,9 +544,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52901 return;
52902
52903 mutex_lock(&tzd->lock);
52904- tzd->ops->get_temp = NULL;
52905- tzd->ops->get_trend = NULL;
52906- tzd->ops->set_emul_temp = NULL;
52907+ pax_open_kernel();
52908+ *(void **)&tzd->ops->get_temp = NULL;
52909+ *(void **)&tzd->ops->get_trend = NULL;
52910+ *(void **)&tzd->ops->set_emul_temp = NULL;
52911+ pax_close_kernel();
52912
52913 tz->ops = NULL;
52914 tz->sensor_data = NULL;
52915diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
52916index 9ea3d9d..53e8792 100644
52917--- a/drivers/thermal/x86_pkg_temp_thermal.c
52918+++ b/drivers/thermal/x86_pkg_temp_thermal.c
52919@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
52920 return NOTIFY_OK;
52921 }
52922
52923-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
52924+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
52925 .notifier_call = pkg_temp_thermal_cpu_callback,
52926 };
52927
52928diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52929index fd66f57..48e6376 100644
52930--- a/drivers/tty/cyclades.c
52931+++ b/drivers/tty/cyclades.c
52932@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52933 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52934 info->port.count);
52935 #endif
52936- info->port.count++;
52937+ atomic_inc(&info->port.count);
52938 #ifdef CY_DEBUG_COUNT
52939 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52940- current->pid, info->port.count);
52941+ current->pid, atomic_read(&info->port.count));
52942 #endif
52943
52944 /*
52945@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52946 for (j = 0; j < cy_card[i].nports; j++) {
52947 info = &cy_card[i].ports[j];
52948
52949- if (info->port.count) {
52950+ if (atomic_read(&info->port.count)) {
52951 /* XXX is the ldisc num worth this? */
52952 struct tty_struct *tty;
52953 struct tty_ldisc *ld;
52954diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52955index 4fcec1d..5a036f7 100644
52956--- a/drivers/tty/hvc/hvc_console.c
52957+++ b/drivers/tty/hvc/hvc_console.c
52958@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52959
52960 spin_lock_irqsave(&hp->port.lock, flags);
52961 /* Check and then increment for fast path open. */
52962- if (hp->port.count++ > 0) {
52963+ if (atomic_inc_return(&hp->port.count) > 1) {
52964 spin_unlock_irqrestore(&hp->port.lock, flags);
52965 hvc_kick();
52966 return 0;
52967@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52968
52969 spin_lock_irqsave(&hp->port.lock, flags);
52970
52971- if (--hp->port.count == 0) {
52972+ if (atomic_dec_return(&hp->port.count) == 0) {
52973 spin_unlock_irqrestore(&hp->port.lock, flags);
52974 /* We are done with the tty pointer now. */
52975 tty_port_tty_set(&hp->port, NULL);
52976@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52977 */
52978 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52979 } else {
52980- if (hp->port.count < 0)
52981+ if (atomic_read(&hp->port.count) < 0)
52982 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52983- hp->vtermno, hp->port.count);
52984+ hp->vtermno, atomic_read(&hp->port.count));
52985 spin_unlock_irqrestore(&hp->port.lock, flags);
52986 }
52987 }
52988@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52989 * open->hangup case this can be called after the final close so prevent
52990 * that from happening for now.
52991 */
52992- if (hp->port.count <= 0) {
52993+ if (atomic_read(&hp->port.count) <= 0) {
52994 spin_unlock_irqrestore(&hp->port.lock, flags);
52995 return;
52996 }
52997
52998- hp->port.count = 0;
52999+ atomic_set(&hp->port.count, 0);
53000 spin_unlock_irqrestore(&hp->port.lock, flags);
53001 tty_port_tty_set(&hp->port, NULL);
53002
53003@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53004 return -EPIPE;
53005
53006 /* FIXME what's this (unprotected) check for? */
53007- if (hp->port.count <= 0)
53008+ if (atomic_read(&hp->port.count) <= 0)
53009 return -EIO;
53010
53011 spin_lock_irqsave(&hp->lock, flags);
53012diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53013index 81ff7e1..dfb7b71 100644
53014--- a/drivers/tty/hvc/hvcs.c
53015+++ b/drivers/tty/hvc/hvcs.c
53016@@ -83,6 +83,7 @@
53017 #include <asm/hvcserver.h>
53018 #include <asm/uaccess.h>
53019 #include <asm/vio.h>
53020+#include <asm/local.h>
53021
53022 /*
53023 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53024@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53025
53026 spin_lock_irqsave(&hvcsd->lock, flags);
53027
53028- if (hvcsd->port.count > 0) {
53029+ if (atomic_read(&hvcsd->port.count) > 0) {
53030 spin_unlock_irqrestore(&hvcsd->lock, flags);
53031 printk(KERN_INFO "HVCS: vterm state unchanged. "
53032 "The hvcs device node is still in use.\n");
53033@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53034 }
53035 }
53036
53037- hvcsd->port.count = 0;
53038+ atomic_set(&hvcsd->port.count, 0);
53039 hvcsd->port.tty = tty;
53040 tty->driver_data = hvcsd;
53041
53042@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53043 unsigned long flags;
53044
53045 spin_lock_irqsave(&hvcsd->lock, flags);
53046- hvcsd->port.count++;
53047+ atomic_inc(&hvcsd->port.count);
53048 hvcsd->todo_mask |= HVCS_SCHED_READ;
53049 spin_unlock_irqrestore(&hvcsd->lock, flags);
53050
53051@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53052 hvcsd = tty->driver_data;
53053
53054 spin_lock_irqsave(&hvcsd->lock, flags);
53055- if (--hvcsd->port.count == 0) {
53056+ if (atomic_dec_and_test(&hvcsd->port.count)) {
53057
53058 vio_disable_interrupts(hvcsd->vdev);
53059
53060@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53061
53062 free_irq(irq, hvcsd);
53063 return;
53064- } else if (hvcsd->port.count < 0) {
53065+ } else if (atomic_read(&hvcsd->port.count) < 0) {
53066 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
53067 " is missmanaged.\n",
53068- hvcsd->vdev->unit_address, hvcsd->port.count);
53069+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
53070 }
53071
53072 spin_unlock_irqrestore(&hvcsd->lock, flags);
53073@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53074
53075 spin_lock_irqsave(&hvcsd->lock, flags);
53076 /* Preserve this so that we know how many kref refs to put */
53077- temp_open_count = hvcsd->port.count;
53078+ temp_open_count = atomic_read(&hvcsd->port.count);
53079
53080 /*
53081 * Don't kref put inside the spinlock because the destruction
53082@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53083 tty->driver_data = NULL;
53084 hvcsd->port.tty = NULL;
53085
53086- hvcsd->port.count = 0;
53087+ atomic_set(&hvcsd->port.count, 0);
53088
53089 /* This will drop any buffered data on the floor which is OK in a hangup
53090 * scenario. */
53091@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
53092 * the middle of a write operation? This is a crummy place to do this
53093 * but we want to keep it all in the spinlock.
53094 */
53095- if (hvcsd->port.count <= 0) {
53096+ if (atomic_read(&hvcsd->port.count) <= 0) {
53097 spin_unlock_irqrestore(&hvcsd->lock, flags);
53098 return -ENODEV;
53099 }
53100@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
53101 {
53102 struct hvcs_struct *hvcsd = tty->driver_data;
53103
53104- if (!hvcsd || hvcsd->port.count <= 0)
53105+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
53106 return 0;
53107
53108 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
53109diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
53110index 4190199..06d5bfa 100644
53111--- a/drivers/tty/hvc/hvsi.c
53112+++ b/drivers/tty/hvc/hvsi.c
53113@@ -85,7 +85,7 @@ struct hvsi_struct {
53114 int n_outbuf;
53115 uint32_t vtermno;
53116 uint32_t virq;
53117- atomic_t seqno; /* HVSI packet sequence number */
53118+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
53119 uint16_t mctrl;
53120 uint8_t state; /* HVSI protocol state */
53121 uint8_t flags;
53122@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
53123
53124 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
53125 packet.hdr.len = sizeof(struct hvsi_query_response);
53126- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53127+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53128 packet.verb = VSV_SEND_VERSION_NUMBER;
53129 packet.u.version = HVSI_VERSION;
53130 packet.query_seqno = query_seqno+1;
53131@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
53132
53133 packet.hdr.type = VS_QUERY_PACKET_HEADER;
53134 packet.hdr.len = sizeof(struct hvsi_query);
53135- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53136+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53137 packet.verb = verb;
53138
53139 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
53140@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
53141 int wrote;
53142
53143 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
53144- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53145+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53146 packet.hdr.len = sizeof(struct hvsi_control);
53147 packet.verb = VSV_SET_MODEM_CTL;
53148 packet.mask = HVSI_TSDTR;
53149@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
53150 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
53151
53152 packet.hdr.type = VS_DATA_PACKET_HEADER;
53153- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53154+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53155 packet.hdr.len = count + sizeof(struct hvsi_header);
53156 memcpy(&packet.data, buf, count);
53157
53158@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
53159 struct hvsi_control packet __ALIGNED__;
53160
53161 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
53162- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53163+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53164 packet.hdr.len = 6;
53165 packet.verb = VSV_CLOSE_PROTOCOL;
53166
53167@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
53168
53169 tty_port_tty_set(&hp->port, tty);
53170 spin_lock_irqsave(&hp->lock, flags);
53171- hp->port.count++;
53172+ atomic_inc(&hp->port.count);
53173 atomic_set(&hp->seqno, 0);
53174 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
53175 spin_unlock_irqrestore(&hp->lock, flags);
53176@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53177
53178 spin_lock_irqsave(&hp->lock, flags);
53179
53180- if (--hp->port.count == 0) {
53181+ if (atomic_dec_return(&hp->port.count) == 0) {
53182 tty_port_tty_set(&hp->port, NULL);
53183 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
53184
53185@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53186
53187 spin_lock_irqsave(&hp->lock, flags);
53188 }
53189- } else if (hp->port.count < 0)
53190+ } else if (atomic_read(&hp->port.count) < 0)
53191 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
53192- hp - hvsi_ports, hp->port.count);
53193+ hp - hvsi_ports, atomic_read(&hp->port.count));
53194
53195 spin_unlock_irqrestore(&hp->lock, flags);
53196 }
53197@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
53198 tty_port_tty_set(&hp->port, NULL);
53199
53200 spin_lock_irqsave(&hp->lock, flags);
53201- hp->port.count = 0;
53202+ atomic_set(&hp->port.count, 0);
53203 hp->n_outbuf = 0;
53204 spin_unlock_irqrestore(&hp->lock, flags);
53205 }
53206diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
53207index a270f04..7c77b5d 100644
53208--- a/drivers/tty/hvc/hvsi_lib.c
53209+++ b/drivers/tty/hvc/hvsi_lib.c
53210@@ -8,7 +8,7 @@
53211
53212 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
53213 {
53214- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
53215+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
53216
53217 /* Assumes that always succeeds, works in practice */
53218 return pv->put_chars(pv->termno, (char *)packet, packet->len);
53219@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
53220
53221 /* Reset state */
53222 pv->established = 0;
53223- atomic_set(&pv->seqno, 0);
53224+ atomic_set_unchecked(&pv->seqno, 0);
53225
53226 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
53227
53228diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
53229index 345cebb..d5a1e9e 100644
53230--- a/drivers/tty/ipwireless/tty.c
53231+++ b/drivers/tty/ipwireless/tty.c
53232@@ -28,6 +28,7 @@
53233 #include <linux/tty_driver.h>
53234 #include <linux/tty_flip.h>
53235 #include <linux/uaccess.h>
53236+#include <asm/local.h>
53237
53238 #include "tty.h"
53239 #include "network.h"
53240@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53241 return -ENODEV;
53242
53243 mutex_lock(&tty->ipw_tty_mutex);
53244- if (tty->port.count == 0)
53245+ if (atomic_read(&tty->port.count) == 0)
53246 tty->tx_bytes_queued = 0;
53247
53248- tty->port.count++;
53249+ atomic_inc(&tty->port.count);
53250
53251 tty->port.tty = linux_tty;
53252 linux_tty->driver_data = tty;
53253@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53254
53255 static void do_ipw_close(struct ipw_tty *tty)
53256 {
53257- tty->port.count--;
53258-
53259- if (tty->port.count == 0) {
53260+ if (atomic_dec_return(&tty->port.count) == 0) {
53261 struct tty_struct *linux_tty = tty->port.tty;
53262
53263 if (linux_tty != NULL) {
53264@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
53265 return;
53266
53267 mutex_lock(&tty->ipw_tty_mutex);
53268- if (tty->port.count == 0) {
53269+ if (atomic_read(&tty->port.count) == 0) {
53270 mutex_unlock(&tty->ipw_tty_mutex);
53271 return;
53272 }
53273@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
53274
53275 mutex_lock(&tty->ipw_tty_mutex);
53276
53277- if (!tty->port.count) {
53278+ if (!atomic_read(&tty->port.count)) {
53279 mutex_unlock(&tty->ipw_tty_mutex);
53280 return;
53281 }
53282@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
53283 return -ENODEV;
53284
53285 mutex_lock(&tty->ipw_tty_mutex);
53286- if (!tty->port.count) {
53287+ if (!atomic_read(&tty->port.count)) {
53288 mutex_unlock(&tty->ipw_tty_mutex);
53289 return -EINVAL;
53290 }
53291@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
53292 if (!tty)
53293 return -ENODEV;
53294
53295- if (!tty->port.count)
53296+ if (!atomic_read(&tty->port.count))
53297 return -EINVAL;
53298
53299 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
53300@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
53301 if (!tty)
53302 return 0;
53303
53304- if (!tty->port.count)
53305+ if (!atomic_read(&tty->port.count))
53306 return 0;
53307
53308 return tty->tx_bytes_queued;
53309@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
53310 if (!tty)
53311 return -ENODEV;
53312
53313- if (!tty->port.count)
53314+ if (!atomic_read(&tty->port.count))
53315 return -EINVAL;
53316
53317 return get_control_lines(tty);
53318@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
53319 if (!tty)
53320 return -ENODEV;
53321
53322- if (!tty->port.count)
53323+ if (!atomic_read(&tty->port.count))
53324 return -EINVAL;
53325
53326 return set_control_lines(tty, set, clear);
53327@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
53328 if (!tty)
53329 return -ENODEV;
53330
53331- if (!tty->port.count)
53332+ if (!atomic_read(&tty->port.count))
53333 return -EINVAL;
53334
53335 /* FIXME: Exactly how is the tty object locked here .. */
53336@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
53337 * are gone */
53338 mutex_lock(&ttyj->ipw_tty_mutex);
53339 }
53340- while (ttyj->port.count)
53341+ while (atomic_read(&ttyj->port.count))
53342 do_ipw_close(ttyj);
53343 ipwireless_disassociate_network_ttys(network,
53344 ttyj->channel_idx);
53345diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
53346index 14c54e0..1efd4f2 100644
53347--- a/drivers/tty/moxa.c
53348+++ b/drivers/tty/moxa.c
53349@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
53350 }
53351
53352 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
53353- ch->port.count++;
53354+ atomic_inc(&ch->port.count);
53355 tty->driver_data = ch;
53356 tty_port_tty_set(&ch->port, tty);
53357 mutex_lock(&ch->port.mutex);
53358diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
53359index c434376..114ce13 100644
53360--- a/drivers/tty/n_gsm.c
53361+++ b/drivers/tty/n_gsm.c
53362@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
53363 spin_lock_init(&dlci->lock);
53364 mutex_init(&dlci->mutex);
53365 dlci->fifo = &dlci->_fifo;
53366- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
53367+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
53368 kfree(dlci);
53369 return NULL;
53370 }
53371@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
53372 struct gsm_dlci *dlci = tty->driver_data;
53373 struct tty_port *port = &dlci->port;
53374
53375- port->count++;
53376+ atomic_inc(&port->count);
53377 tty_port_tty_set(port, tty);
53378
53379 dlci->modem_rx = 0;
53380diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
53381index 6f8cf3a..c690dfb 100644
53382--- a/drivers/tty/n_tty.c
53383+++ b/drivers/tty/n_tty.c
53384@@ -115,7 +115,7 @@ struct n_tty_data {
53385 int minimum_to_wake;
53386
53387 /* consumer-published */
53388- size_t read_tail;
53389+ size_t read_tail __intentional_overflow(-1);
53390 size_t line_start;
53391
53392 /* protected by output lock */
53393@@ -2555,6 +2555,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
53394 {
53395 *ops = tty_ldisc_N_TTY;
53396 ops->owner = NULL;
53397- ops->refcount = ops->flags = 0;
53398+ atomic_set(&ops->refcount, 0);
53399+ ops->flags = 0;
53400 }
53401 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
53402diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
53403index 6e1f150..c3ba598 100644
53404--- a/drivers/tty/pty.c
53405+++ b/drivers/tty/pty.c
53406@@ -850,8 +850,10 @@ static void __init unix98_pty_init(void)
53407 panic("Couldn't register Unix98 pts driver");
53408
53409 /* Now create the /dev/ptmx special device */
53410+ pax_open_kernel();
53411 tty_default_fops(&ptmx_fops);
53412- ptmx_fops.open = ptmx_open;
53413+ *(void **)&ptmx_fops.open = ptmx_open;
53414+ pax_close_kernel();
53415
53416 cdev_init(&ptmx_cdev, &ptmx_fops);
53417 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
53418diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
53419index 383c4c7..d408e21 100644
53420--- a/drivers/tty/rocket.c
53421+++ b/drivers/tty/rocket.c
53422@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53423 tty->driver_data = info;
53424 tty_port_tty_set(port, tty);
53425
53426- if (port->count++ == 0) {
53427+ if (atomic_inc_return(&port->count) == 1) {
53428 atomic_inc(&rp_num_ports_open);
53429
53430 #ifdef ROCKET_DEBUG_OPEN
53431@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53432 #endif
53433 }
53434 #ifdef ROCKET_DEBUG_OPEN
53435- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
53436+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
53437 #endif
53438
53439 /*
53440@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
53441 spin_unlock_irqrestore(&info->port.lock, flags);
53442 return;
53443 }
53444- if (info->port.count)
53445+ if (atomic_read(&info->port.count))
53446 atomic_dec(&rp_num_ports_open);
53447 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
53448 spin_unlock_irqrestore(&info->port.lock, flags);
53449diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53450index aa28209..e08fb85 100644
53451--- a/drivers/tty/serial/ioc4_serial.c
53452+++ b/drivers/tty/serial/ioc4_serial.c
53453@@ -437,7 +437,7 @@ struct ioc4_soft {
53454 } is_intr_info[MAX_IOC4_INTR_ENTS];
53455
53456 /* Number of entries active in the above array */
53457- atomic_t is_num_intrs;
53458+ atomic_unchecked_t is_num_intrs;
53459 } is_intr_type[IOC4_NUM_INTR_TYPES];
53460
53461 /* is_ir_lock must be held while
53462@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53463 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53464 || (type == IOC4_OTHER_INTR_TYPE)));
53465
53466- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53467+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53468 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53469
53470 /* Save off the lower level interrupt handler */
53471@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53472
53473 soft = arg;
53474 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53475- num_intrs = (int)atomic_read(
53476+ num_intrs = (int)atomic_read_unchecked(
53477 &soft->is_intr_type[intr_type].is_num_intrs);
53478
53479 this_mir = this_ir = pending_intrs(soft, intr_type);
53480diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53481index 129dc5b..1da5bb8 100644
53482--- a/drivers/tty/serial/kgdb_nmi.c
53483+++ b/drivers/tty/serial/kgdb_nmi.c
53484@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53485 * I/O utilities that messages sent to the console will automatically
53486 * be displayed on the dbg_io.
53487 */
53488- dbg_io_ops->is_console = true;
53489+ pax_open_kernel();
53490+ *(int *)&dbg_io_ops->is_console = true;
53491+ pax_close_kernel();
53492
53493 return 0;
53494 }
53495diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53496index a260cde..6b2b5ce 100644
53497--- a/drivers/tty/serial/kgdboc.c
53498+++ b/drivers/tty/serial/kgdboc.c
53499@@ -24,8 +24,9 @@
53500 #define MAX_CONFIG_LEN 40
53501
53502 static struct kgdb_io kgdboc_io_ops;
53503+static struct kgdb_io kgdboc_io_ops_console;
53504
53505-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53506+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53507 static int configured = -1;
53508
53509 static char config[MAX_CONFIG_LEN];
53510@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53511 kgdboc_unregister_kbd();
53512 if (configured == 1)
53513 kgdb_unregister_io_module(&kgdboc_io_ops);
53514+ else if (configured == 2)
53515+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
53516 }
53517
53518 static int configure_kgdboc(void)
53519@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53520 int err;
53521 char *cptr = config;
53522 struct console *cons;
53523+ int is_console = 0;
53524
53525 err = kgdboc_option_setup(config);
53526 if (err || !strlen(config) || isspace(config[0]))
53527 goto noconfig;
53528
53529 err = -ENODEV;
53530- kgdboc_io_ops.is_console = 0;
53531 kgdb_tty_driver = NULL;
53532
53533 kgdboc_use_kms = 0;
53534@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53535 int idx;
53536 if (cons->device && cons->device(cons, &idx) == p &&
53537 idx == tty_line) {
53538- kgdboc_io_ops.is_console = 1;
53539+ is_console = 1;
53540 break;
53541 }
53542 cons = cons->next;
53543@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53544 kgdb_tty_line = tty_line;
53545
53546 do_register:
53547- err = kgdb_register_io_module(&kgdboc_io_ops);
53548+ if (is_console) {
53549+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53550+ configured = 2;
53551+ } else {
53552+ err = kgdb_register_io_module(&kgdboc_io_ops);
53553+ configured = 1;
53554+ }
53555 if (err)
53556 goto noconfig;
53557
53558@@ -205,8 +214,6 @@ do_register:
53559 if (err)
53560 goto nmi_con_failed;
53561
53562- configured = 1;
53563-
53564 return 0;
53565
53566 nmi_con_failed:
53567@@ -223,7 +230,7 @@ noconfig:
53568 static int __init init_kgdboc(void)
53569 {
53570 /* Already configured? */
53571- if (configured == 1)
53572+ if (configured >= 1)
53573 return 0;
53574
53575 return configure_kgdboc();
53576@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53577 if (config[len - 1] == '\n')
53578 config[len - 1] = '\0';
53579
53580- if (configured == 1)
53581+ if (configured >= 1)
53582 cleanup_kgdboc();
53583
53584 /* Go and configure with the new params. */
53585@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53586 .post_exception = kgdboc_post_exp_handler,
53587 };
53588
53589+static struct kgdb_io kgdboc_io_ops_console = {
53590+ .name = "kgdboc",
53591+ .read_char = kgdboc_get_char,
53592+ .write_char = kgdboc_put_char,
53593+ .pre_exception = kgdboc_pre_exp_handler,
53594+ .post_exception = kgdboc_post_exp_handler,
53595+ .is_console = 1
53596+};
53597+
53598 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53599 /* This is only available if kgdboc is a built in for early debugging */
53600 static int __init kgdboc_early_init(char *opt)
53601diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53602index c88b522..e763029 100644
53603--- a/drivers/tty/serial/msm_serial.c
53604+++ b/drivers/tty/serial/msm_serial.c
53605@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53606 .cons = MSM_CONSOLE,
53607 };
53608
53609-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53610+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53611
53612 static const struct of_device_id msm_uartdm_table[] = {
53613 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53614@@ -1052,7 +1052,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53615 line = pdev->id;
53616
53617 if (line < 0)
53618- line = atomic_inc_return(&msm_uart_next_id) - 1;
53619+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53620
53621 if (unlikely(line < 0 || line >= UART_NR))
53622 return -ENXIO;
53623diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53624index 107e807..d4a02fa 100644
53625--- a/drivers/tty/serial/samsung.c
53626+++ b/drivers/tty/serial/samsung.c
53627@@ -480,11 +480,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53628 }
53629 }
53630
53631+static int s3c64xx_serial_startup(struct uart_port *port);
53632 static int s3c24xx_serial_startup(struct uart_port *port)
53633 {
53634 struct s3c24xx_uart_port *ourport = to_ourport(port);
53635 int ret;
53636
53637+ /* Startup sequence is different for s3c64xx and higher SoC's */
53638+ if (s3c24xx_serial_has_interrupt_mask(port))
53639+ return s3c64xx_serial_startup(port);
53640+
53641 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53642 port, (unsigned long long)port->mapbase, port->membase);
53643
53644@@ -1169,10 +1174,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53645 /* setup info for port */
53646 port->dev = &platdev->dev;
53647
53648- /* Startup sequence is different for s3c64xx and higher SoC's */
53649- if (s3c24xx_serial_has_interrupt_mask(port))
53650- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53651-
53652 port->uartclk = 1;
53653
53654 if (cfg->uart_flags & UPF_CONS_FLOW) {
53655diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53656index 984605b..e538330 100644
53657--- a/drivers/tty/serial/serial_core.c
53658+++ b/drivers/tty/serial/serial_core.c
53659@@ -1396,7 +1396,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53660 state = drv->state + tty->index;
53661 port = &state->port;
53662 spin_lock_irq(&port->lock);
53663- --port->count;
53664+ atomic_dec(&port->count);
53665 spin_unlock_irq(&port->lock);
53666 return;
53667 }
53668@@ -1406,7 +1406,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53669
53670 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53671
53672- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53673+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53674 return;
53675
53676 /*
53677@@ -1530,7 +1530,7 @@ static void uart_hangup(struct tty_struct *tty)
53678 uart_flush_buffer(tty);
53679 uart_shutdown(tty, state);
53680 spin_lock_irqsave(&port->lock, flags);
53681- port->count = 0;
53682+ atomic_set(&port->count, 0);
53683 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53684 spin_unlock_irqrestore(&port->lock, flags);
53685 tty_port_tty_set(port, NULL);
53686@@ -1617,7 +1617,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53687 pr_debug("uart_open(%d) called\n", line);
53688
53689 spin_lock_irq(&port->lock);
53690- ++port->count;
53691+ atomic_inc(&port->count);
53692 spin_unlock_irq(&port->lock);
53693
53694 /*
53695diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53696index b799170..87dafd5 100644
53697--- a/drivers/tty/synclink.c
53698+++ b/drivers/tty/synclink.c
53699@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53700
53701 if (debug_level >= DEBUG_LEVEL_INFO)
53702 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53703- __FILE__,__LINE__, info->device_name, info->port.count);
53704+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53705
53706 if (tty_port_close_start(&info->port, tty, filp) == 0)
53707 goto cleanup;
53708@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53709 cleanup:
53710 if (debug_level >= DEBUG_LEVEL_INFO)
53711 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53712- tty->driver->name, info->port.count);
53713+ tty->driver->name, atomic_read(&info->port.count));
53714
53715 } /* end of mgsl_close() */
53716
53717@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53718
53719 mgsl_flush_buffer(tty);
53720 shutdown(info);
53721-
53722- info->port.count = 0;
53723+
53724+ atomic_set(&info->port.count, 0);
53725 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53726 info->port.tty = NULL;
53727
53728@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53729
53730 if (debug_level >= DEBUG_LEVEL_INFO)
53731 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53732- __FILE__,__LINE__, tty->driver->name, port->count );
53733+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53734
53735 spin_lock_irqsave(&info->irq_spinlock, flags);
53736- port->count--;
53737+ atomic_dec(&port->count);
53738 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53739 port->blocked_open++;
53740
53741@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53742
53743 if (debug_level >= DEBUG_LEVEL_INFO)
53744 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53745- __FILE__,__LINE__, tty->driver->name, port->count );
53746+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53747
53748 tty_unlock(tty);
53749 schedule();
53750@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53751
53752 /* FIXME: Racy on hangup during close wait */
53753 if (!tty_hung_up_p(filp))
53754- port->count++;
53755+ atomic_inc(&port->count);
53756 port->blocked_open--;
53757
53758 if (debug_level >= DEBUG_LEVEL_INFO)
53759 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53760- __FILE__,__LINE__, tty->driver->name, port->count );
53761+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53762
53763 if (!retval)
53764 port->flags |= ASYNC_NORMAL_ACTIVE;
53765@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53766
53767 if (debug_level >= DEBUG_LEVEL_INFO)
53768 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53769- __FILE__,__LINE__,tty->driver->name, info->port.count);
53770+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53771
53772 /* If port is closing, signal caller to try again */
53773 if (info->port.flags & ASYNC_CLOSING){
53774@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53775 spin_unlock_irqrestore(&info->netlock, flags);
53776 goto cleanup;
53777 }
53778- info->port.count++;
53779+ atomic_inc(&info->port.count);
53780 spin_unlock_irqrestore(&info->netlock, flags);
53781
53782- if (info->port.count == 1) {
53783+ if (atomic_read(&info->port.count) == 1) {
53784 /* 1st open on this device, init hardware */
53785 retval = startup(info);
53786 if (retval < 0)
53787@@ -3442,8 +3442,8 @@ cleanup:
53788 if (retval) {
53789 if (tty->count == 1)
53790 info->port.tty = NULL; /* tty layer will release tty struct */
53791- if(info->port.count)
53792- info->port.count--;
53793+ if (atomic_read(&info->port.count))
53794+ atomic_dec(&info->port.count);
53795 }
53796
53797 return retval;
53798@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53799 unsigned short new_crctype;
53800
53801 /* return error if TTY interface open */
53802- if (info->port.count)
53803+ if (atomic_read(&info->port.count))
53804 return -EBUSY;
53805
53806 switch (encoding)
53807@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53808
53809 /* arbitrate between network and tty opens */
53810 spin_lock_irqsave(&info->netlock, flags);
53811- if (info->port.count != 0 || info->netcount != 0) {
53812+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53813 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53814 spin_unlock_irqrestore(&info->netlock, flags);
53815 return -EBUSY;
53816@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53817 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53818
53819 /* return error if TTY interface open */
53820- if (info->port.count)
53821+ if (atomic_read(&info->port.count))
53822 return -EBUSY;
53823
53824 if (cmd != SIOCWANDEV)
53825diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53826index 0e8c39b..e0cb171 100644
53827--- a/drivers/tty/synclink_gt.c
53828+++ b/drivers/tty/synclink_gt.c
53829@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53830 tty->driver_data = info;
53831 info->port.tty = tty;
53832
53833- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53834+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53835
53836 /* If port is closing, signal caller to try again */
53837 if (info->port.flags & ASYNC_CLOSING){
53838@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53839 mutex_unlock(&info->port.mutex);
53840 goto cleanup;
53841 }
53842- info->port.count++;
53843+ atomic_inc(&info->port.count);
53844 spin_unlock_irqrestore(&info->netlock, flags);
53845
53846- if (info->port.count == 1) {
53847+ if (atomic_read(&info->port.count) == 1) {
53848 /* 1st open on this device, init hardware */
53849 retval = startup(info);
53850 if (retval < 0) {
53851@@ -715,8 +715,8 @@ cleanup:
53852 if (retval) {
53853 if (tty->count == 1)
53854 info->port.tty = NULL; /* tty layer will release tty struct */
53855- if(info->port.count)
53856- info->port.count--;
53857+ if(atomic_read(&info->port.count))
53858+ atomic_dec(&info->port.count);
53859 }
53860
53861 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53862@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53863
53864 if (sanity_check(info, tty->name, "close"))
53865 return;
53866- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53867+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53868
53869 if (tty_port_close_start(&info->port, tty, filp) == 0)
53870 goto cleanup;
53871@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53872 tty_port_close_end(&info->port, tty);
53873 info->port.tty = NULL;
53874 cleanup:
53875- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53876+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53877 }
53878
53879 static void hangup(struct tty_struct *tty)
53880@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53881 shutdown(info);
53882
53883 spin_lock_irqsave(&info->port.lock, flags);
53884- info->port.count = 0;
53885+ atomic_set(&info->port.count, 0);
53886 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53887 info->port.tty = NULL;
53888 spin_unlock_irqrestore(&info->port.lock, flags);
53889@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53890 unsigned short new_crctype;
53891
53892 /* return error if TTY interface open */
53893- if (info->port.count)
53894+ if (atomic_read(&info->port.count))
53895 return -EBUSY;
53896
53897 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53898@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53899
53900 /* arbitrate between network and tty opens */
53901 spin_lock_irqsave(&info->netlock, flags);
53902- if (info->port.count != 0 || info->netcount != 0) {
53903+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53904 DBGINFO(("%s hdlc_open busy\n", dev->name));
53905 spin_unlock_irqrestore(&info->netlock, flags);
53906 return -EBUSY;
53907@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53908 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53909
53910 /* return error if TTY interface open */
53911- if (info->port.count)
53912+ if (atomic_read(&info->port.count))
53913 return -EBUSY;
53914
53915 if (cmd != SIOCWANDEV)
53916@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53917 if (port == NULL)
53918 continue;
53919 spin_lock(&port->lock);
53920- if ((port->port.count || port->netcount) &&
53921+ if ((atomic_read(&port->port.count) || port->netcount) &&
53922 port->pending_bh && !port->bh_running &&
53923 !port->bh_requested) {
53924 DBGISR(("%s bh queued\n", port->device_name));
53925@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53926 add_wait_queue(&port->open_wait, &wait);
53927
53928 spin_lock_irqsave(&info->lock, flags);
53929- port->count--;
53930+ atomic_dec(&port->count);
53931 spin_unlock_irqrestore(&info->lock, flags);
53932 port->blocked_open++;
53933
53934@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53935 remove_wait_queue(&port->open_wait, &wait);
53936
53937 if (!tty_hung_up_p(filp))
53938- port->count++;
53939+ atomic_inc(&port->count);
53940 port->blocked_open--;
53941
53942 if (!retval)
53943diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53944index c3f9091..abe4601 100644
53945--- a/drivers/tty/synclinkmp.c
53946+++ b/drivers/tty/synclinkmp.c
53947@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53948
53949 if (debug_level >= DEBUG_LEVEL_INFO)
53950 printk("%s(%d):%s open(), old ref count = %d\n",
53951- __FILE__,__LINE__,tty->driver->name, info->port.count);
53952+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53953
53954 /* If port is closing, signal caller to try again */
53955 if (info->port.flags & ASYNC_CLOSING){
53956@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53957 spin_unlock_irqrestore(&info->netlock, flags);
53958 goto cleanup;
53959 }
53960- info->port.count++;
53961+ atomic_inc(&info->port.count);
53962 spin_unlock_irqrestore(&info->netlock, flags);
53963
53964- if (info->port.count == 1) {
53965+ if (atomic_read(&info->port.count) == 1) {
53966 /* 1st open on this device, init hardware */
53967 retval = startup(info);
53968 if (retval < 0)
53969@@ -796,8 +796,8 @@ cleanup:
53970 if (retval) {
53971 if (tty->count == 1)
53972 info->port.tty = NULL; /* tty layer will release tty struct */
53973- if(info->port.count)
53974- info->port.count--;
53975+ if(atomic_read(&info->port.count))
53976+ atomic_dec(&info->port.count);
53977 }
53978
53979 return retval;
53980@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53981
53982 if (debug_level >= DEBUG_LEVEL_INFO)
53983 printk("%s(%d):%s close() entry, count=%d\n",
53984- __FILE__,__LINE__, info->device_name, info->port.count);
53985+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53986
53987 if (tty_port_close_start(&info->port, tty, filp) == 0)
53988 goto cleanup;
53989@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53990 cleanup:
53991 if (debug_level >= DEBUG_LEVEL_INFO)
53992 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53993- tty->driver->name, info->port.count);
53994+ tty->driver->name, atomic_read(&info->port.count));
53995 }
53996
53997 /* Called by tty_hangup() when a hangup is signaled.
53998@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53999 shutdown(info);
54000
54001 spin_lock_irqsave(&info->port.lock, flags);
54002- info->port.count = 0;
54003+ atomic_set(&info->port.count, 0);
54004 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54005 info->port.tty = NULL;
54006 spin_unlock_irqrestore(&info->port.lock, flags);
54007@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54008 unsigned short new_crctype;
54009
54010 /* return error if TTY interface open */
54011- if (info->port.count)
54012+ if (atomic_read(&info->port.count))
54013 return -EBUSY;
54014
54015 switch (encoding)
54016@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
54017
54018 /* arbitrate between network and tty opens */
54019 spin_lock_irqsave(&info->netlock, flags);
54020- if (info->port.count != 0 || info->netcount != 0) {
54021+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54022 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54023 spin_unlock_irqrestore(&info->netlock, flags);
54024 return -EBUSY;
54025@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54026 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54027
54028 /* return error if TTY interface open */
54029- if (info->port.count)
54030+ if (atomic_read(&info->port.count))
54031 return -EBUSY;
54032
54033 if (cmd != SIOCWANDEV)
54034@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
54035 * do not request bottom half processing if the
54036 * device is not open in a normal mode.
54037 */
54038- if ( port && (port->port.count || port->netcount) &&
54039+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
54040 port->pending_bh && !port->bh_running &&
54041 !port->bh_requested ) {
54042 if ( debug_level >= DEBUG_LEVEL_ISR )
54043@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54044
54045 if (debug_level >= DEBUG_LEVEL_INFO)
54046 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
54047- __FILE__,__LINE__, tty->driver->name, port->count );
54048+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54049
54050 spin_lock_irqsave(&info->lock, flags);
54051- port->count--;
54052+ atomic_dec(&port->count);
54053 spin_unlock_irqrestore(&info->lock, flags);
54054 port->blocked_open++;
54055
54056@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54057
54058 if (debug_level >= DEBUG_LEVEL_INFO)
54059 printk("%s(%d):%s block_til_ready() count=%d\n",
54060- __FILE__,__LINE__, tty->driver->name, port->count );
54061+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54062
54063 tty_unlock(tty);
54064 schedule();
54065@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54066 set_current_state(TASK_RUNNING);
54067 remove_wait_queue(&port->open_wait, &wait);
54068 if (!tty_hung_up_p(filp))
54069- port->count++;
54070+ atomic_inc(&port->count);
54071 port->blocked_open--;
54072
54073 if (debug_level >= DEBUG_LEVEL_INFO)
54074 printk("%s(%d):%s block_til_ready() after, count=%d\n",
54075- __FILE__,__LINE__, tty->driver->name, port->count );
54076+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54077
54078 if (!retval)
54079 port->flags |= ASYNC_NORMAL_ACTIVE;
54080diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
54081index 42bad18..447d7a2 100644
54082--- a/drivers/tty/sysrq.c
54083+++ b/drivers/tty/sysrq.c
54084@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
54085 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
54086 size_t count, loff_t *ppos)
54087 {
54088- if (count) {
54089+ if (count && capable(CAP_SYS_ADMIN)) {
54090 char c;
54091
54092 if (get_user(c, buf))
54093diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
54094index 2bb4dfc..a7f6e86 100644
54095--- a/drivers/tty/tty_io.c
54096+++ b/drivers/tty/tty_io.c
54097@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
54098
54099 void tty_default_fops(struct file_operations *fops)
54100 {
54101- *fops = tty_fops;
54102+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
54103 }
54104
54105 /*
54106diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
54107index 3737f55..7cef448 100644
54108--- a/drivers/tty/tty_ldisc.c
54109+++ b/drivers/tty/tty_ldisc.c
54110@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
54111 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54112 tty_ldiscs[disc] = new_ldisc;
54113 new_ldisc->num = disc;
54114- new_ldisc->refcount = 0;
54115+ atomic_set(&new_ldisc->refcount, 0);
54116 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54117
54118 return ret;
54119@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
54120 return -EINVAL;
54121
54122 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54123- if (tty_ldiscs[disc]->refcount)
54124+ if (atomic_read(&tty_ldiscs[disc]->refcount))
54125 ret = -EBUSY;
54126 else
54127 tty_ldiscs[disc] = NULL;
54128@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
54129 if (ldops) {
54130 ret = ERR_PTR(-EAGAIN);
54131 if (try_module_get(ldops->owner)) {
54132- ldops->refcount++;
54133+ atomic_inc(&ldops->refcount);
54134 ret = ldops;
54135 }
54136 }
54137@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
54138 unsigned long flags;
54139
54140 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54141- ldops->refcount--;
54142+ atomic_dec(&ldops->refcount);
54143 module_put(ldops->owner);
54144 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54145 }
54146diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
54147index 40b31835..94d92ae 100644
54148--- a/drivers/tty/tty_port.c
54149+++ b/drivers/tty/tty_port.c
54150@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
54151 unsigned long flags;
54152
54153 spin_lock_irqsave(&port->lock, flags);
54154- port->count = 0;
54155+ atomic_set(&port->count, 0);
54156 port->flags &= ~ASYNC_NORMAL_ACTIVE;
54157 tty = port->tty;
54158 if (tty)
54159@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54160
54161 /* The port lock protects the port counts */
54162 spin_lock_irqsave(&port->lock, flags);
54163- port->count--;
54164+ atomic_dec(&port->count);
54165 port->blocked_open++;
54166 spin_unlock_irqrestore(&port->lock, flags);
54167
54168@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54169 we must not mess that up further */
54170 spin_lock_irqsave(&port->lock, flags);
54171 if (!tty_hung_up_p(filp))
54172- port->count++;
54173+ atomic_inc(&port->count);
54174 port->blocked_open--;
54175 if (retval == 0)
54176 port->flags |= ASYNC_NORMAL_ACTIVE;
54177@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
54178 return 0;
54179
54180 spin_lock_irqsave(&port->lock, flags);
54181- if (tty->count == 1 && port->count != 1) {
54182+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
54183 printk(KERN_WARNING
54184 "tty_port_close_start: tty->count = 1 port count = %d.\n",
54185- port->count);
54186- port->count = 1;
54187+ atomic_read(&port->count));
54188+ atomic_set(&port->count, 1);
54189 }
54190- if (--port->count < 0) {
54191+ if (atomic_dec_return(&port->count) < 0) {
54192 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
54193- port->count);
54194- port->count = 0;
54195+ atomic_read(&port->count));
54196+ atomic_set(&port->count, 0);
54197 }
54198
54199- if (port->count) {
54200+ if (atomic_read(&port->count)) {
54201 spin_unlock_irqrestore(&port->lock, flags);
54202 return 0;
54203 }
54204@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
54205 struct file *filp)
54206 {
54207 spin_lock_irq(&port->lock);
54208- ++port->count;
54209+ atomic_inc(&port->count);
54210 spin_unlock_irq(&port->lock);
54211 tty_port_tty_set(port, tty);
54212
54213diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
54214index 8a89f6e..50b32af 100644
54215--- a/drivers/tty/vt/keyboard.c
54216+++ b/drivers/tty/vt/keyboard.c
54217@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
54218 kbd->kbdmode == VC_OFF) &&
54219 value != KVAL(K_SAK))
54220 return; /* SAK is allowed even in raw mode */
54221+
54222+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
54223+ {
54224+ void *func = fn_handler[value];
54225+ if (func == fn_show_state || func == fn_show_ptregs ||
54226+ func == fn_show_mem)
54227+ return;
54228+ }
54229+#endif
54230+
54231 fn_handler[value](vc);
54232 }
54233
54234@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54235 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
54236 return -EFAULT;
54237
54238- if (!capable(CAP_SYS_TTY_CONFIG))
54239- perm = 0;
54240-
54241 switch (cmd) {
54242 case KDGKBENT:
54243 /* Ensure another thread doesn't free it under us */
54244@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54245 spin_unlock_irqrestore(&kbd_event_lock, flags);
54246 return put_user(val, &user_kbe->kb_value);
54247 case KDSKBENT:
54248+ if (!capable(CAP_SYS_TTY_CONFIG))
54249+ perm = 0;
54250+
54251 if (!perm)
54252 return -EPERM;
54253 if (!i && v == K_NOSUCHMAP) {
54254@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54255 int i, j, k;
54256 int ret;
54257
54258- if (!capable(CAP_SYS_TTY_CONFIG))
54259- perm = 0;
54260-
54261 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
54262 if (!kbs) {
54263 ret = -ENOMEM;
54264@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54265 kfree(kbs);
54266 return ((p && *p) ? -EOVERFLOW : 0);
54267 case KDSKBSENT:
54268+ if (!capable(CAP_SYS_TTY_CONFIG))
54269+ perm = 0;
54270+
54271 if (!perm) {
54272 ret = -EPERM;
54273 goto reterr;
54274diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
54275index 6276f13..84f2449 100644
54276--- a/drivers/uio/uio.c
54277+++ b/drivers/uio/uio.c
54278@@ -25,6 +25,7 @@
54279 #include <linux/kobject.h>
54280 #include <linux/cdev.h>
54281 #include <linux/uio_driver.h>
54282+#include <asm/local.h>
54283
54284 #define UIO_MAX_DEVICES (1U << MINORBITS)
54285
54286@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
54287 struct device_attribute *attr, char *buf)
54288 {
54289 struct uio_device *idev = dev_get_drvdata(dev);
54290- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
54291+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
54292 }
54293 static DEVICE_ATTR_RO(event);
54294
54295@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
54296 {
54297 struct uio_device *idev = info->uio_dev;
54298
54299- atomic_inc(&idev->event);
54300+ atomic_inc_unchecked(&idev->event);
54301 wake_up_interruptible(&idev->wait);
54302 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
54303 }
54304@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
54305 }
54306
54307 listener->dev = idev;
54308- listener->event_count = atomic_read(&idev->event);
54309+ listener->event_count = atomic_read_unchecked(&idev->event);
54310 filep->private_data = listener;
54311
54312 if (idev->info->open) {
54313@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
54314 return -EIO;
54315
54316 poll_wait(filep, &idev->wait, wait);
54317- if (listener->event_count != atomic_read(&idev->event))
54318+ if (listener->event_count != atomic_read_unchecked(&idev->event))
54319 return POLLIN | POLLRDNORM;
54320 return 0;
54321 }
54322@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
54323 do {
54324 set_current_state(TASK_INTERRUPTIBLE);
54325
54326- event_count = atomic_read(&idev->event);
54327+ event_count = atomic_read_unchecked(&idev->event);
54328 if (event_count != listener->event_count) {
54329 if (copy_to_user(buf, &event_count, count))
54330 retval = -EFAULT;
54331@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
54332 static int uio_find_mem_index(struct vm_area_struct *vma)
54333 {
54334 struct uio_device *idev = vma->vm_private_data;
54335+ unsigned long size;
54336
54337 if (vma->vm_pgoff < MAX_UIO_MAPS) {
54338- if (idev->info->mem[vma->vm_pgoff].size == 0)
54339+ size = idev->info->mem[vma->vm_pgoff].size;
54340+ if (size == 0)
54341+ return -1;
54342+ if (vma->vm_end - vma->vm_start > size)
54343 return -1;
54344 return (int)vma->vm_pgoff;
54345 }
54346@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
54347 idev->owner = owner;
54348 idev->info = info;
54349 init_waitqueue_head(&idev->wait);
54350- atomic_set(&idev->event, 0);
54351+ atomic_set_unchecked(&idev->event, 0);
54352
54353 ret = uio_get_minor(idev);
54354 if (ret)
54355diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
54356index 813d4d3..a71934f 100644
54357--- a/drivers/usb/atm/cxacru.c
54358+++ b/drivers/usb/atm/cxacru.c
54359@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
54360 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
54361 if (ret < 2)
54362 return -EINVAL;
54363- if (index < 0 || index > 0x7f)
54364+ if (index > 0x7f)
54365 return -EINVAL;
54366 pos += tmp;
54367
54368diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
54369index dada014..1d0d517 100644
54370--- a/drivers/usb/atm/usbatm.c
54371+++ b/drivers/usb/atm/usbatm.c
54372@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54373 if (printk_ratelimit())
54374 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
54375 __func__, vpi, vci);
54376- atomic_inc(&vcc->stats->rx_err);
54377+ atomic_inc_unchecked(&vcc->stats->rx_err);
54378 return;
54379 }
54380
54381@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54382 if (length > ATM_MAX_AAL5_PDU) {
54383 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
54384 __func__, length, vcc);
54385- atomic_inc(&vcc->stats->rx_err);
54386+ atomic_inc_unchecked(&vcc->stats->rx_err);
54387 goto out;
54388 }
54389
54390@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54391 if (sarb->len < pdu_length) {
54392 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
54393 __func__, pdu_length, sarb->len, vcc);
54394- atomic_inc(&vcc->stats->rx_err);
54395+ atomic_inc_unchecked(&vcc->stats->rx_err);
54396 goto out;
54397 }
54398
54399 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
54400 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
54401 __func__, vcc);
54402- atomic_inc(&vcc->stats->rx_err);
54403+ atomic_inc_unchecked(&vcc->stats->rx_err);
54404 goto out;
54405 }
54406
54407@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54408 if (printk_ratelimit())
54409 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
54410 __func__, length);
54411- atomic_inc(&vcc->stats->rx_drop);
54412+ atomic_inc_unchecked(&vcc->stats->rx_drop);
54413 goto out;
54414 }
54415
54416@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54417
54418 vcc->push(vcc, skb);
54419
54420- atomic_inc(&vcc->stats->rx);
54421+ atomic_inc_unchecked(&vcc->stats->rx);
54422 out:
54423 skb_trim(sarb, 0);
54424 }
54425@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
54426 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
54427
54428 usbatm_pop(vcc, skb);
54429- atomic_inc(&vcc->stats->tx);
54430+ atomic_inc_unchecked(&vcc->stats->tx);
54431
54432 skb = skb_dequeue(&instance->sndqueue);
54433 }
54434@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
54435 if (!left--)
54436 return sprintf(page,
54437 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
54438- atomic_read(&atm_dev->stats.aal5.tx),
54439- atomic_read(&atm_dev->stats.aal5.tx_err),
54440- atomic_read(&atm_dev->stats.aal5.rx),
54441- atomic_read(&atm_dev->stats.aal5.rx_err),
54442- atomic_read(&atm_dev->stats.aal5.rx_drop));
54443+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
54444+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
54445+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
54446+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
54447+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
54448
54449 if (!left--) {
54450 if (instance->disconnected)
54451diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54452index 2a3bbdf..91d72cf 100644
54453--- a/drivers/usb/core/devices.c
54454+++ b/drivers/usb/core/devices.c
54455@@ -126,7 +126,7 @@ static const char format_endpt[] =
54456 * time it gets called.
54457 */
54458 static struct device_connect_event {
54459- atomic_t count;
54460+ atomic_unchecked_t count;
54461 wait_queue_head_t wait;
54462 } device_event = {
54463 .count = ATOMIC_INIT(1),
54464@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54465
54466 void usbfs_conn_disc_event(void)
54467 {
54468- atomic_add(2, &device_event.count);
54469+ atomic_add_unchecked(2, &device_event.count);
54470 wake_up(&device_event.wait);
54471 }
54472
54473@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54474
54475 poll_wait(file, &device_event.wait, wait);
54476
54477- event_count = atomic_read(&device_event.count);
54478+ event_count = atomic_read_unchecked(&device_event.count);
54479 if (file->f_version != event_count) {
54480 file->f_version = event_count;
54481 return POLLIN | POLLRDNORM;
54482diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54483index e500243..401300f 100644
54484--- a/drivers/usb/core/devio.c
54485+++ b/drivers/usb/core/devio.c
54486@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54487 struct usb_dev_state *ps = file->private_data;
54488 struct usb_device *dev = ps->dev;
54489 ssize_t ret = 0;
54490- unsigned len;
54491+ size_t len;
54492 loff_t pos;
54493 int i;
54494
54495@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54496 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54497 struct usb_config_descriptor *config =
54498 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54499- unsigned int length = le16_to_cpu(config->wTotalLength);
54500+ size_t length = le16_to_cpu(config->wTotalLength);
54501
54502 if (*ppos < pos + length) {
54503
54504 /* The descriptor may claim to be longer than it
54505 * really is. Here is the actual allocated length. */
54506- unsigned alloclen =
54507+ size_t alloclen =
54508 le16_to_cpu(dev->config[i].desc.wTotalLength);
54509
54510- len = length - (*ppos - pos);
54511+ len = length + pos - *ppos;
54512 if (len > nbytes)
54513 len = nbytes;
54514
54515 /* Simply don't write (skip over) unallocated parts */
54516 if (alloclen > (*ppos - pos)) {
54517- alloclen -= (*ppos - pos);
54518+ alloclen = alloclen + pos - *ppos;
54519 if (copy_to_user(buf,
54520 dev->rawdescriptors[i] + (*ppos - pos),
54521 min(len, alloclen))) {
54522diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54523index 45a915c..09f9735 100644
54524--- a/drivers/usb/core/hcd.c
54525+++ b/drivers/usb/core/hcd.c
54526@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54527 */
54528 usb_get_urb(urb);
54529 atomic_inc(&urb->use_count);
54530- atomic_inc(&urb->dev->urbnum);
54531+ atomic_inc_unchecked(&urb->dev->urbnum);
54532 usbmon_urb_submit(&hcd->self, urb);
54533
54534 /* NOTE requirements on root-hub callers (usbfs and the hub
54535@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54536 urb->hcpriv = NULL;
54537 INIT_LIST_HEAD(&urb->urb_list);
54538 atomic_dec(&urb->use_count);
54539- atomic_dec(&urb->dev->urbnum);
54540+ atomic_dec_unchecked(&urb->dev->urbnum);
54541 if (atomic_read(&urb->reject))
54542 wake_up(&usb_kill_urb_queue);
54543 usb_put_urb(urb);
54544diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54545index b4bfa3a..008f926 100644
54546--- a/drivers/usb/core/hub.c
54547+++ b/drivers/usb/core/hub.c
54548@@ -26,6 +26,7 @@
54549 #include <linux/mutex.h>
54550 #include <linux/random.h>
54551 #include <linux/pm_qos.h>
54552+#include <linux/grsecurity.h>
54553
54554 #include <asm/uaccess.h>
54555 #include <asm/byteorder.h>
54556@@ -4664,6 +4665,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54557 goto done;
54558 return;
54559 }
54560+
54561+ if (gr_handle_new_usb())
54562+ goto done;
54563+
54564 if (hub_is_superspeed(hub->hdev))
54565 unit_load = 150;
54566 else
54567diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54568index f368d20..0c30ac5 100644
54569--- a/drivers/usb/core/message.c
54570+++ b/drivers/usb/core/message.c
54571@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54572 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54573 * error number.
54574 */
54575-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54576+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54577 __u8 requesttype, __u16 value, __u16 index, void *data,
54578 __u16 size, int timeout)
54579 {
54580@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54581 * If successful, 0. Otherwise a negative error number. The number of actual
54582 * bytes transferred will be stored in the @actual_length parameter.
54583 */
54584-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54585+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54586 void *data, int len, int *actual_length, int timeout)
54587 {
54588 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54589@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54590 * bytes transferred will be stored in the @actual_length parameter.
54591 *
54592 */
54593-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54594+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54595 void *data, int len, int *actual_length, int timeout)
54596 {
54597 struct urb *urb;
54598diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54599index d269738..7340cd7 100644
54600--- a/drivers/usb/core/sysfs.c
54601+++ b/drivers/usb/core/sysfs.c
54602@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54603 struct usb_device *udev;
54604
54605 udev = to_usb_device(dev);
54606- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54607+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54608 }
54609 static DEVICE_ATTR_RO(urbnum);
54610
54611diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54612index b1fb9ae..4224885 100644
54613--- a/drivers/usb/core/usb.c
54614+++ b/drivers/usb/core/usb.c
54615@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54616 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54617 dev->state = USB_STATE_ATTACHED;
54618 dev->lpm_disable_count = 1;
54619- atomic_set(&dev->urbnum, 0);
54620+ atomic_set_unchecked(&dev->urbnum, 0);
54621
54622 INIT_LIST_HEAD(&dev->ep0.urb_list);
54623 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54624diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54625index 8cfc319..4868255 100644
54626--- a/drivers/usb/early/ehci-dbgp.c
54627+++ b/drivers/usb/early/ehci-dbgp.c
54628@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54629
54630 #ifdef CONFIG_KGDB
54631 static struct kgdb_io kgdbdbgp_io_ops;
54632-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54633+static struct kgdb_io kgdbdbgp_io_ops_console;
54634+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54635 #else
54636 #define dbgp_kgdb_mode (0)
54637 #endif
54638@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54639 .write_char = kgdbdbgp_write_char,
54640 };
54641
54642+static struct kgdb_io kgdbdbgp_io_ops_console = {
54643+ .name = "kgdbdbgp",
54644+ .read_char = kgdbdbgp_read_char,
54645+ .write_char = kgdbdbgp_write_char,
54646+ .is_console = 1
54647+};
54648+
54649 static int kgdbdbgp_wait_time;
54650
54651 static int __init kgdbdbgp_parse_config(char *str)
54652@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54653 ptr++;
54654 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54655 }
54656- kgdb_register_io_module(&kgdbdbgp_io_ops);
54657- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54658+ if (early_dbgp_console.index != -1)
54659+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54660+ else
54661+ kgdb_register_io_module(&kgdbdbgp_io_ops);
54662
54663 return 0;
54664 }
54665diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54666index e971584..03495ab 100644
54667--- a/drivers/usb/gadget/function/f_uac1.c
54668+++ b/drivers/usb/gadget/function/f_uac1.c
54669@@ -14,6 +14,7 @@
54670 #include <linux/module.h>
54671 #include <linux/device.h>
54672 #include <linux/atomic.h>
54673+#include <linux/module.h>
54674
54675 #include "u_uac1.h"
54676
54677diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54678index 491082a..dfd7d17 100644
54679--- a/drivers/usb/gadget/function/u_serial.c
54680+++ b/drivers/usb/gadget/function/u_serial.c
54681@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54682 spin_lock_irq(&port->port_lock);
54683
54684 /* already open? Great. */
54685- if (port->port.count) {
54686+ if (atomic_read(&port->port.count)) {
54687 status = 0;
54688- port->port.count++;
54689+ atomic_inc(&port->port.count);
54690
54691 /* currently opening/closing? wait ... */
54692 } else if (port->openclose) {
54693@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54694 tty->driver_data = port;
54695 port->port.tty = tty;
54696
54697- port->port.count = 1;
54698+ atomic_set(&port->port.count, 1);
54699 port->openclose = false;
54700
54701 /* if connected, start the I/O stream */
54702@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54703
54704 spin_lock_irq(&port->port_lock);
54705
54706- if (port->port.count != 1) {
54707- if (port->port.count == 0)
54708+ if (atomic_read(&port->port.count) != 1) {
54709+ if (atomic_read(&port->port.count) == 0)
54710 WARN_ON(1);
54711 else
54712- --port->port.count;
54713+ atomic_dec(&port->port.count);
54714 goto exit;
54715 }
54716
54717@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54718 * and sleep if necessary
54719 */
54720 port->openclose = true;
54721- port->port.count = 0;
54722+ atomic_set(&port->port.count, 0);
54723
54724 gser = port->port_usb;
54725 if (gser && gser->disconnect)
54726@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54727 int cond;
54728
54729 spin_lock_irq(&port->port_lock);
54730- cond = (port->port.count == 0) && !port->openclose;
54731+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54732 spin_unlock_irq(&port->port_lock);
54733 return cond;
54734 }
54735@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54736 /* if it's already open, start I/O ... and notify the serial
54737 * protocol about open/close status (connect/disconnect).
54738 */
54739- if (port->port.count) {
54740+ if (atomic_read(&port->port.count)) {
54741 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54742 gs_start_io(port);
54743 if (gser->connect)
54744@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54745
54746 port->port_usb = NULL;
54747 gser->ioport = NULL;
54748- if (port->port.count > 0 || port->openclose) {
54749+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
54750 wake_up_interruptible(&port->drain_wait);
54751 if (port->port.tty)
54752 tty_hangup(port->port.tty);
54753@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54754
54755 /* finally, free any unused/unusable I/O buffers */
54756 spin_lock_irqsave(&port->port_lock, flags);
54757- if (port->port.count == 0 && !port->openclose)
54758+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
54759 gs_buf_free(&port->port_write_buf);
54760 gs_free_requests(gser->out, &port->read_pool, NULL);
54761 gs_free_requests(gser->out, &port->read_queue, NULL);
54762diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54763index 53842a1..2bef3b6 100644
54764--- a/drivers/usb/gadget/function/u_uac1.c
54765+++ b/drivers/usb/gadget/function/u_uac1.c
54766@@ -17,6 +17,7 @@
54767 #include <linux/ctype.h>
54768 #include <linux/random.h>
54769 #include <linux/syscalls.h>
54770+#include <linux/module.h>
54771
54772 #include "u_uac1.h"
54773
54774diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54775index 118edb7..7a6415f 100644
54776--- a/drivers/usb/host/ehci-hub.c
54777+++ b/drivers/usb/host/ehci-hub.c
54778@@ -769,7 +769,7 @@ static struct urb *request_single_step_set_feature_urb(
54779 urb->transfer_flags = URB_DIR_IN;
54780 usb_get_urb(urb);
54781 atomic_inc(&urb->use_count);
54782- atomic_inc(&urb->dev->urbnum);
54783+ atomic_inc_unchecked(&urb->dev->urbnum);
54784 urb->setup_dma = dma_map_single(
54785 hcd->self.controller,
54786 urb->setup_packet,
54787@@ -836,7 +836,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54788 urb->status = -EINPROGRESS;
54789 usb_get_urb(urb);
54790 atomic_inc(&urb->use_count);
54791- atomic_inc(&urb->dev->urbnum);
54792+ atomic_inc_unchecked(&urb->dev->urbnum);
54793 retval = submit_single_step_set_feature(hcd, urb, 0);
54794 if (!retval && !wait_for_completion_timeout(&done,
54795 msecs_to_jiffies(2000))) {
54796diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54797index 1db0626..4948782 100644
54798--- a/drivers/usb/host/hwa-hc.c
54799+++ b/drivers/usb/host/hwa-hc.c
54800@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54801 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54802 struct wahc *wa = &hwahc->wa;
54803 struct device *dev = &wa->usb_iface->dev;
54804- u8 mas_le[UWB_NUM_MAS/8];
54805+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54806+
54807+ if (mas_le == NULL)
54808+ return -ENOMEM;
54809
54810 /* Set the stream index */
54811 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54812@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54813 WUSB_REQ_SET_WUSB_MAS,
54814 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54815 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54816- mas_le, 32, USB_CTRL_SET_TIMEOUT);
54817+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54818 if (result < 0)
54819 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54820 out:
54821+ kfree(mas_le);
54822+
54823 return result;
54824 }
54825
54826diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54827index b3d245e..99549ed 100644
54828--- a/drivers/usb/misc/appledisplay.c
54829+++ b/drivers/usb/misc/appledisplay.c
54830@@ -84,7 +84,7 @@ struct appledisplay {
54831 struct mutex sysfslock; /* concurrent read and write */
54832 };
54833
54834-static atomic_t count_displays = ATOMIC_INIT(0);
54835+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54836 static struct workqueue_struct *wq;
54837
54838 static void appledisplay_complete(struct urb *urb)
54839@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54840
54841 /* Register backlight device */
54842 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54843- atomic_inc_return(&count_displays) - 1);
54844+ atomic_inc_return_unchecked(&count_displays) - 1);
54845 memset(&props, 0, sizeof(struct backlight_properties));
54846 props.type = BACKLIGHT_RAW;
54847 props.max_brightness = 0xff;
54848diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54849index 29fa1c3..a57b08e 100644
54850--- a/drivers/usb/serial/console.c
54851+++ b/drivers/usb/serial/console.c
54852@@ -125,7 +125,7 @@ static int usb_console_setup(struct console *co, char *options)
54853
54854 info->port = port;
54855
54856- ++port->port.count;
54857+ atomic_inc(&port->port.count);
54858 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54859 if (serial->type->set_termios) {
54860 /*
54861@@ -173,7 +173,7 @@ static int usb_console_setup(struct console *co, char *options)
54862 }
54863 /* Now that any required fake tty operations are completed restore
54864 * the tty port count */
54865- --port->port.count;
54866+ atomic_dec(&port->port.count);
54867 /* The console is special in terms of closing the device so
54868 * indicate this port is now acting as a system console. */
54869 port->port.console = 1;
54870@@ -186,7 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
54871 put_tty:
54872 tty_kref_put(tty);
54873 reset_open_count:
54874- port->port.count = 0;
54875+ atomic_set(&port->port.count, 0);
54876 usb_autopm_put_interface(serial->interface);
54877 error_get_interface:
54878 usb_serial_put(serial);
54879@@ -197,7 +197,7 @@ static int usb_console_setup(struct console *co, char *options)
54880 static void usb_console_write(struct console *co,
54881 const char *buf, unsigned count)
54882 {
54883- static struct usbcons_info *info = &usbcons_info;
54884+ struct usbcons_info *info = &usbcons_info;
54885 struct usb_serial_port *port = info->port;
54886 struct usb_serial *serial;
54887 int retval = -ENODEV;
54888diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54889index 307e339..6aa97cb 100644
54890--- a/drivers/usb/storage/usb.h
54891+++ b/drivers/usb/storage/usb.h
54892@@ -63,7 +63,7 @@ struct us_unusual_dev {
54893 __u8 useProtocol;
54894 __u8 useTransport;
54895 int (*initFunction)(struct us_data *);
54896-};
54897+} __do_const;
54898
54899
54900 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54901diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54902index a863a98..d272795 100644
54903--- a/drivers/usb/usbip/vhci.h
54904+++ b/drivers/usb/usbip/vhci.h
54905@@ -83,7 +83,7 @@ struct vhci_hcd {
54906 unsigned resuming:1;
54907 unsigned long re_timeout;
54908
54909- atomic_t seqnum;
54910+ atomic_unchecked_t seqnum;
54911
54912 /*
54913 * NOTE:
54914diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54915index 1ae9d40..c62604b 100644
54916--- a/drivers/usb/usbip/vhci_hcd.c
54917+++ b/drivers/usb/usbip/vhci_hcd.c
54918@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54919
54920 spin_lock(&vdev->priv_lock);
54921
54922- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54923+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54924 if (priv->seqnum == 0xffff)
54925 dev_info(&urb->dev->dev, "seqnum max\n");
54926
54927@@ -684,7 +684,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54928 return -ENOMEM;
54929 }
54930
54931- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54932+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54933 if (unlink->seqnum == 0xffff)
54934 pr_info("seqnum max\n");
54935
54936@@ -888,7 +888,7 @@ static int vhci_start(struct usb_hcd *hcd)
54937 vdev->rhport = rhport;
54938 }
54939
54940- atomic_set(&vhci->seqnum, 0);
54941+ atomic_set_unchecked(&vhci->seqnum, 0);
54942 spin_lock_init(&vhci->lock);
54943
54944 hcd->power_budget = 0; /* no limit */
54945diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54946index 00e4a54..d676f85 100644
54947--- a/drivers/usb/usbip/vhci_rx.c
54948+++ b/drivers/usb/usbip/vhci_rx.c
54949@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54950 if (!urb) {
54951 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54952 pr_info("max seqnum %d\n",
54953- atomic_read(&the_controller->seqnum));
54954+ atomic_read_unchecked(&the_controller->seqnum));
54955 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54956 return;
54957 }
54958diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54959index edc7267..9f65ce2 100644
54960--- a/drivers/usb/wusbcore/wa-hc.h
54961+++ b/drivers/usb/wusbcore/wa-hc.h
54962@@ -240,7 +240,7 @@ struct wahc {
54963 spinlock_t xfer_list_lock;
54964 struct work_struct xfer_enqueue_work;
54965 struct work_struct xfer_error_work;
54966- atomic_t xfer_id_count;
54967+ atomic_unchecked_t xfer_id_count;
54968
54969 kernel_ulong_t quirks;
54970 };
54971@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54972 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54973 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54974 wa->dto_in_use = 0;
54975- atomic_set(&wa->xfer_id_count, 1);
54976+ atomic_set_unchecked(&wa->xfer_id_count, 1);
54977 /* init the buf in URBs */
54978 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54979 usb_init_urb(&(wa->buf_in_urbs[index]));
54980diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54981index 69af4fd..da390d7 100644
54982--- a/drivers/usb/wusbcore/wa-xfer.c
54983+++ b/drivers/usb/wusbcore/wa-xfer.c
54984@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54985 */
54986 static void wa_xfer_id_init(struct wa_xfer *xfer)
54987 {
54988- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54989+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54990 }
54991
54992 /* Return the xfer's ID. */
54993diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54994index f018d8d..ccab63f 100644
54995--- a/drivers/vfio/vfio.c
54996+++ b/drivers/vfio/vfio.c
54997@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54998 return 0;
54999
55000 /* TODO Prevent device auto probing */
55001- WARN("Device %s added to live group %d!\n", dev_name(dev),
55002+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55003 iommu_group_id(group->iommu_group));
55004
55005 return 0;
55006diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
55007index 9484d56..d415d69 100644
55008--- a/drivers/vhost/net.c
55009+++ b/drivers/vhost/net.c
55010@@ -650,10 +650,8 @@ static void handle_rx(struct vhost_net *net)
55011 break;
55012 }
55013 /* TODO: Should check and handle checksum. */
55014-
55015- hdr.num_buffers = cpu_to_vhost16(vq, headcount);
55016 if (likely(mergeable) &&
55017- memcpy_toiovecend(nvq->hdr, (void *)&hdr.num_buffers,
55018+ memcpy_toiovecend(nvq->hdr, (unsigned char *)&headcount,
55019 offsetof(typeof(hdr), num_buffers),
55020 sizeof hdr.num_buffers)) {
55021 vq_err(vq, "Failed num_buffers write");
55022diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55023index 3bb02c6..a01ff38 100644
55024--- a/drivers/vhost/vringh.c
55025+++ b/drivers/vhost/vringh.c
55026@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55027 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
55028 {
55029 __virtio16 v = 0;
55030- int rc = get_user(v, (__force __virtio16 __user *)p);
55031+ int rc = get_user(v, (__force_user __virtio16 *)p);
55032 *val = vringh16_to_cpu(vrh, v);
55033 return rc;
55034 }
55035@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
55036 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
55037 {
55038 __virtio16 v = cpu_to_vringh16(vrh, val);
55039- return put_user(v, (__force __virtio16 __user *)p);
55040+ return put_user(v, (__force_user __virtio16 *)p);
55041 }
55042
55043 static inline int copydesc_user(void *dst, const void *src, size_t len)
55044 {
55045- return copy_from_user(dst, (__force void __user *)src, len) ?
55046+ return copy_from_user(dst, (void __force_user *)src, len) ?
55047 -EFAULT : 0;
55048 }
55049
55050@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
55051 const struct vring_used_elem *src,
55052 unsigned int num)
55053 {
55054- return copy_to_user((__force void __user *)dst, src,
55055+ return copy_to_user((void __force_user *)dst, src,
55056 sizeof(*dst) * num) ? -EFAULT : 0;
55057 }
55058
55059 static inline int xfer_from_user(void *src, void *dst, size_t len)
55060 {
55061- return copy_from_user(dst, (__force void __user *)src, len) ?
55062+ return copy_from_user(dst, (void __force_user *)src, len) ?
55063 -EFAULT : 0;
55064 }
55065
55066 static inline int xfer_to_user(void *dst, void *src, size_t len)
55067 {
55068- return copy_to_user((__force void __user *)dst, src, len) ?
55069+ return copy_to_user((void __force_user *)dst, src, len) ?
55070 -EFAULT : 0;
55071 }
55072
55073@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
55074 vrh->last_used_idx = 0;
55075 vrh->vring.num = num;
55076 /* vring expects kernel addresses, but only used via accessors. */
55077- vrh->vring.desc = (__force struct vring_desc *)desc;
55078- vrh->vring.avail = (__force struct vring_avail *)avail;
55079- vrh->vring.used = (__force struct vring_used *)used;
55080+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
55081+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
55082+ vrh->vring.used = (__force_kernel struct vring_used *)used;
55083 return 0;
55084 }
55085 EXPORT_SYMBOL(vringh_init_user);
55086@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
55087
55088 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
55089 {
55090- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
55091+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
55092 return 0;
55093 }
55094
55095diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
55096index 84a110a..96312c3 100644
55097--- a/drivers/video/backlight/kb3886_bl.c
55098+++ b/drivers/video/backlight/kb3886_bl.c
55099@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
55100 static unsigned long kb3886bl_flags;
55101 #define KB3886BL_SUSPENDED 0x01
55102
55103-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
55104+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
55105 {
55106 .ident = "Sahara Touch-iT",
55107 .matches = {
55108diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
55109index 1b0b233..6f34c2c 100644
55110--- a/drivers/video/fbdev/arcfb.c
55111+++ b/drivers/video/fbdev/arcfb.c
55112@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
55113 return -ENOSPC;
55114
55115 err = 0;
55116- if ((count + p) > fbmemlength) {
55117+ if (count > (fbmemlength - p)) {
55118 count = fbmemlength - p;
55119 err = -ENOSPC;
55120 }
55121diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
55122index aedf2fb..47c9aca 100644
55123--- a/drivers/video/fbdev/aty/aty128fb.c
55124+++ b/drivers/video/fbdev/aty/aty128fb.c
55125@@ -149,7 +149,7 @@ enum {
55126 };
55127
55128 /* Must match above enum */
55129-static char * const r128_family[] = {
55130+static const char * const r128_family[] = {
55131 "AGP",
55132 "PCI",
55133 "PRO AGP",
55134diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
55135index 37ec09b..98f8862 100644
55136--- a/drivers/video/fbdev/aty/atyfb_base.c
55137+++ b/drivers/video/fbdev/aty/atyfb_base.c
55138@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
55139 par->accel_flags = var->accel_flags; /* hack */
55140
55141 if (var->accel_flags) {
55142- info->fbops->fb_sync = atyfb_sync;
55143+ pax_open_kernel();
55144+ *(void **)&info->fbops->fb_sync = atyfb_sync;
55145+ pax_close_kernel();
55146 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55147 } else {
55148- info->fbops->fb_sync = NULL;
55149+ pax_open_kernel();
55150+ *(void **)&info->fbops->fb_sync = NULL;
55151+ pax_close_kernel();
55152 info->flags |= FBINFO_HWACCEL_DISABLED;
55153 }
55154
55155diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
55156index 2fa0317..4983f2a 100644
55157--- a/drivers/video/fbdev/aty/mach64_cursor.c
55158+++ b/drivers/video/fbdev/aty/mach64_cursor.c
55159@@ -8,6 +8,7 @@
55160 #include "../core/fb_draw.h"
55161
55162 #include <asm/io.h>
55163+#include <asm/pgtable.h>
55164
55165 #ifdef __sparc__
55166 #include <asm/fbio.h>
55167@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
55168 info->sprite.buf_align = 16; /* and 64 lines tall. */
55169 info->sprite.flags = FB_PIXMAP_IO;
55170
55171- info->fbops->fb_cursor = atyfb_cursor;
55172+ pax_open_kernel();
55173+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
55174+ pax_close_kernel();
55175
55176 return 0;
55177 }
55178diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
55179index d6cab1f..112f680 100644
55180--- a/drivers/video/fbdev/core/fb_defio.c
55181+++ b/drivers/video/fbdev/core/fb_defio.c
55182@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
55183
55184 BUG_ON(!fbdefio);
55185 mutex_init(&fbdefio->lock);
55186- info->fbops->fb_mmap = fb_deferred_io_mmap;
55187+ pax_open_kernel();
55188+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
55189+ pax_close_kernel();
55190 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
55191 INIT_LIST_HEAD(&fbdefio->pagelist);
55192 if (fbdefio->delay == 0) /* set a default of 1 s */
55193@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
55194 page->mapping = NULL;
55195 }
55196
55197- info->fbops->fb_mmap = NULL;
55198+ *(void **)&info->fbops->fb_mmap = NULL;
55199 mutex_destroy(&fbdefio->lock);
55200 }
55201 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
55202diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
55203index 0705d88..d9429bf 100644
55204--- a/drivers/video/fbdev/core/fbmem.c
55205+++ b/drivers/video/fbdev/core/fbmem.c
55206@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
55207 __u32 data;
55208 int err;
55209
55210- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
55211+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
55212
55213 data = (__u32) (unsigned long) fix->smem_start;
55214 err |= put_user(data, &fix32->smem_start);
55215diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
55216index 4254336..282567e 100644
55217--- a/drivers/video/fbdev/hyperv_fb.c
55218+++ b/drivers/video/fbdev/hyperv_fb.c
55219@@ -240,7 +240,7 @@ static uint screen_fb_size;
55220 static inline int synthvid_send(struct hv_device *hdev,
55221 struct synthvid_msg *msg)
55222 {
55223- static atomic64_t request_id = ATOMIC64_INIT(0);
55224+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
55225 int ret;
55226
55227 msg->pipe_hdr.type = PIPE_MSG_DATA;
55228@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
55229
55230 ret = vmbus_sendpacket(hdev->channel, msg,
55231 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
55232- atomic64_inc_return(&request_id),
55233+ atomic64_inc_return_unchecked(&request_id),
55234 VM_PKT_DATA_INBAND, 0);
55235
55236 if (ret)
55237diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
55238index 7672d2e..b56437f 100644
55239--- a/drivers/video/fbdev/i810/i810_accel.c
55240+++ b/drivers/video/fbdev/i810/i810_accel.c
55241@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
55242 }
55243 }
55244 printk("ringbuffer lockup!!!\n");
55245+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
55246 i810_report_error(mmio);
55247 par->dev_flags |= LOCKUP;
55248 info->pixmap.scan_align = 1;
55249diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55250index a01147f..5d896f8 100644
55251--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55252+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55253@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
55254
55255 #ifdef CONFIG_FB_MATROX_MYSTIQUE
55256 struct matrox_switch matrox_mystique = {
55257- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
55258+ .preinit = MGA1064_preinit,
55259+ .reset = MGA1064_reset,
55260+ .init = MGA1064_init,
55261+ .restore = MGA1064_restore,
55262 };
55263 EXPORT_SYMBOL(matrox_mystique);
55264 #endif
55265
55266 #ifdef CONFIG_FB_MATROX_G
55267 struct matrox_switch matrox_G100 = {
55268- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
55269+ .preinit = MGAG100_preinit,
55270+ .reset = MGAG100_reset,
55271+ .init = MGAG100_init,
55272+ .restore = MGAG100_restore,
55273 };
55274 EXPORT_SYMBOL(matrox_G100);
55275 #endif
55276diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55277index 195ad7c..09743fc 100644
55278--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55279+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55280@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
55281 }
55282
55283 struct matrox_switch matrox_millennium = {
55284- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
55285+ .preinit = Ti3026_preinit,
55286+ .reset = Ti3026_reset,
55287+ .init = Ti3026_init,
55288+ .restore = Ti3026_restore
55289 };
55290 EXPORT_SYMBOL(matrox_millennium);
55291 #endif
55292diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55293index fe92eed..106e085 100644
55294--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55295+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55296@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
55297 struct mb862xxfb_par *par = info->par;
55298
55299 if (info->var.bits_per_pixel == 32) {
55300- info->fbops->fb_fillrect = cfb_fillrect;
55301- info->fbops->fb_copyarea = cfb_copyarea;
55302- info->fbops->fb_imageblit = cfb_imageblit;
55303+ pax_open_kernel();
55304+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55305+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55306+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55307+ pax_close_kernel();
55308 } else {
55309 outreg(disp, GC_L0EM, 3);
55310- info->fbops->fb_fillrect = mb86290fb_fillrect;
55311- info->fbops->fb_copyarea = mb86290fb_copyarea;
55312- info->fbops->fb_imageblit = mb86290fb_imageblit;
55313+ pax_open_kernel();
55314+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
55315+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
55316+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
55317+ pax_close_kernel();
55318 }
55319 outreg(draw, GDC_REG_DRAW_BASE, 0);
55320 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
55321diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
55322index def0412..fed6529 100644
55323--- a/drivers/video/fbdev/nvidia/nvidia.c
55324+++ b/drivers/video/fbdev/nvidia/nvidia.c
55325@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
55326 info->fix.line_length = (info->var.xres_virtual *
55327 info->var.bits_per_pixel) >> 3;
55328 if (info->var.accel_flags) {
55329- info->fbops->fb_imageblit = nvidiafb_imageblit;
55330- info->fbops->fb_fillrect = nvidiafb_fillrect;
55331- info->fbops->fb_copyarea = nvidiafb_copyarea;
55332- info->fbops->fb_sync = nvidiafb_sync;
55333+ pax_open_kernel();
55334+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
55335+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
55336+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
55337+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
55338+ pax_close_kernel();
55339 info->pixmap.scan_align = 4;
55340 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55341 info->flags |= FBINFO_READS_FAST;
55342 NVResetGraphics(info);
55343 } else {
55344- info->fbops->fb_imageblit = cfb_imageblit;
55345- info->fbops->fb_fillrect = cfb_fillrect;
55346- info->fbops->fb_copyarea = cfb_copyarea;
55347- info->fbops->fb_sync = NULL;
55348+ pax_open_kernel();
55349+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55350+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55351+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55352+ *(void **)&info->fbops->fb_sync = NULL;
55353+ pax_close_kernel();
55354 info->pixmap.scan_align = 1;
55355 info->flags |= FBINFO_HWACCEL_DISABLED;
55356 info->flags &= ~FBINFO_READS_FAST;
55357@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
55358 info->pixmap.size = 8 * 1024;
55359 info->pixmap.flags = FB_PIXMAP_SYSTEM;
55360
55361- if (!hwcur)
55362- info->fbops->fb_cursor = NULL;
55363+ if (!hwcur) {
55364+ pax_open_kernel();
55365+ *(void **)&info->fbops->fb_cursor = NULL;
55366+ pax_close_kernel();
55367+ }
55368
55369 info->var.accel_flags = (!noaccel);
55370
55371diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
55372index 2412a0d..294215b 100644
55373--- a/drivers/video/fbdev/omap2/dss/display.c
55374+++ b/drivers/video/fbdev/omap2/dss/display.c
55375@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
55376 if (dssdev->name == NULL)
55377 dssdev->name = dssdev->alias;
55378
55379+ pax_open_kernel();
55380 if (drv && drv->get_resolution == NULL)
55381- drv->get_resolution = omapdss_default_get_resolution;
55382+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
55383 if (drv && drv->get_recommended_bpp == NULL)
55384- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55385+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55386 if (drv && drv->get_timings == NULL)
55387- drv->get_timings = omapdss_default_get_timings;
55388+ *(void **)&drv->get_timings = omapdss_default_get_timings;
55389+ pax_close_kernel();
55390
55391 mutex_lock(&panel_list_mutex);
55392 list_add_tail(&dssdev->panel_list, &panel_list);
55393diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
55394index 83433cb..71e9b98 100644
55395--- a/drivers/video/fbdev/s1d13xxxfb.c
55396+++ b/drivers/video/fbdev/s1d13xxxfb.c
55397@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55398
55399 switch(prod_id) {
55400 case S1D13506_PROD_ID: /* activate acceleration */
55401- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55402- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55403+ pax_open_kernel();
55404+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55405+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55406+ pax_close_kernel();
55407 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55408 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55409 break;
55410diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55411index d3013cd..95b8285 100644
55412--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
55413+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55414@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55415 }
55416
55417 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55418- lcdc_sys_write_index,
55419- lcdc_sys_write_data,
55420- lcdc_sys_read_data,
55421+ .write_index = lcdc_sys_write_index,
55422+ .write_data = lcdc_sys_write_data,
55423+ .read_data = lcdc_sys_read_data,
55424 };
55425
55426 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55427diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
55428index 9279e5f..d5f5276 100644
55429--- a/drivers/video/fbdev/smscufx.c
55430+++ b/drivers/video/fbdev/smscufx.c
55431@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55432 fb_deferred_io_cleanup(info);
55433 kfree(info->fbdefio);
55434 info->fbdefio = NULL;
55435- info->fbops->fb_mmap = ufx_ops_mmap;
55436+ pax_open_kernel();
55437+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55438+ pax_close_kernel();
55439 }
55440
55441 pr_debug("released /dev/fb%d user=%d count=%d",
55442diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
55443index ff2b873..626a8d5 100644
55444--- a/drivers/video/fbdev/udlfb.c
55445+++ b/drivers/video/fbdev/udlfb.c
55446@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55447 dlfb_urb_completion(urb);
55448
55449 error:
55450- atomic_add(bytes_sent, &dev->bytes_sent);
55451- atomic_add(bytes_identical, &dev->bytes_identical);
55452- atomic_add(width*height*2, &dev->bytes_rendered);
55453+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55454+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55455+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55456 end_cycles = get_cycles();
55457- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55458+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55459 >> 10)), /* Kcycles */
55460 &dev->cpu_kcycles_used);
55461
55462@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55463 dlfb_urb_completion(urb);
55464
55465 error:
55466- atomic_add(bytes_sent, &dev->bytes_sent);
55467- atomic_add(bytes_identical, &dev->bytes_identical);
55468- atomic_add(bytes_rendered, &dev->bytes_rendered);
55469+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55470+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55471+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55472 end_cycles = get_cycles();
55473- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55474+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55475 >> 10)), /* Kcycles */
55476 &dev->cpu_kcycles_used);
55477 }
55478@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55479 fb_deferred_io_cleanup(info);
55480 kfree(info->fbdefio);
55481 info->fbdefio = NULL;
55482- info->fbops->fb_mmap = dlfb_ops_mmap;
55483+ pax_open_kernel();
55484+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55485+ pax_close_kernel();
55486 }
55487
55488 pr_warn("released /dev/fb%d user=%d count=%d\n",
55489@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55490 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55491 struct dlfb_data *dev = fb_info->par;
55492 return snprintf(buf, PAGE_SIZE, "%u\n",
55493- atomic_read(&dev->bytes_rendered));
55494+ atomic_read_unchecked(&dev->bytes_rendered));
55495 }
55496
55497 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55498@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55499 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55500 struct dlfb_data *dev = fb_info->par;
55501 return snprintf(buf, PAGE_SIZE, "%u\n",
55502- atomic_read(&dev->bytes_identical));
55503+ atomic_read_unchecked(&dev->bytes_identical));
55504 }
55505
55506 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55507@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55508 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55509 struct dlfb_data *dev = fb_info->par;
55510 return snprintf(buf, PAGE_SIZE, "%u\n",
55511- atomic_read(&dev->bytes_sent));
55512+ atomic_read_unchecked(&dev->bytes_sent));
55513 }
55514
55515 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55516@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55517 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55518 struct dlfb_data *dev = fb_info->par;
55519 return snprintf(buf, PAGE_SIZE, "%u\n",
55520- atomic_read(&dev->cpu_kcycles_used));
55521+ atomic_read_unchecked(&dev->cpu_kcycles_used));
55522 }
55523
55524 static ssize_t edid_show(
55525@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55526 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55527 struct dlfb_data *dev = fb_info->par;
55528
55529- atomic_set(&dev->bytes_rendered, 0);
55530- atomic_set(&dev->bytes_identical, 0);
55531- atomic_set(&dev->bytes_sent, 0);
55532- atomic_set(&dev->cpu_kcycles_used, 0);
55533+ atomic_set_unchecked(&dev->bytes_rendered, 0);
55534+ atomic_set_unchecked(&dev->bytes_identical, 0);
55535+ atomic_set_unchecked(&dev->bytes_sent, 0);
55536+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55537
55538 return count;
55539 }
55540diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55541index d32d1c4..46722e6 100644
55542--- a/drivers/video/fbdev/uvesafb.c
55543+++ b/drivers/video/fbdev/uvesafb.c
55544@@ -19,6 +19,7 @@
55545 #include <linux/io.h>
55546 #include <linux/mutex.h>
55547 #include <linux/slab.h>
55548+#include <linux/moduleloader.h>
55549 #include <video/edid.h>
55550 #include <video/uvesafb.h>
55551 #ifdef CONFIG_X86
55552@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55553 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55554 par->pmi_setpal = par->ypan = 0;
55555 } else {
55556+
55557+#ifdef CONFIG_PAX_KERNEXEC
55558+#ifdef CONFIG_MODULES
55559+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55560+#endif
55561+ if (!par->pmi_code) {
55562+ par->pmi_setpal = par->ypan = 0;
55563+ return 0;
55564+ }
55565+#endif
55566+
55567 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55568 + task->t.regs.edi);
55569+
55570+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55571+ pax_open_kernel();
55572+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55573+ pax_close_kernel();
55574+
55575+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55576+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55577+#else
55578 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55579 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55580+#endif
55581+
55582 printk(KERN_INFO "uvesafb: protected mode interface info at "
55583 "%04x:%04x\n",
55584 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55585@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55586 par->ypan = ypan;
55587
55588 if (par->pmi_setpal || par->ypan) {
55589+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55590 if (__supported_pte_mask & _PAGE_NX) {
55591 par->pmi_setpal = par->ypan = 0;
55592 printk(KERN_WARNING "uvesafb: NX protection is active, "
55593 "better not use the PMI.\n");
55594- } else {
55595+ } else
55596+#endif
55597 uvesafb_vbe_getpmi(task, par);
55598- }
55599 }
55600 #else
55601 /* The protected mode interface is not available on non-x86. */
55602@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55603 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55604
55605 /* Disable blanking if the user requested so. */
55606- if (!blank)
55607- info->fbops->fb_blank = NULL;
55608+ if (!blank) {
55609+ pax_open_kernel();
55610+ *(void **)&info->fbops->fb_blank = NULL;
55611+ pax_close_kernel();
55612+ }
55613
55614 /*
55615 * Find out how much IO memory is required for the mode with
55616@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55617 info->flags = FBINFO_FLAG_DEFAULT |
55618 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55619
55620- if (!par->ypan)
55621- info->fbops->fb_pan_display = NULL;
55622+ if (!par->ypan) {
55623+ pax_open_kernel();
55624+ *(void **)&info->fbops->fb_pan_display = NULL;
55625+ pax_close_kernel();
55626+ }
55627 }
55628
55629 static void uvesafb_init_mtrr(struct fb_info *info)
55630@@ -1786,6 +1816,11 @@ out_mode:
55631 out:
55632 kfree(par->vbe_modes);
55633
55634+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55635+ if (par->pmi_code)
55636+ module_memfree_exec(par->pmi_code);
55637+#endif
55638+
55639 framebuffer_release(info);
55640 return err;
55641 }
55642@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
55643 kfree(par->vbe_state_orig);
55644 kfree(par->vbe_state_saved);
55645
55646+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55647+ if (par->pmi_code)
55648+ module_memfree_exec(par->pmi_code);
55649+#endif
55650+
55651 framebuffer_release(info);
55652 }
55653 return 0;
55654diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55655index d79a0ac..2d0c3d4 100644
55656--- a/drivers/video/fbdev/vesafb.c
55657+++ b/drivers/video/fbdev/vesafb.c
55658@@ -9,6 +9,7 @@
55659 */
55660
55661 #include <linux/module.h>
55662+#include <linux/moduleloader.h>
55663 #include <linux/kernel.h>
55664 #include <linux/errno.h>
55665 #include <linux/string.h>
55666@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55667 static int vram_total; /* Set total amount of memory */
55668 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55669 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55670-static void (*pmi_start)(void) __read_mostly;
55671-static void (*pmi_pal) (void) __read_mostly;
55672+static void (*pmi_start)(void) __read_only;
55673+static void (*pmi_pal) (void) __read_only;
55674 static int depth __read_mostly;
55675 static int vga_compat __read_mostly;
55676 /* --------------------------------------------------------------------- */
55677@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55678 unsigned int size_remap;
55679 unsigned int size_total;
55680 char *option = NULL;
55681+ void *pmi_code = NULL;
55682
55683 /* ignore error return of fb_get_options */
55684 fb_get_options("vesafb", &option);
55685@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55686 size_remap = size_total;
55687 vesafb_fix.smem_len = size_remap;
55688
55689-#ifndef __i386__
55690- screen_info.vesapm_seg = 0;
55691-#endif
55692-
55693 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55694 printk(KERN_WARNING
55695 "vesafb: cannot reserve video memory at 0x%lx\n",
55696@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55697 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55698 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55699
55700+#ifdef __i386__
55701+
55702+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55703+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
55704+ if (!pmi_code)
55705+#elif !defined(CONFIG_PAX_KERNEXEC)
55706+ if (0)
55707+#endif
55708+
55709+#endif
55710+ screen_info.vesapm_seg = 0;
55711+
55712 if (screen_info.vesapm_seg) {
55713- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55714- screen_info.vesapm_seg,screen_info.vesapm_off);
55715+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55716+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55717 }
55718
55719 if (screen_info.vesapm_seg < 0xc000)
55720@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55721
55722 if (ypan || pmi_setpal) {
55723 unsigned short *pmi_base;
55724+
55725 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55726- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55727- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55728+
55729+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55730+ pax_open_kernel();
55731+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55732+#else
55733+ pmi_code = pmi_base;
55734+#endif
55735+
55736+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55737+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55738+
55739+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55740+ pmi_start = ktva_ktla(pmi_start);
55741+ pmi_pal = ktva_ktla(pmi_pal);
55742+ pax_close_kernel();
55743+#endif
55744+
55745 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55746 if (pmi_base[3]) {
55747 printk(KERN_INFO "vesafb: pmi: ports = ");
55748@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55749 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55750 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55751
55752- if (!ypan)
55753- info->fbops->fb_pan_display = NULL;
55754+ if (!ypan) {
55755+ pax_open_kernel();
55756+ *(void **)&info->fbops->fb_pan_display = NULL;
55757+ pax_close_kernel();
55758+ }
55759
55760 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55761 err = -ENOMEM;
55762@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55763 fb_info(info, "%s frame buffer device\n", info->fix.id);
55764 return 0;
55765 err:
55766+
55767+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55768+ module_memfree_exec(pmi_code);
55769+#endif
55770+
55771 if (info->screen_base)
55772 iounmap(info->screen_base);
55773 framebuffer_release(info);
55774diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55775index 88714ae..16c2e11 100644
55776--- a/drivers/video/fbdev/via/via_clock.h
55777+++ b/drivers/video/fbdev/via/via_clock.h
55778@@ -56,7 +56,7 @@ struct via_clock {
55779
55780 void (*set_engine_pll_state)(u8 state);
55781 void (*set_engine_pll)(struct via_pll_config config);
55782-};
55783+} __no_const;
55784
55785
55786 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55787diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55788index 3c14e43..2630570 100644
55789--- a/drivers/video/logo/logo_linux_clut224.ppm
55790+++ b/drivers/video/logo/logo_linux_clut224.ppm
55791@@ -2,1603 +2,1123 @@ P3
55792 # Standard 224-color Linux logo
55793 80 80
55794 255
55795- 0 0 0 0 0 0 0 0 0 0 0 0
55796- 0 0 0 0 0 0 0 0 0 0 0 0
55797- 0 0 0 0 0 0 0 0 0 0 0 0
55798- 0 0 0 0 0 0 0 0 0 0 0 0
55799- 0 0 0 0 0 0 0 0 0 0 0 0
55800- 0 0 0 0 0 0 0 0 0 0 0 0
55801- 0 0 0 0 0 0 0 0 0 0 0 0
55802- 0 0 0 0 0 0 0 0 0 0 0 0
55803- 0 0 0 0 0 0 0 0 0 0 0 0
55804- 6 6 6 6 6 6 10 10 10 10 10 10
55805- 10 10 10 6 6 6 6 6 6 6 6 6
55806- 0 0 0 0 0 0 0 0 0 0 0 0
55807- 0 0 0 0 0 0 0 0 0 0 0 0
55808- 0 0 0 0 0 0 0 0 0 0 0 0
55809- 0 0 0 0 0 0 0 0 0 0 0 0
55810- 0 0 0 0 0 0 0 0 0 0 0 0
55811- 0 0 0 0 0 0 0 0 0 0 0 0
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- 0 0 0 0 0 0 0 0 0 0 0 0
55822- 0 0 0 0 0 0 0 0 0 0 0 0
55823- 0 0 0 6 6 6 10 10 10 14 14 14
55824- 22 22 22 26 26 26 30 30 30 34 34 34
55825- 30 30 30 30 30 30 26 26 26 18 18 18
55826- 14 14 14 10 10 10 6 6 6 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 1 0 0 1 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 0 0 0 0 0 0 0 0 0
55841- 0 0 0 0 0 0 0 0 0 0 0 0
55842- 0 0 0 0 0 0 0 0 0 0 0 0
55843- 6 6 6 14 14 14 26 26 26 42 42 42
55844- 54 54 54 66 66 66 78 78 78 78 78 78
55845- 78 78 78 74 74 74 66 66 66 54 54 54
55846- 42 42 42 26 26 26 18 18 18 10 10 10
55847- 6 6 6 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 0 0 0 0 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 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55861- 0 0 0 0 0 0 0 0 0 0 0 0
55862- 0 0 0 0 0 0 0 0 0 10 10 10
55863- 22 22 22 42 42 42 66 66 66 86 86 86
55864- 66 66 66 38 38 38 38 38 38 22 22 22
55865- 26 26 26 34 34 34 54 54 54 66 66 66
55866- 86 86 86 70 70 70 46 46 46 26 26 26
55867- 14 14 14 6 6 6 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 0 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 1 0 0 1 0 0 1 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 0 0 0
55880- 0 0 0 0 0 0 0 0 0 0 0 0
55881- 0 0 0 0 0 0 0 0 0 0 0 0
55882- 0 0 0 0 0 0 10 10 10 26 26 26
55883- 50 50 50 82 82 82 58 58 58 6 6 6
55884- 2 2 6 2 2 6 2 2 6 2 2 6
55885- 2 2 6 2 2 6 2 2 6 2 2 6
55886- 6 6 6 54 54 54 86 86 86 66 66 66
55887- 38 38 38 18 18 18 6 6 6 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 0 0 0 0 0 0 0 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 0 0 0 0 0 0
55900- 0 0 0 0 0 0 0 0 0 0 0 0
55901- 0 0 0 0 0 0 0 0 0 0 0 0
55902- 0 0 0 6 6 6 22 22 22 50 50 50
55903- 78 78 78 34 34 34 2 2 6 2 2 6
55904- 2 2 6 2 2 6 2 2 6 2 2 6
55905- 2 2 6 2 2 6 2 2 6 2 2 6
55906- 2 2 6 2 2 6 6 6 6 70 70 70
55907- 78 78 78 46 46 46 22 22 22 6 6 6
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 1 0 0 1 0 0 1 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 0 0 0 0 0 0 0 0 0
55920- 0 0 0 0 0 0 0 0 0 0 0 0
55921- 0 0 0 0 0 0 0 0 0 0 0 0
55922- 6 6 6 18 18 18 42 42 42 82 82 82
55923- 26 26 26 2 2 6 2 2 6 2 2 6
55924- 2 2 6 2 2 6 2 2 6 2 2 6
55925- 2 2 6 2 2 6 2 2 6 14 14 14
55926- 46 46 46 34 34 34 6 6 6 2 2 6
55927- 42 42 42 78 78 78 42 42 42 18 18 18
55928- 6 6 6 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 0 0 0 0 0 0 0 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 1 0 0 0 0 0 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55940- 0 0 0 0 0 0 0 0 0 0 0 0
55941- 0 0 0 0 0 0 0 0 0 0 0 0
55942- 10 10 10 30 30 30 66 66 66 58 58 58
55943- 2 2 6 2 2 6 2 2 6 2 2 6
55944- 2 2 6 2 2 6 2 2 6 2 2 6
55945- 2 2 6 2 2 6 2 2 6 26 26 26
55946- 86 86 86 101 101 101 46 46 46 10 10 10
55947- 2 2 6 58 58 58 70 70 70 34 34 34
55948- 10 10 10 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 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55960- 0 0 0 0 0 0 0 0 0 0 0 0
55961- 0 0 0 0 0 0 0 0 0 0 0 0
55962- 14 14 14 42 42 42 86 86 86 10 10 10
55963- 2 2 6 2 2 6 2 2 6 2 2 6
55964- 2 2 6 2 2 6 2 2 6 2 2 6
55965- 2 2 6 2 2 6 2 2 6 30 30 30
55966- 94 94 94 94 94 94 58 58 58 26 26 26
55967- 2 2 6 6 6 6 78 78 78 54 54 54
55968- 22 22 22 6 6 6 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 0 0 0 0 0 0 0 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- 0 0 0 0 0 0 0 0 0 0 0 0
55980- 0 0 0 0 0 0 0 0 0 0 0 0
55981- 0 0 0 0 0 0 0 0 0 6 6 6
55982- 22 22 22 62 62 62 62 62 62 2 2 6
55983- 2 2 6 2 2 6 2 2 6 2 2 6
55984- 2 2 6 2 2 6 2 2 6 2 2 6
55985- 2 2 6 2 2 6 2 2 6 26 26 26
55986- 54 54 54 38 38 38 18 18 18 10 10 10
55987- 2 2 6 2 2 6 34 34 34 82 82 82
55988- 38 38 38 14 14 14 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 1 0 0 1 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 0 0 0
55999- 0 0 0 0 0 0 0 0 0 0 0 0
56000- 0 0 0 0 0 0 0 0 0 0 0 0
56001- 0 0 0 0 0 0 0 0 0 6 6 6
56002- 30 30 30 78 78 78 30 30 30 2 2 6
56003- 2 2 6 2 2 6 2 2 6 2 2 6
56004- 2 2 6 2 2 6 2 2 6 2 2 6
56005- 2 2 6 2 2 6 2 2 6 10 10 10
56006- 10 10 10 2 2 6 2 2 6 2 2 6
56007- 2 2 6 2 2 6 2 2 6 78 78 78
56008- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 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 1 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 0 0 0
56019- 0 0 0 0 0 0 0 0 0 0 0 0
56020- 0 0 0 0 0 0 0 0 0 0 0 0
56021- 0 0 0 0 0 0 0 0 0 10 10 10
56022- 38 38 38 86 86 86 14 14 14 2 2 6
56023- 2 2 6 2 2 6 2 2 6 2 2 6
56024- 2 2 6 2 2 6 2 2 6 2 2 6
56025- 2 2 6 2 2 6 2 2 6 2 2 6
56026- 2 2 6 2 2 6 2 2 6 2 2 6
56027- 2 2 6 2 2 6 2 2 6 54 54 54
56028- 66 66 66 26 26 26 6 6 6 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 0 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 1 0 0 1 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 0 0 0
56039- 0 0 0 0 0 0 0 0 0 0 0 0
56040- 0 0 0 0 0 0 0 0 0 0 0 0
56041- 0 0 0 0 0 0 0 0 0 14 14 14
56042- 42 42 42 82 82 82 2 2 6 2 2 6
56043- 2 2 6 6 6 6 10 10 10 2 2 6
56044- 2 2 6 2 2 6 2 2 6 2 2 6
56045- 2 2 6 2 2 6 2 2 6 6 6 6
56046- 14 14 14 10 10 10 2 2 6 2 2 6
56047- 2 2 6 2 2 6 2 2 6 18 18 18
56048- 82 82 82 34 34 34 10 10 10 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 0 0 0 0 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 1 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 0 0 0
56059- 0 0 0 0 0 0 0 0 0 0 0 0
56060- 0 0 0 0 0 0 0 0 0 0 0 0
56061- 0 0 0 0 0 0 0 0 0 14 14 14
56062- 46 46 46 86 86 86 2 2 6 2 2 6
56063- 6 6 6 6 6 6 22 22 22 34 34 34
56064- 6 6 6 2 2 6 2 2 6 2 2 6
56065- 2 2 6 2 2 6 18 18 18 34 34 34
56066- 10 10 10 50 50 50 22 22 22 2 2 6
56067- 2 2 6 2 2 6 2 2 6 10 10 10
56068- 86 86 86 42 42 42 14 14 14 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 0 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 1 0 0 1 0 0 1 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 0 0 0
56079- 0 0 0 0 0 0 0 0 0 0 0 0
56080- 0 0 0 0 0 0 0 0 0 0 0 0
56081- 0 0 0 0 0 0 0 0 0 14 14 14
56082- 46 46 46 86 86 86 2 2 6 2 2 6
56083- 38 38 38 116 116 116 94 94 94 22 22 22
56084- 22 22 22 2 2 6 2 2 6 2 2 6
56085- 14 14 14 86 86 86 138 138 138 162 162 162
56086-154 154 154 38 38 38 26 26 26 6 6 6
56087- 2 2 6 2 2 6 2 2 6 2 2 6
56088- 86 86 86 46 46 46 14 14 14 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 0 0 0 0 0 0 0 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 0 0 0
56099- 0 0 0 0 0 0 0 0 0 0 0 0
56100- 0 0 0 0 0 0 0 0 0 0 0 0
56101- 0 0 0 0 0 0 0 0 0 14 14 14
56102- 46 46 46 86 86 86 2 2 6 14 14 14
56103-134 134 134 198 198 198 195 195 195 116 116 116
56104- 10 10 10 2 2 6 2 2 6 6 6 6
56105-101 98 89 187 187 187 210 210 210 218 218 218
56106-214 214 214 134 134 134 14 14 14 6 6 6
56107- 2 2 6 2 2 6 2 2 6 2 2 6
56108- 86 86 86 50 50 50 18 18 18 6 6 6
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 1 0 0 0
56116- 0 0 1 0 0 1 0 0 1 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 0 0 0
56119- 0 0 0 0 0 0 0 0 0 0 0 0
56120- 0 0 0 0 0 0 0 0 0 0 0 0
56121- 0 0 0 0 0 0 0 0 0 14 14 14
56122- 46 46 46 86 86 86 2 2 6 54 54 54
56123-218 218 218 195 195 195 226 226 226 246 246 246
56124- 58 58 58 2 2 6 2 2 6 30 30 30
56125-210 210 210 253 253 253 174 174 174 123 123 123
56126-221 221 221 234 234 234 74 74 74 2 2 6
56127- 2 2 6 2 2 6 2 2 6 2 2 6
56128- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 0 0 0
56133- 0 0 0 0 0 0 0 0 0 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 0 0 0
56139- 0 0 0 0 0 0 0 0 0 0 0 0
56140- 0 0 0 0 0 0 0 0 0 0 0 0
56141- 0 0 0 0 0 0 0 0 0 14 14 14
56142- 46 46 46 82 82 82 2 2 6 106 106 106
56143-170 170 170 26 26 26 86 86 86 226 226 226
56144-123 123 123 10 10 10 14 14 14 46 46 46
56145-231 231 231 190 190 190 6 6 6 70 70 70
56146- 90 90 90 238 238 238 158 158 158 2 2 6
56147- 2 2 6 2 2 6 2 2 6 2 2 6
56148- 70 70 70 58 58 58 22 22 22 6 6 6
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 1 0 0 0
56156- 0 0 1 0 0 1 0 0 1 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 0 0 0
56159- 0 0 0 0 0 0 0 0 0 0 0 0
56160- 0 0 0 0 0 0 0 0 0 0 0 0
56161- 0 0 0 0 0 0 0 0 0 14 14 14
56162- 42 42 42 86 86 86 6 6 6 116 116 116
56163-106 106 106 6 6 6 70 70 70 149 149 149
56164-128 128 128 18 18 18 38 38 38 54 54 54
56165-221 221 221 106 106 106 2 2 6 14 14 14
56166- 46 46 46 190 190 190 198 198 198 2 2 6
56167- 2 2 6 2 2 6 2 2 6 2 2 6
56168- 74 74 74 62 62 62 22 22 22 6 6 6
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 0 0 0 0
56173- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
56176- 0 0 1 0 0 0 0 0 1 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 0 0 0
56179- 0 0 0 0 0 0 0 0 0 0 0 0
56180- 0 0 0 0 0 0 0 0 0 0 0 0
56181- 0 0 0 0 0 0 0 0 0 14 14 14
56182- 42 42 42 94 94 94 14 14 14 101 101 101
56183-128 128 128 2 2 6 18 18 18 116 116 116
56184-118 98 46 121 92 8 121 92 8 98 78 10
56185-162 162 162 106 106 106 2 2 6 2 2 6
56186- 2 2 6 195 195 195 195 195 195 6 6 6
56187- 2 2 6 2 2 6 2 2 6 2 2 6
56188- 74 74 74 62 62 62 22 22 22 6 6 6
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 0 0 0 0
56193- 0 0 0 0 0 0 0 0 0 0 0 0
56194- 0 0 0 0 0 0 0 0 0 0 0 0
56195- 0 0 0 0 0 0 0 0 1 0 0 1
56196- 0 0 1 0 0 0 0 0 1 0 0 0
56197- 0 0 0 0 0 0 0 0 0 0 0 0
56198- 0 0 0 0 0 0 0 0 0 0 0 0
56199- 0 0 0 0 0 0 0 0 0 0 0 0
56200- 0 0 0 0 0 0 0 0 0 0 0 0
56201- 0 0 0 0 0 0 0 0 0 10 10 10
56202- 38 38 38 90 90 90 14 14 14 58 58 58
56203-210 210 210 26 26 26 54 38 6 154 114 10
56204-226 170 11 236 186 11 225 175 15 184 144 12
56205-215 174 15 175 146 61 37 26 9 2 2 6
56206- 70 70 70 246 246 246 138 138 138 2 2 6
56207- 2 2 6 2 2 6 2 2 6 2 2 6
56208- 70 70 70 66 66 66 26 26 26 6 6 6
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 0 0 0 0
56213- 0 0 0 0 0 0 0 0 0 0 0 0
56214- 0 0 0 0 0 0 0 0 0 0 0 0
56215- 0 0 0 0 0 0 0 0 0 0 0 0
56216- 0 0 0 0 0 0 0 0 0 0 0 0
56217- 0 0 0 0 0 0 0 0 0 0 0 0
56218- 0 0 0 0 0 0 0 0 0 0 0 0
56219- 0 0 0 0 0 0 0 0 0 0 0 0
56220- 0 0 0 0 0 0 0 0 0 0 0 0
56221- 0 0 0 0 0 0 0 0 0 10 10 10
56222- 38 38 38 86 86 86 14 14 14 10 10 10
56223-195 195 195 188 164 115 192 133 9 225 175 15
56224-239 182 13 234 190 10 232 195 16 232 200 30
56225-245 207 45 241 208 19 232 195 16 184 144 12
56226-218 194 134 211 206 186 42 42 42 2 2 6
56227- 2 2 6 2 2 6 2 2 6 2 2 6
56228- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0
56239- 0 0 0 0 0 0 0 0 0 0 0 0
56240- 0 0 0 0 0 0 0 0 0 0 0 0
56241- 0 0 0 0 0 0 0 0 0 10 10 10
56242- 34 34 34 86 86 86 14 14 14 2 2 6
56243-121 87 25 192 133 9 219 162 10 239 182 13
56244-236 186 11 232 195 16 241 208 19 244 214 54
56245-246 218 60 246 218 38 246 215 20 241 208 19
56246-241 208 19 226 184 13 121 87 25 2 2 6
56247- 2 2 6 2 2 6 2 2 6 2 2 6
56248- 50 50 50 82 82 82 34 34 34 10 10 10
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 0 0 0
56259- 0 0 0 0 0 0 0 0 0 0 0 0
56260- 0 0 0 0 0 0 0 0 0 0 0 0
56261- 0 0 0 0 0 0 0 0 0 10 10 10
56262- 34 34 34 82 82 82 30 30 30 61 42 6
56263-180 123 7 206 145 10 230 174 11 239 182 13
56264-234 190 10 238 202 15 241 208 19 246 218 74
56265-246 218 38 246 215 20 246 215 20 246 215 20
56266-226 184 13 215 174 15 184 144 12 6 6 6
56267- 2 2 6 2 2 6 2 2 6 2 2 6
56268- 26 26 26 94 94 94 42 42 42 14 14 14
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 0 0 0
56279- 0 0 0 0 0 0 0 0 0 0 0 0
56280- 0 0 0 0 0 0 0 0 0 0 0 0
56281- 0 0 0 0 0 0 0 0 0 10 10 10
56282- 30 30 30 78 78 78 50 50 50 104 69 6
56283-192 133 9 216 158 10 236 178 12 236 186 11
56284-232 195 16 241 208 19 244 214 54 245 215 43
56285-246 215 20 246 215 20 241 208 19 198 155 10
56286-200 144 11 216 158 10 156 118 10 2 2 6
56287- 2 2 6 2 2 6 2 2 6 2 2 6
56288- 6 6 6 90 90 90 54 54 54 18 18 18
56289- 6 6 6 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 0 0 0
56299- 0 0 0 0 0 0 0 0 0 0 0 0
56300- 0 0 0 0 0 0 0 0 0 0 0 0
56301- 0 0 0 0 0 0 0 0 0 10 10 10
56302- 30 30 30 78 78 78 46 46 46 22 22 22
56303-137 92 6 210 162 10 239 182 13 238 190 10
56304-238 202 15 241 208 19 246 215 20 246 215 20
56305-241 208 19 203 166 17 185 133 11 210 150 10
56306-216 158 10 210 150 10 102 78 10 2 2 6
56307- 6 6 6 54 54 54 14 14 14 2 2 6
56308- 2 2 6 62 62 62 74 74 74 30 30 30
56309- 10 10 10 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 0 0 0
56319- 0 0 0 0 0 0 0 0 0 0 0 0
56320- 0 0 0 0 0 0 0 0 0 0 0 0
56321- 0 0 0 0 0 0 0 0 0 10 10 10
56322- 34 34 34 78 78 78 50 50 50 6 6 6
56323- 94 70 30 139 102 15 190 146 13 226 184 13
56324-232 200 30 232 195 16 215 174 15 190 146 13
56325-168 122 10 192 133 9 210 150 10 213 154 11
56326-202 150 34 182 157 106 101 98 89 2 2 6
56327- 2 2 6 78 78 78 116 116 116 58 58 58
56328- 2 2 6 22 22 22 90 90 90 46 46 46
56329- 18 18 18 6 6 6 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 0 0 0
56339- 0 0 0 0 0 0 0 0 0 0 0 0
56340- 0 0 0 0 0 0 0 0 0 0 0 0
56341- 0 0 0 0 0 0 0 0 0 10 10 10
56342- 38 38 38 86 86 86 50 50 50 6 6 6
56343-128 128 128 174 154 114 156 107 11 168 122 10
56344-198 155 10 184 144 12 197 138 11 200 144 11
56345-206 145 10 206 145 10 197 138 11 188 164 115
56346-195 195 195 198 198 198 174 174 174 14 14 14
56347- 2 2 6 22 22 22 116 116 116 116 116 116
56348- 22 22 22 2 2 6 74 74 74 70 70 70
56349- 30 30 30 10 10 10 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 0 0 0
56359- 0 0 0 0 0 0 0 0 0 0 0 0
56360- 0 0 0 0 0 0 0 0 0 0 0 0
56361- 0 0 0 0 0 0 6 6 6 18 18 18
56362- 50 50 50 101 101 101 26 26 26 10 10 10
56363-138 138 138 190 190 190 174 154 114 156 107 11
56364-197 138 11 200 144 11 197 138 11 192 133 9
56365-180 123 7 190 142 34 190 178 144 187 187 187
56366-202 202 202 221 221 221 214 214 214 66 66 66
56367- 2 2 6 2 2 6 50 50 50 62 62 62
56368- 6 6 6 2 2 6 10 10 10 90 90 90
56369- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 0 0
56379- 0 0 0 0 0 0 0 0 0 0 0 0
56380- 0 0 0 0 0 0 0 0 0 0 0 0
56381- 0 0 0 0 0 0 10 10 10 34 34 34
56382- 74 74 74 74 74 74 2 2 6 6 6 6
56383-144 144 144 198 198 198 190 190 190 178 166 146
56384-154 121 60 156 107 11 156 107 11 168 124 44
56385-174 154 114 187 187 187 190 190 190 210 210 210
56386-246 246 246 253 253 253 253 253 253 182 182 182
56387- 6 6 6 2 2 6 2 2 6 2 2 6
56388- 2 2 6 2 2 6 2 2 6 62 62 62
56389- 74 74 74 34 34 34 14 14 14 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 0 0 0 0 0 0
56399- 0 0 0 0 0 0 0 0 0 0 0 0
56400- 0 0 0 0 0 0 0 0 0 0 0 0
56401- 0 0 0 10 10 10 22 22 22 54 54 54
56402- 94 94 94 18 18 18 2 2 6 46 46 46
56403-234 234 234 221 221 221 190 190 190 190 190 190
56404-190 190 190 187 187 187 187 187 187 190 190 190
56405-190 190 190 195 195 195 214 214 214 242 242 242
56406-253 253 253 253 253 253 253 253 253 253 253 253
56407- 82 82 82 2 2 6 2 2 6 2 2 6
56408- 2 2 6 2 2 6 2 2 6 14 14 14
56409- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
56419- 0 0 0 0 0 0 0 0 0 0 0 0
56420- 0 0 0 0 0 0 0 0 0 0 0 0
56421- 6 6 6 18 18 18 46 46 46 90 90 90
56422- 46 46 46 18 18 18 6 6 6 182 182 182
56423-253 253 253 246 246 246 206 206 206 190 190 190
56424-190 190 190 190 190 190 190 190 190 190 190 190
56425-206 206 206 231 231 231 250 250 250 253 253 253
56426-253 253 253 253 253 253 253 253 253 253 253 253
56427-202 202 202 14 14 14 2 2 6 2 2 6
56428- 2 2 6 2 2 6 2 2 6 2 2 6
56429- 42 42 42 86 86 86 42 42 42 18 18 18
56430- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
56439- 0 0 0 0 0 0 0 0 0 0 0 0
56440- 0 0 0 0 0 0 0 0 0 6 6 6
56441- 14 14 14 38 38 38 74 74 74 66 66 66
56442- 2 2 6 6 6 6 90 90 90 250 250 250
56443-253 253 253 253 253 253 238 238 238 198 198 198
56444-190 190 190 190 190 190 195 195 195 221 221 221
56445-246 246 246 253 253 253 253 253 253 253 253 253
56446-253 253 253 253 253 253 253 253 253 253 253 253
56447-253 253 253 82 82 82 2 2 6 2 2 6
56448- 2 2 6 2 2 6 2 2 6 2 2 6
56449- 2 2 6 78 78 78 70 70 70 34 34 34
56450- 14 14 14 6 6 6 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 0 0 0
56458- 0 0 0 0 0 0 0 0 0 0 0 0
56459- 0 0 0 0 0 0 0 0 0 0 0 0
56460- 0 0 0 0 0 0 0 0 0 14 14 14
56461- 34 34 34 66 66 66 78 78 78 6 6 6
56462- 2 2 6 18 18 18 218 218 218 253 253 253
56463-253 253 253 253 253 253 253 253 253 246 246 246
56464-226 226 226 231 231 231 246 246 246 253 253 253
56465-253 253 253 253 253 253 253 253 253 253 253 253
56466-253 253 253 253 253 253 253 253 253 253 253 253
56467-253 253 253 178 178 178 2 2 6 2 2 6
56468- 2 2 6 2 2 6 2 2 6 2 2 6
56469- 2 2 6 18 18 18 90 90 90 62 62 62
56470- 30 30 30 10 10 10 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 0 0 0
56478- 0 0 0 0 0 0 0 0 0 0 0 0
56479- 0 0 0 0 0 0 0 0 0 0 0 0
56480- 0 0 0 0 0 0 10 10 10 26 26 26
56481- 58 58 58 90 90 90 18 18 18 2 2 6
56482- 2 2 6 110 110 110 253 253 253 253 253 253
56483-253 253 253 253 253 253 253 253 253 253 253 253
56484-250 250 250 253 253 253 253 253 253 253 253 253
56485-253 253 253 253 253 253 253 253 253 253 253 253
56486-253 253 253 253 253 253 253 253 253 253 253 253
56487-253 253 253 231 231 231 18 18 18 2 2 6
56488- 2 2 6 2 2 6 2 2 6 2 2 6
56489- 2 2 6 2 2 6 18 18 18 94 94 94
56490- 54 54 54 26 26 26 10 10 10 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 0 0 0 0 0 0
56498- 0 0 0 0 0 0 0 0 0 0 0 0
56499- 0 0 0 0 0 0 0 0 0 0 0 0
56500- 0 0 0 6 6 6 22 22 22 50 50 50
56501- 90 90 90 26 26 26 2 2 6 2 2 6
56502- 14 14 14 195 195 195 250 250 250 253 253 253
56503-253 253 253 253 253 253 253 253 253 253 253 253
56504-253 253 253 253 253 253 253 253 253 253 253 253
56505-253 253 253 253 253 253 253 253 253 253 253 253
56506-253 253 253 253 253 253 253 253 253 253 253 253
56507-250 250 250 242 242 242 54 54 54 2 2 6
56508- 2 2 6 2 2 6 2 2 6 2 2 6
56509- 2 2 6 2 2 6 2 2 6 38 38 38
56510- 86 86 86 50 50 50 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
56518- 0 0 0 0 0 0 0 0 0 0 0 0
56519- 0 0 0 0 0 0 0 0 0 0 0 0
56520- 6 6 6 14 14 14 38 38 38 82 82 82
56521- 34 34 34 2 2 6 2 2 6 2 2 6
56522- 42 42 42 195 195 195 246 246 246 253 253 253
56523-253 253 253 253 253 253 253 253 253 250 250 250
56524-242 242 242 242 242 242 250 250 250 253 253 253
56525-253 253 253 253 253 253 253 253 253 253 253 253
56526-253 253 253 250 250 250 246 246 246 238 238 238
56527-226 226 226 231 231 231 101 101 101 6 6 6
56528- 2 2 6 2 2 6 2 2 6 2 2 6
56529- 2 2 6 2 2 6 2 2 6 2 2 6
56530- 38 38 38 82 82 82 42 42 42 14 14 14
56531- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
56538- 0 0 0 0 0 0 0 0 0 0 0 0
56539- 0 0 0 0 0 0 0 0 0 0 0 0
56540- 10 10 10 26 26 26 62 62 62 66 66 66
56541- 2 2 6 2 2 6 2 2 6 6 6 6
56542- 70 70 70 170 170 170 206 206 206 234 234 234
56543-246 246 246 250 250 250 250 250 250 238 238 238
56544-226 226 226 231 231 231 238 238 238 250 250 250
56545-250 250 250 250 250 250 246 246 246 231 231 231
56546-214 214 214 206 206 206 202 202 202 202 202 202
56547-198 198 198 202 202 202 182 182 182 18 18 18
56548- 2 2 6 2 2 6 2 2 6 2 2 6
56549- 2 2 6 2 2 6 2 2 6 2 2 6
56550- 2 2 6 62 62 62 66 66 66 30 30 30
56551- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
56558- 0 0 0 0 0 0 0 0 0 0 0 0
56559- 0 0 0 0 0 0 0 0 0 0 0 0
56560- 14 14 14 42 42 42 82 82 82 18 18 18
56561- 2 2 6 2 2 6 2 2 6 10 10 10
56562- 94 94 94 182 182 182 218 218 218 242 242 242
56563-250 250 250 253 253 253 253 253 253 250 250 250
56564-234 234 234 253 253 253 253 253 253 253 253 253
56565-253 253 253 253 253 253 253 253 253 246 246 246
56566-238 238 238 226 226 226 210 210 210 202 202 202
56567-195 195 195 195 195 195 210 210 210 158 158 158
56568- 6 6 6 14 14 14 50 50 50 14 14 14
56569- 2 2 6 2 2 6 2 2 6 2 2 6
56570- 2 2 6 6 6 6 86 86 86 46 46 46
56571- 18 18 18 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
56578- 0 0 0 0 0 0 0 0 0 0 0 0
56579- 0 0 0 0 0 0 0 0 0 6 6 6
56580- 22 22 22 54 54 54 70 70 70 2 2 6
56581- 2 2 6 10 10 10 2 2 6 22 22 22
56582-166 166 166 231 231 231 250 250 250 253 253 253
56583-253 253 253 253 253 253 253 253 253 250 250 250
56584-242 242 242 253 253 253 253 253 253 253 253 253
56585-253 253 253 253 253 253 253 253 253 253 253 253
56586-253 253 253 253 253 253 253 253 253 246 246 246
56587-231 231 231 206 206 206 198 198 198 226 226 226
56588- 94 94 94 2 2 6 6 6 6 38 38 38
56589- 30 30 30 2 2 6 2 2 6 2 2 6
56590- 2 2 6 2 2 6 62 62 62 66 66 66
56591- 26 26 26 10 10 10 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 0 0 0
56597- 0 0 0 0 0 0 0 0 0 0 0 0
56598- 0 0 0 0 0 0 0 0 0 0 0 0
56599- 0 0 0 0 0 0 0 0 0 10 10 10
56600- 30 30 30 74 74 74 50 50 50 2 2 6
56601- 26 26 26 26 26 26 2 2 6 106 106 106
56602-238 238 238 253 253 253 253 253 253 253 253 253
56603-253 253 253 253 253 253 253 253 253 253 253 253
56604-253 253 253 253 253 253 253 253 253 253 253 253
56605-253 253 253 253 253 253 253 253 253 253 253 253
56606-253 253 253 253 253 253 253 253 253 253 253 253
56607-253 253 253 246 246 246 218 218 218 202 202 202
56608-210 210 210 14 14 14 2 2 6 2 2 6
56609- 30 30 30 22 22 22 2 2 6 2 2 6
56610- 2 2 6 2 2 6 18 18 18 86 86 86
56611- 42 42 42 14 14 14 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 0 0 0
56617- 0 0 0 0 0 0 0 0 0 0 0 0
56618- 0 0 0 0 0 0 0 0 0 0 0 0
56619- 0 0 0 0 0 0 0 0 0 14 14 14
56620- 42 42 42 90 90 90 22 22 22 2 2 6
56621- 42 42 42 2 2 6 18 18 18 218 218 218
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 253 253 253 253 253 253 253 253 253
56625-253 253 253 253 253 253 253 253 253 253 253 253
56626-253 253 253 253 253 253 253 253 253 253 253 253
56627-253 253 253 253 253 253 250 250 250 221 221 221
56628-218 218 218 101 101 101 2 2 6 14 14 14
56629- 18 18 18 38 38 38 10 10 10 2 2 6
56630- 2 2 6 2 2 6 2 2 6 78 78 78
56631- 58 58 58 22 22 22 6 6 6 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 0 0 0
56637- 0 0 0 0 0 0 0 0 0 0 0 0
56638- 0 0 0 0 0 0 0 0 0 0 0 0
56639- 0 0 0 0 0 0 6 6 6 18 18 18
56640- 54 54 54 82 82 82 2 2 6 26 26 26
56641- 22 22 22 2 2 6 123 123 123 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 253 253 253 253 253 253
56645-253 253 253 253 253 253 253 253 253 253 253 253
56646-253 253 253 253 253 253 253 253 253 253 253 253
56647-253 253 253 253 253 253 253 253 253 250 250 250
56648-238 238 238 198 198 198 6 6 6 38 38 38
56649- 58 58 58 26 26 26 38 38 38 2 2 6
56650- 2 2 6 2 2 6 2 2 6 46 46 46
56651- 78 78 78 30 30 30 10 10 10 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 0 0 0 0 0 0
56657- 0 0 0 0 0 0 0 0 0 0 0 0
56658- 0 0 0 0 0 0 0 0 0 0 0 0
56659- 0 0 0 0 0 0 10 10 10 30 30 30
56660- 74 74 74 58 58 58 2 2 6 42 42 42
56661- 2 2 6 22 22 22 231 231 231 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 250 250 250
56664-253 253 253 253 253 253 253 253 253 253 253 253
56665-253 253 253 253 253 253 253 253 253 253 253 253
56666-253 253 253 253 253 253 253 253 253 253 253 253
56667-253 253 253 253 253 253 253 253 253 253 253 253
56668-253 253 253 246 246 246 46 46 46 38 38 38
56669- 42 42 42 14 14 14 38 38 38 14 14 14
56670- 2 2 6 2 2 6 2 2 6 6 6 6
56671- 86 86 86 46 46 46 14 14 14 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 0 0 0 0 0 0
56677- 0 0 0 0 0 0 0 0 0 0 0 0
56678- 0 0 0 0 0 0 0 0 0 0 0 0
56679- 0 0 0 6 6 6 14 14 14 42 42 42
56680- 90 90 90 18 18 18 18 18 18 26 26 26
56681- 2 2 6 116 116 116 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 250 250 250 238 238 238
56684-253 253 253 253 253 253 253 253 253 253 253 253
56685-253 253 253 253 253 253 253 253 253 253 253 253
56686-253 253 253 253 253 253 253 253 253 253 253 253
56687-253 253 253 253 253 253 253 253 253 253 253 253
56688-253 253 253 253 253 253 94 94 94 6 6 6
56689- 2 2 6 2 2 6 10 10 10 34 34 34
56690- 2 2 6 2 2 6 2 2 6 2 2 6
56691- 74 74 74 58 58 58 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
56697- 0 0 0 0 0 0 0 0 0 0 0 0
56698- 0 0 0 0 0 0 0 0 0 0 0 0
56699- 0 0 0 10 10 10 26 26 26 66 66 66
56700- 82 82 82 2 2 6 38 38 38 6 6 6
56701- 14 14 14 210 210 210 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 246 246 246 242 242 242
56704-253 253 253 253 253 253 253 253 253 253 253 253
56705-253 253 253 253 253 253 253 253 253 253 253 253
56706-253 253 253 253 253 253 253 253 253 253 253 253
56707-253 253 253 253 253 253 253 253 253 253 253 253
56708-253 253 253 253 253 253 144 144 144 2 2 6
56709- 2 2 6 2 2 6 2 2 6 46 46 46
56710- 2 2 6 2 2 6 2 2 6 2 2 6
56711- 42 42 42 74 74 74 30 30 30 10 10 10
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 0 0 0 0 0 0 0 0 0
56717- 0 0 0 0 0 0 0 0 0 0 0 0
56718- 0 0 0 0 0 0 0 0 0 0 0 0
56719- 6 6 6 14 14 14 42 42 42 90 90 90
56720- 26 26 26 6 6 6 42 42 42 2 2 6
56721- 74 74 74 250 250 250 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 242 242 242 242 242 242
56724-253 253 253 253 253 253 253 253 253 253 253 253
56725-253 253 253 253 253 253 253 253 253 253 253 253
56726-253 253 253 253 253 253 253 253 253 253 253 253
56727-253 253 253 253 253 253 253 253 253 253 253 253
56728-253 253 253 253 253 253 182 182 182 2 2 6
56729- 2 2 6 2 2 6 2 2 6 46 46 46
56730- 2 2 6 2 2 6 2 2 6 2 2 6
56731- 10 10 10 86 86 86 38 38 38 10 10 10
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- 0 0 0 0 0 0 0 0 0 0 0 0
56737- 0 0 0 0 0 0 0 0 0 0 0 0
56738- 0 0 0 0 0 0 0 0 0 0 0 0
56739- 10 10 10 26 26 26 66 66 66 82 82 82
56740- 2 2 6 22 22 22 18 18 18 2 2 6
56741-149 149 149 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 234 234 234 242 242 242
56744-253 253 253 253 253 253 253 253 253 253 253 253
56745-253 253 253 253 253 253 253 253 253 253 253 253
56746-253 253 253 253 253 253 253 253 253 253 253 253
56747-253 253 253 253 253 253 253 253 253 253 253 253
56748-253 253 253 253 253 253 206 206 206 2 2 6
56749- 2 2 6 2 2 6 2 2 6 38 38 38
56750- 2 2 6 2 2 6 2 2 6 2 2 6
56751- 6 6 6 86 86 86 46 46 46 14 14 14
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- 0 0 0 0 0 0 0 0 0 0 0 0
56757- 0 0 0 0 0 0 0 0 0 0 0 0
56758- 0 0 0 0 0 0 0 0 0 6 6 6
56759- 18 18 18 46 46 46 86 86 86 18 18 18
56760- 2 2 6 34 34 34 10 10 10 6 6 6
56761-210 210 210 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 234 234 234 242 242 242
56764-253 253 253 253 253 253 253 253 253 253 253 253
56765-253 253 253 253 253 253 253 253 253 253 253 253
56766-253 253 253 253 253 253 253 253 253 253 253 253
56767-253 253 253 253 253 253 253 253 253 253 253 253
56768-253 253 253 253 253 253 221 221 221 6 6 6
56769- 2 2 6 2 2 6 6 6 6 30 30 30
56770- 2 2 6 2 2 6 2 2 6 2 2 6
56771- 2 2 6 82 82 82 54 54 54 18 18 18
56772- 6 6 6 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 0 0 0 0 0 0 0 0 0
56775- 0 0 0 0 0 0 0 0 0 0 0 0
56776- 0 0 0 0 0 0 0 0 0 0 0 0
56777- 0 0 0 0 0 0 0 0 0 0 0 0
56778- 0 0 0 0 0 0 0 0 0 10 10 10
56779- 26 26 26 66 66 66 62 62 62 2 2 6
56780- 2 2 6 38 38 38 10 10 10 26 26 26
56781-238 238 238 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 231 231 231 238 238 238
56784-253 253 253 253 253 253 253 253 253 253 253 253
56785-253 253 253 253 253 253 253 253 253 253 253 253
56786-253 253 253 253 253 253 253 253 253 253 253 253
56787-253 253 253 253 253 253 253 253 253 253 253 253
56788-253 253 253 253 253 253 231 231 231 6 6 6
56789- 2 2 6 2 2 6 10 10 10 30 30 30
56790- 2 2 6 2 2 6 2 2 6 2 2 6
56791- 2 2 6 66 66 66 58 58 58 22 22 22
56792- 6 6 6 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 0 0 0
56796- 0 0 0 0 0 0 0 0 0 0 0 0
56797- 0 0 0 0 0 0 0 0 0 0 0 0
56798- 0 0 0 0 0 0 0 0 0 10 10 10
56799- 38 38 38 78 78 78 6 6 6 2 2 6
56800- 2 2 6 46 46 46 14 14 14 42 42 42
56801-246 246 246 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 231 231 231 242 242 242
56804-253 253 253 253 253 253 253 253 253 253 253 253
56805-253 253 253 253 253 253 253 253 253 253 253 253
56806-253 253 253 253 253 253 253 253 253 253 253 253
56807-253 253 253 253 253 253 253 253 253 253 253 253
56808-253 253 253 253 253 253 234 234 234 10 10 10
56809- 2 2 6 2 2 6 22 22 22 14 14 14
56810- 2 2 6 2 2 6 2 2 6 2 2 6
56811- 2 2 6 66 66 66 62 62 62 22 22 22
56812- 6 6 6 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 0 0 0
56816- 0 0 0 0 0 0 0 0 0 0 0 0
56817- 0 0 0 0 0 0 0 0 0 0 0 0
56818- 0 0 0 0 0 0 6 6 6 18 18 18
56819- 50 50 50 74 74 74 2 2 6 2 2 6
56820- 14 14 14 70 70 70 34 34 34 62 62 62
56821-250 250 250 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 231 231 231 246 246 246
56824-253 253 253 253 253 253 253 253 253 253 253 253
56825-253 253 253 253 253 253 253 253 253 253 253 253
56826-253 253 253 253 253 253 253 253 253 253 253 253
56827-253 253 253 253 253 253 253 253 253 253 253 253
56828-253 253 253 253 253 253 234 234 234 14 14 14
56829- 2 2 6 2 2 6 30 30 30 2 2 6
56830- 2 2 6 2 2 6 2 2 6 2 2 6
56831- 2 2 6 66 66 66 62 62 62 22 22 22
56832- 6 6 6 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 0 0 0 0 0 0
56836- 0 0 0 0 0 0 0 0 0 0 0 0
56837- 0 0 0 0 0 0 0 0 0 0 0 0
56838- 0 0 0 0 0 0 6 6 6 18 18 18
56839- 54 54 54 62 62 62 2 2 6 2 2 6
56840- 2 2 6 30 30 30 46 46 46 70 70 70
56841-250 250 250 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 231 231 231 246 246 246
56844-253 253 253 253 253 253 253 253 253 253 253 253
56845-253 253 253 253 253 253 253 253 253 253 253 253
56846-253 253 253 253 253 253 253 253 253 253 253 253
56847-253 253 253 253 253 253 253 253 253 253 253 253
56848-253 253 253 253 253 253 226 226 226 10 10 10
56849- 2 2 6 6 6 6 30 30 30 2 2 6
56850- 2 2 6 2 2 6 2 2 6 2 2 6
56851- 2 2 6 66 66 66 58 58 58 22 22 22
56852- 6 6 6 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 0 0 0 0 0 0
56856- 0 0 0 0 0 0 0 0 0 0 0 0
56857- 0 0 0 0 0 0 0 0 0 0 0 0
56858- 0 0 0 0 0 0 6 6 6 22 22 22
56859- 58 58 58 62 62 62 2 2 6 2 2 6
56860- 2 2 6 2 2 6 30 30 30 78 78 78
56861-250 250 250 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 231 231 231 246 246 246
56864-253 253 253 253 253 253 253 253 253 253 253 253
56865-253 253 253 253 253 253 253 253 253 253 253 253
56866-253 253 253 253 253 253 253 253 253 253 253 253
56867-253 253 253 253 253 253 253 253 253 253 253 253
56868-253 253 253 253 253 253 206 206 206 2 2 6
56869- 22 22 22 34 34 34 18 14 6 22 22 22
56870- 26 26 26 18 18 18 6 6 6 2 2 6
56871- 2 2 6 82 82 82 54 54 54 18 18 18
56872- 6 6 6 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 0 0 0 0 0 0
56876- 0 0 0 0 0 0 0 0 0 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 6 6 6 26 26 26
56879- 62 62 62 106 106 106 74 54 14 185 133 11
56880-210 162 10 121 92 8 6 6 6 62 62 62
56881-238 238 238 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 231 231 231 246 246 246
56884-253 253 253 253 253 253 253 253 253 253 253 253
56885-253 253 253 253 253 253 253 253 253 253 253 253
56886-253 253 253 253 253 253 253 253 253 253 253 253
56887-253 253 253 253 253 253 253 253 253 253 253 253
56888-253 253 253 253 253 253 158 158 158 18 18 18
56889- 14 14 14 2 2 6 2 2 6 2 2 6
56890- 6 6 6 18 18 18 66 66 66 38 38 38
56891- 6 6 6 94 94 94 50 50 50 18 18 18
56892- 6 6 6 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 0 0 0 0 0 0
56896- 0 0 0 0 0 0 0 0 0 0 0 0
56897- 0 0 0 0 0 0 0 0 0 6 6 6
56898- 10 10 10 10 10 10 18 18 18 38 38 38
56899- 78 78 78 142 134 106 216 158 10 242 186 14
56900-246 190 14 246 190 14 156 118 10 10 10 10
56901- 90 90 90 238 238 238 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 231 231 231 250 250 250
56904-253 253 253 253 253 253 253 253 253 253 253 253
56905-253 253 253 253 253 253 253 253 253 253 253 253
56906-253 253 253 253 253 253 253 253 253 253 253 253
56907-253 253 253 253 253 253 253 253 253 246 230 190
56908-238 204 91 238 204 91 181 142 44 37 26 9
56909- 2 2 6 2 2 6 2 2 6 2 2 6
56910- 2 2 6 2 2 6 38 38 38 46 46 46
56911- 26 26 26 106 106 106 54 54 54 18 18 18
56912- 6 6 6 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 0 0 0 0 0 0 0 0 0 0 0 0
56916- 0 0 0 0 0 0 0 0 0 0 0 0
56917- 0 0 0 6 6 6 14 14 14 22 22 22
56918- 30 30 30 38 38 38 50 50 50 70 70 70
56919-106 106 106 190 142 34 226 170 11 242 186 14
56920-246 190 14 246 190 14 246 190 14 154 114 10
56921- 6 6 6 74 74 74 226 226 226 253 253 253
56922-253 253 253 253 253 253 253 253 253 253 253 253
56923-253 253 253 253 253 253 231 231 231 250 250 250
56924-253 253 253 253 253 253 253 253 253 253 253 253
56925-253 253 253 253 253 253 253 253 253 253 253 253
56926-253 253 253 253 253 253 253 253 253 253 253 253
56927-253 253 253 253 253 253 253 253 253 228 184 62
56928-241 196 14 241 208 19 232 195 16 38 30 10
56929- 2 2 6 2 2 6 2 2 6 2 2 6
56930- 2 2 6 6 6 6 30 30 30 26 26 26
56931-203 166 17 154 142 90 66 66 66 26 26 26
56932- 6 6 6 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 0 0 0 0 0 0 0 0 0 0
56936- 0 0 0 0 0 0 0 0 0 0 0 0
56937- 6 6 6 18 18 18 38 38 38 58 58 58
56938- 78 78 78 86 86 86 101 101 101 123 123 123
56939-175 146 61 210 150 10 234 174 13 246 186 14
56940-246 190 14 246 190 14 246 190 14 238 190 10
56941-102 78 10 2 2 6 46 46 46 198 198 198
56942-253 253 253 253 253 253 253 253 253 253 253 253
56943-253 253 253 253 253 253 234 234 234 242 242 242
56944-253 253 253 253 253 253 253 253 253 253 253 253
56945-253 253 253 253 253 253 253 253 253 253 253 253
56946-253 253 253 253 253 253 253 253 253 253 253 253
56947-253 253 253 253 253 253 253 253 253 224 178 62
56948-242 186 14 241 196 14 210 166 10 22 18 6
56949- 2 2 6 2 2 6 2 2 6 2 2 6
56950- 2 2 6 2 2 6 6 6 6 121 92 8
56951-238 202 15 232 195 16 82 82 82 34 34 34
56952- 10 10 10 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 0 0 0 0 0 0 0 0 0 0
56956- 0 0 0 0 0 0 0 0 0 0 0 0
56957- 14 14 14 38 38 38 70 70 70 154 122 46
56958-190 142 34 200 144 11 197 138 11 197 138 11
56959-213 154 11 226 170 11 242 186 14 246 190 14
56960-246 190 14 246 190 14 246 190 14 246 190 14
56961-225 175 15 46 32 6 2 2 6 22 22 22
56962-158 158 158 250 250 250 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 253 253 253
56965-253 253 253 253 253 253 253 253 253 253 253 253
56966-253 253 253 253 253 253 253 253 253 253 253 253
56967-253 253 253 250 250 250 242 242 242 224 178 62
56968-239 182 13 236 186 11 213 154 11 46 32 6
56969- 2 2 6 2 2 6 2 2 6 2 2 6
56970- 2 2 6 2 2 6 61 42 6 225 175 15
56971-238 190 10 236 186 11 112 100 78 42 42 42
56972- 14 14 14 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 0 0 0
56975- 0 0 0 0 0 0 0 0 0 0 0 0
56976- 0 0 0 0 0 0 0 0 0 6 6 6
56977- 22 22 22 54 54 54 154 122 46 213 154 11
56978-226 170 11 230 174 11 226 170 11 226 170 11
56979-236 178 12 242 186 14 246 190 14 246 190 14
56980-246 190 14 246 190 14 246 190 14 246 190 14
56981-241 196 14 184 144 12 10 10 10 2 2 6
56982- 6 6 6 116 116 116 242 242 242 253 253 253
56983-253 253 253 253 253 253 253 253 253 253 253 253
56984-253 253 253 253 253 253 253 253 253 253 253 253
56985-253 253 253 253 253 253 253 253 253 253 253 253
56986-253 253 253 253 253 253 253 253 253 253 253 253
56987-253 253 253 231 231 231 198 198 198 214 170 54
56988-236 178 12 236 178 12 210 150 10 137 92 6
56989- 18 14 6 2 2 6 2 2 6 2 2 6
56990- 6 6 6 70 47 6 200 144 11 236 178 12
56991-239 182 13 239 182 13 124 112 88 58 58 58
56992- 22 22 22 6 6 6 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 0 0 0
56995- 0 0 0 0 0 0 0 0 0 0 0 0
56996- 0 0 0 0 0 0 0 0 0 10 10 10
56997- 30 30 30 70 70 70 180 133 36 226 170 11
56998-239 182 13 242 186 14 242 186 14 246 186 14
56999-246 190 14 246 190 14 246 190 14 246 190 14
57000-246 190 14 246 190 14 246 190 14 246 190 14
57001-246 190 14 232 195 16 98 70 6 2 2 6
57002- 2 2 6 2 2 6 66 66 66 221 221 221
57003-253 253 253 253 253 253 253 253 253 253 253 253
57004-253 253 253 253 253 253 253 253 253 253 253 253
57005-253 253 253 253 253 253 253 253 253 253 253 253
57006-253 253 253 253 253 253 253 253 253 253 253 253
57007-253 253 253 206 206 206 198 198 198 214 166 58
57008-230 174 11 230 174 11 216 158 10 192 133 9
57009-163 110 8 116 81 8 102 78 10 116 81 8
57010-167 114 7 197 138 11 226 170 11 239 182 13
57011-242 186 14 242 186 14 162 146 94 78 78 78
57012- 34 34 34 14 14 14 6 6 6 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 0 0 0 0 0 0 0
57016- 0 0 0 0 0 0 0 0 0 6 6 6
57017- 30 30 30 78 78 78 190 142 34 226 170 11
57018-239 182 13 246 190 14 246 190 14 246 190 14
57019-246 190 14 246 190 14 246 190 14 246 190 14
57020-246 190 14 246 190 14 246 190 14 246 190 14
57021-246 190 14 241 196 14 203 166 17 22 18 6
57022- 2 2 6 2 2 6 2 2 6 38 38 38
57023-218 218 218 253 253 253 253 253 253 253 253 253
57024-253 253 253 253 253 253 253 253 253 253 253 253
57025-253 253 253 253 253 253 253 253 253 253 253 253
57026-253 253 253 253 253 253 253 253 253 253 253 253
57027-250 250 250 206 206 206 198 198 198 202 162 69
57028-226 170 11 236 178 12 224 166 10 210 150 10
57029-200 144 11 197 138 11 192 133 9 197 138 11
57030-210 150 10 226 170 11 242 186 14 246 190 14
57031-246 190 14 246 186 14 225 175 15 124 112 88
57032- 62 62 62 30 30 30 14 14 14 6 6 6
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 0 0 0 0 0 0 0 0 0 0
57036- 0 0 0 0 0 0 0 0 0 10 10 10
57037- 30 30 30 78 78 78 174 135 50 224 166 10
57038-239 182 13 246 190 14 246 190 14 246 190 14
57039-246 190 14 246 190 14 246 190 14 246 190 14
57040-246 190 14 246 190 14 246 190 14 246 190 14
57041-246 190 14 246 190 14 241 196 14 139 102 15
57042- 2 2 6 2 2 6 2 2 6 2 2 6
57043- 78 78 78 250 250 250 253 253 253 253 253 253
57044-253 253 253 253 253 253 253 253 253 253 253 253
57045-253 253 253 253 253 253 253 253 253 253 253 253
57046-253 253 253 253 253 253 253 253 253 253 253 253
57047-250 250 250 214 214 214 198 198 198 190 150 46
57048-219 162 10 236 178 12 234 174 13 224 166 10
57049-216 158 10 213 154 11 213 154 11 216 158 10
57050-226 170 11 239 182 13 246 190 14 246 190 14
57051-246 190 14 246 190 14 242 186 14 206 162 42
57052-101 101 101 58 58 58 30 30 30 14 14 14
57053- 6 6 6 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 0 0 0
57055- 0 0 0 0 0 0 0 0 0 0 0 0
57056- 0 0 0 0 0 0 0 0 0 10 10 10
57057- 30 30 30 74 74 74 174 135 50 216 158 10
57058-236 178 12 246 190 14 246 190 14 246 190 14
57059-246 190 14 246 190 14 246 190 14 246 190 14
57060-246 190 14 246 190 14 246 190 14 246 190 14
57061-246 190 14 246 190 14 241 196 14 226 184 13
57062- 61 42 6 2 2 6 2 2 6 2 2 6
57063- 22 22 22 238 238 238 253 253 253 253 253 253
57064-253 253 253 253 253 253 253 253 253 253 253 253
57065-253 253 253 253 253 253 253 253 253 253 253 253
57066-253 253 253 253 253 253 253 253 253 253 253 253
57067-253 253 253 226 226 226 187 187 187 180 133 36
57068-216 158 10 236 178 12 239 182 13 236 178 12
57069-230 174 11 226 170 11 226 170 11 230 174 11
57070-236 178 12 242 186 14 246 190 14 246 190 14
57071-246 190 14 246 190 14 246 186 14 239 182 13
57072-206 162 42 106 106 106 66 66 66 34 34 34
57073- 14 14 14 6 6 6 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 0 0 0
57075- 0 0 0 0 0 0 0 0 0 0 0 0
57076- 0 0 0 0 0 0 0 0 0 6 6 6
57077- 26 26 26 70 70 70 163 133 67 213 154 11
57078-236 178 12 246 190 14 246 190 14 246 190 14
57079-246 190 14 246 190 14 246 190 14 246 190 14
57080-246 190 14 246 190 14 246 190 14 246 190 14
57081-246 190 14 246 190 14 246 190 14 241 196 14
57082-190 146 13 18 14 6 2 2 6 2 2 6
57083- 46 46 46 246 246 246 253 253 253 253 253 253
57084-253 253 253 253 253 253 253 253 253 253 253 253
57085-253 253 253 253 253 253 253 253 253 253 253 253
57086-253 253 253 253 253 253 253 253 253 253 253 253
57087-253 253 253 221 221 221 86 86 86 156 107 11
57088-216 158 10 236 178 12 242 186 14 246 186 14
57089-242 186 14 239 182 13 239 182 13 242 186 14
57090-242 186 14 246 186 14 246 190 14 246 190 14
57091-246 190 14 246 190 14 246 190 14 246 190 14
57092-242 186 14 225 175 15 142 122 72 66 66 66
57093- 30 30 30 10 10 10 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 0 0 0
57095- 0 0 0 0 0 0 0 0 0 0 0 0
57096- 0 0 0 0 0 0 0 0 0 6 6 6
57097- 26 26 26 70 70 70 163 133 67 210 150 10
57098-236 178 12 246 190 14 246 190 14 246 190 14
57099-246 190 14 246 190 14 246 190 14 246 190 14
57100-246 190 14 246 190 14 246 190 14 246 190 14
57101-246 190 14 246 190 14 246 190 14 246 190 14
57102-232 195 16 121 92 8 34 34 34 106 106 106
57103-221 221 221 253 253 253 253 253 253 253 253 253
57104-253 253 253 253 253 253 253 253 253 253 253 253
57105-253 253 253 253 253 253 253 253 253 253 253 253
57106-253 253 253 253 253 253 253 253 253 253 253 253
57107-242 242 242 82 82 82 18 14 6 163 110 8
57108-216 158 10 236 178 12 242 186 14 246 190 14
57109-246 190 14 246 190 14 246 190 14 246 190 14
57110-246 190 14 246 190 14 246 190 14 246 190 14
57111-246 190 14 246 190 14 246 190 14 246 190 14
57112-246 190 14 246 190 14 242 186 14 163 133 67
57113- 46 46 46 18 18 18 6 6 6 0 0 0
57114- 0 0 0 0 0 0 0 0 0 0 0 0
57115- 0 0 0 0 0 0 0 0 0 0 0 0
57116- 0 0 0 0 0 0 0 0 0 10 10 10
57117- 30 30 30 78 78 78 163 133 67 210 150 10
57118-236 178 12 246 186 14 246 190 14 246 190 14
57119-246 190 14 246 190 14 246 190 14 246 190 14
57120-246 190 14 246 190 14 246 190 14 246 190 14
57121-246 190 14 246 190 14 246 190 14 246 190 14
57122-241 196 14 215 174 15 190 178 144 253 253 253
57123-253 253 253 253 253 253 253 253 253 253 253 253
57124-253 253 253 253 253 253 253 253 253 253 253 253
57125-253 253 253 253 253 253 253 253 253 253 253 253
57126-253 253 253 253 253 253 253 253 253 218 218 218
57127- 58 58 58 2 2 6 22 18 6 167 114 7
57128-216 158 10 236 178 12 246 186 14 246 190 14
57129-246 190 14 246 190 14 246 190 14 246 190 14
57130-246 190 14 246 190 14 246 190 14 246 190 14
57131-246 190 14 246 190 14 246 190 14 246 190 14
57132-246 190 14 246 186 14 242 186 14 190 150 46
57133- 54 54 54 22 22 22 6 6 6 0 0 0
57134- 0 0 0 0 0 0 0 0 0 0 0 0
57135- 0 0 0 0 0 0 0 0 0 0 0 0
57136- 0 0 0 0 0 0 0 0 0 14 14 14
57137- 38 38 38 86 86 86 180 133 36 213 154 11
57138-236 178 12 246 186 14 246 190 14 246 190 14
57139-246 190 14 246 190 14 246 190 14 246 190 14
57140-246 190 14 246 190 14 246 190 14 246 190 14
57141-246 190 14 246 190 14 246 190 14 246 190 14
57142-246 190 14 232 195 16 190 146 13 214 214 214
57143-253 253 253 253 253 253 253 253 253 253 253 253
57144-253 253 253 253 253 253 253 253 253 253 253 253
57145-253 253 253 253 253 253 253 253 253 253 253 253
57146-253 253 253 250 250 250 170 170 170 26 26 26
57147- 2 2 6 2 2 6 37 26 9 163 110 8
57148-219 162 10 239 182 13 246 186 14 246 190 14
57149-246 190 14 246 190 14 246 190 14 246 190 14
57150-246 190 14 246 190 14 246 190 14 246 190 14
57151-246 190 14 246 190 14 246 190 14 246 190 14
57152-246 186 14 236 178 12 224 166 10 142 122 72
57153- 46 46 46 18 18 18 6 6 6 0 0 0
57154- 0 0 0 0 0 0 0 0 0 0 0 0
57155- 0 0 0 0 0 0 0 0 0 0 0 0
57156- 0 0 0 0 0 0 6 6 6 18 18 18
57157- 50 50 50 109 106 95 192 133 9 224 166 10
57158-242 186 14 246 190 14 246 190 14 246 190 14
57159-246 190 14 246 190 14 246 190 14 246 190 14
57160-246 190 14 246 190 14 246 190 14 246 190 14
57161-246 190 14 246 190 14 246 190 14 246 190 14
57162-242 186 14 226 184 13 210 162 10 142 110 46
57163-226 226 226 253 253 253 253 253 253 253 253 253
57164-253 253 253 253 253 253 253 253 253 253 253 253
57165-253 253 253 253 253 253 253 253 253 253 253 253
57166-198 198 198 66 66 66 2 2 6 2 2 6
57167- 2 2 6 2 2 6 50 34 6 156 107 11
57168-219 162 10 239 182 13 246 186 14 246 190 14
57169-246 190 14 246 190 14 246 190 14 246 190 14
57170-246 190 14 246 190 14 246 190 14 246 190 14
57171-246 190 14 246 190 14 246 190 14 242 186 14
57172-234 174 13 213 154 11 154 122 46 66 66 66
57173- 30 30 30 10 10 10 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 0 0 0
57175- 0 0 0 0 0 0 0 0 0 0 0 0
57176- 0 0 0 0 0 0 6 6 6 22 22 22
57177- 58 58 58 154 121 60 206 145 10 234 174 13
57178-242 186 14 246 186 14 246 190 14 246 190 14
57179-246 190 14 246 190 14 246 190 14 246 190 14
57180-246 190 14 246 190 14 246 190 14 246 190 14
57181-246 190 14 246 190 14 246 190 14 246 190 14
57182-246 186 14 236 178 12 210 162 10 163 110 8
57183- 61 42 6 138 138 138 218 218 218 250 250 250
57184-253 253 253 253 253 253 253 253 253 250 250 250
57185-242 242 242 210 210 210 144 144 144 66 66 66
57186- 6 6 6 2 2 6 2 2 6 2 2 6
57187- 2 2 6 2 2 6 61 42 6 163 110 8
57188-216 158 10 236 178 12 246 190 14 246 190 14
57189-246 190 14 246 190 14 246 190 14 246 190 14
57190-246 190 14 246 190 14 246 190 14 246 190 14
57191-246 190 14 239 182 13 230 174 11 216 158 10
57192-190 142 34 124 112 88 70 70 70 38 38 38
57193- 18 18 18 6 6 6 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 0 0 0
57195- 0 0 0 0 0 0 0 0 0 0 0 0
57196- 0 0 0 0 0 0 6 6 6 22 22 22
57197- 62 62 62 168 124 44 206 145 10 224 166 10
57198-236 178 12 239 182 13 242 186 14 242 186 14
57199-246 186 14 246 190 14 246 190 14 246 190 14
57200-246 190 14 246 190 14 246 190 14 246 190 14
57201-246 190 14 246 190 14 246 190 14 246 190 14
57202-246 190 14 236 178 12 216 158 10 175 118 6
57203- 80 54 7 2 2 6 6 6 6 30 30 30
57204- 54 54 54 62 62 62 50 50 50 38 38 38
57205- 14 14 14 2 2 6 2 2 6 2 2 6
57206- 2 2 6 2 2 6 2 2 6 2 2 6
57207- 2 2 6 6 6 6 80 54 7 167 114 7
57208-213 154 11 236 178 12 246 190 14 246 190 14
57209-246 190 14 246 190 14 246 190 14 246 190 14
57210-246 190 14 242 186 14 239 182 13 239 182 13
57211-230 174 11 210 150 10 174 135 50 124 112 88
57212- 82 82 82 54 54 54 34 34 34 18 18 18
57213- 6 6 6 0 0 0 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 0 0 0
57215- 0 0 0 0 0 0 0 0 0 0 0 0
57216- 0 0 0 0 0 0 6 6 6 18 18 18
57217- 50 50 50 158 118 36 192 133 9 200 144 11
57218-216 158 10 219 162 10 224 166 10 226 170 11
57219-230 174 11 236 178 12 239 182 13 239 182 13
57220-242 186 14 246 186 14 246 190 14 246 190 14
57221-246 190 14 246 190 14 246 190 14 246 190 14
57222-246 186 14 230 174 11 210 150 10 163 110 8
57223-104 69 6 10 10 10 2 2 6 2 2 6
57224- 2 2 6 2 2 6 2 2 6 2 2 6
57225- 2 2 6 2 2 6 2 2 6 2 2 6
57226- 2 2 6 2 2 6 2 2 6 2 2 6
57227- 2 2 6 6 6 6 91 60 6 167 114 7
57228-206 145 10 230 174 11 242 186 14 246 190 14
57229-246 190 14 246 190 14 246 186 14 242 186 14
57230-239 182 13 230 174 11 224 166 10 213 154 11
57231-180 133 36 124 112 88 86 86 86 58 58 58
57232- 38 38 38 22 22 22 10 10 10 6 6 6
57233- 0 0 0 0 0 0 0 0 0 0 0 0
57234- 0 0 0 0 0 0 0 0 0 0 0 0
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 14 14 14
57237- 34 34 34 70 70 70 138 110 50 158 118 36
57238-167 114 7 180 123 7 192 133 9 197 138 11
57239-200 144 11 206 145 10 213 154 11 219 162 10
57240-224 166 10 230 174 11 239 182 13 242 186 14
57241-246 186 14 246 186 14 246 186 14 246 186 14
57242-239 182 13 216 158 10 185 133 11 152 99 6
57243-104 69 6 18 14 6 2 2 6 2 2 6
57244- 2 2 6 2 2 6 2 2 6 2 2 6
57245- 2 2 6 2 2 6 2 2 6 2 2 6
57246- 2 2 6 2 2 6 2 2 6 2 2 6
57247- 2 2 6 6 6 6 80 54 7 152 99 6
57248-192 133 9 219 162 10 236 178 12 239 182 13
57249-246 186 14 242 186 14 239 182 13 236 178 12
57250-224 166 10 206 145 10 192 133 9 154 121 60
57251- 94 94 94 62 62 62 42 42 42 22 22 22
57252- 14 14 14 6 6 6 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 0 0 0
57254- 0 0 0 0 0 0 0 0 0 0 0 0
57255- 0 0 0 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 6 6 6
57257- 18 18 18 34 34 34 58 58 58 78 78 78
57258-101 98 89 124 112 88 142 110 46 156 107 11
57259-163 110 8 167 114 7 175 118 6 180 123 7
57260-185 133 11 197 138 11 210 150 10 219 162 10
57261-226 170 11 236 178 12 236 178 12 234 174 13
57262-219 162 10 197 138 11 163 110 8 130 83 6
57263- 91 60 6 10 10 10 2 2 6 2 2 6
57264- 18 18 18 38 38 38 38 38 38 38 38 38
57265- 38 38 38 38 38 38 38 38 38 38 38 38
57266- 38 38 38 38 38 38 26 26 26 2 2 6
57267- 2 2 6 6 6 6 70 47 6 137 92 6
57268-175 118 6 200 144 11 219 162 10 230 174 11
57269-234 174 13 230 174 11 219 162 10 210 150 10
57270-192 133 9 163 110 8 124 112 88 82 82 82
57271- 50 50 50 30 30 30 14 14 14 6 6 6
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 0 0 0
57274- 0 0 0 0 0 0 0 0 0 0 0 0
57275- 0 0 0 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 6 6 6 14 14 14 22 22 22 34 34 34
57278- 42 42 42 58 58 58 74 74 74 86 86 86
57279-101 98 89 122 102 70 130 98 46 121 87 25
57280-137 92 6 152 99 6 163 110 8 180 123 7
57281-185 133 11 197 138 11 206 145 10 200 144 11
57282-180 123 7 156 107 11 130 83 6 104 69 6
57283- 50 34 6 54 54 54 110 110 110 101 98 89
57284- 86 86 86 82 82 82 78 78 78 78 78 78
57285- 78 78 78 78 78 78 78 78 78 78 78 78
57286- 78 78 78 82 82 82 86 86 86 94 94 94
57287-106 106 106 101 101 101 86 66 34 124 80 6
57288-156 107 11 180 123 7 192 133 9 200 144 11
57289-206 145 10 200 144 11 192 133 9 175 118 6
57290-139 102 15 109 106 95 70 70 70 42 42 42
57291- 22 22 22 10 10 10 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 0 0 0
57294- 0 0 0 0 0 0 0 0 0 0 0 0
57295- 0 0 0 0 0 0 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 6 6 6 10 10 10
57298- 14 14 14 22 22 22 30 30 30 38 38 38
57299- 50 50 50 62 62 62 74 74 74 90 90 90
57300-101 98 89 112 100 78 121 87 25 124 80 6
57301-137 92 6 152 99 6 152 99 6 152 99 6
57302-138 86 6 124 80 6 98 70 6 86 66 30
57303-101 98 89 82 82 82 58 58 58 46 46 46
57304- 38 38 38 34 34 34 34 34 34 34 34 34
57305- 34 34 34 34 34 34 34 34 34 34 34 34
57306- 34 34 34 34 34 34 38 38 38 42 42 42
57307- 54 54 54 82 82 82 94 86 76 91 60 6
57308-134 86 6 156 107 11 167 114 7 175 118 6
57309-175 118 6 167 114 7 152 99 6 121 87 25
57310-101 98 89 62 62 62 34 34 34 18 18 18
57311- 6 6 6 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 0 0 0
57314- 0 0 0 0 0 0 0 0 0 0 0 0
57315- 0 0 0 0 0 0 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 6 6 6 6 6 6 10 10 10
57319- 18 18 18 22 22 22 30 30 30 42 42 42
57320- 50 50 50 66 66 66 86 86 86 101 98 89
57321-106 86 58 98 70 6 104 69 6 104 69 6
57322-104 69 6 91 60 6 82 62 34 90 90 90
57323- 62 62 62 38 38 38 22 22 22 14 14 14
57324- 10 10 10 10 10 10 10 10 10 10 10 10
57325- 10 10 10 10 10 10 6 6 6 10 10 10
57326- 10 10 10 10 10 10 10 10 10 14 14 14
57327- 22 22 22 42 42 42 70 70 70 89 81 66
57328- 80 54 7 104 69 6 124 80 6 137 92 6
57329-134 86 6 116 81 8 100 82 52 86 86 86
57330- 58 58 58 30 30 30 14 14 14 6 6 6
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 0 0 0 0 0 0 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 6 6 6 10 10 10 14 14 14
57340- 18 18 18 26 26 26 38 38 38 54 54 54
57341- 70 70 70 86 86 86 94 86 76 89 81 66
57342- 89 81 66 86 86 86 74 74 74 50 50 50
57343- 30 30 30 14 14 14 6 6 6 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 0 0 0
57347- 6 6 6 18 18 18 34 34 34 58 58 58
57348- 82 82 82 89 81 66 89 81 66 89 81 66
57349- 94 86 66 94 86 76 74 74 74 50 50 50
57350- 26 26 26 14 14 14 6 6 6 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 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 6 6 6 6 6 6 14 14 14 18 18 18
57361- 30 30 30 38 38 38 46 46 46 54 54 54
57362- 50 50 50 42 42 42 30 30 30 18 18 18
57363- 10 10 10 0 0 0 0 0 0 0 0 0
57364- 0 0 0 0 0 0 0 0 0 0 0 0
57365- 0 0 0 0 0 0 0 0 0 0 0 0
57366- 0 0 0 0 0 0 0 0 0 0 0 0
57367- 0 0 0 6 6 6 14 14 14 26 26 26
57368- 38 38 38 50 50 50 58 58 58 58 58 58
57369- 54 54 54 42 42 42 30 30 30 18 18 18
57370- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 0 6 6 6
57381- 6 6 6 10 10 10 14 14 14 18 18 18
57382- 18 18 18 14 14 14 10 10 10 6 6 6
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 0 0 0
57387- 0 0 0 0 0 0 0 0 0 6 6 6
57388- 14 14 14 18 18 18 22 22 22 22 22 22
57389- 18 18 18 14 14 14 10 10 10 6 6 6
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+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57408+4 4 4 4 4 4
57409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0
57484+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 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 1 1 1 0 0 0
57489+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57490+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
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
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 4 4 4 4 4 4 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 2 2 2 0 0 0 3 4 3 26 28 28
57498+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57499+5 5 5 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 4 4 4 4 4 4 4 4 4
57501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57502+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57503+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57504+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57505+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57506+4 4 4 4 4 4
57507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57512+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57513+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57516+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57517+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57518+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57519+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57520+4 4 4 4 4 4
57521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57524+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57525+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57526+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57527+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57529+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57530+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57531+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57532+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57533+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57534+4 4 4 4 4 4
57535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57538+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57539+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57540+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57541+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57542+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57543+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57544+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57545+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57546+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57547+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57548+4 4 4 4 4 4
57549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57552+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57553+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57554+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57555+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57556+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57557+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57558+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57559+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57560+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57561+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57562+4 4 4 4 4 4
57563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57565+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57566+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57567+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57568+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57569+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57570+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57571+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57572+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57573+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57574+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57575+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57576+4 4 4 4 4 4
57577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57579+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57580+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57581+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57582+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57583+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57584+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57585+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57586+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57587+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57588+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57589+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57590+4 4 4 4 4 4
57591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57593+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57594+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57595+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57596+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57597+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57598+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57599+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57600+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57601+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57602+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57603+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57604+4 4 4 4 4 4
57605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57607+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57608+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57609+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57610+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57611+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57612+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57613+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57614+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57615+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57616+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57617+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57618+4 4 4 4 4 4
57619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57620+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
57621+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57622+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57623+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57624+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57625+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57626+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57627+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57628+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57629+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57630+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57631+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57632+4 4 4 4 4 4
57633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57634+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57635+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57636+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57637+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57638+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57639+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57640+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57641+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57642+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57643+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57644+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57645+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57646+0 0 0 4 4 4
57647+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57648+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57649+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57650+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57651+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57652+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57653+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57654+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57655+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57656+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57657+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57658+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57659+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57660+2 0 0 0 0 0
57661+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57662+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57663+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57664+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57665+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57666+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57667+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57668+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57669+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57670+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57671+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57672+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57673+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57674+37 38 37 0 0 0
57675+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57676+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57677+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57678+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57679+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57680+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57681+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57682+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57683+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57684+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57685+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57686+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57687+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57688+85 115 134 4 0 0
57689+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57690+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57691+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57692+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57693+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57694+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57695+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57696+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57697+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57698+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57699+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57700+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57701+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57702+60 73 81 4 0 0
57703+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57704+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57705+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57706+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57707+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57708+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57709+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57710+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57711+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57712+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57713+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57714+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57715+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57716+16 19 21 4 0 0
57717+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57718+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57719+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57720+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57721+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57722+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57723+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57724+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57725+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57726+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57727+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57728+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57729+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57730+4 0 0 4 3 3
57731+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57732+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57733+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57735+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57736+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57737+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57738+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57739+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57740+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57741+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57742+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57743+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57744+3 2 2 4 4 4
57745+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57746+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57747+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57748+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57749+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57750+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57751+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57752+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57753+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57754+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57755+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57756+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57757+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57758+4 4 4 4 4 4
57759+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57760+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57761+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57762+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57763+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57764+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57765+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57766+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57767+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57768+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57769+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57770+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57771+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57772+4 4 4 4 4 4
57773+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57774+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57775+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57776+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57777+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57778+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57779+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57780+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57781+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57782+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57783+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57784+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57785+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57786+5 5 5 5 5 5
57787+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57788+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57789+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57790+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57791+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57792+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57793+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57794+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57795+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57796+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57797+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57798+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57799+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57800+5 5 5 4 4 4
57801+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57802+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57803+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57804+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57805+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57806+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57807+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57808+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57809+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57810+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57811+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57812+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57814+4 4 4 4 4 4
57815+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57816+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57817+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57818+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57819+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57820+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57821+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57822+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57823+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57824+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57825+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57826+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57828+4 4 4 4 4 4
57829+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57830+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57831+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57832+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57833+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57834+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57835+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57836+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57837+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57838+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57839+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57842+4 4 4 4 4 4
57843+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57844+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57845+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57846+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57847+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57848+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57849+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57850+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57851+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57852+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57853+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57856+4 4 4 4 4 4
57857+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57858+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57859+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57860+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57861+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57862+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57863+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57864+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57865+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57866+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57867+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57870+4 4 4 4 4 4
57871+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57872+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57873+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57874+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57875+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57876+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57877+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57878+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57879+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57880+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57881+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
57882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57884+4 4 4 4 4 4
57885+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57886+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57887+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57888+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57889+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57890+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57891+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57892+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57893+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57894+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57895+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
57896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57898+4 4 4 4 4 4
57899+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57900+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57901+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57902+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57903+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57904+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57905+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57906+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57907+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57908+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57909+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57912+4 4 4 4 4 4
57913+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57914+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57915+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57916+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57917+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57918+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57919+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57920+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57921+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57922+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57923+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57924+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57926+4 4 4 4 4 4
57927+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57928+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57929+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57930+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57931+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57932+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57933+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57934+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57935+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57936+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57937+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57938+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57940+4 4 4 4 4 4
57941+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57942+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57943+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57944+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57945+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57946+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57947+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57948+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57949+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57950+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57951+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57954+4 4 4 4 4 4
57955+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57956+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57957+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57958+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57959+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57960+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57961+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57962+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57963+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57964+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57965+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57966+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57968+4 4 4 4 4 4
57969+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57970+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57971+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57972+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57973+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57974+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57975+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57976+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57977+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57978+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57979+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57982+4 4 4 4 4 4
57983+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57984+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57985+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57986+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57987+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57988+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57989+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57990+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57991+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57992+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57993+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57996+4 4 4 4 4 4
57997+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57998+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57999+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58000+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58001+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58002+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58003+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58004+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58005+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58006+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58007+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58010+4 4 4 4 4 4
58011+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58012+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58013+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58014+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58015+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58016+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58017+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58018+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58019+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58020+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58021+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58024+4 4 4 4 4 4
58025+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58026+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58027+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58028+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
58029+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
58030+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
58031+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
58032+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
58033+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
58034+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58035+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58038+4 4 4 4 4 4
58039+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58040+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
58041+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
58042+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
58043+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
58044+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
58045+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
58046+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
58047+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58048+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58049+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58052+4 4 4 4 4 4
58053+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58054+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
58055+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58056+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
58057+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
58058+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
58059+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
58060+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
58061+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58062+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58063+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58066+4 4 4 4 4 4
58067+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58068+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
58069+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
58070+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
58071+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
58072+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
58073+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58074+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
58075+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58076+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58077+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58080+4 4 4 4 4 4
58081+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58082+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
58083+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
58084+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58085+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
58086+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
58087+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58088+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
58089+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58090+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58091+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58094+4 4 4 4 4 4
58095+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58096+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
58097+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
58098+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
58099+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
58100+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
58101+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
58102+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
58103+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
58104+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58105+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58108+4 4 4 4 4 4
58109+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58110+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
58111+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
58112+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
58113+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
58114+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
58115+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
58116+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
58117+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
58118+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58119+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58122+4 4 4 4 4 4
58123+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
58124+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
58125+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
58126+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
58127+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58128+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
58129+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
58130+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
58131+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
58132+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58133+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58134+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58135+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58136+4 4 4 4 4 4
58137+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58138+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
58139+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
58140+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
58141+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
58142+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
58143+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
58144+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
58145+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
58146+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58147+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58148+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58149+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58150+4 4 4 4 4 4
58151+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
58152+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
58153+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
58154+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
58155+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
58156+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
58157+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
58158+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
58159+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
58160+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
58161+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58162+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58163+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58164+4 4 4 4 4 4
58165+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
58166+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58167+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
58168+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
58169+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
58170+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
58171+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
58172+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
58173+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
58174+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
58175+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58176+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58177+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58178+4 4 4 4 4 4
58179+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
58180+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58181+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
58182+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
58183+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
58184+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
58185+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58186+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
58187+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
58188+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
58189+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58190+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58191+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58192+4 4 4 4 4 4
58193+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
58194+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
58195+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
58196+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
58197+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
58198+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
58199+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
58200+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
58201+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
58202+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
58203+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58204+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58205+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58206+4 4 4 4 4 4
58207+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
58208+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
58209+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58210+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
58211+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
58212+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
58213+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
58214+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
58215+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
58216+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
58217+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58218+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58219+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58220+4 4 4 4 4 4
58221+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58222+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
58223+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
58224+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
58225+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
58226+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
58227+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
58228+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
58229+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
58230+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58231+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58232+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58233+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58234+4 4 4 4 4 4
58235+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
58236+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
58237+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
58238+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
58239+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
58240+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
58241+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
58242+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
58243+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
58244+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58245+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58246+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58247+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58248+4 4 4 4 4 4
58249+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
58250+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
58251+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
58252+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
58253+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
58254+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
58255+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
58256+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
58257+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58258+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58259+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58260+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58261+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58262+4 4 4 4 4 4
58263+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
58264+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58265+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
58266+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58267+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
58268+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
58269+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
58270+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
58271+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
58272+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58273+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58274+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58275+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58276+4 4 4 4 4 4
58277+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
58278+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
58279+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
58280+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
58281+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
58282+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
58283+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
58284+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
58285+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
58286+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58287+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58288+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
58291+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58292+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
58293+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
58294+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
58295+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
58296+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
58297+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
58298+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
58299+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58300+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58301+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58302+4 4 4 4 4 4 4 4 4 4 4 4 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
58305+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
58306+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
58307+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58308+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
58309+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
58310+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
58311+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
58312+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
58313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58315+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58316+4 4 4 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
58319+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58320+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
58321+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
58322+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
58323+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
58324+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
58325+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
58326+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
58333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58334+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
58335+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58336+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
58337+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
58338+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
58339+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
58340+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
58341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58343+4 4 4 4 4 4 4 4 4 4 4 4 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
58347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58348+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
58349+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
58350+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
58351+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
58352+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
58353+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
58354+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
58355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58357+4 4 4 4 4 4 4 4 4 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
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 5 5 5 5 5 5 5 5 5
58363+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
58364+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58365+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
58366+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
58367+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
58368+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58374+4 4 4 4 4 4
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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58378+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
58379+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
58380+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
58381+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
58382+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58388+4 4 4 4 4 4
58389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58392+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58393+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
58394+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
58395+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
58396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58402+4 4 4 4 4 4
58403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58406+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58407+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58408+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
58409+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
58410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58420+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58421+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58422+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58423+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
58424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58434+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
58435+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
58436+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
58437+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
58438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58449+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
58450+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58451+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58455+4 4 4 4 4 4 4 4 4 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
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 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
58464+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
58465+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 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
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 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58478+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58479+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58483+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
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 4 4 4 4 4 4 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 5 5 5 4 3 3 6 6 6
58492+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58496+4 4 4 4 4 4 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
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 4 4 4 4 4 4 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 5 5 5 4 3 3
58506+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58510+4 4 4 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
58515diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
58516index 70fba97..8ec7f86 100644
58517--- a/drivers/xen/events/events_base.c
58518+++ b/drivers/xen/events/events_base.c
58519@@ -1563,7 +1563,7 @@ void xen_irq_resume(void)
58520 restore_pirqs();
58521 }
58522
58523-static struct irq_chip xen_dynamic_chip __read_mostly = {
58524+static struct irq_chip xen_dynamic_chip = {
58525 .name = "xen-dyn",
58526
58527 .irq_disable = disable_dynirq,
58528@@ -1577,7 +1577,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
58529 .irq_retrigger = retrigger_dynirq,
58530 };
58531
58532-static struct irq_chip xen_pirq_chip __read_mostly = {
58533+static struct irq_chip xen_pirq_chip = {
58534 .name = "xen-pirq",
58535
58536 .irq_startup = startup_pirq,
58537@@ -1597,7 +1597,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
58538 .irq_retrigger = retrigger_dynirq,
58539 };
58540
58541-static struct irq_chip xen_percpu_chip __read_mostly = {
58542+static struct irq_chip xen_percpu_chip = {
58543 .name = "xen-percpu",
58544
58545 .irq_disable = disable_dynirq,
58546diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58547index fef20db..d28b1ab 100644
58548--- a/drivers/xen/xenfs/xenstored.c
58549+++ b/drivers/xen/xenfs/xenstored.c
58550@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58551 static int xsd_kva_open(struct inode *inode, struct file *file)
58552 {
58553 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58554+#ifdef CONFIG_GRKERNSEC_HIDESYM
58555+ NULL);
58556+#else
58557 xen_store_interface);
58558+#endif
58559+
58560 if (!file->private_data)
58561 return -ENOMEM;
58562 return 0;
58563diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58564index eb14e05..5156de7 100644
58565--- a/fs/9p/vfs_addr.c
58566+++ b/fs/9p/vfs_addr.c
58567@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58568
58569 retval = v9fs_file_write_internal(inode,
58570 v9inode->writeback_fid,
58571- (__force const char __user *)buffer,
58572+ (const char __force_user *)buffer,
58573 len, &offset, 0);
58574 if (retval > 0)
58575 retval = 0;
58576diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58577index 9ee5343..5165e3c 100644
58578--- a/fs/9p/vfs_inode.c
58579+++ b/fs/9p/vfs_inode.c
58580@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58581 void
58582 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58583 {
58584- char *s = nd_get_link(nd);
58585+ const char *s = nd_get_link(nd);
58586
58587 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58588 dentry, IS_ERR(s) ? "<error>" : s);
58589diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58590index c055d56e..a46f4f5 100644
58591--- a/fs/Kconfig.binfmt
58592+++ b/fs/Kconfig.binfmt
58593@@ -106,7 +106,7 @@ config HAVE_AOUT
58594
58595 config BINFMT_AOUT
58596 tristate "Kernel support for a.out and ECOFF binaries"
58597- depends on HAVE_AOUT
58598+ depends on HAVE_AOUT && BROKEN
58599 ---help---
58600 A.out (Assembler.OUTput) is a set of formats for libraries and
58601 executables used in the earliest versions of UNIX. Linux used
58602diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58603index 8a1d38e..300a14e 100644
58604--- a/fs/afs/inode.c
58605+++ b/fs/afs/inode.c
58606@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58607 struct afs_vnode *vnode;
58608 struct super_block *sb;
58609 struct inode *inode;
58610- static atomic_t afs_autocell_ino;
58611+ static atomic_unchecked_t afs_autocell_ino;
58612
58613 _enter("{%x:%u},%*.*s,",
58614 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58615@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58616 data.fid.unique = 0;
58617 data.fid.vnode = 0;
58618
58619- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58620+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58621 afs_iget5_autocell_test, afs_iget5_set,
58622 &data);
58623 if (!inode) {
58624diff --git a/fs/aio.c b/fs/aio.c
58625index ebd0e9b..c577c91 100644
58626--- a/fs/aio.c
58627+++ b/fs/aio.c
58628@@ -413,7 +413,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58629 size += sizeof(struct io_event) * nr_events;
58630
58631 nr_pages = PFN_UP(size);
58632- if (nr_pages < 0)
58633+ if (nr_pages <= 0)
58634 return -EINVAL;
58635
58636 file = aio_private_file(ctx, nr_pages);
58637diff --git a/fs/attr.c b/fs/attr.c
58638index 6530ced..4a827e2 100644
58639--- a/fs/attr.c
58640+++ b/fs/attr.c
58641@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58642 unsigned long limit;
58643
58644 limit = rlimit(RLIMIT_FSIZE);
58645+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58646 if (limit != RLIM_INFINITY && offset > limit)
58647 goto out_sig;
58648 if (offset > inode->i_sb->s_maxbytes)
58649diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58650index 116fd38..c04182da 100644
58651--- a/fs/autofs4/waitq.c
58652+++ b/fs/autofs4/waitq.c
58653@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58654 {
58655 unsigned long sigpipe, flags;
58656 mm_segment_t fs;
58657- const char *data = (const char *)addr;
58658+ const char __user *data = (const char __force_user *)addr;
58659 ssize_t wr = 0;
58660
58661 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58662@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58663 return 1;
58664 }
58665
58666+#ifdef CONFIG_GRKERNSEC_HIDESYM
58667+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58668+#endif
58669+
58670 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58671 enum autofs_notify notify)
58672 {
58673@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58674
58675 /* If this is a direct mount request create a dummy name */
58676 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58677+#ifdef CONFIG_GRKERNSEC_HIDESYM
58678+ /* this name does get written to userland via autofs4_write() */
58679+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58680+#else
58681 qstr.len = sprintf(name, "%p", dentry);
58682+#endif
58683 else {
58684 qstr.len = autofs4_getpath(sbi, dentry, &name);
58685 if (!qstr.len) {
58686diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58687index 2722387..56059b5 100644
58688--- a/fs/befs/endian.h
58689+++ b/fs/befs/endian.h
58690@@ -11,7 +11,7 @@
58691
58692 #include <asm/byteorder.h>
58693
58694-static inline u64
58695+static inline u64 __intentional_overflow(-1)
58696 fs64_to_cpu(const struct super_block *sb, fs64 n)
58697 {
58698 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58699@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58700 return (__force fs64)cpu_to_be64(n);
58701 }
58702
58703-static inline u32
58704+static inline u32 __intentional_overflow(-1)
58705 fs32_to_cpu(const struct super_block *sb, fs32 n)
58706 {
58707 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58708@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58709 return (__force fs32)cpu_to_be32(n);
58710 }
58711
58712-static inline u16
58713+static inline u16 __intentional_overflow(-1)
58714 fs16_to_cpu(const struct super_block *sb, fs16 n)
58715 {
58716 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58717diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58718index 4c55668..eeae150 100644
58719--- a/fs/binfmt_aout.c
58720+++ b/fs/binfmt_aout.c
58721@@ -16,6 +16,7 @@
58722 #include <linux/string.h>
58723 #include <linux/fs.h>
58724 #include <linux/file.h>
58725+#include <linux/security.h>
58726 #include <linux/stat.h>
58727 #include <linux/fcntl.h>
58728 #include <linux/ptrace.h>
58729@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58730 #endif
58731 # define START_STACK(u) ((void __user *)u.start_stack)
58732
58733+ memset(&dump, 0, sizeof(dump));
58734+
58735 fs = get_fs();
58736 set_fs(KERNEL_DS);
58737 has_dumped = 1;
58738@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58739
58740 /* If the size of the dump file exceeds the rlimit, then see what would happen
58741 if we wrote the stack, but not the data area. */
58742+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58743 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58744 dump.u_dsize = 0;
58745
58746 /* Make sure we have enough room to write the stack and data areas. */
58747+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58748 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58749 dump.u_ssize = 0;
58750
58751@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58752 rlim = rlimit(RLIMIT_DATA);
58753 if (rlim >= RLIM_INFINITY)
58754 rlim = ~0;
58755+
58756+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58757 if (ex.a_data + ex.a_bss > rlim)
58758 return -ENOMEM;
58759
58760@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58761
58762 install_exec_creds(bprm);
58763
58764+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58765+ current->mm->pax_flags = 0UL;
58766+#endif
58767+
58768+#ifdef CONFIG_PAX_PAGEEXEC
58769+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58770+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58771+
58772+#ifdef CONFIG_PAX_EMUTRAMP
58773+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58774+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58775+#endif
58776+
58777+#ifdef CONFIG_PAX_MPROTECT
58778+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58779+ current->mm->pax_flags |= MF_PAX_MPROTECT;
58780+#endif
58781+
58782+ }
58783+#endif
58784+
58785 if (N_MAGIC(ex) == OMAGIC) {
58786 unsigned long text_addr, map_size;
58787 loff_t pos;
58788@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58789 return error;
58790
58791 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58792- PROT_READ | PROT_WRITE | PROT_EXEC,
58793+ PROT_READ | PROT_WRITE,
58794 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58795 fd_offset + ex.a_text);
58796 if (error != N_DATADDR(ex))
58797diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58798index 995986b..dcc4ef2 100644
58799--- a/fs/binfmt_elf.c
58800+++ b/fs/binfmt_elf.c
58801@@ -34,6 +34,7 @@
58802 #include <linux/utsname.h>
58803 #include <linux/coredump.h>
58804 #include <linux/sched.h>
58805+#include <linux/xattr.h>
58806 #include <asm/uaccess.h>
58807 #include <asm/param.h>
58808 #include <asm/page.h>
58809@@ -47,7 +48,7 @@
58810
58811 static int load_elf_binary(struct linux_binprm *bprm);
58812 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58813- int, int, unsigned long);
58814+ int, int, unsigned long) __intentional_overflow(-1);
58815
58816 #ifdef CONFIG_USELIB
58817 static int load_elf_library(struct file *);
58818@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58819 #define elf_core_dump NULL
58820 #endif
58821
58822+#ifdef CONFIG_PAX_MPROTECT
58823+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58824+#endif
58825+
58826+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58827+static void elf_handle_mmap(struct file *file);
58828+#endif
58829+
58830 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58831 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58832 #else
58833@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58834 .load_binary = load_elf_binary,
58835 .load_shlib = load_elf_library,
58836 .core_dump = elf_core_dump,
58837+
58838+#ifdef CONFIG_PAX_MPROTECT
58839+ .handle_mprotect= elf_handle_mprotect,
58840+#endif
58841+
58842+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58843+ .handle_mmap = elf_handle_mmap,
58844+#endif
58845+
58846 .min_coredump = ELF_EXEC_PAGESIZE,
58847 };
58848
58849@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58850
58851 static int set_brk(unsigned long start, unsigned long end)
58852 {
58853+ unsigned long e = end;
58854+
58855 start = ELF_PAGEALIGN(start);
58856 end = ELF_PAGEALIGN(end);
58857 if (end > start) {
58858@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58859 if (BAD_ADDR(addr))
58860 return addr;
58861 }
58862- current->mm->start_brk = current->mm->brk = end;
58863+ current->mm->start_brk = current->mm->brk = e;
58864 return 0;
58865 }
58866
58867@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58868 elf_addr_t __user *u_rand_bytes;
58869 const char *k_platform = ELF_PLATFORM;
58870 const char *k_base_platform = ELF_BASE_PLATFORM;
58871- unsigned char k_rand_bytes[16];
58872+ u32 k_rand_bytes[4];
58873 int items;
58874 elf_addr_t *elf_info;
58875 int ei_index = 0;
58876 const struct cred *cred = current_cred();
58877 struct vm_area_struct *vma;
58878+ unsigned long saved_auxv[AT_VECTOR_SIZE];
58879
58880 /*
58881 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58882@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58883 * Generate 16 random bytes for userspace PRNG seeding.
58884 */
58885 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58886- u_rand_bytes = (elf_addr_t __user *)
58887- STACK_ALLOC(p, sizeof(k_rand_bytes));
58888+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58889+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58890+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58891+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58892+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
58893+ u_rand_bytes = (elf_addr_t __user *) p;
58894 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58895 return -EFAULT;
58896
58897@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58898 return -EFAULT;
58899 current->mm->env_end = p;
58900
58901+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58902+
58903 /* Put the elf_info on the stack in the right place. */
58904 sp = (elf_addr_t __user *)envp + 1;
58905- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58906+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58907 return -EFAULT;
58908 return 0;
58909 }
58910@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
58911 an ELF header */
58912
58913 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58914- struct file *interpreter, unsigned long *interp_map_addr,
58915+ struct file *interpreter,
58916 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
58917 {
58918 struct elf_phdr *eppnt;
58919- unsigned long load_addr = 0;
58920+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58921 int load_addr_set = 0;
58922 unsigned long last_bss = 0, elf_bss = 0;
58923- unsigned long error = ~0UL;
58924+ unsigned long error = -EINVAL;
58925 unsigned long total_size;
58926 int i;
58927
58928@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58929 goto out;
58930 }
58931
58932+#ifdef CONFIG_PAX_SEGMEXEC
58933+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58934+ pax_task_size = SEGMEXEC_TASK_SIZE;
58935+#endif
58936+
58937 eppnt = interp_elf_phdata;
58938 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58939 if (eppnt->p_type == PT_LOAD) {
58940@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58941 map_addr = elf_map(interpreter, load_addr + vaddr,
58942 eppnt, elf_prot, elf_type, total_size);
58943 total_size = 0;
58944- if (!*interp_map_addr)
58945- *interp_map_addr = map_addr;
58946 error = map_addr;
58947 if (BAD_ADDR(map_addr))
58948 goto out;
58949@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58950 k = load_addr + eppnt->p_vaddr;
58951 if (BAD_ADDR(k) ||
58952 eppnt->p_filesz > eppnt->p_memsz ||
58953- eppnt->p_memsz > TASK_SIZE ||
58954- TASK_SIZE - eppnt->p_memsz < k) {
58955+ eppnt->p_memsz > pax_task_size ||
58956+ pax_task_size - eppnt->p_memsz < k) {
58957 error = -ENOMEM;
58958 goto out;
58959 }
58960@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58961 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58962
58963 /* Map the last of the bss segment */
58964- error = vm_brk(elf_bss, last_bss - elf_bss);
58965- if (BAD_ADDR(error))
58966- goto out;
58967+ if (last_bss > elf_bss) {
58968+ error = vm_brk(elf_bss, last_bss - elf_bss);
58969+ if (BAD_ADDR(error))
58970+ goto out;
58971+ }
58972 }
58973
58974 error = load_addr;
58975@@ -634,6 +666,336 @@ out:
58976 return error;
58977 }
58978
58979+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58980+#ifdef CONFIG_PAX_SOFTMODE
58981+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58982+{
58983+ unsigned long pax_flags = 0UL;
58984+
58985+#ifdef CONFIG_PAX_PAGEEXEC
58986+ if (elf_phdata->p_flags & PF_PAGEEXEC)
58987+ pax_flags |= MF_PAX_PAGEEXEC;
58988+#endif
58989+
58990+#ifdef CONFIG_PAX_SEGMEXEC
58991+ if (elf_phdata->p_flags & PF_SEGMEXEC)
58992+ pax_flags |= MF_PAX_SEGMEXEC;
58993+#endif
58994+
58995+#ifdef CONFIG_PAX_EMUTRAMP
58996+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58997+ pax_flags |= MF_PAX_EMUTRAMP;
58998+#endif
58999+
59000+#ifdef CONFIG_PAX_MPROTECT
59001+ if (elf_phdata->p_flags & PF_MPROTECT)
59002+ pax_flags |= MF_PAX_MPROTECT;
59003+#endif
59004+
59005+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59006+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
59007+ pax_flags |= MF_PAX_RANDMMAP;
59008+#endif
59009+
59010+ return pax_flags;
59011+}
59012+#endif
59013+
59014+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
59015+{
59016+ unsigned long pax_flags = 0UL;
59017+
59018+#ifdef CONFIG_PAX_PAGEEXEC
59019+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
59020+ pax_flags |= MF_PAX_PAGEEXEC;
59021+#endif
59022+
59023+#ifdef CONFIG_PAX_SEGMEXEC
59024+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
59025+ pax_flags |= MF_PAX_SEGMEXEC;
59026+#endif
59027+
59028+#ifdef CONFIG_PAX_EMUTRAMP
59029+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
59030+ pax_flags |= MF_PAX_EMUTRAMP;
59031+#endif
59032+
59033+#ifdef CONFIG_PAX_MPROTECT
59034+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
59035+ pax_flags |= MF_PAX_MPROTECT;
59036+#endif
59037+
59038+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59039+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
59040+ pax_flags |= MF_PAX_RANDMMAP;
59041+#endif
59042+
59043+ return pax_flags;
59044+}
59045+#endif
59046+
59047+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59048+#ifdef CONFIG_PAX_SOFTMODE
59049+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
59050+{
59051+ unsigned long pax_flags = 0UL;
59052+
59053+#ifdef CONFIG_PAX_PAGEEXEC
59054+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
59055+ pax_flags |= MF_PAX_PAGEEXEC;
59056+#endif
59057+
59058+#ifdef CONFIG_PAX_SEGMEXEC
59059+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
59060+ pax_flags |= MF_PAX_SEGMEXEC;
59061+#endif
59062+
59063+#ifdef CONFIG_PAX_EMUTRAMP
59064+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
59065+ pax_flags |= MF_PAX_EMUTRAMP;
59066+#endif
59067+
59068+#ifdef CONFIG_PAX_MPROTECT
59069+ if (pax_flags_softmode & MF_PAX_MPROTECT)
59070+ pax_flags |= MF_PAX_MPROTECT;
59071+#endif
59072+
59073+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59074+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
59075+ pax_flags |= MF_PAX_RANDMMAP;
59076+#endif
59077+
59078+ return pax_flags;
59079+}
59080+#endif
59081+
59082+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
59083+{
59084+ unsigned long pax_flags = 0UL;
59085+
59086+#ifdef CONFIG_PAX_PAGEEXEC
59087+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
59088+ pax_flags |= MF_PAX_PAGEEXEC;
59089+#endif
59090+
59091+#ifdef CONFIG_PAX_SEGMEXEC
59092+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
59093+ pax_flags |= MF_PAX_SEGMEXEC;
59094+#endif
59095+
59096+#ifdef CONFIG_PAX_EMUTRAMP
59097+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
59098+ pax_flags |= MF_PAX_EMUTRAMP;
59099+#endif
59100+
59101+#ifdef CONFIG_PAX_MPROTECT
59102+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
59103+ pax_flags |= MF_PAX_MPROTECT;
59104+#endif
59105+
59106+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59107+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
59108+ pax_flags |= MF_PAX_RANDMMAP;
59109+#endif
59110+
59111+ return pax_flags;
59112+}
59113+#endif
59114+
59115+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59116+static unsigned long pax_parse_defaults(void)
59117+{
59118+ unsigned long pax_flags = 0UL;
59119+
59120+#ifdef CONFIG_PAX_SOFTMODE
59121+ if (pax_softmode)
59122+ return pax_flags;
59123+#endif
59124+
59125+#ifdef CONFIG_PAX_PAGEEXEC
59126+ pax_flags |= MF_PAX_PAGEEXEC;
59127+#endif
59128+
59129+#ifdef CONFIG_PAX_SEGMEXEC
59130+ pax_flags |= MF_PAX_SEGMEXEC;
59131+#endif
59132+
59133+#ifdef CONFIG_PAX_MPROTECT
59134+ pax_flags |= MF_PAX_MPROTECT;
59135+#endif
59136+
59137+#ifdef CONFIG_PAX_RANDMMAP
59138+ if (randomize_va_space)
59139+ pax_flags |= MF_PAX_RANDMMAP;
59140+#endif
59141+
59142+ return pax_flags;
59143+}
59144+
59145+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
59146+{
59147+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
59148+
59149+#ifdef CONFIG_PAX_EI_PAX
59150+
59151+#ifdef CONFIG_PAX_SOFTMODE
59152+ if (pax_softmode)
59153+ return pax_flags;
59154+#endif
59155+
59156+ pax_flags = 0UL;
59157+
59158+#ifdef CONFIG_PAX_PAGEEXEC
59159+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
59160+ pax_flags |= MF_PAX_PAGEEXEC;
59161+#endif
59162+
59163+#ifdef CONFIG_PAX_SEGMEXEC
59164+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
59165+ pax_flags |= MF_PAX_SEGMEXEC;
59166+#endif
59167+
59168+#ifdef CONFIG_PAX_EMUTRAMP
59169+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
59170+ pax_flags |= MF_PAX_EMUTRAMP;
59171+#endif
59172+
59173+#ifdef CONFIG_PAX_MPROTECT
59174+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
59175+ pax_flags |= MF_PAX_MPROTECT;
59176+#endif
59177+
59178+#ifdef CONFIG_PAX_ASLR
59179+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
59180+ pax_flags |= MF_PAX_RANDMMAP;
59181+#endif
59182+
59183+#endif
59184+
59185+ return pax_flags;
59186+
59187+}
59188+
59189+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
59190+{
59191+
59192+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59193+ unsigned long i;
59194+
59195+ for (i = 0UL; i < elf_ex->e_phnum; i++)
59196+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
59197+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
59198+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
59199+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
59200+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
59201+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
59202+ return PAX_PARSE_FLAGS_FALLBACK;
59203+
59204+#ifdef CONFIG_PAX_SOFTMODE
59205+ if (pax_softmode)
59206+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
59207+ else
59208+#endif
59209+
59210+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
59211+ break;
59212+ }
59213+#endif
59214+
59215+ return PAX_PARSE_FLAGS_FALLBACK;
59216+}
59217+
59218+static unsigned long pax_parse_xattr_pax(struct file * const file)
59219+{
59220+
59221+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59222+ ssize_t xattr_size, i;
59223+ unsigned char xattr_value[sizeof("pemrs") - 1];
59224+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
59225+
59226+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
59227+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
59228+ return PAX_PARSE_FLAGS_FALLBACK;
59229+
59230+ for (i = 0; i < xattr_size; i++)
59231+ switch (xattr_value[i]) {
59232+ default:
59233+ return PAX_PARSE_FLAGS_FALLBACK;
59234+
59235+#define parse_flag(option1, option2, flag) \
59236+ case option1: \
59237+ if (pax_flags_hardmode & MF_PAX_##flag) \
59238+ return PAX_PARSE_FLAGS_FALLBACK;\
59239+ pax_flags_hardmode |= MF_PAX_##flag; \
59240+ break; \
59241+ case option2: \
59242+ if (pax_flags_softmode & MF_PAX_##flag) \
59243+ return PAX_PARSE_FLAGS_FALLBACK;\
59244+ pax_flags_softmode |= MF_PAX_##flag; \
59245+ break;
59246+
59247+ parse_flag('p', 'P', PAGEEXEC);
59248+ parse_flag('e', 'E', EMUTRAMP);
59249+ parse_flag('m', 'M', MPROTECT);
59250+ parse_flag('r', 'R', RANDMMAP);
59251+ parse_flag('s', 'S', SEGMEXEC);
59252+
59253+#undef parse_flag
59254+ }
59255+
59256+ if (pax_flags_hardmode & pax_flags_softmode)
59257+ return PAX_PARSE_FLAGS_FALLBACK;
59258+
59259+#ifdef CONFIG_PAX_SOFTMODE
59260+ if (pax_softmode)
59261+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
59262+ else
59263+#endif
59264+
59265+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
59266+#else
59267+ return PAX_PARSE_FLAGS_FALLBACK;
59268+#endif
59269+
59270+}
59271+
59272+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
59273+{
59274+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
59275+
59276+ pax_flags = pax_parse_defaults();
59277+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
59278+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
59279+ xattr_pax_flags = pax_parse_xattr_pax(file);
59280+
59281+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59282+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59283+ pt_pax_flags != xattr_pax_flags)
59284+ return -EINVAL;
59285+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59286+ pax_flags = xattr_pax_flags;
59287+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59288+ pax_flags = pt_pax_flags;
59289+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59290+ pax_flags = ei_pax_flags;
59291+
59292+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
59293+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59294+ if ((__supported_pte_mask & _PAGE_NX))
59295+ pax_flags &= ~MF_PAX_SEGMEXEC;
59296+ else
59297+ pax_flags &= ~MF_PAX_PAGEEXEC;
59298+ }
59299+#endif
59300+
59301+ if (0 > pax_check_flags(&pax_flags))
59302+ return -EINVAL;
59303+
59304+ current->mm->pax_flags = pax_flags;
59305+ return 0;
59306+}
59307+#endif
59308+
59309 /*
59310 * These are the functions used to load ELF style executables and shared
59311 * libraries. There is no binary dependent code anywhere else.
59312@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
59313 {
59314 unsigned long random_variable = 0;
59315
59316+#ifdef CONFIG_PAX_RANDUSTACK
59317+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
59318+ return stack_top - current->mm->delta_stack;
59319+#endif
59320+
59321 if ((current->flags & PF_RANDOMIZE) &&
59322 !(current->personality & ADDR_NO_RANDOMIZE)) {
59323 random_variable = (unsigned long) get_random_int();
59324@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59325 unsigned long load_addr = 0, load_bias = 0;
59326 int load_addr_set = 0;
59327 char * elf_interpreter = NULL;
59328- unsigned long error;
59329+ unsigned long error = 0;
59330 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
59331 unsigned long elf_bss, elf_brk;
59332 int retval, i;
59333@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59334 struct elfhdr interp_elf_ex;
59335 } *loc;
59336 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
59337+ unsigned long pax_task_size;
59338
59339 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
59340 if (!loc) {
59341@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
59342 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
59343 may depend on the personality. */
59344 SET_PERSONALITY2(loc->elf_ex, &arch_state);
59345+
59346+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59347+ current->mm->pax_flags = 0UL;
59348+#endif
59349+
59350+#ifdef CONFIG_PAX_DLRESOLVE
59351+ current->mm->call_dl_resolve = 0UL;
59352+#endif
59353+
59354+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
59355+ current->mm->call_syscall = 0UL;
59356+#endif
59357+
59358+#ifdef CONFIG_PAX_ASLR
59359+ current->mm->delta_mmap = 0UL;
59360+ current->mm->delta_stack = 0UL;
59361+#endif
59362+
59363+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59364+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
59365+ send_sig(SIGKILL, current, 0);
59366+ goto out_free_dentry;
59367+ }
59368+#endif
59369+
59370+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
59371+ pax_set_initial_flags(bprm);
59372+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
59373+ if (pax_set_initial_flags_func)
59374+ (pax_set_initial_flags_func)(bprm);
59375+#endif
59376+
59377+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59378+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
59379+ current->mm->context.user_cs_limit = PAGE_SIZE;
59380+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
59381+ }
59382+#endif
59383+
59384+#ifdef CONFIG_PAX_SEGMEXEC
59385+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
59386+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
59387+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
59388+ pax_task_size = SEGMEXEC_TASK_SIZE;
59389+ current->mm->def_flags |= VM_NOHUGEPAGE;
59390+ } else
59391+#endif
59392+
59393+ pax_task_size = TASK_SIZE;
59394+
59395+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
59396+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59397+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
59398+ put_cpu();
59399+ }
59400+#endif
59401+
59402+#ifdef CONFIG_PAX_ASLR
59403+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59404+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
59405+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
59406+ }
59407+#endif
59408+
59409+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
59410+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59411+ executable_stack = EXSTACK_DISABLE_X;
59412+ current->personality &= ~READ_IMPLIES_EXEC;
59413+ } else
59414+#endif
59415+
59416 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
59417 current->personality |= READ_IMPLIES_EXEC;
59418
59419@@ -924,6 +1363,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
59420 #else
59421 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
59422 #endif
59423+
59424+#ifdef CONFIG_PAX_RANDMMAP
59425+ /* PaX: randomize base address at the default exe base if requested */
59426+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
59427+#ifdef CONFIG_SPARC64
59428+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
59429+#else
59430+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
59431+#endif
59432+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
59433+ elf_flags |= MAP_FIXED;
59434+ }
59435+#endif
59436+
59437 }
59438
59439 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
59440@@ -955,9 +1408,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
59441 * allowed task size. Note that p_filesz must always be
59442 * <= p_memsz so it is only necessary to check p_memsz.
59443 */
59444- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59445- elf_ppnt->p_memsz > TASK_SIZE ||
59446- TASK_SIZE - elf_ppnt->p_memsz < k) {
59447+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59448+ elf_ppnt->p_memsz > pax_task_size ||
59449+ pax_task_size - elf_ppnt->p_memsz < k) {
59450 /* set_brk can never work. Avoid overflows. */
59451 retval = -EINVAL;
59452 goto out_free_dentry;
59453@@ -993,16 +1446,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
59454 if (retval)
59455 goto out_free_dentry;
59456 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
59457- retval = -EFAULT; /* Nobody gets to see this, but.. */
59458- goto out_free_dentry;
59459+ /*
59460+ * This bss-zeroing can fail if the ELF
59461+ * file specifies odd protections. So
59462+ * we don't check the return value
59463+ */
59464 }
59465
59466+#ifdef CONFIG_PAX_RANDMMAP
59467+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59468+ unsigned long start, size, flags;
59469+ vm_flags_t vm_flags;
59470+
59471+ start = ELF_PAGEALIGN(elf_brk);
59472+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
59473+ flags = MAP_FIXED | MAP_PRIVATE;
59474+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
59475+
59476+ down_write(&current->mm->mmap_sem);
59477+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
59478+ retval = -ENOMEM;
59479+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
59480+// if (current->personality & ADDR_NO_RANDOMIZE)
59481+// vm_flags |= VM_READ | VM_MAYREAD;
59482+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
59483+ retval = IS_ERR_VALUE(start) ? start : 0;
59484+ }
59485+ up_write(&current->mm->mmap_sem);
59486+ if (retval == 0)
59487+ retval = set_brk(start + size, start + size + PAGE_SIZE);
59488+ if (retval < 0)
59489+ goto out_free_dentry;
59490+ }
59491+#endif
59492+
59493 if (elf_interpreter) {
59494- unsigned long interp_map_addr = 0;
59495-
59496 elf_entry = load_elf_interp(&loc->interp_elf_ex,
59497 interpreter,
59498- &interp_map_addr,
59499 load_bias, interp_elf_phdata);
59500 if (!IS_ERR((void *)elf_entry)) {
59501 /*
59502@@ -1230,7 +1710,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59503 * Decide what to dump of a segment, part, all or none.
59504 */
59505 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59506- unsigned long mm_flags)
59507+ unsigned long mm_flags, long signr)
59508 {
59509 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59510
59511@@ -1268,7 +1748,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59512 if (vma->vm_file == NULL)
59513 return 0;
59514
59515- if (FILTER(MAPPED_PRIVATE))
59516+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59517 goto whole;
59518
59519 /*
59520@@ -1475,9 +1955,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59521 {
59522 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59523 int i = 0;
59524- do
59525+ do {
59526 i += 2;
59527- while (auxv[i - 2] != AT_NULL);
59528+ } while (auxv[i - 2] != AT_NULL);
59529 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59530 }
59531
59532@@ -1486,7 +1966,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59533 {
59534 mm_segment_t old_fs = get_fs();
59535 set_fs(KERNEL_DS);
59536- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59537+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59538 set_fs(old_fs);
59539 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59540 }
59541@@ -2206,7 +2686,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59542 vma = next_vma(vma, gate_vma)) {
59543 unsigned long dump_size;
59544
59545- dump_size = vma_dump_size(vma, cprm->mm_flags);
59546+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59547 vma_filesz[i++] = dump_size;
59548 vma_data_size += dump_size;
59549 }
59550@@ -2314,6 +2794,167 @@ out:
59551
59552 #endif /* CONFIG_ELF_CORE */
59553
59554+#ifdef CONFIG_PAX_MPROTECT
59555+/* PaX: non-PIC ELF libraries need relocations on their executable segments
59556+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59557+ * we'll remove VM_MAYWRITE for good on RELRO segments.
59558+ *
59559+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59560+ * basis because we want to allow the common case and not the special ones.
59561+ */
59562+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59563+{
59564+ struct elfhdr elf_h;
59565+ struct elf_phdr elf_p;
59566+ unsigned long i;
59567+ unsigned long oldflags;
59568+ bool is_textrel_rw, is_textrel_rx, is_relro;
59569+
59570+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59571+ return;
59572+
59573+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59574+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59575+
59576+#ifdef CONFIG_PAX_ELFRELOCS
59577+ /* possible TEXTREL */
59578+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59579+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59580+#else
59581+ is_textrel_rw = false;
59582+ is_textrel_rx = false;
59583+#endif
59584+
59585+ /* possible RELRO */
59586+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59587+
59588+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59589+ return;
59590+
59591+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59592+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59593+
59594+#ifdef CONFIG_PAX_ETEXECRELOCS
59595+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59596+#else
59597+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59598+#endif
59599+
59600+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59601+ !elf_check_arch(&elf_h) ||
59602+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59603+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59604+ return;
59605+
59606+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59607+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59608+ return;
59609+ switch (elf_p.p_type) {
59610+ case PT_DYNAMIC:
59611+ if (!is_textrel_rw && !is_textrel_rx)
59612+ continue;
59613+ i = 0UL;
59614+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59615+ elf_dyn dyn;
59616+
59617+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59618+ break;
59619+ if (dyn.d_tag == DT_NULL)
59620+ break;
59621+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59622+ gr_log_textrel(vma);
59623+ if (is_textrel_rw)
59624+ vma->vm_flags |= VM_MAYWRITE;
59625+ else
59626+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59627+ vma->vm_flags &= ~VM_MAYWRITE;
59628+ break;
59629+ }
59630+ i++;
59631+ }
59632+ is_textrel_rw = false;
59633+ is_textrel_rx = false;
59634+ continue;
59635+
59636+ case PT_GNU_RELRO:
59637+ if (!is_relro)
59638+ continue;
59639+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59640+ vma->vm_flags &= ~VM_MAYWRITE;
59641+ is_relro = false;
59642+ continue;
59643+
59644+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59645+ case PT_PAX_FLAGS: {
59646+ const char *msg_mprotect = "", *msg_emutramp = "";
59647+ char *buffer_lib, *buffer_exe;
59648+
59649+ if (elf_p.p_flags & PF_NOMPROTECT)
59650+ msg_mprotect = "MPROTECT disabled";
59651+
59652+#ifdef CONFIG_PAX_EMUTRAMP
59653+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59654+ msg_emutramp = "EMUTRAMP enabled";
59655+#endif
59656+
59657+ if (!msg_mprotect[0] && !msg_emutramp[0])
59658+ continue;
59659+
59660+ if (!printk_ratelimit())
59661+ continue;
59662+
59663+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59664+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59665+ if (buffer_lib && buffer_exe) {
59666+ char *path_lib, *path_exe;
59667+
59668+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59669+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59670+
59671+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59672+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59673+
59674+ }
59675+ free_page((unsigned long)buffer_exe);
59676+ free_page((unsigned long)buffer_lib);
59677+ continue;
59678+ }
59679+#endif
59680+
59681+ }
59682+ }
59683+}
59684+#endif
59685+
59686+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59687+
59688+extern int grsec_enable_log_rwxmaps;
59689+
59690+static void elf_handle_mmap(struct file *file)
59691+{
59692+ struct elfhdr elf_h;
59693+ struct elf_phdr elf_p;
59694+ unsigned long i;
59695+
59696+ if (!grsec_enable_log_rwxmaps)
59697+ return;
59698+
59699+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59700+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59701+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59702+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59703+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59704+ return;
59705+
59706+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59707+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59708+ return;
59709+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59710+ gr_log_ptgnustack(file);
59711+ }
59712+}
59713+#endif
59714+
59715 static int __init init_elf_binfmt(void)
59716 {
59717 register_binfmt(&elf_format);
59718diff --git a/fs/block_dev.c b/fs/block_dev.c
59719index b48c41b..e070416 100644
59720--- a/fs/block_dev.c
59721+++ b/fs/block_dev.c
59722@@ -703,7 +703,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59723 else if (bdev->bd_contains == bdev)
59724 return true; /* is a whole device which isn't held */
59725
59726- else if (whole->bd_holder == bd_may_claim)
59727+ else if (whole->bd_holder == (void *)bd_may_claim)
59728 return true; /* is a partition of a device that is being partitioned */
59729 else if (whole->bd_holder != NULL)
59730 return false; /* is a partition of a held device */
59731diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59732index f54511d..58acdec 100644
59733--- a/fs/btrfs/ctree.c
59734+++ b/fs/btrfs/ctree.c
59735@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59736 free_extent_buffer(buf);
59737 add_root_to_dirty_list(root);
59738 } else {
59739- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59740- parent_start = parent->start;
59741- else
59742+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59743+ if (parent)
59744+ parent_start = parent->start;
59745+ else
59746+ parent_start = 0;
59747+ } else
59748 parent_start = 0;
59749
59750 WARN_ON(trans->transid != btrfs_header_generation(parent));
59751diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59752index de4e70f..b41dc45 100644
59753--- a/fs/btrfs/delayed-inode.c
59754+++ b/fs/btrfs/delayed-inode.c
59755@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59756
59757 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59758 {
59759- int seq = atomic_inc_return(&delayed_root->items_seq);
59760+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59761 if ((atomic_dec_return(&delayed_root->items) <
59762 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59763 waitqueue_active(&delayed_root->wait))
59764@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59765
59766 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59767 {
59768- int val = atomic_read(&delayed_root->items_seq);
59769+ int val = atomic_read_unchecked(&delayed_root->items_seq);
59770
59771 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59772 return 1;
59773@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59774 int seq;
59775 int ret;
59776
59777- seq = atomic_read(&delayed_root->items_seq);
59778+ seq = atomic_read_unchecked(&delayed_root->items_seq);
59779
59780 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59781 if (ret)
59782diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59783index f70119f..ab5894d 100644
59784--- a/fs/btrfs/delayed-inode.h
59785+++ b/fs/btrfs/delayed-inode.h
59786@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59787 */
59788 struct list_head prepare_list;
59789 atomic_t items; /* for delayed items */
59790- atomic_t items_seq; /* for delayed items */
59791+ atomic_unchecked_t items_seq; /* for delayed items */
59792 int nodes; /* for delayed nodes */
59793 wait_queue_head_t wait;
59794 };
59795@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59796 struct btrfs_delayed_root *delayed_root)
59797 {
59798 atomic_set(&delayed_root->items, 0);
59799- atomic_set(&delayed_root->items_seq, 0);
59800+ atomic_set_unchecked(&delayed_root->items_seq, 0);
59801 delayed_root->nodes = 0;
59802 spin_lock_init(&delayed_root->lock);
59803 init_waitqueue_head(&delayed_root->wait);
59804diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59805index 6f49b28..483410f 100644
59806--- a/fs/btrfs/super.c
59807+++ b/fs/btrfs/super.c
59808@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59809 function, line, errstr);
59810 return;
59811 }
59812- ACCESS_ONCE(trans->transaction->aborted) = errno;
59813+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59814 /* Wake up anybody who may be waiting on this transaction */
59815 wake_up(&root->fs_info->transaction_wait);
59816 wake_up(&root->fs_info->transaction_blocked_wait);
59817diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59818index 92db3f6..898a561 100644
59819--- a/fs/btrfs/sysfs.c
59820+++ b/fs/btrfs/sysfs.c
59821@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59822 for (set = 0; set < FEAT_MAX; set++) {
59823 int i;
59824 struct attribute *attrs[2];
59825- struct attribute_group agroup = {
59826+ attribute_group_no_const agroup = {
59827 .name = "features",
59828 .attrs = attrs,
59829 };
59830diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59831index 2299bfd..4098e72 100644
59832--- a/fs/btrfs/tests/free-space-tests.c
59833+++ b/fs/btrfs/tests/free-space-tests.c
59834@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59835 * extent entry.
59836 */
59837 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59838- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59839+ pax_open_kernel();
59840+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59841+ pax_close_kernel();
59842
59843 /*
59844 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59845@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59846 if (ret)
59847 return ret;
59848
59849- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59850+ pax_open_kernel();
59851+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59852+ pax_close_kernel();
59853 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59854
59855 return 0;
59856diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59857index 154990c..d0cf699 100644
59858--- a/fs/btrfs/tree-log.h
59859+++ b/fs/btrfs/tree-log.h
59860@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59861 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59862 struct btrfs_trans_handle *trans)
59863 {
59864- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59865+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59866 }
59867
59868 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59869diff --git a/fs/buffer.c b/fs/buffer.c
59870index 20805db..2e8fc69 100644
59871--- a/fs/buffer.c
59872+++ b/fs/buffer.c
59873@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59874 bh_cachep = kmem_cache_create("buffer_head",
59875 sizeof(struct buffer_head), 0,
59876 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59877- SLAB_MEM_SPREAD),
59878+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59879 NULL);
59880
59881 /*
59882diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59883index fbb08e9..0fda764 100644
59884--- a/fs/cachefiles/bind.c
59885+++ b/fs/cachefiles/bind.c
59886@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59887 args);
59888
59889 /* start by checking things over */
59890- ASSERT(cache->fstop_percent >= 0 &&
59891- cache->fstop_percent < cache->fcull_percent &&
59892+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
59893 cache->fcull_percent < cache->frun_percent &&
59894 cache->frun_percent < 100);
59895
59896- ASSERT(cache->bstop_percent >= 0 &&
59897- cache->bstop_percent < cache->bcull_percent &&
59898+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
59899 cache->bcull_percent < cache->brun_percent &&
59900 cache->brun_percent < 100);
59901
59902diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59903index ce1b115..4a6852c 100644
59904--- a/fs/cachefiles/daemon.c
59905+++ b/fs/cachefiles/daemon.c
59906@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59907 if (n > buflen)
59908 return -EMSGSIZE;
59909
59910- if (copy_to_user(_buffer, buffer, n) != 0)
59911+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59912 return -EFAULT;
59913
59914 return n;
59915@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59916 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59917 return -EIO;
59918
59919- if (datalen < 0 || datalen > PAGE_SIZE - 1)
59920+ if (datalen > PAGE_SIZE - 1)
59921 return -EOPNOTSUPP;
59922
59923 /* drag the command string into the kernel so we can parse it */
59924@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59925 if (args[0] != '%' || args[1] != '\0')
59926 return -EINVAL;
59927
59928- if (fstop < 0 || fstop >= cache->fcull_percent)
59929+ if (fstop >= cache->fcull_percent)
59930 return cachefiles_daemon_range_error(cache, args);
59931
59932 cache->fstop_percent = fstop;
59933@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59934 if (args[0] != '%' || args[1] != '\0')
59935 return -EINVAL;
59936
59937- if (bstop < 0 || bstop >= cache->bcull_percent)
59938+ if (bstop >= cache->bcull_percent)
59939 return cachefiles_daemon_range_error(cache, args);
59940
59941 cache->bstop_percent = bstop;
59942diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59943index 8c52472..c4e3a69 100644
59944--- a/fs/cachefiles/internal.h
59945+++ b/fs/cachefiles/internal.h
59946@@ -66,7 +66,7 @@ struct cachefiles_cache {
59947 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59948 struct rb_root active_nodes; /* active nodes (can't be culled) */
59949 rwlock_t active_lock; /* lock for active_nodes */
59950- atomic_t gravecounter; /* graveyard uniquifier */
59951+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59952 unsigned frun_percent; /* when to stop culling (% files) */
59953 unsigned fcull_percent; /* when to start culling (% files) */
59954 unsigned fstop_percent; /* when to stop allocating (% files) */
59955@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59956 * proc.c
59957 */
59958 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59959-extern atomic_t cachefiles_lookup_histogram[HZ];
59960-extern atomic_t cachefiles_mkdir_histogram[HZ];
59961-extern atomic_t cachefiles_create_histogram[HZ];
59962+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59963+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59964+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59965
59966 extern int __init cachefiles_proc_init(void);
59967 extern void cachefiles_proc_cleanup(void);
59968 static inline
59969-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59970+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59971 {
59972 unsigned long jif = jiffies - start_jif;
59973 if (jif >= HZ)
59974 jif = HZ - 1;
59975- atomic_inc(&histogram[jif]);
59976+ atomic_inc_unchecked(&histogram[jif]);
59977 }
59978
59979 #else
59980diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59981index 7f8e83f..8951aa4 100644
59982--- a/fs/cachefiles/namei.c
59983+++ b/fs/cachefiles/namei.c
59984@@ -309,7 +309,7 @@ try_again:
59985 /* first step is to make up a grave dentry in the graveyard */
59986 sprintf(nbuffer, "%08x%08x",
59987 (uint32_t) get_seconds(),
59988- (uint32_t) atomic_inc_return(&cache->gravecounter));
59989+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59990
59991 /* do the multiway lock magic */
59992 trap = lock_rename(cache->graveyard, dir);
59993diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59994index eccd339..4c1d995 100644
59995--- a/fs/cachefiles/proc.c
59996+++ b/fs/cachefiles/proc.c
59997@@ -14,9 +14,9 @@
59998 #include <linux/seq_file.h>
59999 #include "internal.h"
60000
60001-atomic_t cachefiles_lookup_histogram[HZ];
60002-atomic_t cachefiles_mkdir_histogram[HZ];
60003-atomic_t cachefiles_create_histogram[HZ];
60004+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
60005+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
60006+atomic_unchecked_t cachefiles_create_histogram[HZ];
60007
60008 /*
60009 * display the latency histogram
60010@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
60011 return 0;
60012 default:
60013 index = (unsigned long) v - 3;
60014- x = atomic_read(&cachefiles_lookup_histogram[index]);
60015- y = atomic_read(&cachefiles_mkdir_histogram[index]);
60016- z = atomic_read(&cachefiles_create_histogram[index]);
60017+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
60018+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
60019+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
60020 if (x == 0 && y == 0 && z == 0)
60021 return 0;
60022
60023diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
60024index c241603..56bae60 100644
60025--- a/fs/ceph/dir.c
60026+++ b/fs/ceph/dir.c
60027@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
60028 struct dentry *dentry, *last;
60029 struct ceph_dentry_info *di;
60030 int err = 0;
60031+ char d_name[DNAME_INLINE_LEN];
60032+ const unsigned char *name;
60033
60034 /* claim ref on last dentry we returned */
60035 last = fi->dentry;
60036@@ -192,7 +194,12 @@ more:
60037
60038 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
60039 dentry, dentry, dentry->d_inode);
60040- if (!dir_emit(ctx, dentry->d_name.name,
60041+ name = dentry->d_name.name;
60042+ if (name == dentry->d_iname) {
60043+ memcpy(d_name, name, dentry->d_name.len);
60044+ name = d_name;
60045+ }
60046+ if (!dir_emit(ctx, name,
60047 dentry->d_name.len,
60048 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
60049 dentry->d_inode->i_mode >> 12)) {
60050@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
60051 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
60052 struct ceph_mds_client *mdsc = fsc->mdsc;
60053 unsigned frag = fpos_frag(ctx->pos);
60054- int off = fpos_off(ctx->pos);
60055+ unsigned int off = fpos_off(ctx->pos);
60056 int err;
60057 u32 ftype;
60058 struct ceph_mds_reply_info_parsed *rinfo;
60059diff --git a/fs/ceph/super.c b/fs/ceph/super.c
60060index 50f06cd..c7eba3e 100644
60061--- a/fs/ceph/super.c
60062+++ b/fs/ceph/super.c
60063@@ -896,7 +896,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
60064 /*
60065 * construct our own bdi so we can control readahead, etc.
60066 */
60067-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
60068+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
60069
60070 static int ceph_register_bdi(struct super_block *sb,
60071 struct ceph_fs_client *fsc)
60072@@ -913,7 +913,7 @@ static int ceph_register_bdi(struct super_block *sb,
60073 default_backing_dev_info.ra_pages;
60074
60075 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
60076- atomic_long_inc_return(&bdi_seq));
60077+ atomic_long_inc_return_unchecked(&bdi_seq));
60078 if (!err)
60079 sb->s_bdi = &fsc->backing_dev_info;
60080 return err;
60081diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
60082index 7febcf2..62a5721 100644
60083--- a/fs/cifs/cifs_debug.c
60084+++ b/fs/cifs/cifs_debug.c
60085@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60086
60087 if (strtobool(&c, &bv) == 0) {
60088 #ifdef CONFIG_CIFS_STATS2
60089- atomic_set(&totBufAllocCount, 0);
60090- atomic_set(&totSmBufAllocCount, 0);
60091+ atomic_set_unchecked(&totBufAllocCount, 0);
60092+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60093 #endif /* CONFIG_CIFS_STATS2 */
60094 spin_lock(&cifs_tcp_ses_lock);
60095 list_for_each(tmp1, &cifs_tcp_ses_list) {
60096@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60097 tcon = list_entry(tmp3,
60098 struct cifs_tcon,
60099 tcon_list);
60100- atomic_set(&tcon->num_smbs_sent, 0);
60101+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
60102 if (server->ops->clear_stats)
60103 server->ops->clear_stats(tcon);
60104 }
60105@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60106 smBufAllocCount.counter, cifs_min_small);
60107 #ifdef CONFIG_CIFS_STATS2
60108 seq_printf(m, "Total Large %d Small %d Allocations\n",
60109- atomic_read(&totBufAllocCount),
60110- atomic_read(&totSmBufAllocCount));
60111+ atomic_read_unchecked(&totBufAllocCount),
60112+ atomic_read_unchecked(&totSmBufAllocCount));
60113 #endif /* CONFIG_CIFS_STATS2 */
60114
60115 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
60116@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60117 if (tcon->need_reconnect)
60118 seq_puts(m, "\tDISCONNECTED ");
60119 seq_printf(m, "\nSMBs: %d",
60120- atomic_read(&tcon->num_smbs_sent));
60121+ atomic_read_unchecked(&tcon->num_smbs_sent));
60122 if (server->ops->print_stats)
60123 server->ops->print_stats(m, tcon);
60124 }
60125diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
60126index d72fe37..ded5511 100644
60127--- a/fs/cifs/cifsfs.c
60128+++ b/fs/cifs/cifsfs.c
60129@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
60130 */
60131 cifs_req_cachep = kmem_cache_create("cifs_request",
60132 CIFSMaxBufSize + max_hdr_size, 0,
60133- SLAB_HWCACHE_ALIGN, NULL);
60134+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
60135 if (cifs_req_cachep == NULL)
60136 return -ENOMEM;
60137
60138@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
60139 efficient to alloc 1 per page off the slab compared to 17K (5page)
60140 alloc of large cifs buffers even when page debugging is on */
60141 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
60142- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
60143+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
60144 NULL);
60145 if (cifs_sm_req_cachep == NULL) {
60146 mempool_destroy(cifs_req_poolp);
60147@@ -1204,8 +1204,8 @@ init_cifs(void)
60148 atomic_set(&bufAllocCount, 0);
60149 atomic_set(&smBufAllocCount, 0);
60150 #ifdef CONFIG_CIFS_STATS2
60151- atomic_set(&totBufAllocCount, 0);
60152- atomic_set(&totSmBufAllocCount, 0);
60153+ atomic_set_unchecked(&totBufAllocCount, 0);
60154+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60155 #endif /* CONFIG_CIFS_STATS2 */
60156
60157 atomic_set(&midCount, 0);
60158diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
60159index 22b289a..bbbba08 100644
60160--- a/fs/cifs/cifsglob.h
60161+++ b/fs/cifs/cifsglob.h
60162@@ -823,35 +823,35 @@ struct cifs_tcon {
60163 __u16 Flags; /* optional support bits */
60164 enum statusEnum tidStatus;
60165 #ifdef CONFIG_CIFS_STATS
60166- atomic_t num_smbs_sent;
60167+ atomic_unchecked_t num_smbs_sent;
60168 union {
60169 struct {
60170- atomic_t num_writes;
60171- atomic_t num_reads;
60172- atomic_t num_flushes;
60173- atomic_t num_oplock_brks;
60174- atomic_t num_opens;
60175- atomic_t num_closes;
60176- atomic_t num_deletes;
60177- atomic_t num_mkdirs;
60178- atomic_t num_posixopens;
60179- atomic_t num_posixmkdirs;
60180- atomic_t num_rmdirs;
60181- atomic_t num_renames;
60182- atomic_t num_t2renames;
60183- atomic_t num_ffirst;
60184- atomic_t num_fnext;
60185- atomic_t num_fclose;
60186- atomic_t num_hardlinks;
60187- atomic_t num_symlinks;
60188- atomic_t num_locks;
60189- atomic_t num_acl_get;
60190- atomic_t num_acl_set;
60191+ atomic_unchecked_t num_writes;
60192+ atomic_unchecked_t num_reads;
60193+ atomic_unchecked_t num_flushes;
60194+ atomic_unchecked_t num_oplock_brks;
60195+ atomic_unchecked_t num_opens;
60196+ atomic_unchecked_t num_closes;
60197+ atomic_unchecked_t num_deletes;
60198+ atomic_unchecked_t num_mkdirs;
60199+ atomic_unchecked_t num_posixopens;
60200+ atomic_unchecked_t num_posixmkdirs;
60201+ atomic_unchecked_t num_rmdirs;
60202+ atomic_unchecked_t num_renames;
60203+ atomic_unchecked_t num_t2renames;
60204+ atomic_unchecked_t num_ffirst;
60205+ atomic_unchecked_t num_fnext;
60206+ atomic_unchecked_t num_fclose;
60207+ atomic_unchecked_t num_hardlinks;
60208+ atomic_unchecked_t num_symlinks;
60209+ atomic_unchecked_t num_locks;
60210+ atomic_unchecked_t num_acl_get;
60211+ atomic_unchecked_t num_acl_set;
60212 } cifs_stats;
60213 #ifdef CONFIG_CIFS_SMB2
60214 struct {
60215- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60216- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60217+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60218+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60219 } smb2_stats;
60220 #endif /* CONFIG_CIFS_SMB2 */
60221 } stats;
60222@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
60223 }
60224
60225 #ifdef CONFIG_CIFS_STATS
60226-#define cifs_stats_inc atomic_inc
60227+#define cifs_stats_inc atomic_inc_unchecked
60228
60229 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
60230 unsigned int bytes)
60231@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
60232 /* Various Debug counters */
60233 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
60234 #ifdef CONFIG_CIFS_STATS2
60235-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
60236-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
60237+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
60238+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
60239 #endif
60240 GLOBAL_EXTERN atomic_t smBufAllocCount;
60241 GLOBAL_EXTERN atomic_t midCount;
60242diff --git a/fs/cifs/file.c b/fs/cifs/file.c
60243index 3e30d92..2c9f066 100644
60244--- a/fs/cifs/file.c
60245+++ b/fs/cifs/file.c
60246@@ -2061,10 +2061,14 @@ static int cifs_writepages(struct address_space *mapping,
60247 index = mapping->writeback_index; /* Start from prev offset */
60248 end = -1;
60249 } else {
60250- index = wbc->range_start >> PAGE_CACHE_SHIFT;
60251- end = wbc->range_end >> PAGE_CACHE_SHIFT;
60252- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
60253+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
60254 range_whole = true;
60255+ index = 0;
60256+ end = ULONG_MAX;
60257+ } else {
60258+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
60259+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
60260+ }
60261 scanned = true;
60262 }
60263 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
60264diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
60265index 3379463..3af418a 100644
60266--- a/fs/cifs/misc.c
60267+++ b/fs/cifs/misc.c
60268@@ -170,7 +170,7 @@ cifs_buf_get(void)
60269 memset(ret_buf, 0, buf_size + 3);
60270 atomic_inc(&bufAllocCount);
60271 #ifdef CONFIG_CIFS_STATS2
60272- atomic_inc(&totBufAllocCount);
60273+ atomic_inc_unchecked(&totBufAllocCount);
60274 #endif /* CONFIG_CIFS_STATS2 */
60275 }
60276
60277@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
60278 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
60279 atomic_inc(&smBufAllocCount);
60280 #ifdef CONFIG_CIFS_STATS2
60281- atomic_inc(&totSmBufAllocCount);
60282+ atomic_inc_unchecked(&totSmBufAllocCount);
60283 #endif /* CONFIG_CIFS_STATS2 */
60284
60285 }
60286diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
60287index d297903..1cb7516 100644
60288--- a/fs/cifs/smb1ops.c
60289+++ b/fs/cifs/smb1ops.c
60290@@ -622,27 +622,27 @@ static void
60291 cifs_clear_stats(struct cifs_tcon *tcon)
60292 {
60293 #ifdef CONFIG_CIFS_STATS
60294- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
60295- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
60296- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
60297- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60298- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
60299- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
60300- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60301- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
60302- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
60303- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
60304- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
60305- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
60306- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
60307- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
60308- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
60309- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
60310- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
60311- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
60312- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
60313- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
60314- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
60315+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
60316+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
60317+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
60318+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60319+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
60320+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
60321+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60322+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
60323+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
60324+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
60325+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
60326+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
60327+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
60328+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
60329+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
60330+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
60331+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
60332+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
60333+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
60334+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
60335+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
60336 #endif
60337 }
60338
60339@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60340 {
60341 #ifdef CONFIG_CIFS_STATS
60342 seq_printf(m, " Oplocks breaks: %d",
60343- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
60344+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
60345 seq_printf(m, "\nReads: %d Bytes: %llu",
60346- atomic_read(&tcon->stats.cifs_stats.num_reads),
60347+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
60348 (long long)(tcon->bytes_read));
60349 seq_printf(m, "\nWrites: %d Bytes: %llu",
60350- atomic_read(&tcon->stats.cifs_stats.num_writes),
60351+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
60352 (long long)(tcon->bytes_written));
60353 seq_printf(m, "\nFlushes: %d",
60354- atomic_read(&tcon->stats.cifs_stats.num_flushes));
60355+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
60356 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
60357- atomic_read(&tcon->stats.cifs_stats.num_locks),
60358- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
60359- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
60360+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
60361+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
60362+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
60363 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
60364- atomic_read(&tcon->stats.cifs_stats.num_opens),
60365- atomic_read(&tcon->stats.cifs_stats.num_closes),
60366- atomic_read(&tcon->stats.cifs_stats.num_deletes));
60367+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
60368+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
60369+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
60370 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
60371- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
60372- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
60373+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
60374+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
60375 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
60376- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
60377- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
60378+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
60379+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
60380 seq_printf(m, "\nRenames: %d T2 Renames %d",
60381- atomic_read(&tcon->stats.cifs_stats.num_renames),
60382- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
60383+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
60384+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
60385 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
60386- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
60387- atomic_read(&tcon->stats.cifs_stats.num_fnext),
60388- atomic_read(&tcon->stats.cifs_stats.num_fclose));
60389+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
60390+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
60391+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
60392 #endif
60393 }
60394
60395diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
60396index eab05e1..ffe5ea4 100644
60397--- a/fs/cifs/smb2ops.c
60398+++ b/fs/cifs/smb2ops.c
60399@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
60400 #ifdef CONFIG_CIFS_STATS
60401 int i;
60402 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
60403- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60404- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60405+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60406+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60407 }
60408 #endif
60409 }
60410@@ -459,65 +459,65 @@ static void
60411 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60412 {
60413 #ifdef CONFIG_CIFS_STATS
60414- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60415- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60416+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60417+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60418 seq_printf(m, "\nNegotiates: %d sent %d failed",
60419- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
60420- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
60421+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
60422+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
60423 seq_printf(m, "\nSessionSetups: %d sent %d failed",
60424- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
60425- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
60426+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
60427+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
60428 seq_printf(m, "\nLogoffs: %d sent %d failed",
60429- atomic_read(&sent[SMB2_LOGOFF_HE]),
60430- atomic_read(&failed[SMB2_LOGOFF_HE]));
60431+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
60432+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
60433 seq_printf(m, "\nTreeConnects: %d sent %d failed",
60434- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60435- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60436+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60437+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60438 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60439- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60440- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60441+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60442+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60443 seq_printf(m, "\nCreates: %d sent %d failed",
60444- atomic_read(&sent[SMB2_CREATE_HE]),
60445- atomic_read(&failed[SMB2_CREATE_HE]));
60446+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60447+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60448 seq_printf(m, "\nCloses: %d sent %d failed",
60449- atomic_read(&sent[SMB2_CLOSE_HE]),
60450- atomic_read(&failed[SMB2_CLOSE_HE]));
60451+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60452+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60453 seq_printf(m, "\nFlushes: %d sent %d failed",
60454- atomic_read(&sent[SMB2_FLUSH_HE]),
60455- atomic_read(&failed[SMB2_FLUSH_HE]));
60456+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60457+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60458 seq_printf(m, "\nReads: %d sent %d failed",
60459- atomic_read(&sent[SMB2_READ_HE]),
60460- atomic_read(&failed[SMB2_READ_HE]));
60461+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
60462+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
60463 seq_printf(m, "\nWrites: %d sent %d failed",
60464- atomic_read(&sent[SMB2_WRITE_HE]),
60465- atomic_read(&failed[SMB2_WRITE_HE]));
60466+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60467+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60468 seq_printf(m, "\nLocks: %d sent %d failed",
60469- atomic_read(&sent[SMB2_LOCK_HE]),
60470- atomic_read(&failed[SMB2_LOCK_HE]));
60471+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60472+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60473 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60474- atomic_read(&sent[SMB2_IOCTL_HE]),
60475- atomic_read(&failed[SMB2_IOCTL_HE]));
60476+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60477+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60478 seq_printf(m, "\nCancels: %d sent %d failed",
60479- atomic_read(&sent[SMB2_CANCEL_HE]),
60480- atomic_read(&failed[SMB2_CANCEL_HE]));
60481+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60482+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60483 seq_printf(m, "\nEchos: %d sent %d failed",
60484- atomic_read(&sent[SMB2_ECHO_HE]),
60485- atomic_read(&failed[SMB2_ECHO_HE]));
60486+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60487+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60488 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60489- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60490- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60491+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60492+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60493 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60494- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60495- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60496+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60497+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60498 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60499- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60500- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60501+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60502+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60503 seq_printf(m, "\nSetInfos: %d sent %d failed",
60504- atomic_read(&sent[SMB2_SET_INFO_HE]),
60505- atomic_read(&failed[SMB2_SET_INFO_HE]));
60506+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60507+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60508 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60509- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60510- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60511+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60512+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60513 #endif
60514 }
60515
60516diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60517index 3417340..b942390 100644
60518--- a/fs/cifs/smb2pdu.c
60519+++ b/fs/cifs/smb2pdu.c
60520@@ -2144,8 +2144,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60521 default:
60522 cifs_dbg(VFS, "info level %u isn't supported\n",
60523 srch_inf->info_level);
60524- rc = -EINVAL;
60525- goto qdir_exit;
60526+ return -EINVAL;
60527 }
60528
60529 req->FileIndex = cpu_to_le32(index);
60530diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60531index 46ee6f2..89a9e7f 100644
60532--- a/fs/coda/cache.c
60533+++ b/fs/coda/cache.c
60534@@ -24,7 +24,7 @@
60535 #include "coda_linux.h"
60536 #include "coda_cache.h"
60537
60538-static atomic_t permission_epoch = ATOMIC_INIT(0);
60539+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60540
60541 /* replace or extend an acl cache hit */
60542 void coda_cache_enter(struct inode *inode, int mask)
60543@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60544 struct coda_inode_info *cii = ITOC(inode);
60545
60546 spin_lock(&cii->c_lock);
60547- cii->c_cached_epoch = atomic_read(&permission_epoch);
60548+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60549 if (!uid_eq(cii->c_uid, current_fsuid())) {
60550 cii->c_uid = current_fsuid();
60551 cii->c_cached_perm = mask;
60552@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60553 {
60554 struct coda_inode_info *cii = ITOC(inode);
60555 spin_lock(&cii->c_lock);
60556- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60557+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60558 spin_unlock(&cii->c_lock);
60559 }
60560
60561 /* remove all acl caches */
60562 void coda_cache_clear_all(struct super_block *sb)
60563 {
60564- atomic_inc(&permission_epoch);
60565+ atomic_inc_unchecked(&permission_epoch);
60566 }
60567
60568
60569@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60570 spin_lock(&cii->c_lock);
60571 hit = (mask & cii->c_cached_perm) == mask &&
60572 uid_eq(cii->c_uid, current_fsuid()) &&
60573- cii->c_cached_epoch == atomic_read(&permission_epoch);
60574+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60575 spin_unlock(&cii->c_lock);
60576
60577 return hit;
60578diff --git a/fs/compat.c b/fs/compat.c
60579index 6fd272d..dd34ba2 100644
60580--- a/fs/compat.c
60581+++ b/fs/compat.c
60582@@ -54,7 +54,7 @@
60583 #include <asm/ioctls.h>
60584 #include "internal.h"
60585
60586-int compat_log = 1;
60587+int compat_log = 0;
60588
60589 int compat_printk(const char *fmt, ...)
60590 {
60591@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60592
60593 set_fs(KERNEL_DS);
60594 /* The __user pointer cast is valid because of the set_fs() */
60595- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60596+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60597 set_fs(oldfs);
60598 /* truncating is ok because it's a user address */
60599 if (!ret)
60600@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60601 goto out;
60602
60603 ret = -EINVAL;
60604- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60605+ if (nr_segs > UIO_MAXIOV)
60606 goto out;
60607 if (nr_segs > fast_segs) {
60608 ret = -ENOMEM;
60609@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60610 struct compat_readdir_callback {
60611 struct dir_context ctx;
60612 struct compat_old_linux_dirent __user *dirent;
60613+ struct file * file;
60614 int result;
60615 };
60616
60617@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
60618 buf->result = -EOVERFLOW;
60619 return -EOVERFLOW;
60620 }
60621+
60622+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60623+ return 0;
60624+
60625 buf->result++;
60626 dirent = buf->dirent;
60627 if (!access_ok(VERIFY_WRITE, dirent,
60628@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60629 if (!f.file)
60630 return -EBADF;
60631
60632+ buf.file = f.file;
60633 error = iterate_dir(f.file, &buf.ctx);
60634 if (buf.result)
60635 error = buf.result;
60636@@ -913,6 +919,7 @@ struct compat_getdents_callback {
60637 struct dir_context ctx;
60638 struct compat_linux_dirent __user *current_dir;
60639 struct compat_linux_dirent __user *previous;
60640+ struct file * file;
60641 int count;
60642 int error;
60643 };
60644@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
60645 buf->error = -EOVERFLOW;
60646 return -EOVERFLOW;
60647 }
60648+
60649+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60650+ return 0;
60651+
60652 dirent = buf->previous;
60653 if (dirent) {
60654 if (__put_user(offset, &dirent->d_off))
60655@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60656 if (!f.file)
60657 return -EBADF;
60658
60659+ buf.file = f.file;
60660 error = iterate_dir(f.file, &buf.ctx);
60661 if (error >= 0)
60662 error = buf.error;
60663@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
60664 struct dir_context ctx;
60665 struct linux_dirent64 __user *current_dir;
60666 struct linux_dirent64 __user *previous;
60667+ struct file * file;
60668 int count;
60669 int error;
60670 };
60671@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
60672 buf->error = -EINVAL; /* only used if we fail.. */
60673 if (reclen > buf->count)
60674 return -EINVAL;
60675+
60676+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60677+ return 0;
60678+
60679 dirent = buf->previous;
60680
60681 if (dirent) {
60682@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60683 if (!f.file)
60684 return -EBADF;
60685
60686+ buf.file = f.file;
60687 error = iterate_dir(f.file, &buf.ctx);
60688 if (error >= 0)
60689 error = buf.error;
60690diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60691index 4d24d17..4f8c09e 100644
60692--- a/fs/compat_binfmt_elf.c
60693+++ b/fs/compat_binfmt_elf.c
60694@@ -30,11 +30,13 @@
60695 #undef elf_phdr
60696 #undef elf_shdr
60697 #undef elf_note
60698+#undef elf_dyn
60699 #undef elf_addr_t
60700 #define elfhdr elf32_hdr
60701 #define elf_phdr elf32_phdr
60702 #define elf_shdr elf32_shdr
60703 #define elf_note elf32_note
60704+#define elf_dyn Elf32_Dyn
60705 #define elf_addr_t Elf32_Addr
60706
60707 /*
60708diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60709index afec645..9c65620 100644
60710--- a/fs/compat_ioctl.c
60711+++ b/fs/compat_ioctl.c
60712@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60713 return -EFAULT;
60714 if (__get_user(udata, &ss32->iomem_base))
60715 return -EFAULT;
60716- ss.iomem_base = compat_ptr(udata);
60717+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60718 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60719 __get_user(ss.port_high, &ss32->port_high))
60720 return -EFAULT;
60721@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60722 for (i = 0; i < nmsgs; i++) {
60723 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60724 return -EFAULT;
60725- if (get_user(datap, &umsgs[i].buf) ||
60726- put_user(compat_ptr(datap), &tmsgs[i].buf))
60727+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60728+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60729 return -EFAULT;
60730 }
60731 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60732@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60733 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60734 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60735 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60736- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60737+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60738 return -EFAULT;
60739
60740 return ioctl_preallocate(file, p);
60741@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60742 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60743 {
60744 unsigned int a, b;
60745- a = *(unsigned int *)p;
60746- b = *(unsigned int *)q;
60747+ a = *(const unsigned int *)p;
60748+ b = *(const unsigned int *)q;
60749 if (a > b)
60750 return 1;
60751 if (a < b)
60752diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60753index c9c298b..544d100 100644
60754--- a/fs/configfs/dir.c
60755+++ b/fs/configfs/dir.c
60756@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60757 }
60758 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60759 struct configfs_dirent *next;
60760- const char *name;
60761+ const unsigned char * name;
60762+ char d_name[sizeof(next->s_dentry->d_iname)];
60763 int len;
60764 struct inode *inode = NULL;
60765
60766@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60767 continue;
60768
60769 name = configfs_get_name(next);
60770- len = strlen(name);
60771+ if (next->s_dentry && name == next->s_dentry->d_iname) {
60772+ len = next->s_dentry->d_name.len;
60773+ memcpy(d_name, name, len);
60774+ name = d_name;
60775+ } else
60776+ len = strlen(name);
60777
60778 /*
60779 * We'll have a dentry and an inode for
60780diff --git a/fs/coredump.c b/fs/coredump.c
60781index b5c86ff..0dac262 100644
60782--- a/fs/coredump.c
60783+++ b/fs/coredump.c
60784@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60785 struct pipe_inode_info *pipe = file->private_data;
60786
60787 pipe_lock(pipe);
60788- pipe->readers++;
60789- pipe->writers--;
60790+ atomic_inc(&pipe->readers);
60791+ atomic_dec(&pipe->writers);
60792 wake_up_interruptible_sync(&pipe->wait);
60793 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60794 pipe_unlock(pipe);
60795@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60796 * We actually want wait_event_freezable() but then we need
60797 * to clear TIF_SIGPENDING and improve dump_interrupted().
60798 */
60799- wait_event_interruptible(pipe->wait, pipe->readers == 1);
60800+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60801
60802 pipe_lock(pipe);
60803- pipe->readers--;
60804- pipe->writers++;
60805+ atomic_dec(&pipe->readers);
60806+ atomic_inc(&pipe->writers);
60807 pipe_unlock(pipe);
60808 }
60809
60810@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60811 struct files_struct *displaced;
60812 bool need_nonrelative = false;
60813 bool core_dumped = false;
60814- static atomic_t core_dump_count = ATOMIC_INIT(0);
60815+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60816+ long signr = siginfo->si_signo;
60817+ int dumpable;
60818 struct coredump_params cprm = {
60819 .siginfo = siginfo,
60820 .regs = signal_pt_regs(),
60821@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60822 .mm_flags = mm->flags,
60823 };
60824
60825- audit_core_dumps(siginfo->si_signo);
60826+ audit_core_dumps(signr);
60827+
60828+ dumpable = __get_dumpable(cprm.mm_flags);
60829+
60830+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60831+ gr_handle_brute_attach(dumpable);
60832
60833 binfmt = mm->binfmt;
60834 if (!binfmt || !binfmt->core_dump)
60835 goto fail;
60836- if (!__get_dumpable(cprm.mm_flags))
60837+ if (!dumpable)
60838 goto fail;
60839
60840 cred = prepare_creds();
60841@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60842 need_nonrelative = true;
60843 }
60844
60845- retval = coredump_wait(siginfo->si_signo, &core_state);
60846+ retval = coredump_wait(signr, &core_state);
60847 if (retval < 0)
60848 goto fail_creds;
60849
60850@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60851 }
60852 cprm.limit = RLIM_INFINITY;
60853
60854- dump_count = atomic_inc_return(&core_dump_count);
60855+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
60856 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60857 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60858 task_tgid_vnr(current), current->comm);
60859@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60860 } else {
60861 struct inode *inode;
60862
60863+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60864+
60865 if (cprm.limit < binfmt->min_coredump)
60866 goto fail_unlock;
60867
60868@@ -681,7 +690,7 @@ close_fail:
60869 filp_close(cprm.file, NULL);
60870 fail_dropcount:
60871 if (ispipe)
60872- atomic_dec(&core_dump_count);
60873+ atomic_dec_unchecked(&core_dump_count);
60874 fail_unlock:
60875 kfree(cn.corename);
60876 coredump_finish(mm, core_dumped);
60877@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60878 struct file *file = cprm->file;
60879 loff_t pos = file->f_pos;
60880 ssize_t n;
60881+
60882+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60883 if (cprm->written + nr > cprm->limit)
60884 return 0;
60885 while (nr) {
60886diff --git a/fs/dcache.c b/fs/dcache.c
60887index e368d4f..b40ba59 100644
60888--- a/fs/dcache.c
60889+++ b/fs/dcache.c
60890@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60891 * dentry_iput drops the locks, at which point nobody (except
60892 * transient RCU lookups) can reach this dentry.
60893 */
60894- BUG_ON((int)dentry->d_lockref.count > 0);
60895+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60896 this_cpu_dec(nr_dentry);
60897 if (dentry->d_op && dentry->d_op->d_release)
60898 dentry->d_op->d_release(dentry);
60899@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60900 struct dentry *parent = dentry->d_parent;
60901 if (IS_ROOT(dentry))
60902 return NULL;
60903- if (unlikely((int)dentry->d_lockref.count < 0))
60904+ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60905 return NULL;
60906 if (likely(spin_trylock(&parent->d_lock)))
60907 return parent;
60908@@ -638,7 +638,7 @@ repeat:
60909 dentry->d_flags |= DCACHE_REFERENCED;
60910 dentry_lru_add(dentry);
60911
60912- dentry->d_lockref.count--;
60913+ __lockref_dec(&dentry->d_lockref);
60914 spin_unlock(&dentry->d_lock);
60915 return;
60916
60917@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60918 /* This must be called with d_lock held */
60919 static inline void __dget_dlock(struct dentry *dentry)
60920 {
60921- dentry->d_lockref.count++;
60922+ __lockref_inc(&dentry->d_lockref);
60923 }
60924
60925 static inline void __dget(struct dentry *dentry)
60926@@ -694,8 +694,8 @@ repeat:
60927 goto repeat;
60928 }
60929 rcu_read_unlock();
60930- BUG_ON(!ret->d_lockref.count);
60931- ret->d_lockref.count++;
60932+ BUG_ON(!__lockref_read(&ret->d_lockref));
60933+ __lockref_inc(&ret->d_lockref);
60934 spin_unlock(&ret->d_lock);
60935 return ret;
60936 }
60937@@ -773,9 +773,9 @@ restart:
60938 spin_lock(&inode->i_lock);
60939 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60940 spin_lock(&dentry->d_lock);
60941- if (!dentry->d_lockref.count) {
60942+ if (!__lockref_read(&dentry->d_lockref)) {
60943 struct dentry *parent = lock_parent(dentry);
60944- if (likely(!dentry->d_lockref.count)) {
60945+ if (likely(!__lockref_read(&dentry->d_lockref))) {
60946 __dentry_kill(dentry);
60947 dput(parent);
60948 goto restart;
60949@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60950 * We found an inuse dentry which was not removed from
60951 * the LRU because of laziness during lookup. Do not free it.
60952 */
60953- if ((int)dentry->d_lockref.count > 0) {
60954+ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60955 spin_unlock(&dentry->d_lock);
60956 if (parent)
60957 spin_unlock(&parent->d_lock);
60958@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60959 dentry = parent;
60960 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60961 parent = lock_parent(dentry);
60962- if (dentry->d_lockref.count != 1) {
60963- dentry->d_lockref.count--;
60964+ if (__lockref_read(&dentry->d_lockref) != 1) {
60965+ __lockref_inc(&dentry->d_lockref);
60966 spin_unlock(&dentry->d_lock);
60967 if (parent)
60968 spin_unlock(&parent->d_lock);
60969@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60970 * counts, just remove them from the LRU. Otherwise give them
60971 * another pass through the LRU.
60972 */
60973- if (dentry->d_lockref.count) {
60974+ if (__lockref_read(&dentry->d_lockref) > 0) {
60975 d_lru_isolate(dentry);
60976 spin_unlock(&dentry->d_lock);
60977 return LRU_REMOVED;
60978@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60979 } else {
60980 if (dentry->d_flags & DCACHE_LRU_LIST)
60981 d_lru_del(dentry);
60982- if (!dentry->d_lockref.count) {
60983+ if (!__lockref_read(&dentry->d_lockref)) {
60984 d_shrink_add(dentry, &data->dispose);
60985 data->found++;
60986 }
60987@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60988 return D_WALK_CONTINUE;
60989
60990 /* root with refcount 1 is fine */
60991- if (dentry == _data && dentry->d_lockref.count == 1)
60992+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60993 return D_WALK_CONTINUE;
60994
60995 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60996@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60997 dentry->d_inode ?
60998 dentry->d_inode->i_ino : 0UL,
60999 dentry,
61000- dentry->d_lockref.count,
61001+ __lockref_read(&dentry->d_lockref),
61002 dentry->d_sb->s_type->name,
61003 dentry->d_sb->s_id);
61004 WARN_ON(1);
61005@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61006 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
61007 if (name->len > DNAME_INLINE_LEN-1) {
61008 size_t size = offsetof(struct external_name, name[1]);
61009- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
61010+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
61011 if (!p) {
61012 kmem_cache_free(dentry_cache, dentry);
61013 return NULL;
61014@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61015 smp_wmb();
61016 dentry->d_name.name = dname;
61017
61018- dentry->d_lockref.count = 1;
61019+ __lockref_set(&dentry->d_lockref, 1);
61020 dentry->d_flags = 0;
61021 spin_lock_init(&dentry->d_lock);
61022 seqcount_init(&dentry->d_seq);
61023@@ -1452,6 +1452,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61024 dentry->d_sb = sb;
61025 dentry->d_op = NULL;
61026 dentry->d_fsdata = NULL;
61027+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
61028+ atomic_set(&dentry->chroot_refcnt, 0);
61029+#endif
61030 INIT_HLIST_BL_NODE(&dentry->d_hash);
61031 INIT_LIST_HEAD(&dentry->d_lru);
61032 INIT_LIST_HEAD(&dentry->d_subdirs);
61033@@ -2151,7 +2154,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
61034 goto next;
61035 }
61036
61037- dentry->d_lockref.count++;
61038+ __lockref_inc(&dentry->d_lockref);
61039 found = dentry;
61040 spin_unlock(&dentry->d_lock);
61041 break;
61042@@ -2250,7 +2253,7 @@ again:
61043 spin_lock(&dentry->d_lock);
61044 inode = dentry->d_inode;
61045 isdir = S_ISDIR(inode->i_mode);
61046- if (dentry->d_lockref.count == 1) {
61047+ if (__lockref_read(&dentry->d_lockref) == 1) {
61048 if (!spin_trylock(&inode->i_lock)) {
61049 spin_unlock(&dentry->d_lock);
61050 cpu_relax();
61051@@ -3203,7 +3206,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
61052
61053 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
61054 dentry->d_flags |= DCACHE_GENOCIDE;
61055- dentry->d_lockref.count--;
61056+ __lockref_dec(&dentry->d_lockref);
61057 }
61058 }
61059 return D_WALK_CONTINUE;
61060@@ -3319,7 +3322,8 @@ void __init vfs_caches_init(unsigned long mempages)
61061 mempages -= reserve;
61062
61063 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
61064- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
61065+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
61066+ SLAB_NO_SANITIZE, NULL);
61067
61068 dcache_init();
61069 inode_init();
61070diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
61071index 6f0ce53..92bba36 100644
61072--- a/fs/debugfs/inode.c
61073+++ b/fs/debugfs/inode.c
61074@@ -423,10 +423,20 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
61075 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
61076 * returned.
61077 */
61078+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61079+extern int grsec_enable_sysfs_restrict;
61080+#endif
61081+
61082 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
61083 {
61084- return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
61085- parent, NULL, NULL);
61086+ umode_t mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
61087+
61088+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61089+ if (grsec_enable_sysfs_restrict)
61090+ mode = S_IFDIR | S_IRWXU;
61091+#endif
61092+
61093+ return __create_file(name, mode, parent, NULL, NULL);
61094 }
61095 EXPORT_SYMBOL_GPL(debugfs_create_dir);
61096
61097diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
61098index 1686dc2..9611c50 100644
61099--- a/fs/ecryptfs/inode.c
61100+++ b/fs/ecryptfs/inode.c
61101@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
61102 old_fs = get_fs();
61103 set_fs(get_ds());
61104 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
61105- (char __user *)lower_buf,
61106+ (char __force_user *)lower_buf,
61107 PATH_MAX);
61108 set_fs(old_fs);
61109 if (rc < 0)
61110diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
61111index e4141f2..d8263e8 100644
61112--- a/fs/ecryptfs/miscdev.c
61113+++ b/fs/ecryptfs/miscdev.c
61114@@ -304,7 +304,7 @@ check_list:
61115 goto out_unlock_msg_ctx;
61116 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
61117 if (msg_ctx->msg) {
61118- if (copy_to_user(&buf[i], packet_length, packet_length_size))
61119+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
61120 goto out_unlock_msg_ctx;
61121 i += packet_length_size;
61122 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
61123diff --git a/fs/exec.c b/fs/exec.c
61124index 4617a4e..e3f50ec 100644
61125--- a/fs/exec.c
61126+++ b/fs/exec.c
61127@@ -56,8 +56,20 @@
61128 #include <linux/pipe_fs_i.h>
61129 #include <linux/oom.h>
61130 #include <linux/compat.h>
61131+#include <linux/random.h>
61132+#include <linux/seq_file.h>
61133+#include <linux/coredump.h>
61134+#include <linux/mman.h>
61135+
61136+#ifdef CONFIG_PAX_REFCOUNT
61137+#include <linux/kallsyms.h>
61138+#include <linux/kdebug.h>
61139+#endif
61140+
61141+#include <trace/events/fs.h>
61142
61143 #include <asm/uaccess.h>
61144+#include <asm/sections.h>
61145 #include <asm/mmu_context.h>
61146 #include <asm/tlb.h>
61147
61148@@ -66,19 +78,34 @@
61149
61150 #include <trace/events/sched.h>
61151
61152+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
61153+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
61154+{
61155+ 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");
61156+}
61157+#endif
61158+
61159+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
61160+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
61161+EXPORT_SYMBOL(pax_set_initial_flags_func);
61162+#endif
61163+
61164 int suid_dumpable = 0;
61165
61166 static LIST_HEAD(formats);
61167 static DEFINE_RWLOCK(binfmt_lock);
61168
61169+extern int gr_process_kernel_exec_ban(void);
61170+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
61171+
61172 void __register_binfmt(struct linux_binfmt * fmt, int insert)
61173 {
61174 BUG_ON(!fmt);
61175 if (WARN_ON(!fmt->load_binary))
61176 return;
61177 write_lock(&binfmt_lock);
61178- insert ? list_add(&fmt->lh, &formats) :
61179- list_add_tail(&fmt->lh, &formats);
61180+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
61181+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
61182 write_unlock(&binfmt_lock);
61183 }
61184
61185@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
61186 void unregister_binfmt(struct linux_binfmt * fmt)
61187 {
61188 write_lock(&binfmt_lock);
61189- list_del(&fmt->lh);
61190+ pax_list_del((struct list_head *)&fmt->lh);
61191 write_unlock(&binfmt_lock);
61192 }
61193
61194@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61195 int write)
61196 {
61197 struct page *page;
61198- int ret;
61199
61200-#ifdef CONFIG_STACK_GROWSUP
61201- if (write) {
61202- ret = expand_downwards(bprm->vma, pos);
61203- if (ret < 0)
61204- return NULL;
61205- }
61206-#endif
61207- ret = get_user_pages(current, bprm->mm, pos,
61208- 1, write, 1, &page, NULL);
61209- if (ret <= 0)
61210+ if (0 > expand_downwards(bprm->vma, pos))
61211+ return NULL;
61212+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
61213 return NULL;
61214
61215 if (write) {
61216@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61217 if (size <= ARG_MAX)
61218 return page;
61219
61220+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61221+ // only allow 512KB for argv+env on suid/sgid binaries
61222+ // to prevent easy ASLR exhaustion
61223+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
61224+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
61225+ (size > (512 * 1024))) {
61226+ put_page(page);
61227+ return NULL;
61228+ }
61229+#endif
61230+
61231 /*
61232 * Limit to 1/4-th the stack size for the argv+env strings.
61233 * This ensures that:
61234@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61235 vma->vm_end = STACK_TOP_MAX;
61236 vma->vm_start = vma->vm_end - PAGE_SIZE;
61237 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
61238+
61239+#ifdef CONFIG_PAX_SEGMEXEC
61240+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
61241+#endif
61242+
61243 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
61244 INIT_LIST_HEAD(&vma->anon_vma_chain);
61245
61246@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61247 arch_bprm_mm_init(mm, vma);
61248 up_write(&mm->mmap_sem);
61249 bprm->p = vma->vm_end - sizeof(void *);
61250+
61251+#ifdef CONFIG_PAX_RANDUSTACK
61252+ if (randomize_va_space)
61253+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
61254+#endif
61255+
61256 return 0;
61257 err:
61258 up_write(&mm->mmap_sem);
61259@@ -396,7 +437,7 @@ struct user_arg_ptr {
61260 } ptr;
61261 };
61262
61263-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61264+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61265 {
61266 const char __user *native;
61267
61268@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61269 compat_uptr_t compat;
61270
61271 if (get_user(compat, argv.ptr.compat + nr))
61272- return ERR_PTR(-EFAULT);
61273+ return (const char __force_user *)ERR_PTR(-EFAULT);
61274
61275 return compat_ptr(compat);
61276 }
61277 #endif
61278
61279 if (get_user(native, argv.ptr.native + nr))
61280- return ERR_PTR(-EFAULT);
61281+ return (const char __force_user *)ERR_PTR(-EFAULT);
61282
61283 return native;
61284 }
61285@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
61286 if (!p)
61287 break;
61288
61289- if (IS_ERR(p))
61290+ if (IS_ERR((const char __force_kernel *)p))
61291 return -EFAULT;
61292
61293 if (i >= max)
61294@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
61295
61296 ret = -EFAULT;
61297 str = get_user_arg_ptr(argv, argc);
61298- if (IS_ERR(str))
61299+ if (IS_ERR((const char __force_kernel *)str))
61300 goto out;
61301
61302 len = strnlen_user(str, MAX_ARG_STRLEN);
61303@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
61304 int r;
61305 mm_segment_t oldfs = get_fs();
61306 struct user_arg_ptr argv = {
61307- .ptr.native = (const char __user *const __user *)__argv,
61308+ .ptr.native = (const char __user * const __force_user *)__argv,
61309 };
61310
61311 set_fs(KERNEL_DS);
61312@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61313 unsigned long new_end = old_end - shift;
61314 struct mmu_gather tlb;
61315
61316- BUG_ON(new_start > new_end);
61317+ if (new_start >= new_end || new_start < mmap_min_addr)
61318+ return -ENOMEM;
61319
61320 /*
61321 * ensure there are no vmas between where we want to go
61322@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61323 if (vma != find_vma(mm, new_start))
61324 return -EFAULT;
61325
61326+#ifdef CONFIG_PAX_SEGMEXEC
61327+ BUG_ON(pax_find_mirror_vma(vma));
61328+#endif
61329+
61330 /*
61331 * cover the whole range: [new_start, old_end)
61332 */
61333@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61334 stack_top = arch_align_stack(stack_top);
61335 stack_top = PAGE_ALIGN(stack_top);
61336
61337- if (unlikely(stack_top < mmap_min_addr) ||
61338- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
61339- return -ENOMEM;
61340-
61341 stack_shift = vma->vm_end - stack_top;
61342
61343 bprm->p -= stack_shift;
61344@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
61345 bprm->exec -= stack_shift;
61346
61347 down_write(&mm->mmap_sem);
61348+
61349+ /* Move stack pages down in memory. */
61350+ if (stack_shift) {
61351+ ret = shift_arg_pages(vma, stack_shift);
61352+ if (ret)
61353+ goto out_unlock;
61354+ }
61355+
61356 vm_flags = VM_STACK_FLAGS;
61357
61358+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61359+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
61360+ vm_flags &= ~VM_EXEC;
61361+
61362+#ifdef CONFIG_PAX_MPROTECT
61363+ if (mm->pax_flags & MF_PAX_MPROTECT)
61364+ vm_flags &= ~VM_MAYEXEC;
61365+#endif
61366+
61367+ }
61368+#endif
61369+
61370 /*
61371 * Adjust stack execute permissions; explicitly enable for
61372 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
61373@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61374 goto out_unlock;
61375 BUG_ON(prev != vma);
61376
61377- /* Move stack pages down in memory. */
61378- if (stack_shift) {
61379- ret = shift_arg_pages(vma, stack_shift);
61380- if (ret)
61381- goto out_unlock;
61382- }
61383-
61384 /* mprotect_fixup is overkill to remove the temporary stack flags */
61385 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
61386
61387@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
61388 #endif
61389 current->mm->start_stack = bprm->p;
61390 ret = expand_stack(vma, stack_base);
61391+
61392+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
61393+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
61394+ unsigned long size;
61395+ vm_flags_t vm_flags;
61396+
61397+ size = STACK_TOP - vma->vm_end;
61398+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
61399+
61400+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
61401+
61402+#ifdef CONFIG_X86
61403+ if (!ret) {
61404+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
61405+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
61406+ }
61407+#endif
61408+
61409+ }
61410+#endif
61411+
61412 if (ret)
61413 ret = -EFAULT;
61414
61415@@ -781,8 +857,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
61416 if (err)
61417 goto exit;
61418
61419- if (name->name[0] != '\0')
61420+ if (name->name[0] != '\0') {
61421 fsnotify_open(file);
61422+ trace_open_exec(name->name);
61423+ }
61424
61425 out:
61426 return file;
61427@@ -809,7 +887,7 @@ int kernel_read(struct file *file, loff_t offset,
61428 old_fs = get_fs();
61429 set_fs(get_ds());
61430 /* The cast to a user pointer is valid due to the set_fs() */
61431- result = vfs_read(file, (void __user *)addr, count, &pos);
61432+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
61433 set_fs(old_fs);
61434 return result;
61435 }
61436@@ -854,6 +932,7 @@ static int exec_mmap(struct mm_struct *mm)
61437 tsk->mm = mm;
61438 tsk->active_mm = mm;
61439 activate_mm(active_mm, mm);
61440+ populate_stack();
61441 tsk->mm->vmacache_seqnum = 0;
61442 vmacache_flush(tsk);
61443 task_unlock(tsk);
61444@@ -920,10 +999,14 @@ static int de_thread(struct task_struct *tsk)
61445 if (!thread_group_leader(tsk)) {
61446 struct task_struct *leader = tsk->group_leader;
61447
61448- sig->notify_count = -1; /* for exit_notify() */
61449 for (;;) {
61450 threadgroup_change_begin(tsk);
61451 write_lock_irq(&tasklist_lock);
61452+ /*
61453+ * Do this under tasklist_lock to ensure that
61454+ * exit_notify() can't miss ->group_exit_task
61455+ */
61456+ sig->notify_count = -1;
61457 if (likely(leader->exit_state))
61458 break;
61459 __set_current_state(TASK_KILLABLE);
61460@@ -1252,7 +1335,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
61461 }
61462 rcu_read_unlock();
61463
61464- if (p->fs->users > n_fs)
61465+ if (atomic_read(&p->fs->users) > n_fs)
61466 bprm->unsafe |= LSM_UNSAFE_SHARE;
61467 else
61468 p->fs->in_exec = 1;
61469@@ -1453,6 +1536,31 @@ static int exec_binprm(struct linux_binprm *bprm)
61470 return ret;
61471 }
61472
61473+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61474+static DEFINE_PER_CPU(u64, exec_counter);
61475+static int __init init_exec_counters(void)
61476+{
61477+ unsigned int cpu;
61478+
61479+ for_each_possible_cpu(cpu) {
61480+ per_cpu(exec_counter, cpu) = (u64)cpu;
61481+ }
61482+
61483+ return 0;
61484+}
61485+early_initcall(init_exec_counters);
61486+static inline void increment_exec_counter(void)
61487+{
61488+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
61489+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61490+}
61491+#else
61492+static inline void increment_exec_counter(void) {}
61493+#endif
61494+
61495+extern void gr_handle_exec_args(struct linux_binprm *bprm,
61496+ struct user_arg_ptr argv);
61497+
61498 /*
61499 * sys_execve() executes a new program.
61500 */
61501@@ -1461,6 +1569,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61502 struct user_arg_ptr envp,
61503 int flags)
61504 {
61505+#ifdef CONFIG_GRKERNSEC
61506+ struct file *old_exec_file;
61507+ struct acl_subject_label *old_acl;
61508+ struct rlimit old_rlim[RLIM_NLIMITS];
61509+#endif
61510 char *pathbuf = NULL;
61511 struct linux_binprm *bprm;
61512 struct file *file;
61513@@ -1470,6 +1583,8 @@ static int do_execveat_common(int fd, struct filename *filename,
61514 if (IS_ERR(filename))
61515 return PTR_ERR(filename);
61516
61517+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61518+
61519 /*
61520 * We move the actual failure in case of RLIMIT_NPROC excess from
61521 * set*uid() to execve() because too many poorly written programs
61522@@ -1507,6 +1622,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61523 if (IS_ERR(file))
61524 goto out_unmark;
61525
61526+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
61527+ retval = -EPERM;
61528+ goto out_unmark;
61529+ }
61530+
61531 sched_exec();
61532
61533 bprm->file = file;
61534@@ -1533,6 +1653,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61535 }
61536 bprm->interp = bprm->filename;
61537
61538+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61539+ retval = -EACCES;
61540+ goto out_unmark;
61541+ }
61542+
61543 retval = bprm_mm_init(bprm);
61544 if (retval)
61545 goto out_unmark;
61546@@ -1549,24 +1674,70 @@ static int do_execveat_common(int fd, struct filename *filename,
61547 if (retval < 0)
61548 goto out;
61549
61550+#ifdef CONFIG_GRKERNSEC
61551+ old_acl = current->acl;
61552+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61553+ old_exec_file = current->exec_file;
61554+ get_file(file);
61555+ current->exec_file = file;
61556+#endif
61557+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61558+ /* limit suid stack to 8MB
61559+ * we saved the old limits above and will restore them if this exec fails
61560+ */
61561+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61562+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61563+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61564+#endif
61565+
61566+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61567+ retval = -EPERM;
61568+ goto out_fail;
61569+ }
61570+
61571+ if (!gr_tpe_allow(file)) {
61572+ retval = -EACCES;
61573+ goto out_fail;
61574+ }
61575+
61576+ if (gr_check_crash_exec(file)) {
61577+ retval = -EACCES;
61578+ goto out_fail;
61579+ }
61580+
61581+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61582+ bprm->unsafe);
61583+ if (retval < 0)
61584+ goto out_fail;
61585+
61586 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61587 if (retval < 0)
61588- goto out;
61589+ goto out_fail;
61590
61591 bprm->exec = bprm->p;
61592 retval = copy_strings(bprm->envc, envp, bprm);
61593 if (retval < 0)
61594- goto out;
61595+ goto out_fail;
61596
61597 retval = copy_strings(bprm->argc, argv, bprm);
61598 if (retval < 0)
61599- goto out;
61600+ goto out_fail;
61601+
61602+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61603+
61604+ gr_handle_exec_args(bprm, argv);
61605
61606 retval = exec_binprm(bprm);
61607 if (retval < 0)
61608- goto out;
61609+ goto out_fail;
61610+#ifdef CONFIG_GRKERNSEC
61611+ if (old_exec_file)
61612+ fput(old_exec_file);
61613+#endif
61614
61615 /* execve succeeded */
61616+
61617+ increment_exec_counter();
61618 current->fs->in_exec = 0;
61619 current->in_execve = 0;
61620 acct_update_integrals(current);
61621@@ -1578,6 +1749,14 @@ static int do_execveat_common(int fd, struct filename *filename,
61622 put_files_struct(displaced);
61623 return retval;
61624
61625+out_fail:
61626+#ifdef CONFIG_GRKERNSEC
61627+ current->acl = old_acl;
61628+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61629+ fput(current->exec_file);
61630+ current->exec_file = old_exec_file;
61631+#endif
61632+
61633 out:
61634 if (bprm->mm) {
61635 acct_arg_size(bprm, 0);
61636@@ -1724,3 +1903,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
61637 argv, envp, flags);
61638 }
61639 #endif
61640+
61641+int pax_check_flags(unsigned long *flags)
61642+{
61643+ int retval = 0;
61644+
61645+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61646+ if (*flags & MF_PAX_SEGMEXEC)
61647+ {
61648+ *flags &= ~MF_PAX_SEGMEXEC;
61649+ retval = -EINVAL;
61650+ }
61651+#endif
61652+
61653+ if ((*flags & MF_PAX_PAGEEXEC)
61654+
61655+#ifdef CONFIG_PAX_PAGEEXEC
61656+ && (*flags & MF_PAX_SEGMEXEC)
61657+#endif
61658+
61659+ )
61660+ {
61661+ *flags &= ~MF_PAX_PAGEEXEC;
61662+ retval = -EINVAL;
61663+ }
61664+
61665+ if ((*flags & MF_PAX_MPROTECT)
61666+
61667+#ifdef CONFIG_PAX_MPROTECT
61668+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61669+#endif
61670+
61671+ )
61672+ {
61673+ *flags &= ~MF_PAX_MPROTECT;
61674+ retval = -EINVAL;
61675+ }
61676+
61677+ if ((*flags & MF_PAX_EMUTRAMP)
61678+
61679+#ifdef CONFIG_PAX_EMUTRAMP
61680+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61681+#endif
61682+
61683+ )
61684+ {
61685+ *flags &= ~MF_PAX_EMUTRAMP;
61686+ retval = -EINVAL;
61687+ }
61688+
61689+ return retval;
61690+}
61691+
61692+EXPORT_SYMBOL(pax_check_flags);
61693+
61694+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61695+char *pax_get_path(const struct path *path, char *buf, int buflen)
61696+{
61697+ char *pathname = d_path(path, buf, buflen);
61698+
61699+ if (IS_ERR(pathname))
61700+ goto toolong;
61701+
61702+ pathname = mangle_path(buf, pathname, "\t\n\\");
61703+ if (!pathname)
61704+ goto toolong;
61705+
61706+ *pathname = 0;
61707+ return buf;
61708+
61709+toolong:
61710+ return "<path too long>";
61711+}
61712+EXPORT_SYMBOL(pax_get_path);
61713+
61714+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61715+{
61716+ struct task_struct *tsk = current;
61717+ struct mm_struct *mm = current->mm;
61718+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61719+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61720+ char *path_exec = NULL;
61721+ char *path_fault = NULL;
61722+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
61723+ siginfo_t info = { };
61724+
61725+ if (buffer_exec && buffer_fault) {
61726+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61727+
61728+ down_read(&mm->mmap_sem);
61729+ vma = mm->mmap;
61730+ while (vma && (!vma_exec || !vma_fault)) {
61731+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61732+ vma_exec = vma;
61733+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61734+ vma_fault = vma;
61735+ vma = vma->vm_next;
61736+ }
61737+ if (vma_exec)
61738+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61739+ if (vma_fault) {
61740+ start = vma_fault->vm_start;
61741+ end = vma_fault->vm_end;
61742+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61743+ if (vma_fault->vm_file)
61744+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61745+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61746+ path_fault = "<heap>";
61747+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61748+ path_fault = "<stack>";
61749+ else
61750+ path_fault = "<anonymous mapping>";
61751+ }
61752+ up_read(&mm->mmap_sem);
61753+ }
61754+ if (tsk->signal->curr_ip)
61755+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61756+ else
61757+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61758+ 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),
61759+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61760+ free_page((unsigned long)buffer_exec);
61761+ free_page((unsigned long)buffer_fault);
61762+ pax_report_insns(regs, pc, sp);
61763+ info.si_signo = SIGKILL;
61764+ info.si_errno = 0;
61765+ info.si_code = SI_KERNEL;
61766+ info.si_pid = 0;
61767+ info.si_uid = 0;
61768+ do_coredump(&info);
61769+}
61770+#endif
61771+
61772+#ifdef CONFIG_PAX_REFCOUNT
61773+void pax_report_refcount_overflow(struct pt_regs *regs)
61774+{
61775+ if (current->signal->curr_ip)
61776+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61777+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
61778+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61779+ else
61780+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61781+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61782+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61783+ preempt_disable();
61784+ show_regs(regs);
61785+ preempt_enable();
61786+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61787+}
61788+#endif
61789+
61790+#ifdef CONFIG_PAX_USERCOPY
61791+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61792+static noinline int check_stack_object(const void *obj, unsigned long len)
61793+{
61794+ const void * const stack = task_stack_page(current);
61795+ const void * const stackend = stack + THREAD_SIZE;
61796+
61797+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61798+ const void *frame = NULL;
61799+ const void *oldframe;
61800+#endif
61801+
61802+ if (obj + len < obj)
61803+ return -1;
61804+
61805+ if (obj + len <= stack || stackend <= obj)
61806+ return 0;
61807+
61808+ if (obj < stack || stackend < obj + len)
61809+ return -1;
61810+
61811+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61812+ oldframe = __builtin_frame_address(1);
61813+ if (oldframe)
61814+ frame = __builtin_frame_address(2);
61815+ /*
61816+ low ----------------------------------------------> high
61817+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
61818+ ^----------------^
61819+ allow copies only within here
61820+ */
61821+ while (stack <= frame && frame < stackend) {
61822+ /* if obj + len extends past the last frame, this
61823+ check won't pass and the next frame will be 0,
61824+ causing us to bail out and correctly report
61825+ the copy as invalid
61826+ */
61827+ if (obj + len <= frame)
61828+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61829+ oldframe = frame;
61830+ frame = *(const void * const *)frame;
61831+ }
61832+ return -1;
61833+#else
61834+ return 1;
61835+#endif
61836+}
61837+
61838+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61839+{
61840+ if (current->signal->curr_ip)
61841+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61842+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61843+ else
61844+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61845+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61846+ dump_stack();
61847+ gr_handle_kernel_exploit();
61848+ do_group_exit(SIGKILL);
61849+}
61850+#endif
61851+
61852+#ifdef CONFIG_PAX_USERCOPY
61853+
61854+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61855+{
61856+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61857+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
61858+#ifdef CONFIG_MODULES
61859+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61860+#else
61861+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61862+#endif
61863+
61864+#else
61865+ unsigned long textlow = (unsigned long)_stext;
61866+ unsigned long texthigh = (unsigned long)_etext;
61867+
61868+#ifdef CONFIG_X86_64
61869+ /* check against linear mapping as well */
61870+ if (high > (unsigned long)__va(__pa(textlow)) &&
61871+ low < (unsigned long)__va(__pa(texthigh)))
61872+ return true;
61873+#endif
61874+
61875+#endif
61876+
61877+ if (high <= textlow || low >= texthigh)
61878+ return false;
61879+ else
61880+ return true;
61881+}
61882+#endif
61883+
61884+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61885+{
61886+#ifdef CONFIG_PAX_USERCOPY
61887+ const char *type;
61888+#endif
61889+
61890+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
61891+ unsigned long stackstart = (unsigned long)task_stack_page(current);
61892+ unsigned long currentsp = (unsigned long)&stackstart;
61893+ if (unlikely((currentsp < stackstart + 512 ||
61894+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61895+ BUG();
61896+#endif
61897+
61898+#ifndef CONFIG_PAX_USERCOPY_DEBUG
61899+ if (const_size)
61900+ return;
61901+#endif
61902+
61903+#ifdef CONFIG_PAX_USERCOPY
61904+ if (!n)
61905+ return;
61906+
61907+ type = check_heap_object(ptr, n);
61908+ if (!type) {
61909+ int ret = check_stack_object(ptr, n);
61910+ if (ret == 1 || ret == 2)
61911+ return;
61912+ if (ret == 0) {
61913+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61914+ type = "<kernel text>";
61915+ else
61916+ return;
61917+ } else
61918+ type = "<process stack>";
61919+ }
61920+
61921+ pax_report_usercopy(ptr, n, to_user, type);
61922+#endif
61923+
61924+}
61925+EXPORT_SYMBOL(__check_object_size);
61926+
61927+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61928+void pax_track_stack(void)
61929+{
61930+ unsigned long sp = (unsigned long)&sp;
61931+ if (sp < current_thread_info()->lowest_stack &&
61932+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
61933+ current_thread_info()->lowest_stack = sp;
61934+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61935+ BUG();
61936+}
61937+EXPORT_SYMBOL(pax_track_stack);
61938+#endif
61939+
61940+#ifdef CONFIG_PAX_SIZE_OVERFLOW
61941+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61942+{
61943+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61944+ dump_stack();
61945+ do_group_exit(SIGKILL);
61946+}
61947+EXPORT_SYMBOL(report_size_overflow);
61948+#endif
61949diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61950index 9f9992b..8b59411 100644
61951--- a/fs/ext2/balloc.c
61952+++ b/fs/ext2/balloc.c
61953@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61954
61955 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61956 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61957- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61958+ if (free_blocks < root_blocks + 1 &&
61959 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61960 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61961- !in_group_p (sbi->s_resgid))) {
61962+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61963 return 0;
61964 }
61965 return 1;
61966diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61967index ae55fdd..5e64c27 100644
61968--- a/fs/ext2/super.c
61969+++ b/fs/ext2/super.c
61970@@ -268,10 +268,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61971 #ifdef CONFIG_EXT2_FS_XATTR
61972 if (test_opt(sb, XATTR_USER))
61973 seq_puts(seq, ",user_xattr");
61974- if (!test_opt(sb, XATTR_USER) &&
61975- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61976+ if (!test_opt(sb, XATTR_USER))
61977 seq_puts(seq, ",nouser_xattr");
61978- }
61979 #endif
61980
61981 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61982@@ -850,8 +848,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61983 if (def_mount_opts & EXT2_DEFM_UID16)
61984 set_opt(sbi->s_mount_opt, NO_UID32);
61985 #ifdef CONFIG_EXT2_FS_XATTR
61986- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61987- set_opt(sbi->s_mount_opt, XATTR_USER);
61988+ /* always enable user xattrs */
61989+ set_opt(sbi->s_mount_opt, XATTR_USER);
61990 #endif
61991 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61992 if (def_mount_opts & EXT2_DEFM_ACL)
61993diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61994index 9142614..97484fa 100644
61995--- a/fs/ext2/xattr.c
61996+++ b/fs/ext2/xattr.c
61997@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61998 struct buffer_head *bh = NULL;
61999 struct ext2_xattr_entry *entry;
62000 char *end;
62001- size_t rest = buffer_size;
62002+ size_t rest = buffer_size, total_size = 0;
62003 int error;
62004
62005 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
62006@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
62007 buffer += size;
62008 }
62009 rest -= size;
62010+ total_size += size;
62011 }
62012 }
62013- error = buffer_size - rest; /* total size */
62014+ error = total_size;
62015
62016 cleanup:
62017 brelse(bh);
62018diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
62019index 158b5d4..2432610 100644
62020--- a/fs/ext3/balloc.c
62021+++ b/fs/ext3/balloc.c
62022@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
62023
62024 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
62025 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
62026- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
62027+ if (free_blocks < root_blocks + 1 &&
62028 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
62029 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
62030- !in_group_p (sbi->s_resgid))) {
62031+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
62032 return 0;
62033 }
62034 return 1;
62035diff --git a/fs/ext3/super.c b/fs/ext3/super.c
62036index 9b4e7d7..048d025 100644
62037--- a/fs/ext3/super.c
62038+++ b/fs/ext3/super.c
62039@@ -653,10 +653,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
62040 #ifdef CONFIG_EXT3_FS_XATTR
62041 if (test_opt(sb, XATTR_USER))
62042 seq_puts(seq, ",user_xattr");
62043- if (!test_opt(sb, XATTR_USER) &&
62044- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
62045+ if (!test_opt(sb, XATTR_USER))
62046 seq_puts(seq, ",nouser_xattr");
62047- }
62048 #endif
62049 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62050 if (test_opt(sb, POSIX_ACL))
62051@@ -1758,8 +1756,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
62052 if (def_mount_opts & EXT3_DEFM_UID16)
62053 set_opt(sbi->s_mount_opt, NO_UID32);
62054 #ifdef CONFIG_EXT3_FS_XATTR
62055- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
62056- set_opt(sbi->s_mount_opt, XATTR_USER);
62057+ /* always enable user xattrs */
62058+ set_opt(sbi->s_mount_opt, XATTR_USER);
62059 #endif
62060 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62061 if (def_mount_opts & EXT3_DEFM_ACL)
62062diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
62063index c6874be..f8a6ae8 100644
62064--- a/fs/ext3/xattr.c
62065+++ b/fs/ext3/xattr.c
62066@@ -330,7 +330,7 @@ static int
62067 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62068 char *buffer, size_t buffer_size)
62069 {
62070- size_t rest = buffer_size;
62071+ size_t rest = buffer_size, total_size = 0;
62072
62073 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
62074 const struct xattr_handler *handler =
62075@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62076 buffer += size;
62077 }
62078 rest -= size;
62079+ total_size += size;
62080 }
62081 }
62082- return buffer_size - rest;
62083+ return total_size;
62084 }
62085
62086 static int
62087diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
62088index 83a6f49..d4e4d03 100644
62089--- a/fs/ext4/balloc.c
62090+++ b/fs/ext4/balloc.c
62091@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
62092 /* Hm, nope. Are (enough) root reserved clusters available? */
62093 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
62094 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
62095- capable(CAP_SYS_RESOURCE) ||
62096- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
62097+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
62098+ capable_nolog(CAP_SYS_RESOURCE)) {
62099
62100 if (free_clusters >= (nclusters + dirty_clusters +
62101 resv_clusters))
62102diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
62103index a75fba6..8235fca 100644
62104--- a/fs/ext4/ext4.h
62105+++ b/fs/ext4/ext4.h
62106@@ -1274,19 +1274,19 @@ struct ext4_sb_info {
62107 unsigned long s_mb_last_start;
62108
62109 /* stats for buddy allocator */
62110- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
62111- atomic_t s_bal_success; /* we found long enough chunks */
62112- atomic_t s_bal_allocated; /* in blocks */
62113- atomic_t s_bal_ex_scanned; /* total extents scanned */
62114- atomic_t s_bal_goals; /* goal hits */
62115- atomic_t s_bal_breaks; /* too long searches */
62116- atomic_t s_bal_2orders; /* 2^order hits */
62117+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
62118+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
62119+ atomic_unchecked_t s_bal_allocated; /* in blocks */
62120+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
62121+ atomic_unchecked_t s_bal_goals; /* goal hits */
62122+ atomic_unchecked_t s_bal_breaks; /* too long searches */
62123+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
62124 spinlock_t s_bal_lock;
62125 unsigned long s_mb_buddies_generated;
62126 unsigned long long s_mb_generation_time;
62127- atomic_t s_mb_lost_chunks;
62128- atomic_t s_mb_preallocated;
62129- atomic_t s_mb_discarded;
62130+ atomic_unchecked_t s_mb_lost_chunks;
62131+ atomic_unchecked_t s_mb_preallocated;
62132+ atomic_unchecked_t s_mb_discarded;
62133 atomic_t s_lock_busy;
62134
62135 /* locality groups */
62136diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
62137index 8d1e602..abf497b 100644
62138--- a/fs/ext4/mballoc.c
62139+++ b/fs/ext4/mballoc.c
62140@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
62141 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
62142
62143 if (EXT4_SB(sb)->s_mb_stats)
62144- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
62145+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
62146
62147 break;
62148 }
62149@@ -2211,7 +2211,7 @@ repeat:
62150 ac->ac_status = AC_STATUS_CONTINUE;
62151 ac->ac_flags |= EXT4_MB_HINT_FIRST;
62152 cr = 3;
62153- atomic_inc(&sbi->s_mb_lost_chunks);
62154+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
62155 goto repeat;
62156 }
62157 }
62158@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
62159 if (sbi->s_mb_stats) {
62160 ext4_msg(sb, KERN_INFO,
62161 "mballoc: %u blocks %u reqs (%u success)",
62162- atomic_read(&sbi->s_bal_allocated),
62163- atomic_read(&sbi->s_bal_reqs),
62164- atomic_read(&sbi->s_bal_success));
62165+ atomic_read_unchecked(&sbi->s_bal_allocated),
62166+ atomic_read_unchecked(&sbi->s_bal_reqs),
62167+ atomic_read_unchecked(&sbi->s_bal_success));
62168 ext4_msg(sb, KERN_INFO,
62169 "mballoc: %u extents scanned, %u goal hits, "
62170 "%u 2^N hits, %u breaks, %u lost",
62171- atomic_read(&sbi->s_bal_ex_scanned),
62172- atomic_read(&sbi->s_bal_goals),
62173- atomic_read(&sbi->s_bal_2orders),
62174- atomic_read(&sbi->s_bal_breaks),
62175- atomic_read(&sbi->s_mb_lost_chunks));
62176+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
62177+ atomic_read_unchecked(&sbi->s_bal_goals),
62178+ atomic_read_unchecked(&sbi->s_bal_2orders),
62179+ atomic_read_unchecked(&sbi->s_bal_breaks),
62180+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
62181 ext4_msg(sb, KERN_INFO,
62182 "mballoc: %lu generated and it took %Lu",
62183 sbi->s_mb_buddies_generated,
62184 sbi->s_mb_generation_time);
62185 ext4_msg(sb, KERN_INFO,
62186 "mballoc: %u preallocated, %u discarded",
62187- atomic_read(&sbi->s_mb_preallocated),
62188- atomic_read(&sbi->s_mb_discarded));
62189+ atomic_read_unchecked(&sbi->s_mb_preallocated),
62190+ atomic_read_unchecked(&sbi->s_mb_discarded));
62191 }
62192
62193 free_percpu(sbi->s_locality_groups);
62194@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
62195 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
62196
62197 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
62198- atomic_inc(&sbi->s_bal_reqs);
62199- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62200+ atomic_inc_unchecked(&sbi->s_bal_reqs);
62201+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62202 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
62203- atomic_inc(&sbi->s_bal_success);
62204- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
62205+ atomic_inc_unchecked(&sbi->s_bal_success);
62206+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
62207 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
62208 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
62209- atomic_inc(&sbi->s_bal_goals);
62210+ atomic_inc_unchecked(&sbi->s_bal_goals);
62211 if (ac->ac_found > sbi->s_mb_max_to_scan)
62212- atomic_inc(&sbi->s_bal_breaks);
62213+ atomic_inc_unchecked(&sbi->s_bal_breaks);
62214 }
62215
62216 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
62217@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
62218 trace_ext4_mb_new_inode_pa(ac, pa);
62219
62220 ext4_mb_use_inode_pa(ac, pa);
62221- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
62222+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
62223
62224 ei = EXT4_I(ac->ac_inode);
62225 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62226@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
62227 trace_ext4_mb_new_group_pa(ac, pa);
62228
62229 ext4_mb_use_group_pa(ac, pa);
62230- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62231+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62232
62233 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62234 lg = ac->ac_lg;
62235@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
62236 * from the bitmap and continue.
62237 */
62238 }
62239- atomic_add(free, &sbi->s_mb_discarded);
62240+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
62241
62242 return err;
62243 }
62244@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
62245 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
62246 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
62247 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
62248- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62249+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62250 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
62251
62252 return 0;
62253diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
62254index 8313ca3..8a37d08 100644
62255--- a/fs/ext4/mmp.c
62256+++ b/fs/ext4/mmp.c
62257@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
62258 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
62259 const char *function, unsigned int line, const char *msg)
62260 {
62261- __ext4_warning(sb, function, line, msg);
62262+ __ext4_warning(sb, function, line, "%s", msg);
62263 __ext4_warning(sb, function, line,
62264 "MMP failure info: last update time: %llu, last update "
62265 "node: %s, last update device: %s\n",
62266diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
62267index 8a8ec62..1b02de5 100644
62268--- a/fs/ext4/resize.c
62269+++ b/fs/ext4/resize.c
62270@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62271
62272 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
62273 for (count2 = count; count > 0; count -= count2, block += count2) {
62274- ext4_fsblk_t start;
62275+ ext4_fsblk_t start, diff;
62276 struct buffer_head *bh;
62277 ext4_group_t group;
62278 int err;
62279@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62280 start = ext4_group_first_block_no(sb, group);
62281 group -= flex_gd->groups[0].group;
62282
62283- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
62284- if (count2 > count)
62285- count2 = count;
62286-
62287 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
62288 BUG_ON(flex_gd->count > 1);
62289 continue;
62290@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62291 err = ext4_journal_get_write_access(handle, bh);
62292 if (err)
62293 return err;
62294+
62295+ diff = block - start;
62296+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
62297+ if (count2 > count)
62298+ count2 = count;
62299+
62300 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
62301- block - start, count2);
62302- ext4_set_bits(bh->b_data, block - start, count2);
62303+ diff, count2);
62304+ ext4_set_bits(bh->b_data, diff, count2);
62305
62306 err = ext4_handle_dirty_metadata(handle, NULL, bh);
62307 if (unlikely(err))
62308diff --git a/fs/ext4/super.c b/fs/ext4/super.c
62309index fc29b2c..6c8b255 100644
62310--- a/fs/ext4/super.c
62311+++ b/fs/ext4/super.c
62312@@ -1252,7 +1252,7 @@ static ext4_fsblk_t get_sb_block(void **data)
62313 }
62314
62315 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
62316-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62317+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62318 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
62319
62320 #ifdef CONFIG_QUOTA
62321@@ -2440,7 +2440,7 @@ struct ext4_attr {
62322 int offset;
62323 int deprecated_val;
62324 } u;
62325-};
62326+} __do_const;
62327
62328 static int parse_strtoull(const char *buf,
62329 unsigned long long max, unsigned long long *value)
62330diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
62331index 1e09fc7..0400dd4 100644
62332--- a/fs/ext4/xattr.c
62333+++ b/fs/ext4/xattr.c
62334@@ -399,7 +399,7 @@ static int
62335 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62336 char *buffer, size_t buffer_size)
62337 {
62338- size_t rest = buffer_size;
62339+ size_t rest = buffer_size, total_size = 0;
62340
62341 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
62342 const struct xattr_handler *handler =
62343@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62344 buffer += size;
62345 }
62346 rest -= size;
62347+ total_size += size;
62348 }
62349 }
62350- return buffer_size - rest;
62351+ return total_size;
62352 }
62353
62354 static int
62355diff --git a/fs/fcntl.c b/fs/fcntl.c
62356index ee85cd4..9dd0d20 100644
62357--- a/fs/fcntl.c
62358+++ b/fs/fcntl.c
62359@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
62360 int force)
62361 {
62362 security_file_set_fowner(filp);
62363+ if (gr_handle_chroot_fowner(pid, type))
62364+ return;
62365+ if (gr_check_protected_task_fowner(pid, type))
62366+ return;
62367 f_modown(filp, pid, type, force);
62368 }
62369 EXPORT_SYMBOL(__f_setown);
62370diff --git a/fs/fhandle.c b/fs/fhandle.c
62371index 999ff5c..2281df9 100644
62372--- a/fs/fhandle.c
62373+++ b/fs/fhandle.c
62374@@ -8,6 +8,7 @@
62375 #include <linux/fs_struct.h>
62376 #include <linux/fsnotify.h>
62377 #include <linux/personality.h>
62378+#include <linux/grsecurity.h>
62379 #include <asm/uaccess.h>
62380 #include "internal.h"
62381 #include "mount.h"
62382@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
62383 } else
62384 retval = 0;
62385 /* copy the mount id */
62386- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
62387- sizeof(*mnt_id)) ||
62388+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
62389 copy_to_user(ufh, handle,
62390 sizeof(struct file_handle) + handle_bytes))
62391 retval = -EFAULT;
62392@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62393 * the directory. Ideally we would like CAP_DAC_SEARCH.
62394 * But we don't have that
62395 */
62396- if (!capable(CAP_DAC_READ_SEARCH)) {
62397+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
62398 retval = -EPERM;
62399 goto out_err;
62400 }
62401@@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62402 goto out_err;
62403 }
62404 /* copy the full handle */
62405- if (copy_from_user(handle, ufh,
62406- sizeof(struct file_handle) +
62407+ *handle = f_handle;
62408+ if (copy_from_user(&handle->f_handle,
62409+ &ufh->f_handle,
62410 f_handle.handle_bytes)) {
62411 retval = -EFAULT;
62412 goto out_handle;
62413diff --git a/fs/file.c b/fs/file.c
62414index ee738ea..f6c15629 100644
62415--- a/fs/file.c
62416+++ b/fs/file.c
62417@@ -16,6 +16,7 @@
62418 #include <linux/slab.h>
62419 #include <linux/vmalloc.h>
62420 #include <linux/file.h>
62421+#include <linux/security.h>
62422 #include <linux/fdtable.h>
62423 #include <linux/bitops.h>
62424 #include <linux/interrupt.h>
62425@@ -139,7 +140,7 @@ out:
62426 * Return <0 error code on error; 1 on successful completion.
62427 * The files->file_lock should be held on entry, and will be held on exit.
62428 */
62429-static int expand_fdtable(struct files_struct *files, int nr)
62430+static int expand_fdtable(struct files_struct *files, unsigned int nr)
62431 __releases(files->file_lock)
62432 __acquires(files->file_lock)
62433 {
62434@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
62435 * expanded and execution may have blocked.
62436 * The files->file_lock should be held on entry, and will be held on exit.
62437 */
62438-static int expand_files(struct files_struct *files, int nr)
62439+static int expand_files(struct files_struct *files, unsigned int nr)
62440 {
62441 struct fdtable *fdt;
62442
62443@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
62444 if (!file)
62445 return __close_fd(files, fd);
62446
62447+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
62448 if (fd >= rlimit(RLIMIT_NOFILE))
62449 return -EBADF;
62450
62451@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
62452 if (unlikely(oldfd == newfd))
62453 return -EINVAL;
62454
62455+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
62456 if (newfd >= rlimit(RLIMIT_NOFILE))
62457 return -EBADF;
62458
62459@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
62460 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
62461 {
62462 int err;
62463+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
62464 if (from >= rlimit(RLIMIT_NOFILE))
62465 return -EINVAL;
62466 err = alloc_fd(from, flags);
62467diff --git a/fs/filesystems.c b/fs/filesystems.c
62468index 5797d45..7d7d79a 100644
62469--- a/fs/filesystems.c
62470+++ b/fs/filesystems.c
62471@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
62472 int len = dot ? dot - name : strlen(name);
62473
62474 fs = __get_fs_type(name, len);
62475+#ifdef CONFIG_GRKERNSEC_MODHARDEN
62476+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
62477+#else
62478 if (!fs && (request_module("fs-%.*s", len, name) == 0))
62479+#endif
62480 fs = __get_fs_type(name, len);
62481
62482 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
62483diff --git a/fs/fs_struct.c b/fs/fs_struct.c
62484index 7dca743..1ff87ae 100644
62485--- a/fs/fs_struct.c
62486+++ b/fs/fs_struct.c
62487@@ -4,6 +4,7 @@
62488 #include <linux/path.h>
62489 #include <linux/slab.h>
62490 #include <linux/fs_struct.h>
62491+#include <linux/grsecurity.h>
62492 #include "internal.h"
62493
62494 /*
62495@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
62496 struct path old_root;
62497
62498 path_get(path);
62499+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
62500 spin_lock(&fs->lock);
62501 write_seqcount_begin(&fs->seq);
62502 old_root = fs->root;
62503 fs->root = *path;
62504+ gr_set_chroot_entries(current, path);
62505 write_seqcount_end(&fs->seq);
62506 spin_unlock(&fs->lock);
62507- if (old_root.dentry)
62508+ if (old_root.dentry) {
62509+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
62510 path_put(&old_root);
62511+ }
62512 }
62513
62514 /*
62515@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62516 int hits = 0;
62517 spin_lock(&fs->lock);
62518 write_seqcount_begin(&fs->seq);
62519+ /* this root replacement is only done by pivot_root,
62520+ leave grsec's chroot tagging alone for this task
62521+ so that a pivoted root isn't treated as a chroot
62522+ */
62523 hits += replace_path(&fs->root, old_root, new_root);
62524 hits += replace_path(&fs->pwd, old_root, new_root);
62525 write_seqcount_end(&fs->seq);
62526@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62527
62528 void free_fs_struct(struct fs_struct *fs)
62529 {
62530+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62531 path_put(&fs->root);
62532 path_put(&fs->pwd);
62533 kmem_cache_free(fs_cachep, fs);
62534@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
62535 task_lock(tsk);
62536 spin_lock(&fs->lock);
62537 tsk->fs = NULL;
62538- kill = !--fs->users;
62539+ gr_clear_chroot_entries(tsk);
62540+ kill = !atomic_dec_return(&fs->users);
62541 spin_unlock(&fs->lock);
62542 task_unlock(tsk);
62543 if (kill)
62544@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62545 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
62546 /* We don't need to lock fs - think why ;-) */
62547 if (fs) {
62548- fs->users = 1;
62549+ atomic_set(&fs->users, 1);
62550 fs->in_exec = 0;
62551 spin_lock_init(&fs->lock);
62552 seqcount_init(&fs->seq);
62553@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62554 spin_lock(&old->lock);
62555 fs->root = old->root;
62556 path_get(&fs->root);
62557+ /* instead of calling gr_set_chroot_entries here,
62558+ we call it from every caller of this function
62559+ */
62560 fs->pwd = old->pwd;
62561 path_get(&fs->pwd);
62562 spin_unlock(&old->lock);
62563+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62564 }
62565 return fs;
62566 }
62567@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
62568
62569 task_lock(current);
62570 spin_lock(&fs->lock);
62571- kill = !--fs->users;
62572+ kill = !atomic_dec_return(&fs->users);
62573 current->fs = new_fs;
62574+ gr_set_chroot_entries(current, &new_fs->root);
62575 spin_unlock(&fs->lock);
62576 task_unlock(current);
62577
62578@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
62579
62580 int current_umask(void)
62581 {
62582- return current->fs->umask;
62583+ return current->fs->umask | gr_acl_umask();
62584 }
62585 EXPORT_SYMBOL(current_umask);
62586
62587 /* to be mentioned only in INIT_TASK */
62588 struct fs_struct init_fs = {
62589- .users = 1,
62590+ .users = ATOMIC_INIT(1),
62591 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
62592 .seq = SEQCNT_ZERO(init_fs.seq),
62593 .umask = 0022,
62594diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
62595index 89acec7..a575262 100644
62596--- a/fs/fscache/cookie.c
62597+++ b/fs/fscache/cookie.c
62598@@ -19,7 +19,7 @@
62599
62600 struct kmem_cache *fscache_cookie_jar;
62601
62602-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
62603+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
62604
62605 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
62606 static int fscache_alloc_object(struct fscache_cache *cache,
62607@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62608 parent ? (char *) parent->def->name : "<no-parent>",
62609 def->name, netfs_data, enable);
62610
62611- fscache_stat(&fscache_n_acquires);
62612+ fscache_stat_unchecked(&fscache_n_acquires);
62613
62614 /* if there's no parent cookie, then we don't create one here either */
62615 if (!parent) {
62616- fscache_stat(&fscache_n_acquires_null);
62617+ fscache_stat_unchecked(&fscache_n_acquires_null);
62618 _leave(" [no parent]");
62619 return NULL;
62620 }
62621@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62622 /* allocate and initialise a cookie */
62623 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62624 if (!cookie) {
62625- fscache_stat(&fscache_n_acquires_oom);
62626+ fscache_stat_unchecked(&fscache_n_acquires_oom);
62627 _leave(" [ENOMEM]");
62628 return NULL;
62629 }
62630@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62631
62632 switch (cookie->def->type) {
62633 case FSCACHE_COOKIE_TYPE_INDEX:
62634- fscache_stat(&fscache_n_cookie_index);
62635+ fscache_stat_unchecked(&fscache_n_cookie_index);
62636 break;
62637 case FSCACHE_COOKIE_TYPE_DATAFILE:
62638- fscache_stat(&fscache_n_cookie_data);
62639+ fscache_stat_unchecked(&fscache_n_cookie_data);
62640 break;
62641 default:
62642- fscache_stat(&fscache_n_cookie_special);
62643+ fscache_stat_unchecked(&fscache_n_cookie_special);
62644 break;
62645 }
62646
62647@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62648 } else {
62649 atomic_dec(&parent->n_children);
62650 __fscache_cookie_put(cookie);
62651- fscache_stat(&fscache_n_acquires_nobufs);
62652+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62653 _leave(" = NULL");
62654 return NULL;
62655 }
62656@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62657 }
62658 }
62659
62660- fscache_stat(&fscache_n_acquires_ok);
62661+ fscache_stat_unchecked(&fscache_n_acquires_ok);
62662 _leave(" = %p", cookie);
62663 return cookie;
62664 }
62665@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62666 cache = fscache_select_cache_for_object(cookie->parent);
62667 if (!cache) {
62668 up_read(&fscache_addremove_sem);
62669- fscache_stat(&fscache_n_acquires_no_cache);
62670+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62671 _leave(" = -ENOMEDIUM [no cache]");
62672 return -ENOMEDIUM;
62673 }
62674@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62675 object = cache->ops->alloc_object(cache, cookie);
62676 fscache_stat_d(&fscache_n_cop_alloc_object);
62677 if (IS_ERR(object)) {
62678- fscache_stat(&fscache_n_object_no_alloc);
62679+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
62680 ret = PTR_ERR(object);
62681 goto error;
62682 }
62683
62684- fscache_stat(&fscache_n_object_alloc);
62685+ fscache_stat_unchecked(&fscache_n_object_alloc);
62686
62687- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62688+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62689
62690 _debug("ALLOC OBJ%x: %s {%lx}",
62691 object->debug_id, cookie->def->name, object->events);
62692@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62693
62694 _enter("{%s}", cookie->def->name);
62695
62696- fscache_stat(&fscache_n_invalidates);
62697+ fscache_stat_unchecked(&fscache_n_invalidates);
62698
62699 /* Only permit invalidation of data files. Invalidating an index will
62700 * require the caller to release all its attachments to the tree rooted
62701@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62702 {
62703 struct fscache_object *object;
62704
62705- fscache_stat(&fscache_n_updates);
62706+ fscache_stat_unchecked(&fscache_n_updates);
62707
62708 if (!cookie) {
62709- fscache_stat(&fscache_n_updates_null);
62710+ fscache_stat_unchecked(&fscache_n_updates_null);
62711 _leave(" [no cookie]");
62712 return;
62713 }
62714@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62715 */
62716 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62717 {
62718- fscache_stat(&fscache_n_relinquishes);
62719+ fscache_stat_unchecked(&fscache_n_relinquishes);
62720 if (retire)
62721- fscache_stat(&fscache_n_relinquishes_retire);
62722+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62723
62724 if (!cookie) {
62725- fscache_stat(&fscache_n_relinquishes_null);
62726+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
62727 _leave(" [no cookie]");
62728 return;
62729 }
62730@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62731 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62732 goto inconsistent;
62733
62734- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62735+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62736
62737 __fscache_use_cookie(cookie);
62738 if (fscache_submit_op(object, op) < 0)
62739diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62740index 7872a62..d91b19f 100644
62741--- a/fs/fscache/internal.h
62742+++ b/fs/fscache/internal.h
62743@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62744 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62745 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62746 struct fscache_operation *,
62747- atomic_t *,
62748- atomic_t *,
62749+ atomic_unchecked_t *,
62750+ atomic_unchecked_t *,
62751 void (*)(struct fscache_operation *));
62752 extern void fscache_invalidate_writes(struct fscache_cookie *);
62753
62754@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62755 * stats.c
62756 */
62757 #ifdef CONFIG_FSCACHE_STATS
62758-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62759-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62760+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62761+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62762
62763-extern atomic_t fscache_n_op_pend;
62764-extern atomic_t fscache_n_op_run;
62765-extern atomic_t fscache_n_op_enqueue;
62766-extern atomic_t fscache_n_op_deferred_release;
62767-extern atomic_t fscache_n_op_release;
62768-extern atomic_t fscache_n_op_gc;
62769-extern atomic_t fscache_n_op_cancelled;
62770-extern atomic_t fscache_n_op_rejected;
62771+extern atomic_unchecked_t fscache_n_op_pend;
62772+extern atomic_unchecked_t fscache_n_op_run;
62773+extern atomic_unchecked_t fscache_n_op_enqueue;
62774+extern atomic_unchecked_t fscache_n_op_deferred_release;
62775+extern atomic_unchecked_t fscache_n_op_release;
62776+extern atomic_unchecked_t fscache_n_op_gc;
62777+extern atomic_unchecked_t fscache_n_op_cancelled;
62778+extern atomic_unchecked_t fscache_n_op_rejected;
62779
62780-extern atomic_t fscache_n_attr_changed;
62781-extern atomic_t fscache_n_attr_changed_ok;
62782-extern atomic_t fscache_n_attr_changed_nobufs;
62783-extern atomic_t fscache_n_attr_changed_nomem;
62784-extern atomic_t fscache_n_attr_changed_calls;
62785+extern atomic_unchecked_t fscache_n_attr_changed;
62786+extern atomic_unchecked_t fscache_n_attr_changed_ok;
62787+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62788+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62789+extern atomic_unchecked_t fscache_n_attr_changed_calls;
62790
62791-extern atomic_t fscache_n_allocs;
62792-extern atomic_t fscache_n_allocs_ok;
62793-extern atomic_t fscache_n_allocs_wait;
62794-extern atomic_t fscache_n_allocs_nobufs;
62795-extern atomic_t fscache_n_allocs_intr;
62796-extern atomic_t fscache_n_allocs_object_dead;
62797-extern atomic_t fscache_n_alloc_ops;
62798-extern atomic_t fscache_n_alloc_op_waits;
62799+extern atomic_unchecked_t fscache_n_allocs;
62800+extern atomic_unchecked_t fscache_n_allocs_ok;
62801+extern atomic_unchecked_t fscache_n_allocs_wait;
62802+extern atomic_unchecked_t fscache_n_allocs_nobufs;
62803+extern atomic_unchecked_t fscache_n_allocs_intr;
62804+extern atomic_unchecked_t fscache_n_allocs_object_dead;
62805+extern atomic_unchecked_t fscache_n_alloc_ops;
62806+extern atomic_unchecked_t fscache_n_alloc_op_waits;
62807
62808-extern atomic_t fscache_n_retrievals;
62809-extern atomic_t fscache_n_retrievals_ok;
62810-extern atomic_t fscache_n_retrievals_wait;
62811-extern atomic_t fscache_n_retrievals_nodata;
62812-extern atomic_t fscache_n_retrievals_nobufs;
62813-extern atomic_t fscache_n_retrievals_intr;
62814-extern atomic_t fscache_n_retrievals_nomem;
62815-extern atomic_t fscache_n_retrievals_object_dead;
62816-extern atomic_t fscache_n_retrieval_ops;
62817-extern atomic_t fscache_n_retrieval_op_waits;
62818+extern atomic_unchecked_t fscache_n_retrievals;
62819+extern atomic_unchecked_t fscache_n_retrievals_ok;
62820+extern atomic_unchecked_t fscache_n_retrievals_wait;
62821+extern atomic_unchecked_t fscache_n_retrievals_nodata;
62822+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62823+extern atomic_unchecked_t fscache_n_retrievals_intr;
62824+extern atomic_unchecked_t fscache_n_retrievals_nomem;
62825+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62826+extern atomic_unchecked_t fscache_n_retrieval_ops;
62827+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62828
62829-extern atomic_t fscache_n_stores;
62830-extern atomic_t fscache_n_stores_ok;
62831-extern atomic_t fscache_n_stores_again;
62832-extern atomic_t fscache_n_stores_nobufs;
62833-extern atomic_t fscache_n_stores_oom;
62834-extern atomic_t fscache_n_store_ops;
62835-extern atomic_t fscache_n_store_calls;
62836-extern atomic_t fscache_n_store_pages;
62837-extern atomic_t fscache_n_store_radix_deletes;
62838-extern atomic_t fscache_n_store_pages_over_limit;
62839+extern atomic_unchecked_t fscache_n_stores;
62840+extern atomic_unchecked_t fscache_n_stores_ok;
62841+extern atomic_unchecked_t fscache_n_stores_again;
62842+extern atomic_unchecked_t fscache_n_stores_nobufs;
62843+extern atomic_unchecked_t fscache_n_stores_oom;
62844+extern atomic_unchecked_t fscache_n_store_ops;
62845+extern atomic_unchecked_t fscache_n_store_calls;
62846+extern atomic_unchecked_t fscache_n_store_pages;
62847+extern atomic_unchecked_t fscache_n_store_radix_deletes;
62848+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62849
62850-extern atomic_t fscache_n_store_vmscan_not_storing;
62851-extern atomic_t fscache_n_store_vmscan_gone;
62852-extern atomic_t fscache_n_store_vmscan_busy;
62853-extern atomic_t fscache_n_store_vmscan_cancelled;
62854-extern atomic_t fscache_n_store_vmscan_wait;
62855+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62856+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62857+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62858+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62859+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62860
62861-extern atomic_t fscache_n_marks;
62862-extern atomic_t fscache_n_uncaches;
62863+extern atomic_unchecked_t fscache_n_marks;
62864+extern atomic_unchecked_t fscache_n_uncaches;
62865
62866-extern atomic_t fscache_n_acquires;
62867-extern atomic_t fscache_n_acquires_null;
62868-extern atomic_t fscache_n_acquires_no_cache;
62869-extern atomic_t fscache_n_acquires_ok;
62870-extern atomic_t fscache_n_acquires_nobufs;
62871-extern atomic_t fscache_n_acquires_oom;
62872+extern atomic_unchecked_t fscache_n_acquires;
62873+extern atomic_unchecked_t fscache_n_acquires_null;
62874+extern atomic_unchecked_t fscache_n_acquires_no_cache;
62875+extern atomic_unchecked_t fscache_n_acquires_ok;
62876+extern atomic_unchecked_t fscache_n_acquires_nobufs;
62877+extern atomic_unchecked_t fscache_n_acquires_oom;
62878
62879-extern atomic_t fscache_n_invalidates;
62880-extern atomic_t fscache_n_invalidates_run;
62881+extern atomic_unchecked_t fscache_n_invalidates;
62882+extern atomic_unchecked_t fscache_n_invalidates_run;
62883
62884-extern atomic_t fscache_n_updates;
62885-extern atomic_t fscache_n_updates_null;
62886-extern atomic_t fscache_n_updates_run;
62887+extern atomic_unchecked_t fscache_n_updates;
62888+extern atomic_unchecked_t fscache_n_updates_null;
62889+extern atomic_unchecked_t fscache_n_updates_run;
62890
62891-extern atomic_t fscache_n_relinquishes;
62892-extern atomic_t fscache_n_relinquishes_null;
62893-extern atomic_t fscache_n_relinquishes_waitcrt;
62894-extern atomic_t fscache_n_relinquishes_retire;
62895+extern atomic_unchecked_t fscache_n_relinquishes;
62896+extern atomic_unchecked_t fscache_n_relinquishes_null;
62897+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62898+extern atomic_unchecked_t fscache_n_relinquishes_retire;
62899
62900-extern atomic_t fscache_n_cookie_index;
62901-extern atomic_t fscache_n_cookie_data;
62902-extern atomic_t fscache_n_cookie_special;
62903+extern atomic_unchecked_t fscache_n_cookie_index;
62904+extern atomic_unchecked_t fscache_n_cookie_data;
62905+extern atomic_unchecked_t fscache_n_cookie_special;
62906
62907-extern atomic_t fscache_n_object_alloc;
62908-extern atomic_t fscache_n_object_no_alloc;
62909-extern atomic_t fscache_n_object_lookups;
62910-extern atomic_t fscache_n_object_lookups_negative;
62911-extern atomic_t fscache_n_object_lookups_positive;
62912-extern atomic_t fscache_n_object_lookups_timed_out;
62913-extern atomic_t fscache_n_object_created;
62914-extern atomic_t fscache_n_object_avail;
62915-extern atomic_t fscache_n_object_dead;
62916+extern atomic_unchecked_t fscache_n_object_alloc;
62917+extern atomic_unchecked_t fscache_n_object_no_alloc;
62918+extern atomic_unchecked_t fscache_n_object_lookups;
62919+extern atomic_unchecked_t fscache_n_object_lookups_negative;
62920+extern atomic_unchecked_t fscache_n_object_lookups_positive;
62921+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62922+extern atomic_unchecked_t fscache_n_object_created;
62923+extern atomic_unchecked_t fscache_n_object_avail;
62924+extern atomic_unchecked_t fscache_n_object_dead;
62925
62926-extern atomic_t fscache_n_checkaux_none;
62927-extern atomic_t fscache_n_checkaux_okay;
62928-extern atomic_t fscache_n_checkaux_update;
62929-extern atomic_t fscache_n_checkaux_obsolete;
62930+extern atomic_unchecked_t fscache_n_checkaux_none;
62931+extern atomic_unchecked_t fscache_n_checkaux_okay;
62932+extern atomic_unchecked_t fscache_n_checkaux_update;
62933+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62934
62935 extern atomic_t fscache_n_cop_alloc_object;
62936 extern atomic_t fscache_n_cop_lookup_object;
62937@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62938 atomic_inc(stat);
62939 }
62940
62941+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62942+{
62943+ atomic_inc_unchecked(stat);
62944+}
62945+
62946 static inline void fscache_stat_d(atomic_t *stat)
62947 {
62948 atomic_dec(stat);
62949@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62950
62951 #define __fscache_stat(stat) (NULL)
62952 #define fscache_stat(stat) do {} while (0)
62953+#define fscache_stat_unchecked(stat) do {} while (0)
62954 #define fscache_stat_d(stat) do {} while (0)
62955 #endif
62956
62957diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62958index da032da..0076ce7 100644
62959--- a/fs/fscache/object.c
62960+++ b/fs/fscache/object.c
62961@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62962 _debug("LOOKUP \"%s\" in \"%s\"",
62963 cookie->def->name, object->cache->tag->name);
62964
62965- fscache_stat(&fscache_n_object_lookups);
62966+ fscache_stat_unchecked(&fscache_n_object_lookups);
62967 fscache_stat(&fscache_n_cop_lookup_object);
62968 ret = object->cache->ops->lookup_object(object);
62969 fscache_stat_d(&fscache_n_cop_lookup_object);
62970@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62971 if (ret == -ETIMEDOUT) {
62972 /* probably stuck behind another object, so move this one to
62973 * the back of the queue */
62974- fscache_stat(&fscache_n_object_lookups_timed_out);
62975+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62976 _leave(" [timeout]");
62977 return NO_TRANSIT;
62978 }
62979@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62980 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62981
62982 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62983- fscache_stat(&fscache_n_object_lookups_negative);
62984+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62985
62986 /* Allow write requests to begin stacking up and read requests to begin
62987 * returning ENODATA.
62988@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62989 /* if we were still looking up, then we must have a positive lookup
62990 * result, in which case there may be data available */
62991 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62992- fscache_stat(&fscache_n_object_lookups_positive);
62993+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62994
62995 /* We do (presumably) have data */
62996 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62997@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62998 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62999 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
63000 } else {
63001- fscache_stat(&fscache_n_object_created);
63002+ fscache_stat_unchecked(&fscache_n_object_created);
63003 }
63004
63005 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
63006@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
63007 fscache_stat_d(&fscache_n_cop_lookup_complete);
63008
63009 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
63010- fscache_stat(&fscache_n_object_avail);
63011+ fscache_stat_unchecked(&fscache_n_object_avail);
63012
63013 _leave("");
63014 return transit_to(JUMPSTART_DEPS);
63015@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
63016
63017 /* this just shifts the object release to the work processor */
63018 fscache_put_object(object);
63019- fscache_stat(&fscache_n_object_dead);
63020+ fscache_stat_unchecked(&fscache_n_object_dead);
63021
63022 _leave("");
63023 return transit_to(OBJECT_DEAD);
63024@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63025 enum fscache_checkaux result;
63026
63027 if (!object->cookie->def->check_aux) {
63028- fscache_stat(&fscache_n_checkaux_none);
63029+ fscache_stat_unchecked(&fscache_n_checkaux_none);
63030 return FSCACHE_CHECKAUX_OKAY;
63031 }
63032
63033@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63034 switch (result) {
63035 /* entry okay as is */
63036 case FSCACHE_CHECKAUX_OKAY:
63037- fscache_stat(&fscache_n_checkaux_okay);
63038+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
63039 break;
63040
63041 /* entry requires update */
63042 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
63043- fscache_stat(&fscache_n_checkaux_update);
63044+ fscache_stat_unchecked(&fscache_n_checkaux_update);
63045 break;
63046
63047 /* entry requires deletion */
63048 case FSCACHE_CHECKAUX_OBSOLETE:
63049- fscache_stat(&fscache_n_checkaux_obsolete);
63050+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
63051 break;
63052
63053 default:
63054@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
63055 {
63056 const struct fscache_state *s;
63057
63058- fscache_stat(&fscache_n_invalidates_run);
63059+ fscache_stat_unchecked(&fscache_n_invalidates_run);
63060 fscache_stat(&fscache_n_cop_invalidate_object);
63061 s = _fscache_invalidate_object(object, event);
63062 fscache_stat_d(&fscache_n_cop_invalidate_object);
63063@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
63064 {
63065 _enter("{OBJ%x},%d", object->debug_id, event);
63066
63067- fscache_stat(&fscache_n_updates_run);
63068+ fscache_stat_unchecked(&fscache_n_updates_run);
63069 fscache_stat(&fscache_n_cop_update_object);
63070 object->cache->ops->update_object(object);
63071 fscache_stat_d(&fscache_n_cop_update_object);
63072diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
63073index e7b87a0..a85d47a 100644
63074--- a/fs/fscache/operation.c
63075+++ b/fs/fscache/operation.c
63076@@ -17,7 +17,7 @@
63077 #include <linux/slab.h>
63078 #include "internal.h"
63079
63080-atomic_t fscache_op_debug_id;
63081+atomic_unchecked_t fscache_op_debug_id;
63082 EXPORT_SYMBOL(fscache_op_debug_id);
63083
63084 /**
63085@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
63086 ASSERTCMP(atomic_read(&op->usage), >, 0);
63087 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
63088
63089- fscache_stat(&fscache_n_op_enqueue);
63090+ fscache_stat_unchecked(&fscache_n_op_enqueue);
63091 switch (op->flags & FSCACHE_OP_TYPE) {
63092 case FSCACHE_OP_ASYNC:
63093 _debug("queue async");
63094@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
63095 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
63096 if (op->processor)
63097 fscache_enqueue_operation(op);
63098- fscache_stat(&fscache_n_op_run);
63099+ fscache_stat_unchecked(&fscache_n_op_run);
63100 }
63101
63102 /*
63103@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63104 if (object->n_in_progress > 0) {
63105 atomic_inc(&op->usage);
63106 list_add_tail(&op->pend_link, &object->pending_ops);
63107- fscache_stat(&fscache_n_op_pend);
63108+ fscache_stat_unchecked(&fscache_n_op_pend);
63109 } else if (!list_empty(&object->pending_ops)) {
63110 atomic_inc(&op->usage);
63111 list_add_tail(&op->pend_link, &object->pending_ops);
63112- fscache_stat(&fscache_n_op_pend);
63113+ fscache_stat_unchecked(&fscache_n_op_pend);
63114 fscache_start_operations(object);
63115 } else {
63116 ASSERTCMP(object->n_in_progress, ==, 0);
63117@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63118 object->n_exclusive++; /* reads and writes must wait */
63119 atomic_inc(&op->usage);
63120 list_add_tail(&op->pend_link, &object->pending_ops);
63121- fscache_stat(&fscache_n_op_pend);
63122+ fscache_stat_unchecked(&fscache_n_op_pend);
63123 ret = 0;
63124 } else {
63125 /* If we're in any other state, there must have been an I/O
63126@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
63127 if (object->n_exclusive > 0) {
63128 atomic_inc(&op->usage);
63129 list_add_tail(&op->pend_link, &object->pending_ops);
63130- fscache_stat(&fscache_n_op_pend);
63131+ fscache_stat_unchecked(&fscache_n_op_pend);
63132 } else if (!list_empty(&object->pending_ops)) {
63133 atomic_inc(&op->usage);
63134 list_add_tail(&op->pend_link, &object->pending_ops);
63135- fscache_stat(&fscache_n_op_pend);
63136+ fscache_stat_unchecked(&fscache_n_op_pend);
63137 fscache_start_operations(object);
63138 } else {
63139 ASSERTCMP(object->n_exclusive, ==, 0);
63140@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
63141 object->n_ops++;
63142 atomic_inc(&op->usage);
63143 list_add_tail(&op->pend_link, &object->pending_ops);
63144- fscache_stat(&fscache_n_op_pend);
63145+ fscache_stat_unchecked(&fscache_n_op_pend);
63146 ret = 0;
63147 } else if (fscache_object_is_dying(object)) {
63148- fscache_stat(&fscache_n_op_rejected);
63149+ fscache_stat_unchecked(&fscache_n_op_rejected);
63150 op->state = FSCACHE_OP_ST_CANCELLED;
63151 ret = -ENOBUFS;
63152 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
63153@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
63154 ret = -EBUSY;
63155 if (op->state == FSCACHE_OP_ST_PENDING) {
63156 ASSERT(!list_empty(&op->pend_link));
63157- fscache_stat(&fscache_n_op_cancelled);
63158+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63159 list_del_init(&op->pend_link);
63160 if (do_cancel)
63161 do_cancel(op);
63162@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
63163 while (!list_empty(&object->pending_ops)) {
63164 op = list_entry(object->pending_ops.next,
63165 struct fscache_operation, pend_link);
63166- fscache_stat(&fscache_n_op_cancelled);
63167+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63168 list_del_init(&op->pend_link);
63169
63170 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
63171@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
63172 op->state, ==, FSCACHE_OP_ST_CANCELLED);
63173 op->state = FSCACHE_OP_ST_DEAD;
63174
63175- fscache_stat(&fscache_n_op_release);
63176+ fscache_stat_unchecked(&fscache_n_op_release);
63177
63178 if (op->release) {
63179 op->release(op);
63180@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
63181 * lock, and defer it otherwise */
63182 if (!spin_trylock(&object->lock)) {
63183 _debug("defer put");
63184- fscache_stat(&fscache_n_op_deferred_release);
63185+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
63186
63187 cache = object->cache;
63188 spin_lock(&cache->op_gc_list_lock);
63189@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
63190
63191 _debug("GC DEFERRED REL OBJ%x OP%x",
63192 object->debug_id, op->debug_id);
63193- fscache_stat(&fscache_n_op_gc);
63194+ fscache_stat_unchecked(&fscache_n_op_gc);
63195
63196 ASSERTCMP(atomic_read(&op->usage), ==, 0);
63197 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
63198diff --git a/fs/fscache/page.c b/fs/fscache/page.c
63199index de33b3f..8be4d29 100644
63200--- a/fs/fscache/page.c
63201+++ b/fs/fscache/page.c
63202@@ -74,7 +74,7 @@ try_again:
63203 val = radix_tree_lookup(&cookie->stores, page->index);
63204 if (!val) {
63205 rcu_read_unlock();
63206- fscache_stat(&fscache_n_store_vmscan_not_storing);
63207+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
63208 __fscache_uncache_page(cookie, page);
63209 return true;
63210 }
63211@@ -104,11 +104,11 @@ try_again:
63212 spin_unlock(&cookie->stores_lock);
63213
63214 if (xpage) {
63215- fscache_stat(&fscache_n_store_vmscan_cancelled);
63216- fscache_stat(&fscache_n_store_radix_deletes);
63217+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
63218+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63219 ASSERTCMP(xpage, ==, page);
63220 } else {
63221- fscache_stat(&fscache_n_store_vmscan_gone);
63222+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
63223 }
63224
63225 wake_up_bit(&cookie->flags, 0);
63226@@ -123,11 +123,11 @@ page_busy:
63227 * sleeping on memory allocation, so we may need to impose a timeout
63228 * too. */
63229 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
63230- fscache_stat(&fscache_n_store_vmscan_busy);
63231+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
63232 return false;
63233 }
63234
63235- fscache_stat(&fscache_n_store_vmscan_wait);
63236+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
63237 if (!release_page_wait_timeout(cookie, page))
63238 _debug("fscache writeout timeout page: %p{%lx}",
63239 page, page->index);
63240@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
63241 FSCACHE_COOKIE_STORING_TAG);
63242 if (!radix_tree_tag_get(&cookie->stores, page->index,
63243 FSCACHE_COOKIE_PENDING_TAG)) {
63244- fscache_stat(&fscache_n_store_radix_deletes);
63245+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63246 xpage = radix_tree_delete(&cookie->stores, page->index);
63247 }
63248 spin_unlock(&cookie->stores_lock);
63249@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
63250
63251 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
63252
63253- fscache_stat(&fscache_n_attr_changed_calls);
63254+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
63255
63256 if (fscache_object_is_active(object)) {
63257 fscache_stat(&fscache_n_cop_attr_changed);
63258@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63259
63260 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63261
63262- fscache_stat(&fscache_n_attr_changed);
63263+ fscache_stat_unchecked(&fscache_n_attr_changed);
63264
63265 op = kzalloc(sizeof(*op), GFP_KERNEL);
63266 if (!op) {
63267- fscache_stat(&fscache_n_attr_changed_nomem);
63268+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
63269 _leave(" = -ENOMEM");
63270 return -ENOMEM;
63271 }
63272@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63273 if (fscache_submit_exclusive_op(object, op) < 0)
63274 goto nobufs_dec;
63275 spin_unlock(&cookie->lock);
63276- fscache_stat(&fscache_n_attr_changed_ok);
63277+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
63278 fscache_put_operation(op);
63279 _leave(" = 0");
63280 return 0;
63281@@ -242,7 +242,7 @@ nobufs:
63282 kfree(op);
63283 if (wake_cookie)
63284 __fscache_wake_unused_cookie(cookie);
63285- fscache_stat(&fscache_n_attr_changed_nobufs);
63286+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
63287 _leave(" = %d", -ENOBUFS);
63288 return -ENOBUFS;
63289 }
63290@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
63291 /* allocate a retrieval operation and attempt to submit it */
63292 op = kzalloc(sizeof(*op), GFP_NOIO);
63293 if (!op) {
63294- fscache_stat(&fscache_n_retrievals_nomem);
63295+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63296 return NULL;
63297 }
63298
63299@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
63300 return 0;
63301 }
63302
63303- fscache_stat(&fscache_n_retrievals_wait);
63304+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
63305
63306 jif = jiffies;
63307 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
63308 TASK_INTERRUPTIBLE) != 0) {
63309- fscache_stat(&fscache_n_retrievals_intr);
63310+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63311 _leave(" = -ERESTARTSYS");
63312 return -ERESTARTSYS;
63313 }
63314@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
63315 */
63316 int fscache_wait_for_operation_activation(struct fscache_object *object,
63317 struct fscache_operation *op,
63318- atomic_t *stat_op_waits,
63319- atomic_t *stat_object_dead,
63320+ atomic_unchecked_t *stat_op_waits,
63321+ atomic_unchecked_t *stat_object_dead,
63322 void (*do_cancel)(struct fscache_operation *))
63323 {
63324 int ret;
63325@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63326
63327 _debug(">>> WT");
63328 if (stat_op_waits)
63329- fscache_stat(stat_op_waits);
63330+ fscache_stat_unchecked(stat_op_waits);
63331 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
63332 TASK_INTERRUPTIBLE) != 0) {
63333 ret = fscache_cancel_op(op, do_cancel);
63334@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63335 check_if_dead:
63336 if (op->state == FSCACHE_OP_ST_CANCELLED) {
63337 if (stat_object_dead)
63338- fscache_stat(stat_object_dead);
63339+ fscache_stat_unchecked(stat_object_dead);
63340 _leave(" = -ENOBUFS [cancelled]");
63341 return -ENOBUFS;
63342 }
63343@@ -381,7 +381,7 @@ check_if_dead:
63344 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
63345 fscache_cancel_op(op, do_cancel);
63346 if (stat_object_dead)
63347- fscache_stat(stat_object_dead);
63348+ fscache_stat_unchecked(stat_object_dead);
63349 return -ENOBUFS;
63350 }
63351 return 0;
63352@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63353
63354 _enter("%p,%p,,,", cookie, page);
63355
63356- fscache_stat(&fscache_n_retrievals);
63357+ fscache_stat_unchecked(&fscache_n_retrievals);
63358
63359 if (hlist_empty(&cookie->backing_objects))
63360 goto nobufs;
63361@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63362 goto nobufs_unlock_dec;
63363 spin_unlock(&cookie->lock);
63364
63365- fscache_stat(&fscache_n_retrieval_ops);
63366+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63367
63368 /* pin the netfs read context in case we need to do the actual netfs
63369 * read because we've encountered a cache read failure */
63370@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63371
63372 error:
63373 if (ret == -ENOMEM)
63374- fscache_stat(&fscache_n_retrievals_nomem);
63375+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63376 else if (ret == -ERESTARTSYS)
63377- fscache_stat(&fscache_n_retrievals_intr);
63378+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63379 else if (ret == -ENODATA)
63380- fscache_stat(&fscache_n_retrievals_nodata);
63381+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63382 else if (ret < 0)
63383- fscache_stat(&fscache_n_retrievals_nobufs);
63384+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63385 else
63386- fscache_stat(&fscache_n_retrievals_ok);
63387+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63388
63389 fscache_put_retrieval(op);
63390 _leave(" = %d", ret);
63391@@ -505,7 +505,7 @@ nobufs_unlock:
63392 __fscache_wake_unused_cookie(cookie);
63393 kfree(op);
63394 nobufs:
63395- fscache_stat(&fscache_n_retrievals_nobufs);
63396+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63397 _leave(" = -ENOBUFS");
63398 return -ENOBUFS;
63399 }
63400@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63401
63402 _enter("%p,,%d,,,", cookie, *nr_pages);
63403
63404- fscache_stat(&fscache_n_retrievals);
63405+ fscache_stat_unchecked(&fscache_n_retrievals);
63406
63407 if (hlist_empty(&cookie->backing_objects))
63408 goto nobufs;
63409@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63410 goto nobufs_unlock_dec;
63411 spin_unlock(&cookie->lock);
63412
63413- fscache_stat(&fscache_n_retrieval_ops);
63414+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63415
63416 /* pin the netfs read context in case we need to do the actual netfs
63417 * read because we've encountered a cache read failure */
63418@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63419
63420 error:
63421 if (ret == -ENOMEM)
63422- fscache_stat(&fscache_n_retrievals_nomem);
63423+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63424 else if (ret == -ERESTARTSYS)
63425- fscache_stat(&fscache_n_retrievals_intr);
63426+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63427 else if (ret == -ENODATA)
63428- fscache_stat(&fscache_n_retrievals_nodata);
63429+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63430 else if (ret < 0)
63431- fscache_stat(&fscache_n_retrievals_nobufs);
63432+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63433 else
63434- fscache_stat(&fscache_n_retrievals_ok);
63435+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63436
63437 fscache_put_retrieval(op);
63438 _leave(" = %d", ret);
63439@@ -636,7 +636,7 @@ nobufs_unlock:
63440 if (wake_cookie)
63441 __fscache_wake_unused_cookie(cookie);
63442 nobufs:
63443- fscache_stat(&fscache_n_retrievals_nobufs);
63444+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63445 _leave(" = -ENOBUFS");
63446 return -ENOBUFS;
63447 }
63448@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63449
63450 _enter("%p,%p,,,", cookie, page);
63451
63452- fscache_stat(&fscache_n_allocs);
63453+ fscache_stat_unchecked(&fscache_n_allocs);
63454
63455 if (hlist_empty(&cookie->backing_objects))
63456 goto nobufs;
63457@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63458 goto nobufs_unlock_dec;
63459 spin_unlock(&cookie->lock);
63460
63461- fscache_stat(&fscache_n_alloc_ops);
63462+ fscache_stat_unchecked(&fscache_n_alloc_ops);
63463
63464 ret = fscache_wait_for_operation_activation(
63465 object, &op->op,
63466@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63467
63468 error:
63469 if (ret == -ERESTARTSYS)
63470- fscache_stat(&fscache_n_allocs_intr);
63471+ fscache_stat_unchecked(&fscache_n_allocs_intr);
63472 else if (ret < 0)
63473- fscache_stat(&fscache_n_allocs_nobufs);
63474+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63475 else
63476- fscache_stat(&fscache_n_allocs_ok);
63477+ fscache_stat_unchecked(&fscache_n_allocs_ok);
63478
63479 fscache_put_retrieval(op);
63480 _leave(" = %d", ret);
63481@@ -730,7 +730,7 @@ nobufs_unlock:
63482 if (wake_cookie)
63483 __fscache_wake_unused_cookie(cookie);
63484 nobufs:
63485- fscache_stat(&fscache_n_allocs_nobufs);
63486+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63487 _leave(" = -ENOBUFS");
63488 return -ENOBUFS;
63489 }
63490@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63491
63492 spin_lock(&cookie->stores_lock);
63493
63494- fscache_stat(&fscache_n_store_calls);
63495+ fscache_stat_unchecked(&fscache_n_store_calls);
63496
63497 /* find a page to store */
63498 page = NULL;
63499@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63500 page = results[0];
63501 _debug("gang %d [%lx]", n, page->index);
63502 if (page->index > op->store_limit) {
63503- fscache_stat(&fscache_n_store_pages_over_limit);
63504+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
63505 goto superseded;
63506 }
63507
63508@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63509 spin_unlock(&cookie->stores_lock);
63510 spin_unlock(&object->lock);
63511
63512- fscache_stat(&fscache_n_store_pages);
63513+ fscache_stat_unchecked(&fscache_n_store_pages);
63514 fscache_stat(&fscache_n_cop_write_page);
63515 ret = object->cache->ops->write_page(op, page);
63516 fscache_stat_d(&fscache_n_cop_write_page);
63517@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63518 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63519 ASSERT(PageFsCache(page));
63520
63521- fscache_stat(&fscache_n_stores);
63522+ fscache_stat_unchecked(&fscache_n_stores);
63523
63524 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
63525 _leave(" = -ENOBUFS [invalidating]");
63526@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63527 spin_unlock(&cookie->stores_lock);
63528 spin_unlock(&object->lock);
63529
63530- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
63531+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63532 op->store_limit = object->store_limit;
63533
63534 __fscache_use_cookie(cookie);
63535@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63536
63537 spin_unlock(&cookie->lock);
63538 radix_tree_preload_end();
63539- fscache_stat(&fscache_n_store_ops);
63540- fscache_stat(&fscache_n_stores_ok);
63541+ fscache_stat_unchecked(&fscache_n_store_ops);
63542+ fscache_stat_unchecked(&fscache_n_stores_ok);
63543
63544 /* the work queue now carries its own ref on the object */
63545 fscache_put_operation(&op->op);
63546@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63547 return 0;
63548
63549 already_queued:
63550- fscache_stat(&fscache_n_stores_again);
63551+ fscache_stat_unchecked(&fscache_n_stores_again);
63552 already_pending:
63553 spin_unlock(&cookie->stores_lock);
63554 spin_unlock(&object->lock);
63555 spin_unlock(&cookie->lock);
63556 radix_tree_preload_end();
63557 kfree(op);
63558- fscache_stat(&fscache_n_stores_ok);
63559+ fscache_stat_unchecked(&fscache_n_stores_ok);
63560 _leave(" = 0");
63561 return 0;
63562
63563@@ -1039,14 +1039,14 @@ nobufs:
63564 kfree(op);
63565 if (wake_cookie)
63566 __fscache_wake_unused_cookie(cookie);
63567- fscache_stat(&fscache_n_stores_nobufs);
63568+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
63569 _leave(" = -ENOBUFS");
63570 return -ENOBUFS;
63571
63572 nomem_free:
63573 kfree(op);
63574 nomem:
63575- fscache_stat(&fscache_n_stores_oom);
63576+ fscache_stat_unchecked(&fscache_n_stores_oom);
63577 _leave(" = -ENOMEM");
63578 return -ENOMEM;
63579 }
63580@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
63581 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63582 ASSERTCMP(page, !=, NULL);
63583
63584- fscache_stat(&fscache_n_uncaches);
63585+ fscache_stat_unchecked(&fscache_n_uncaches);
63586
63587 /* cache withdrawal may beat us to it */
63588 if (!PageFsCache(page))
63589@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
63590 struct fscache_cookie *cookie = op->op.object->cookie;
63591
63592 #ifdef CONFIG_FSCACHE_STATS
63593- atomic_inc(&fscache_n_marks);
63594+ atomic_inc_unchecked(&fscache_n_marks);
63595 #endif
63596
63597 _debug("- mark %p{%lx}", page, page->index);
63598diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
63599index 40d13c7..ddf52b9 100644
63600--- a/fs/fscache/stats.c
63601+++ b/fs/fscache/stats.c
63602@@ -18,99 +18,99 @@
63603 /*
63604 * operation counters
63605 */
63606-atomic_t fscache_n_op_pend;
63607-atomic_t fscache_n_op_run;
63608-atomic_t fscache_n_op_enqueue;
63609-atomic_t fscache_n_op_requeue;
63610-atomic_t fscache_n_op_deferred_release;
63611-atomic_t fscache_n_op_release;
63612-atomic_t fscache_n_op_gc;
63613-atomic_t fscache_n_op_cancelled;
63614-atomic_t fscache_n_op_rejected;
63615+atomic_unchecked_t fscache_n_op_pend;
63616+atomic_unchecked_t fscache_n_op_run;
63617+atomic_unchecked_t fscache_n_op_enqueue;
63618+atomic_unchecked_t fscache_n_op_requeue;
63619+atomic_unchecked_t fscache_n_op_deferred_release;
63620+atomic_unchecked_t fscache_n_op_release;
63621+atomic_unchecked_t fscache_n_op_gc;
63622+atomic_unchecked_t fscache_n_op_cancelled;
63623+atomic_unchecked_t fscache_n_op_rejected;
63624
63625-atomic_t fscache_n_attr_changed;
63626-atomic_t fscache_n_attr_changed_ok;
63627-atomic_t fscache_n_attr_changed_nobufs;
63628-atomic_t fscache_n_attr_changed_nomem;
63629-atomic_t fscache_n_attr_changed_calls;
63630+atomic_unchecked_t fscache_n_attr_changed;
63631+atomic_unchecked_t fscache_n_attr_changed_ok;
63632+atomic_unchecked_t fscache_n_attr_changed_nobufs;
63633+atomic_unchecked_t fscache_n_attr_changed_nomem;
63634+atomic_unchecked_t fscache_n_attr_changed_calls;
63635
63636-atomic_t fscache_n_allocs;
63637-atomic_t fscache_n_allocs_ok;
63638-atomic_t fscache_n_allocs_wait;
63639-atomic_t fscache_n_allocs_nobufs;
63640-atomic_t fscache_n_allocs_intr;
63641-atomic_t fscache_n_allocs_object_dead;
63642-atomic_t fscache_n_alloc_ops;
63643-atomic_t fscache_n_alloc_op_waits;
63644+atomic_unchecked_t fscache_n_allocs;
63645+atomic_unchecked_t fscache_n_allocs_ok;
63646+atomic_unchecked_t fscache_n_allocs_wait;
63647+atomic_unchecked_t fscache_n_allocs_nobufs;
63648+atomic_unchecked_t fscache_n_allocs_intr;
63649+atomic_unchecked_t fscache_n_allocs_object_dead;
63650+atomic_unchecked_t fscache_n_alloc_ops;
63651+atomic_unchecked_t fscache_n_alloc_op_waits;
63652
63653-atomic_t fscache_n_retrievals;
63654-atomic_t fscache_n_retrievals_ok;
63655-atomic_t fscache_n_retrievals_wait;
63656-atomic_t fscache_n_retrievals_nodata;
63657-atomic_t fscache_n_retrievals_nobufs;
63658-atomic_t fscache_n_retrievals_intr;
63659-atomic_t fscache_n_retrievals_nomem;
63660-atomic_t fscache_n_retrievals_object_dead;
63661-atomic_t fscache_n_retrieval_ops;
63662-atomic_t fscache_n_retrieval_op_waits;
63663+atomic_unchecked_t fscache_n_retrievals;
63664+atomic_unchecked_t fscache_n_retrievals_ok;
63665+atomic_unchecked_t fscache_n_retrievals_wait;
63666+atomic_unchecked_t fscache_n_retrievals_nodata;
63667+atomic_unchecked_t fscache_n_retrievals_nobufs;
63668+atomic_unchecked_t fscache_n_retrievals_intr;
63669+atomic_unchecked_t fscache_n_retrievals_nomem;
63670+atomic_unchecked_t fscache_n_retrievals_object_dead;
63671+atomic_unchecked_t fscache_n_retrieval_ops;
63672+atomic_unchecked_t fscache_n_retrieval_op_waits;
63673
63674-atomic_t fscache_n_stores;
63675-atomic_t fscache_n_stores_ok;
63676-atomic_t fscache_n_stores_again;
63677-atomic_t fscache_n_stores_nobufs;
63678-atomic_t fscache_n_stores_oom;
63679-atomic_t fscache_n_store_ops;
63680-atomic_t fscache_n_store_calls;
63681-atomic_t fscache_n_store_pages;
63682-atomic_t fscache_n_store_radix_deletes;
63683-atomic_t fscache_n_store_pages_over_limit;
63684+atomic_unchecked_t fscache_n_stores;
63685+atomic_unchecked_t fscache_n_stores_ok;
63686+atomic_unchecked_t fscache_n_stores_again;
63687+atomic_unchecked_t fscache_n_stores_nobufs;
63688+atomic_unchecked_t fscache_n_stores_oom;
63689+atomic_unchecked_t fscache_n_store_ops;
63690+atomic_unchecked_t fscache_n_store_calls;
63691+atomic_unchecked_t fscache_n_store_pages;
63692+atomic_unchecked_t fscache_n_store_radix_deletes;
63693+atomic_unchecked_t fscache_n_store_pages_over_limit;
63694
63695-atomic_t fscache_n_store_vmscan_not_storing;
63696-atomic_t fscache_n_store_vmscan_gone;
63697-atomic_t fscache_n_store_vmscan_busy;
63698-atomic_t fscache_n_store_vmscan_cancelled;
63699-atomic_t fscache_n_store_vmscan_wait;
63700+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63701+atomic_unchecked_t fscache_n_store_vmscan_gone;
63702+atomic_unchecked_t fscache_n_store_vmscan_busy;
63703+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63704+atomic_unchecked_t fscache_n_store_vmscan_wait;
63705
63706-atomic_t fscache_n_marks;
63707-atomic_t fscache_n_uncaches;
63708+atomic_unchecked_t fscache_n_marks;
63709+atomic_unchecked_t fscache_n_uncaches;
63710
63711-atomic_t fscache_n_acquires;
63712-atomic_t fscache_n_acquires_null;
63713-atomic_t fscache_n_acquires_no_cache;
63714-atomic_t fscache_n_acquires_ok;
63715-atomic_t fscache_n_acquires_nobufs;
63716-atomic_t fscache_n_acquires_oom;
63717+atomic_unchecked_t fscache_n_acquires;
63718+atomic_unchecked_t fscache_n_acquires_null;
63719+atomic_unchecked_t fscache_n_acquires_no_cache;
63720+atomic_unchecked_t fscache_n_acquires_ok;
63721+atomic_unchecked_t fscache_n_acquires_nobufs;
63722+atomic_unchecked_t fscache_n_acquires_oom;
63723
63724-atomic_t fscache_n_invalidates;
63725-atomic_t fscache_n_invalidates_run;
63726+atomic_unchecked_t fscache_n_invalidates;
63727+atomic_unchecked_t fscache_n_invalidates_run;
63728
63729-atomic_t fscache_n_updates;
63730-atomic_t fscache_n_updates_null;
63731-atomic_t fscache_n_updates_run;
63732+atomic_unchecked_t fscache_n_updates;
63733+atomic_unchecked_t fscache_n_updates_null;
63734+atomic_unchecked_t fscache_n_updates_run;
63735
63736-atomic_t fscache_n_relinquishes;
63737-atomic_t fscache_n_relinquishes_null;
63738-atomic_t fscache_n_relinquishes_waitcrt;
63739-atomic_t fscache_n_relinquishes_retire;
63740+atomic_unchecked_t fscache_n_relinquishes;
63741+atomic_unchecked_t fscache_n_relinquishes_null;
63742+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63743+atomic_unchecked_t fscache_n_relinquishes_retire;
63744
63745-atomic_t fscache_n_cookie_index;
63746-atomic_t fscache_n_cookie_data;
63747-atomic_t fscache_n_cookie_special;
63748+atomic_unchecked_t fscache_n_cookie_index;
63749+atomic_unchecked_t fscache_n_cookie_data;
63750+atomic_unchecked_t fscache_n_cookie_special;
63751
63752-atomic_t fscache_n_object_alloc;
63753-atomic_t fscache_n_object_no_alloc;
63754-atomic_t fscache_n_object_lookups;
63755-atomic_t fscache_n_object_lookups_negative;
63756-atomic_t fscache_n_object_lookups_positive;
63757-atomic_t fscache_n_object_lookups_timed_out;
63758-atomic_t fscache_n_object_created;
63759-atomic_t fscache_n_object_avail;
63760-atomic_t fscache_n_object_dead;
63761+atomic_unchecked_t fscache_n_object_alloc;
63762+atomic_unchecked_t fscache_n_object_no_alloc;
63763+atomic_unchecked_t fscache_n_object_lookups;
63764+atomic_unchecked_t fscache_n_object_lookups_negative;
63765+atomic_unchecked_t fscache_n_object_lookups_positive;
63766+atomic_unchecked_t fscache_n_object_lookups_timed_out;
63767+atomic_unchecked_t fscache_n_object_created;
63768+atomic_unchecked_t fscache_n_object_avail;
63769+atomic_unchecked_t fscache_n_object_dead;
63770
63771-atomic_t fscache_n_checkaux_none;
63772-atomic_t fscache_n_checkaux_okay;
63773-atomic_t fscache_n_checkaux_update;
63774-atomic_t fscache_n_checkaux_obsolete;
63775+atomic_unchecked_t fscache_n_checkaux_none;
63776+atomic_unchecked_t fscache_n_checkaux_okay;
63777+atomic_unchecked_t fscache_n_checkaux_update;
63778+atomic_unchecked_t fscache_n_checkaux_obsolete;
63779
63780 atomic_t fscache_n_cop_alloc_object;
63781 atomic_t fscache_n_cop_lookup_object;
63782@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63783 seq_puts(m, "FS-Cache statistics\n");
63784
63785 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63786- atomic_read(&fscache_n_cookie_index),
63787- atomic_read(&fscache_n_cookie_data),
63788- atomic_read(&fscache_n_cookie_special));
63789+ atomic_read_unchecked(&fscache_n_cookie_index),
63790+ atomic_read_unchecked(&fscache_n_cookie_data),
63791+ atomic_read_unchecked(&fscache_n_cookie_special));
63792
63793 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63794- atomic_read(&fscache_n_object_alloc),
63795- atomic_read(&fscache_n_object_no_alloc),
63796- atomic_read(&fscache_n_object_avail),
63797- atomic_read(&fscache_n_object_dead));
63798+ atomic_read_unchecked(&fscache_n_object_alloc),
63799+ atomic_read_unchecked(&fscache_n_object_no_alloc),
63800+ atomic_read_unchecked(&fscache_n_object_avail),
63801+ atomic_read_unchecked(&fscache_n_object_dead));
63802 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63803- atomic_read(&fscache_n_checkaux_none),
63804- atomic_read(&fscache_n_checkaux_okay),
63805- atomic_read(&fscache_n_checkaux_update),
63806- atomic_read(&fscache_n_checkaux_obsolete));
63807+ atomic_read_unchecked(&fscache_n_checkaux_none),
63808+ atomic_read_unchecked(&fscache_n_checkaux_okay),
63809+ atomic_read_unchecked(&fscache_n_checkaux_update),
63810+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63811
63812 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63813- atomic_read(&fscache_n_marks),
63814- atomic_read(&fscache_n_uncaches));
63815+ atomic_read_unchecked(&fscache_n_marks),
63816+ atomic_read_unchecked(&fscache_n_uncaches));
63817
63818 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63819 " oom=%u\n",
63820- atomic_read(&fscache_n_acquires),
63821- atomic_read(&fscache_n_acquires_null),
63822- atomic_read(&fscache_n_acquires_no_cache),
63823- atomic_read(&fscache_n_acquires_ok),
63824- atomic_read(&fscache_n_acquires_nobufs),
63825- atomic_read(&fscache_n_acquires_oom));
63826+ atomic_read_unchecked(&fscache_n_acquires),
63827+ atomic_read_unchecked(&fscache_n_acquires_null),
63828+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
63829+ atomic_read_unchecked(&fscache_n_acquires_ok),
63830+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
63831+ atomic_read_unchecked(&fscache_n_acquires_oom));
63832
63833 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63834- atomic_read(&fscache_n_object_lookups),
63835- atomic_read(&fscache_n_object_lookups_negative),
63836- atomic_read(&fscache_n_object_lookups_positive),
63837- atomic_read(&fscache_n_object_created),
63838- atomic_read(&fscache_n_object_lookups_timed_out));
63839+ atomic_read_unchecked(&fscache_n_object_lookups),
63840+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
63841+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
63842+ atomic_read_unchecked(&fscache_n_object_created),
63843+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63844
63845 seq_printf(m, "Invals : n=%u run=%u\n",
63846- atomic_read(&fscache_n_invalidates),
63847- atomic_read(&fscache_n_invalidates_run));
63848+ atomic_read_unchecked(&fscache_n_invalidates),
63849+ atomic_read_unchecked(&fscache_n_invalidates_run));
63850
63851 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63852- atomic_read(&fscache_n_updates),
63853- atomic_read(&fscache_n_updates_null),
63854- atomic_read(&fscache_n_updates_run));
63855+ atomic_read_unchecked(&fscache_n_updates),
63856+ atomic_read_unchecked(&fscache_n_updates_null),
63857+ atomic_read_unchecked(&fscache_n_updates_run));
63858
63859 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63860- atomic_read(&fscache_n_relinquishes),
63861- atomic_read(&fscache_n_relinquishes_null),
63862- atomic_read(&fscache_n_relinquishes_waitcrt),
63863- atomic_read(&fscache_n_relinquishes_retire));
63864+ atomic_read_unchecked(&fscache_n_relinquishes),
63865+ atomic_read_unchecked(&fscache_n_relinquishes_null),
63866+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63867+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
63868
63869 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63870- atomic_read(&fscache_n_attr_changed),
63871- atomic_read(&fscache_n_attr_changed_ok),
63872- atomic_read(&fscache_n_attr_changed_nobufs),
63873- atomic_read(&fscache_n_attr_changed_nomem),
63874- atomic_read(&fscache_n_attr_changed_calls));
63875+ atomic_read_unchecked(&fscache_n_attr_changed),
63876+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
63877+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63878+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63879+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
63880
63881 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63882- atomic_read(&fscache_n_allocs),
63883- atomic_read(&fscache_n_allocs_ok),
63884- atomic_read(&fscache_n_allocs_wait),
63885- atomic_read(&fscache_n_allocs_nobufs),
63886- atomic_read(&fscache_n_allocs_intr));
63887+ atomic_read_unchecked(&fscache_n_allocs),
63888+ atomic_read_unchecked(&fscache_n_allocs_ok),
63889+ atomic_read_unchecked(&fscache_n_allocs_wait),
63890+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
63891+ atomic_read_unchecked(&fscache_n_allocs_intr));
63892 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63893- atomic_read(&fscache_n_alloc_ops),
63894- atomic_read(&fscache_n_alloc_op_waits),
63895- atomic_read(&fscache_n_allocs_object_dead));
63896+ atomic_read_unchecked(&fscache_n_alloc_ops),
63897+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
63898+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
63899
63900 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63901 " int=%u oom=%u\n",
63902- atomic_read(&fscache_n_retrievals),
63903- atomic_read(&fscache_n_retrievals_ok),
63904- atomic_read(&fscache_n_retrievals_wait),
63905- atomic_read(&fscache_n_retrievals_nodata),
63906- atomic_read(&fscache_n_retrievals_nobufs),
63907- atomic_read(&fscache_n_retrievals_intr),
63908- atomic_read(&fscache_n_retrievals_nomem));
63909+ atomic_read_unchecked(&fscache_n_retrievals),
63910+ atomic_read_unchecked(&fscache_n_retrievals_ok),
63911+ atomic_read_unchecked(&fscache_n_retrievals_wait),
63912+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
63913+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63914+ atomic_read_unchecked(&fscache_n_retrievals_intr),
63915+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
63916 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63917- atomic_read(&fscache_n_retrieval_ops),
63918- atomic_read(&fscache_n_retrieval_op_waits),
63919- atomic_read(&fscache_n_retrievals_object_dead));
63920+ atomic_read_unchecked(&fscache_n_retrieval_ops),
63921+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63922+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63923
63924 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63925- atomic_read(&fscache_n_stores),
63926- atomic_read(&fscache_n_stores_ok),
63927- atomic_read(&fscache_n_stores_again),
63928- atomic_read(&fscache_n_stores_nobufs),
63929- atomic_read(&fscache_n_stores_oom));
63930+ atomic_read_unchecked(&fscache_n_stores),
63931+ atomic_read_unchecked(&fscache_n_stores_ok),
63932+ atomic_read_unchecked(&fscache_n_stores_again),
63933+ atomic_read_unchecked(&fscache_n_stores_nobufs),
63934+ atomic_read_unchecked(&fscache_n_stores_oom));
63935 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63936- atomic_read(&fscache_n_store_ops),
63937- atomic_read(&fscache_n_store_calls),
63938- atomic_read(&fscache_n_store_pages),
63939- atomic_read(&fscache_n_store_radix_deletes),
63940- atomic_read(&fscache_n_store_pages_over_limit));
63941+ atomic_read_unchecked(&fscache_n_store_ops),
63942+ atomic_read_unchecked(&fscache_n_store_calls),
63943+ atomic_read_unchecked(&fscache_n_store_pages),
63944+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
63945+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63946
63947 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63948- atomic_read(&fscache_n_store_vmscan_not_storing),
63949- atomic_read(&fscache_n_store_vmscan_gone),
63950- atomic_read(&fscache_n_store_vmscan_busy),
63951- atomic_read(&fscache_n_store_vmscan_cancelled),
63952- atomic_read(&fscache_n_store_vmscan_wait));
63953+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63954+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63955+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63956+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63957+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63958
63959 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63960- atomic_read(&fscache_n_op_pend),
63961- atomic_read(&fscache_n_op_run),
63962- atomic_read(&fscache_n_op_enqueue),
63963- atomic_read(&fscache_n_op_cancelled),
63964- atomic_read(&fscache_n_op_rejected));
63965+ atomic_read_unchecked(&fscache_n_op_pend),
63966+ atomic_read_unchecked(&fscache_n_op_run),
63967+ atomic_read_unchecked(&fscache_n_op_enqueue),
63968+ atomic_read_unchecked(&fscache_n_op_cancelled),
63969+ atomic_read_unchecked(&fscache_n_op_rejected));
63970 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63971- atomic_read(&fscache_n_op_deferred_release),
63972- atomic_read(&fscache_n_op_release),
63973- atomic_read(&fscache_n_op_gc));
63974+ atomic_read_unchecked(&fscache_n_op_deferred_release),
63975+ atomic_read_unchecked(&fscache_n_op_release),
63976+ atomic_read_unchecked(&fscache_n_op_gc));
63977
63978 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63979 atomic_read(&fscache_n_cop_alloc_object),
63980diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63981index 28d0c7a..04816b7 100644
63982--- a/fs/fuse/cuse.c
63983+++ b/fs/fuse/cuse.c
63984@@ -611,10 +611,12 @@ static int __init cuse_init(void)
63985 INIT_LIST_HEAD(&cuse_conntbl[i]);
63986
63987 /* inherit and extend fuse_dev_operations */
63988- cuse_channel_fops = fuse_dev_operations;
63989- cuse_channel_fops.owner = THIS_MODULE;
63990- cuse_channel_fops.open = cuse_channel_open;
63991- cuse_channel_fops.release = cuse_channel_release;
63992+ pax_open_kernel();
63993+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63994+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63995+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
63996+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
63997+ pax_close_kernel();
63998
63999 cuse_class = class_create(THIS_MODULE, "cuse");
64000 if (IS_ERR(cuse_class))
64001diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
64002index 71c4619..6a9f6d4 100644
64003--- a/fs/fuse/dev.c
64004+++ b/fs/fuse/dev.c
64005@@ -1394,7 +1394,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64006 ret = 0;
64007 pipe_lock(pipe);
64008
64009- if (!pipe->readers) {
64010+ if (!atomic_read(&pipe->readers)) {
64011 send_sig(SIGPIPE, current, 0);
64012 if (!ret)
64013 ret = -EPIPE;
64014@@ -1423,7 +1423,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64015 page_nr++;
64016 ret += buf->len;
64017
64018- if (pipe->files)
64019+ if (atomic_read(&pipe->files))
64020 do_wakeup = 1;
64021 }
64022
64023diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
64024index 08e7b1a..d91c6ee 100644
64025--- a/fs/fuse/dir.c
64026+++ b/fs/fuse/dir.c
64027@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
64028 return link;
64029 }
64030
64031-static void free_link(char *link)
64032+static void free_link(const char *link)
64033 {
64034 if (!IS_ERR(link))
64035 free_page((unsigned long) link);
64036diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
64037index fd62cae..3494dfa 100644
64038--- a/fs/hostfs/hostfs_kern.c
64039+++ b/fs/hostfs/hostfs_kern.c
64040@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
64041
64042 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
64043 {
64044- char *s = nd_get_link(nd);
64045+ const char *s = nd_get_link(nd);
64046 if (!IS_ERR(s))
64047 __putname(s);
64048 }
64049diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
64050index 5eba47f..d353c22 100644
64051--- a/fs/hugetlbfs/inode.c
64052+++ b/fs/hugetlbfs/inode.c
64053@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64054 struct mm_struct *mm = current->mm;
64055 struct vm_area_struct *vma;
64056 struct hstate *h = hstate_file(file);
64057+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
64058 struct vm_unmapped_area_info info;
64059
64060 if (len & ~huge_page_mask(h))
64061@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64062 return addr;
64063 }
64064
64065+#ifdef CONFIG_PAX_RANDMMAP
64066+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
64067+#endif
64068+
64069 if (addr) {
64070 addr = ALIGN(addr, huge_page_size(h));
64071 vma = find_vma(mm, addr);
64072- if (TASK_SIZE - len >= addr &&
64073- (!vma || addr + len <= vma->vm_start))
64074+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
64075 return addr;
64076 }
64077
64078 info.flags = 0;
64079 info.length = len;
64080 info.low_limit = TASK_UNMAPPED_BASE;
64081+
64082+#ifdef CONFIG_PAX_RANDMMAP
64083+ if (mm->pax_flags & MF_PAX_RANDMMAP)
64084+ info.low_limit += mm->delta_mmap;
64085+#endif
64086+
64087 info.high_limit = TASK_SIZE;
64088 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
64089 info.align_offset = 0;
64090@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
64091 };
64092 MODULE_ALIAS_FS("hugetlbfs");
64093
64094-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64095+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64096
64097 static int can_do_hugetlb_shm(void)
64098 {
64099diff --git a/fs/inode.c b/fs/inode.c
64100index aa149e7..46f1f65 100644
64101--- a/fs/inode.c
64102+++ b/fs/inode.c
64103@@ -842,16 +842,20 @@ unsigned int get_next_ino(void)
64104 unsigned int *p = &get_cpu_var(last_ino);
64105 unsigned int res = *p;
64106
64107+start:
64108+
64109 #ifdef CONFIG_SMP
64110 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
64111- static atomic_t shared_last_ino;
64112- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
64113+ static atomic_unchecked_t shared_last_ino;
64114+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
64115
64116 res = next - LAST_INO_BATCH;
64117 }
64118 #endif
64119
64120- *p = ++res;
64121+ if (unlikely(!++res))
64122+ goto start; /* never zero */
64123+ *p = res;
64124 put_cpu_var(last_ino);
64125 return res;
64126 }
64127diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
64128index 4a6cf28..d3a29d3 100644
64129--- a/fs/jffs2/erase.c
64130+++ b/fs/jffs2/erase.c
64131@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
64132 struct jffs2_unknown_node marker = {
64133 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
64134 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64135- .totlen = cpu_to_je32(c->cleanmarker_size)
64136+ .totlen = cpu_to_je32(c->cleanmarker_size),
64137+ .hdr_crc = cpu_to_je32(0)
64138 };
64139
64140 jffs2_prealloc_raw_node_refs(c, jeb, 1);
64141diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
64142index 09ed551..45684f8 100644
64143--- a/fs/jffs2/wbuf.c
64144+++ b/fs/jffs2/wbuf.c
64145@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
64146 {
64147 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
64148 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64149- .totlen = constant_cpu_to_je32(8)
64150+ .totlen = constant_cpu_to_je32(8),
64151+ .hdr_crc = constant_cpu_to_je32(0)
64152 };
64153
64154 /*
64155diff --git a/fs/jfs/super.c b/fs/jfs/super.c
64156index 16c3a95..e9cb75d 100644
64157--- a/fs/jfs/super.c
64158+++ b/fs/jfs/super.c
64159@@ -902,7 +902,7 @@ static int __init init_jfs_fs(void)
64160
64161 jfs_inode_cachep =
64162 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
64163- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
64164+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
64165 init_once);
64166 if (jfs_inode_cachep == NULL)
64167 return -ENOMEM;
64168diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
64169index 2d881b3..fe1ac77 100644
64170--- a/fs/kernfs/dir.c
64171+++ b/fs/kernfs/dir.c
64172@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
64173 *
64174 * Returns 31 bit hash of ns + name (so it fits in an off_t )
64175 */
64176-static unsigned int kernfs_name_hash(const char *name, const void *ns)
64177+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
64178 {
64179 unsigned long hash = init_name_hash();
64180 unsigned int len = strlen(name);
64181@@ -833,6 +833,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
64182 ret = scops->mkdir(parent, dentry->d_name.name, mode);
64183
64184 kernfs_put_active(parent);
64185+
64186+ if (!ret) {
64187+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
64188+ ret = PTR_ERR_OR_ZERO(dentry_ret);
64189+ }
64190+
64191 return ret;
64192 }
64193
64194diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
64195index ddc9f96..4e450ad 100644
64196--- a/fs/kernfs/file.c
64197+++ b/fs/kernfs/file.c
64198@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
64199
64200 struct kernfs_open_node {
64201 atomic_t refcnt;
64202- atomic_t event;
64203+ atomic_unchecked_t event;
64204 wait_queue_head_t poll;
64205 struct list_head files; /* goes through kernfs_open_file.list */
64206 };
64207@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
64208 {
64209 struct kernfs_open_file *of = sf->private;
64210
64211- of->event = atomic_read(&of->kn->attr.open->event);
64212+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
64213
64214 return of->kn->attr.ops->seq_show(sf, v);
64215 }
64216@@ -271,7 +271,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
64217 {
64218 struct kernfs_open_file *of = kernfs_of(file);
64219 const struct kernfs_ops *ops;
64220- size_t len;
64221+ ssize_t len;
64222 char *buf;
64223
64224 if (of->atomic_write_len) {
64225@@ -384,12 +384,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
64226 return ret;
64227 }
64228
64229-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64230- void *buf, int len, int write)
64231+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64232+ void *buf, size_t len, int write)
64233 {
64234 struct file *file = vma->vm_file;
64235 struct kernfs_open_file *of = kernfs_of(file);
64236- int ret;
64237+ ssize_t ret;
64238
64239 if (!of->vm_ops)
64240 return -EINVAL;
64241@@ -568,7 +568,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
64242 return -ENOMEM;
64243
64244 atomic_set(&new_on->refcnt, 0);
64245- atomic_set(&new_on->event, 1);
64246+ atomic_set_unchecked(&new_on->event, 1);
64247 init_waitqueue_head(&new_on->poll);
64248 INIT_LIST_HEAD(&new_on->files);
64249 goto retry;
64250@@ -792,7 +792,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
64251
64252 kernfs_put_active(kn);
64253
64254- if (of->event != atomic_read(&on->event))
64255+ if (of->event != atomic_read_unchecked(&on->event))
64256 goto trigger;
64257
64258 return DEFAULT_POLLMASK;
64259@@ -823,7 +823,7 @@ repeat:
64260
64261 on = kn->attr.open;
64262 if (on) {
64263- atomic_inc(&on->event);
64264+ atomic_inc_unchecked(&on->event);
64265 wake_up_interruptible(&on->poll);
64266 }
64267
64268diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
64269index 8a19889..4c3069a 100644
64270--- a/fs/kernfs/symlink.c
64271+++ b/fs/kernfs/symlink.c
64272@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
64273 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
64274 void *cookie)
64275 {
64276- char *page = nd_get_link(nd);
64277+ const char *page = nd_get_link(nd);
64278 if (!IS_ERR(page))
64279 free_page((unsigned long)page);
64280 }
64281diff --git a/fs/libfs.c b/fs/libfs.c
64282index 005843c..06c4191 100644
64283--- a/fs/libfs.c
64284+++ b/fs/libfs.c
64285@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64286
64287 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
64288 struct dentry *next = list_entry(p, struct dentry, d_child);
64289+ char d_name[sizeof(next->d_iname)];
64290+ const unsigned char *name;
64291+
64292 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
64293 if (!simple_positive(next)) {
64294 spin_unlock(&next->d_lock);
64295@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64296
64297 spin_unlock(&next->d_lock);
64298 spin_unlock(&dentry->d_lock);
64299- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
64300+ name = next->d_name.name;
64301+ if (name == next->d_iname) {
64302+ memcpy(d_name, name, next->d_name.len);
64303+ name = d_name;
64304+ }
64305+ if (!dir_emit(ctx, name, next->d_name.len,
64306 next->d_inode->i_ino, dt_type(next->d_inode)))
64307 return 0;
64308 spin_lock(&dentry->d_lock);
64309@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
64310 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
64311 void *cookie)
64312 {
64313- char *s = nd_get_link(nd);
64314+ const char *s = nd_get_link(nd);
64315 if (!IS_ERR(s))
64316 kfree(s);
64317 }
64318diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
64319index acd3947..1f896e2 100644
64320--- a/fs/lockd/clntproc.c
64321+++ b/fs/lockd/clntproc.c
64322@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
64323 /*
64324 * Cookie counter for NLM requests
64325 */
64326-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
64327+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
64328
64329 void nlmclnt_next_cookie(struct nlm_cookie *c)
64330 {
64331- u32 cookie = atomic_inc_return(&nlm_cookie);
64332+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
64333
64334 memcpy(c->data, &cookie, 4);
64335 c->len=4;
64336diff --git a/fs/locks.c b/fs/locks.c
64337index 59e2f90..bd69071 100644
64338--- a/fs/locks.c
64339+++ b/fs/locks.c
64340@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
64341 locks_remove_posix(filp, filp);
64342
64343 if (filp->f_op->flock) {
64344- struct file_lock fl = {
64345+ struct file_lock flock = {
64346 .fl_owner = filp,
64347 .fl_pid = current->tgid,
64348 .fl_file = filp,
64349@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
64350 .fl_type = F_UNLCK,
64351 .fl_end = OFFSET_MAX,
64352 };
64353- filp->f_op->flock(filp, F_SETLKW, &fl);
64354- if (fl.fl_ops && fl.fl_ops->fl_release_private)
64355- fl.fl_ops->fl_release_private(&fl);
64356+ filp->f_op->flock(filp, F_SETLKW, &flock);
64357+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
64358+ flock.fl_ops->fl_release_private(&flock);
64359 }
64360
64361 spin_lock(&inode->i_lock);
64362diff --git a/fs/mount.h b/fs/mount.h
64363index 0ad6f76..a04c146 100644
64364--- a/fs/mount.h
64365+++ b/fs/mount.h
64366@@ -12,7 +12,7 @@ struct mnt_namespace {
64367 u64 seq; /* Sequence number to prevent loops */
64368 wait_queue_head_t poll;
64369 u64 event;
64370-};
64371+} __randomize_layout;
64372
64373 struct mnt_pcp {
64374 int mnt_count;
64375@@ -63,7 +63,7 @@ struct mount {
64376 int mnt_expiry_mark; /* true if marked for expiry */
64377 struct hlist_head mnt_pins;
64378 struct path mnt_ex_mountpoint;
64379-};
64380+} __randomize_layout;
64381
64382 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
64383
64384diff --git a/fs/namei.c b/fs/namei.c
64385index bc35b02..7ed1f1d 100644
64386--- a/fs/namei.c
64387+++ b/fs/namei.c
64388@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
64389 if (ret != -EACCES)
64390 return ret;
64391
64392+#ifdef CONFIG_GRKERNSEC
64393+ /* we'll block if we have to log due to a denied capability use */
64394+ if (mask & MAY_NOT_BLOCK)
64395+ return -ECHILD;
64396+#endif
64397+
64398 if (S_ISDIR(inode->i_mode)) {
64399 /* DACs are overridable for directories */
64400- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64401- return 0;
64402 if (!(mask & MAY_WRITE))
64403- if (capable_wrt_inode_uidgid(inode,
64404- CAP_DAC_READ_SEARCH))
64405+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64406+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64407 return 0;
64408+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64409+ return 0;
64410 return -EACCES;
64411 }
64412 /*
64413+ * Searching includes executable on directories, else just read.
64414+ */
64415+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64416+ if (mask == MAY_READ)
64417+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64418+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64419+ return 0;
64420+
64421+ /*
64422 * Read/write DACs are always overridable.
64423 * Executable DACs are overridable when there is
64424 * at least one exec bit set.
64425@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
64426 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64427 return 0;
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(inode, CAP_DAC_READ_SEARCH))
64435- return 0;
64436-
64437 return -EACCES;
64438 }
64439 EXPORT_SYMBOL(generic_permission);
64440@@ -497,7 +504,7 @@ struct nameidata {
64441 int last_type;
64442 unsigned depth;
64443 struct file *base;
64444- char *saved_names[MAX_NESTED_LINKS + 1];
64445+ const char *saved_names[MAX_NESTED_LINKS + 1];
64446 };
64447
64448 /*
64449@@ -708,13 +715,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
64450 nd->flags |= LOOKUP_JUMPED;
64451 }
64452
64453-void nd_set_link(struct nameidata *nd, char *path)
64454+void nd_set_link(struct nameidata *nd, const char *path)
64455 {
64456 nd->saved_names[nd->depth] = path;
64457 }
64458 EXPORT_SYMBOL(nd_set_link);
64459
64460-char *nd_get_link(struct nameidata *nd)
64461+const char *nd_get_link(const struct nameidata *nd)
64462 {
64463 return nd->saved_names[nd->depth];
64464 }
64465@@ -849,7 +856,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64466 {
64467 struct dentry *dentry = link->dentry;
64468 int error;
64469- char *s;
64470+ const char *s;
64471
64472 BUG_ON(nd->flags & LOOKUP_RCU);
64473
64474@@ -870,6 +877,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64475 if (error)
64476 goto out_put_nd_path;
64477
64478+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
64479+ dentry->d_inode, dentry, nd->path.mnt)) {
64480+ error = -EACCES;
64481+ goto out_put_nd_path;
64482+ }
64483+
64484 nd->last_type = LAST_BIND;
64485 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
64486 error = PTR_ERR(*p);
64487@@ -1633,6 +1646,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
64488 if (res)
64489 break;
64490 res = walk_component(nd, path, LOOKUP_FOLLOW);
64491+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
64492+ res = -EACCES;
64493 put_link(nd, &link, cookie);
64494 } while (res > 0);
64495
64496@@ -1705,7 +1720,7 @@ EXPORT_SYMBOL(full_name_hash);
64497 static inline u64 hash_name(const char *name)
64498 {
64499 unsigned long a, b, adata, bdata, mask, hash, len;
64500- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64501+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64502
64503 hash = a = 0;
64504 len = -sizeof(unsigned long);
64505@@ -2000,6 +2015,8 @@ static int path_lookupat(int dfd, const char *name,
64506 if (err)
64507 break;
64508 err = lookup_last(nd, &path);
64509+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
64510+ err = -EACCES;
64511 put_link(nd, &link, cookie);
64512 }
64513 }
64514@@ -2007,6 +2024,13 @@ static int path_lookupat(int dfd, const char *name,
64515 if (!err)
64516 err = complete_walk(nd);
64517
64518+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
64519+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64520+ path_put(&nd->path);
64521+ err = -ENOENT;
64522+ }
64523+ }
64524+
64525 if (!err && nd->flags & LOOKUP_DIRECTORY) {
64526 if (!d_can_lookup(nd->path.dentry)) {
64527 path_put(&nd->path);
64528@@ -2028,8 +2052,15 @@ static int filename_lookup(int dfd, struct filename *name,
64529 retval = path_lookupat(dfd, name->name,
64530 flags | LOOKUP_REVAL, nd);
64531
64532- if (likely(!retval))
64533+ if (likely(!retval)) {
64534 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
64535+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
64536+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
64537+ path_put(&nd->path);
64538+ return -ENOENT;
64539+ }
64540+ }
64541+ }
64542 return retval;
64543 }
64544
64545@@ -2595,6 +2626,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
64546 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
64547 return -EPERM;
64548
64549+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
64550+ return -EPERM;
64551+ if (gr_handle_rawio(inode))
64552+ return -EPERM;
64553+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
64554+ return -EACCES;
64555+
64556 return 0;
64557 }
64558
64559@@ -2826,7 +2864,7 @@ looked_up:
64560 * cleared otherwise prior to returning.
64561 */
64562 static int lookup_open(struct nameidata *nd, struct path *path,
64563- struct file *file,
64564+ struct path *link, struct file *file,
64565 const struct open_flags *op,
64566 bool got_write, int *opened)
64567 {
64568@@ -2861,6 +2899,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64569 /* Negative dentry, just create the file */
64570 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
64571 umode_t mode = op->mode;
64572+
64573+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
64574+ error = -EACCES;
64575+ goto out_dput;
64576+ }
64577+
64578+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
64579+ error = -EACCES;
64580+ goto out_dput;
64581+ }
64582+
64583 if (!IS_POSIXACL(dir->d_inode))
64584 mode &= ~current_umask();
64585 /*
64586@@ -2882,6 +2931,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64587 nd->flags & LOOKUP_EXCL);
64588 if (error)
64589 goto out_dput;
64590+ else
64591+ gr_handle_create(dentry, nd->path.mnt);
64592 }
64593 out_no_open:
64594 path->dentry = dentry;
64595@@ -2896,7 +2947,7 @@ out_dput:
64596 /*
64597 * Handle the last step of open()
64598 */
64599-static int do_last(struct nameidata *nd, struct path *path,
64600+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
64601 struct file *file, const struct open_flags *op,
64602 int *opened, struct filename *name)
64603 {
64604@@ -2946,6 +2997,15 @@ static int do_last(struct nameidata *nd, struct path *path,
64605 if (error)
64606 return error;
64607
64608+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
64609+ error = -ENOENT;
64610+ goto out;
64611+ }
64612+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64613+ error = -EACCES;
64614+ goto out;
64615+ }
64616+
64617 audit_inode(name, dir, LOOKUP_PARENT);
64618 error = -EISDIR;
64619 /* trailing slashes? */
64620@@ -2965,7 +3025,7 @@ retry_lookup:
64621 */
64622 }
64623 mutex_lock(&dir->d_inode->i_mutex);
64624- error = lookup_open(nd, path, file, op, got_write, opened);
64625+ error = lookup_open(nd, path, link, file, op, got_write, opened);
64626 mutex_unlock(&dir->d_inode->i_mutex);
64627
64628 if (error <= 0) {
64629@@ -2989,11 +3049,28 @@ retry_lookup:
64630 goto finish_open_created;
64631 }
64632
64633+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64634+ error = -ENOENT;
64635+ goto exit_dput;
64636+ }
64637+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64638+ error = -EACCES;
64639+ goto exit_dput;
64640+ }
64641+
64642 /*
64643 * create/update audit record if it already exists.
64644 */
64645- if (d_is_positive(path->dentry))
64646+ if (d_is_positive(path->dentry)) {
64647+ /* only check if O_CREAT is specified, all other checks need to go
64648+ into may_open */
64649+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64650+ error = -EACCES;
64651+ goto exit_dput;
64652+ }
64653+
64654 audit_inode(name, path->dentry, 0);
64655+ }
64656
64657 /*
64658 * If atomic_open() acquired write access it is dropped now due to
64659@@ -3034,6 +3111,11 @@ finish_lookup:
64660 }
64661 }
64662 BUG_ON(inode != path->dentry->d_inode);
64663+ /* if we're resolving a symlink to another symlink */
64664+ if (link && gr_handle_symlink_owner(link, inode)) {
64665+ error = -EACCES;
64666+ goto out;
64667+ }
64668 return 1;
64669 }
64670
64671@@ -3053,7 +3135,18 @@ finish_open:
64672 path_put(&save_parent);
64673 return error;
64674 }
64675+
64676+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64677+ error = -ENOENT;
64678+ goto out;
64679+ }
64680+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64681+ error = -EACCES;
64682+ goto out;
64683+ }
64684+
64685 audit_inode(name, nd->path.dentry, 0);
64686+
64687 error = -EISDIR;
64688 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64689 goto out;
64690@@ -3214,7 +3307,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64691 if (unlikely(error))
64692 goto out;
64693
64694- error = do_last(nd, &path, file, op, &opened, pathname);
64695+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64696 while (unlikely(error > 0)) { /* trailing symlink */
64697 struct path link = path;
64698 void *cookie;
64699@@ -3232,7 +3325,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64700 error = follow_link(&link, nd, &cookie);
64701 if (unlikely(error))
64702 break;
64703- error = do_last(nd, &path, file, op, &opened, pathname);
64704+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
64705 put_link(nd, &link, cookie);
64706 }
64707 out:
64708@@ -3329,9 +3422,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64709 goto unlock;
64710
64711 error = -EEXIST;
64712- if (d_is_positive(dentry))
64713+ if (d_is_positive(dentry)) {
64714+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64715+ error = -ENOENT;
64716 goto fail;
64717-
64718+ }
64719 /*
64720 * Special case - lookup gave negative, but... we had foo/bar/
64721 * From the vfs_mknod() POV we just have a negative dentry -
64722@@ -3383,6 +3478,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64723 }
64724 EXPORT_SYMBOL(user_path_create);
64725
64726+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64727+{
64728+ struct filename *tmp = getname(pathname);
64729+ struct dentry *res;
64730+ if (IS_ERR(tmp))
64731+ return ERR_CAST(tmp);
64732+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64733+ if (IS_ERR(res))
64734+ putname(tmp);
64735+ else
64736+ *to = tmp;
64737+ return res;
64738+}
64739+
64740 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64741 {
64742 int error = may_create(dir, dentry);
64743@@ -3446,6 +3555,17 @@ retry:
64744
64745 if (!IS_POSIXACL(path.dentry->d_inode))
64746 mode &= ~current_umask();
64747+
64748+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64749+ error = -EPERM;
64750+ goto out;
64751+ }
64752+
64753+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64754+ error = -EACCES;
64755+ goto out;
64756+ }
64757+
64758 error = security_path_mknod(&path, dentry, mode, dev);
64759 if (error)
64760 goto out;
64761@@ -3461,6 +3581,8 @@ retry:
64762 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64763 break;
64764 }
64765+ if (!error)
64766+ gr_handle_create(dentry, path.mnt);
64767 out:
64768 done_path_create(&path, dentry);
64769 if (retry_estale(error, lookup_flags)) {
64770@@ -3515,9 +3637,16 @@ retry:
64771
64772 if (!IS_POSIXACL(path.dentry->d_inode))
64773 mode &= ~current_umask();
64774+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64775+ error = -EACCES;
64776+ goto out;
64777+ }
64778 error = security_path_mkdir(&path, dentry, mode);
64779 if (!error)
64780 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64781+ if (!error)
64782+ gr_handle_create(dentry, path.mnt);
64783+out:
64784 done_path_create(&path, dentry);
64785 if (retry_estale(error, lookup_flags)) {
64786 lookup_flags |= LOOKUP_REVAL;
64787@@ -3601,6 +3730,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64788 struct filename *name;
64789 struct dentry *dentry;
64790 struct nameidata nd;
64791+ u64 saved_ino = 0;
64792+ dev_t saved_dev = 0;
64793 unsigned int lookup_flags = 0;
64794 retry:
64795 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64796@@ -3633,10 +3764,21 @@ retry:
64797 error = -ENOENT;
64798 goto exit3;
64799 }
64800+
64801+ saved_ino = gr_get_ino_from_dentry(dentry);
64802+ saved_dev = gr_get_dev_from_dentry(dentry);
64803+
64804+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64805+ error = -EACCES;
64806+ goto exit3;
64807+ }
64808+
64809 error = security_path_rmdir(&nd.path, dentry);
64810 if (error)
64811 goto exit3;
64812 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64813+ if (!error && (saved_dev || saved_ino))
64814+ gr_handle_delete(saved_ino, saved_dev);
64815 exit3:
64816 dput(dentry);
64817 exit2:
64818@@ -3729,6 +3871,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64819 struct nameidata nd;
64820 struct inode *inode = NULL;
64821 struct inode *delegated_inode = NULL;
64822+ u64 saved_ino = 0;
64823+ dev_t saved_dev = 0;
64824 unsigned int lookup_flags = 0;
64825 retry:
64826 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64827@@ -3755,10 +3899,22 @@ retry_deleg:
64828 if (d_is_negative(dentry))
64829 goto slashes;
64830 ihold(inode);
64831+
64832+ if (inode->i_nlink <= 1) {
64833+ saved_ino = gr_get_ino_from_dentry(dentry);
64834+ saved_dev = gr_get_dev_from_dentry(dentry);
64835+ }
64836+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64837+ error = -EACCES;
64838+ goto exit2;
64839+ }
64840+
64841 error = security_path_unlink(&nd.path, dentry);
64842 if (error)
64843 goto exit2;
64844 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64845+ if (!error && (saved_ino || saved_dev))
64846+ gr_handle_delete(saved_ino, saved_dev);
64847 exit2:
64848 dput(dentry);
64849 }
64850@@ -3847,9 +4003,17 @@ retry:
64851 if (IS_ERR(dentry))
64852 goto out_putname;
64853
64854+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64855+ error = -EACCES;
64856+ goto out;
64857+ }
64858+
64859 error = security_path_symlink(&path, dentry, from->name);
64860 if (!error)
64861 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64862+ if (!error)
64863+ gr_handle_create(dentry, path.mnt);
64864+out:
64865 done_path_create(&path, dentry);
64866 if (retry_estale(error, lookup_flags)) {
64867 lookup_flags |= LOOKUP_REVAL;
64868@@ -3953,6 +4117,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64869 struct dentry *new_dentry;
64870 struct path old_path, new_path;
64871 struct inode *delegated_inode = NULL;
64872+ struct filename *to = NULL;
64873 int how = 0;
64874 int error;
64875
64876@@ -3976,7 +4141,7 @@ retry:
64877 if (error)
64878 return error;
64879
64880- new_dentry = user_path_create(newdfd, newname, &new_path,
64881+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64882 (how & LOOKUP_REVAL));
64883 error = PTR_ERR(new_dentry);
64884 if (IS_ERR(new_dentry))
64885@@ -3988,11 +4153,28 @@ retry:
64886 error = may_linkat(&old_path);
64887 if (unlikely(error))
64888 goto out_dput;
64889+
64890+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64891+ old_path.dentry->d_inode,
64892+ old_path.dentry->d_inode->i_mode, to)) {
64893+ error = -EACCES;
64894+ goto out_dput;
64895+ }
64896+
64897+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64898+ old_path.dentry, old_path.mnt, to)) {
64899+ error = -EACCES;
64900+ goto out_dput;
64901+ }
64902+
64903 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64904 if (error)
64905 goto out_dput;
64906 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64907+ if (!error)
64908+ gr_handle_create(new_dentry, new_path.mnt);
64909 out_dput:
64910+ putname(to);
64911 done_path_create(&new_path, new_dentry);
64912 if (delegated_inode) {
64913 error = break_deleg_wait(&delegated_inode);
64914@@ -4308,6 +4490,20 @@ retry_deleg:
64915 if (new_dentry == trap)
64916 goto exit5;
64917
64918+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
64919+ /* use EXDEV error to cause 'mv' to switch to an alternative
64920+ * method for usability
64921+ */
64922+ error = -EXDEV;
64923+ goto exit5;
64924+ }
64925+
64926+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64927+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
64928+ to, flags);
64929+ if (error)
64930+ goto exit5;
64931+
64932 error = security_path_rename(&oldnd.path, old_dentry,
64933 &newnd.path, new_dentry, flags);
64934 if (error)
64935@@ -4315,6 +4511,9 @@ retry_deleg:
64936 error = vfs_rename(old_dir->d_inode, old_dentry,
64937 new_dir->d_inode, new_dentry,
64938 &delegated_inode, flags);
64939+ if (!error)
64940+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64941+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64942 exit5:
64943 dput(new_dentry);
64944 exit4:
64945@@ -4371,14 +4570,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64946
64947 int readlink_copy(char __user *buffer, int buflen, const char *link)
64948 {
64949+ char tmpbuf[64];
64950+ const char *newlink;
64951 int len = PTR_ERR(link);
64952+
64953 if (IS_ERR(link))
64954 goto out;
64955
64956 len = strlen(link);
64957 if (len > (unsigned) buflen)
64958 len = buflen;
64959- if (copy_to_user(buffer, link, len))
64960+
64961+ if (len < sizeof(tmpbuf)) {
64962+ memcpy(tmpbuf, link, len);
64963+ newlink = tmpbuf;
64964+ } else
64965+ newlink = link;
64966+
64967+ if (copy_to_user(buffer, newlink, len))
64968 len = -EFAULT;
64969 out:
64970 return len;
64971diff --git a/fs/namespace.c b/fs/namespace.c
64972index cd1e968..e64ff16 100644
64973--- a/fs/namespace.c
64974+++ b/fs/namespace.c
64975@@ -1448,6 +1448,9 @@ static int do_umount(struct mount *mnt, int flags)
64976 if (!(sb->s_flags & MS_RDONLY))
64977 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64978 up_write(&sb->s_umount);
64979+
64980+ gr_log_remount(mnt->mnt_devname, retval);
64981+
64982 return retval;
64983 }
64984
64985@@ -1470,6 +1473,9 @@ static int do_umount(struct mount *mnt, int flags)
64986 }
64987 unlock_mount_hash();
64988 namespace_unlock();
64989+
64990+ gr_log_unmount(mnt->mnt_devname, retval);
64991+
64992 return retval;
64993 }
64994
64995@@ -1520,7 +1526,7 @@ static inline bool may_mount(void)
64996 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64997 */
64998
64999-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
65000+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
65001 {
65002 struct path path;
65003 struct mount *mnt;
65004@@ -1565,7 +1571,7 @@ out:
65005 /*
65006 * The 2.0 compatible umount. No flags.
65007 */
65008-SYSCALL_DEFINE1(oldumount, char __user *, name)
65009+SYSCALL_DEFINE1(oldumount, const char __user *, name)
65010 {
65011 return sys_umount(name, 0);
65012 }
65013@@ -2631,6 +2637,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65014 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
65015 MS_STRICTATIME);
65016
65017+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
65018+ retval = -EPERM;
65019+ goto dput_out;
65020+ }
65021+
65022+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
65023+ retval = -EPERM;
65024+ goto dput_out;
65025+ }
65026+
65027 if (flags & MS_REMOUNT)
65028 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
65029 data_page);
65030@@ -2644,7 +2660,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65031 retval = do_new_mount(&path, type_page, flags, mnt_flags,
65032 dev_name, data_page);
65033 dput_out:
65034+ gr_log_mount(dev_name, &path, retval);
65035+
65036 path_put(&path);
65037+
65038 return retval;
65039 }
65040
65041@@ -2662,7 +2681,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
65042 * number incrementing at 10Ghz will take 12,427 years to wrap which
65043 * is effectively never, so we can ignore the possibility.
65044 */
65045-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
65046+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
65047
65048 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65049 {
65050@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65051 return ERR_PTR(ret);
65052 }
65053 new_ns->ns.ops = &mntns_operations;
65054- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
65055+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
65056 atomic_set(&new_ns->count, 1);
65057 new_ns->root = NULL;
65058 INIT_LIST_HEAD(&new_ns->list);
65059@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65060 return new_ns;
65061 }
65062
65063-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65064+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65065 struct user_namespace *user_ns, struct fs_struct *new_fs)
65066 {
65067 struct mnt_namespace *new_ns;
65068@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
65069 }
65070 EXPORT_SYMBOL(mount_subtree);
65071
65072-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
65073- char __user *, type, unsigned long, flags, void __user *, data)
65074+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
65075+ const char __user *, type, unsigned long, flags, void __user *, data)
65076 {
65077 int ret;
65078 char *kernel_type;
65079@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
65080 if (error)
65081 goto out2;
65082
65083+ if (gr_handle_chroot_pivot()) {
65084+ error = -EPERM;
65085+ goto out2;
65086+ }
65087+
65088 get_fs_root(current->fs, &root);
65089 old_mp = lock_mount(&old);
65090 error = PTR_ERR(old_mp);
65091@@ -3190,7 +3214,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
65092 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
65093 return -EPERM;
65094
65095- if (fs->users != 1)
65096+ if (atomic_read(&fs->users) != 1)
65097 return -EINVAL;
65098
65099 get_mnt_ns(mnt_ns);
65100diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
65101index 02f8d09..a5c25d1 100644
65102--- a/fs/nfs/callback_xdr.c
65103+++ b/fs/nfs/callback_xdr.c
65104@@ -51,7 +51,7 @@ struct callback_op {
65105 callback_decode_arg_t decode_args;
65106 callback_encode_res_t encode_res;
65107 long res_maxsize;
65108-};
65109+} __do_const;
65110
65111 static struct callback_op callback_ops[];
65112
65113diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
65114index 2211f6b..30d0950 100644
65115--- a/fs/nfs/inode.c
65116+++ b/fs/nfs/inode.c
65117@@ -1234,16 +1234,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
65118 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
65119 }
65120
65121-static atomic_long_t nfs_attr_generation_counter;
65122+static atomic_long_unchecked_t nfs_attr_generation_counter;
65123
65124 static unsigned long nfs_read_attr_generation_counter(void)
65125 {
65126- return atomic_long_read(&nfs_attr_generation_counter);
65127+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
65128 }
65129
65130 unsigned long nfs_inc_attr_generation_counter(void)
65131 {
65132- return atomic_long_inc_return(&nfs_attr_generation_counter);
65133+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
65134 }
65135
65136 void nfs_fattr_init(struct nfs_fattr *fattr)
65137diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
65138index ac71d13..a2e590a 100644
65139--- a/fs/nfsd/nfs4proc.c
65140+++ b/fs/nfsd/nfs4proc.c
65141@@ -1237,7 +1237,7 @@ struct nfsd4_operation {
65142 nfsd4op_rsize op_rsize_bop;
65143 stateid_getter op_get_currentstateid;
65144 stateid_setter op_set_currentstateid;
65145-};
65146+} __do_const;
65147
65148 static struct nfsd4_operation nfsd4_ops[];
65149
65150diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
65151index 15f7b73..00e230b 100644
65152--- a/fs/nfsd/nfs4xdr.c
65153+++ b/fs/nfsd/nfs4xdr.c
65154@@ -1560,7 +1560,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
65155
65156 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
65157
65158-static nfsd4_dec nfsd4_dec_ops[] = {
65159+static const nfsd4_dec nfsd4_dec_ops[] = {
65160 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
65161 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
65162 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
65163diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
65164index 83a9694..6b7f928 100644
65165--- a/fs/nfsd/nfscache.c
65166+++ b/fs/nfsd/nfscache.c
65167@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65168 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
65169 u32 hash;
65170 struct nfsd_drc_bucket *b;
65171- int len;
65172+ long len;
65173 size_t bufsize = 0;
65174
65175 if (!rp)
65176@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65177 hash = nfsd_cache_hash(rp->c_xid);
65178 b = &drc_hashtbl[hash];
65179
65180- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
65181- len >>= 2;
65182+ if (statp) {
65183+ len = (char*)statp - (char*)resv->iov_base;
65184+ len = resv->iov_len - len;
65185+ len >>= 2;
65186+ }
65187
65188 /* Don't cache excessive amounts of data and XDR failures */
65189- if (!statp || len > (256 >> 2)) {
65190+ if (!statp || len > (256 >> 2) || len < 0) {
65191 nfsd_reply_cache_free(b, rp);
65192 return;
65193 }
65194@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65195 switch (cachetype) {
65196 case RC_REPLSTAT:
65197 if (len != 1)
65198- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
65199+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
65200 rp->c_replstat = *statp;
65201 break;
65202 case RC_REPLBUFF:
65203diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
65204index 5685c67..73029ef 100644
65205--- a/fs/nfsd/vfs.c
65206+++ b/fs/nfsd/vfs.c
65207@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
65208
65209 oldfs = get_fs();
65210 set_fs(KERNEL_DS);
65211- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
65212+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
65213 set_fs(oldfs);
65214 return nfsd_finish_read(file, count, host_err);
65215 }
65216@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
65217
65218 /* Write the data. */
65219 oldfs = get_fs(); set_fs(KERNEL_DS);
65220- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
65221+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
65222 set_fs(oldfs);
65223 if (host_err < 0)
65224 goto out_nfserr;
65225@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
65226 */
65227
65228 oldfs = get_fs(); set_fs(KERNEL_DS);
65229- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
65230+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
65231 set_fs(oldfs);
65232
65233 if (host_err < 0)
65234diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
65235index 52ccd34..7a6b202 100644
65236--- a/fs/nls/nls_base.c
65237+++ b/fs/nls/nls_base.c
65238@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
65239
65240 int __register_nls(struct nls_table *nls, struct module *owner)
65241 {
65242- struct nls_table ** tmp = &tables;
65243+ struct nls_table *tmp = tables;
65244
65245 if (nls->next)
65246 return -EBUSY;
65247
65248- nls->owner = owner;
65249+ pax_open_kernel();
65250+ *(void **)&nls->owner = owner;
65251+ pax_close_kernel();
65252 spin_lock(&nls_lock);
65253- while (*tmp) {
65254- if (nls == *tmp) {
65255+ while (tmp) {
65256+ if (nls == tmp) {
65257 spin_unlock(&nls_lock);
65258 return -EBUSY;
65259 }
65260- tmp = &(*tmp)->next;
65261+ tmp = tmp->next;
65262 }
65263- nls->next = tables;
65264+ pax_open_kernel();
65265+ *(struct nls_table **)&nls->next = tables;
65266+ pax_close_kernel();
65267 tables = nls;
65268 spin_unlock(&nls_lock);
65269 return 0;
65270@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
65271
65272 int unregister_nls(struct nls_table * nls)
65273 {
65274- struct nls_table ** tmp = &tables;
65275+ struct nls_table * const * tmp = &tables;
65276
65277 spin_lock(&nls_lock);
65278 while (*tmp) {
65279 if (nls == *tmp) {
65280- *tmp = nls->next;
65281+ pax_open_kernel();
65282+ *(struct nls_table **)tmp = nls->next;
65283+ pax_close_kernel();
65284 spin_unlock(&nls_lock);
65285 return 0;
65286 }
65287@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
65288 return -EINVAL;
65289 }
65290
65291-static struct nls_table *find_nls(char *charset)
65292+static struct nls_table *find_nls(const char *charset)
65293 {
65294 struct nls_table *nls;
65295 spin_lock(&nls_lock);
65296@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
65297 return nls;
65298 }
65299
65300-struct nls_table *load_nls(char *charset)
65301+struct nls_table *load_nls(const char *charset)
65302 {
65303 return try_then_request_module(find_nls(charset), "nls_%s", charset);
65304 }
65305diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
65306index 162b3f1..6076a7c 100644
65307--- a/fs/nls/nls_euc-jp.c
65308+++ b/fs/nls/nls_euc-jp.c
65309@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
65310 p_nls = load_nls("cp932");
65311
65312 if (p_nls) {
65313- table.charset2upper = p_nls->charset2upper;
65314- table.charset2lower = p_nls->charset2lower;
65315+ pax_open_kernel();
65316+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
65317+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
65318+ pax_close_kernel();
65319 return register_nls(&table);
65320 }
65321
65322diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
65323index a80a741..7b96e1b 100644
65324--- a/fs/nls/nls_koi8-ru.c
65325+++ b/fs/nls/nls_koi8-ru.c
65326@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
65327 p_nls = load_nls("koi8-u");
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/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
65340index bff8567..83281c6 100644
65341--- a/fs/notify/fanotify/fanotify_user.c
65342+++ b/fs/notify/fanotify/fanotify_user.c
65343@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
65344
65345 fd = fanotify_event_metadata.fd;
65346 ret = -EFAULT;
65347- if (copy_to_user(buf, &fanotify_event_metadata,
65348- fanotify_event_metadata.event_len))
65349+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
65350+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
65351 goto out_close_fd;
65352
65353 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
65354diff --git a/fs/notify/notification.c b/fs/notify/notification.c
65355index a95d8e0..a91a5fd 100644
65356--- a/fs/notify/notification.c
65357+++ b/fs/notify/notification.c
65358@@ -48,7 +48,7 @@
65359 #include <linux/fsnotify_backend.h>
65360 #include "fsnotify.h"
65361
65362-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65363+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65364
65365 /**
65366 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
65367@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65368 */
65369 u32 fsnotify_get_cookie(void)
65370 {
65371- return atomic_inc_return(&fsnotify_sync_cookie);
65372+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
65373 }
65374 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
65375
65376diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
65377index 9e38daf..5727cae 100644
65378--- a/fs/ntfs/dir.c
65379+++ b/fs/ntfs/dir.c
65380@@ -1310,7 +1310,7 @@ find_next_index_buffer:
65381 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
65382 ~(s64)(ndir->itype.index.block_size - 1)));
65383 /* Bounds checks. */
65384- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65385+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65386 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
65387 "inode 0x%lx or driver bug.", vdir->i_ino);
65388 goto err_out;
65389diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
65390index 643faa4..ef9027e 100644
65391--- a/fs/ntfs/file.c
65392+++ b/fs/ntfs/file.c
65393@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
65394 char *addr;
65395 size_t total = 0;
65396 unsigned len;
65397- int left;
65398+ unsigned left;
65399
65400 do {
65401 len = PAGE_CACHE_SIZE - ofs;
65402diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
65403index 9e1e112..241a52a 100644
65404--- a/fs/ntfs/super.c
65405+++ b/fs/ntfs/super.c
65406@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65407 if (!silent)
65408 ntfs_error(sb, "Primary boot sector is invalid.");
65409 } else if (!silent)
65410- ntfs_error(sb, read_err_str, "primary");
65411+ ntfs_error(sb, read_err_str, "%s", "primary");
65412 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
65413 if (bh_primary)
65414 brelse(bh_primary);
65415@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65416 goto hotfix_primary_boot_sector;
65417 brelse(bh_backup);
65418 } else if (!silent)
65419- ntfs_error(sb, read_err_str, "backup");
65420+ ntfs_error(sb, read_err_str, "%s", "backup");
65421 /* Try to read NT3.51- backup boot sector. */
65422 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
65423 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
65424@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65425 "sector.");
65426 brelse(bh_backup);
65427 } else if (!silent)
65428- ntfs_error(sb, read_err_str, "backup");
65429+ ntfs_error(sb, read_err_str, "%s", "backup");
65430 /* We failed. Cleanup and return. */
65431 if (bh_primary)
65432 brelse(bh_primary);
65433diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
65434index 0440134..d52c93a 100644
65435--- a/fs/ocfs2/localalloc.c
65436+++ b/fs/ocfs2/localalloc.c
65437@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
65438 goto bail;
65439 }
65440
65441- atomic_inc(&osb->alloc_stats.moves);
65442+ atomic_inc_unchecked(&osb->alloc_stats.moves);
65443
65444 bail:
65445 if (handle)
65446diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
65447index 7d6b7d0..5fb529a 100644
65448--- a/fs/ocfs2/ocfs2.h
65449+++ b/fs/ocfs2/ocfs2.h
65450@@ -242,11 +242,11 @@ enum ocfs2_vol_state
65451
65452 struct ocfs2_alloc_stats
65453 {
65454- atomic_t moves;
65455- atomic_t local_data;
65456- atomic_t bitmap_data;
65457- atomic_t bg_allocs;
65458- atomic_t bg_extends;
65459+ atomic_unchecked_t moves;
65460+ atomic_unchecked_t local_data;
65461+ atomic_unchecked_t bitmap_data;
65462+ atomic_unchecked_t bg_allocs;
65463+ atomic_unchecked_t bg_extends;
65464 };
65465
65466 enum ocfs2_local_alloc_state
65467diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
65468index d81f6e2..e794c38 100644
65469--- a/fs/ocfs2/refcounttree.c
65470+++ b/fs/ocfs2/refcounttree.c
65471@@ -4278,7 +4278,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
65472 error = posix_acl_create(dir, &mode, &default_acl, &acl);
65473 if (error) {
65474 mlog_errno(error);
65475- goto out;
65476+ return error;
65477 }
65478
65479 error = ocfs2_create_inode_in_orphan(dir, mode,
65480diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
65481index 0cb889a..6a26b24 100644
65482--- a/fs/ocfs2/suballoc.c
65483+++ b/fs/ocfs2/suballoc.c
65484@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
65485 mlog_errno(status);
65486 goto bail;
65487 }
65488- atomic_inc(&osb->alloc_stats.bg_extends);
65489+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
65490
65491 /* You should never ask for this much metadata */
65492 BUG_ON(bits_wanted >
65493@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
65494 mlog_errno(status);
65495 goto bail;
65496 }
65497- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65498+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65499
65500 *suballoc_loc = res.sr_bg_blkno;
65501 *suballoc_bit_start = res.sr_bit_offset;
65502@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
65503 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
65504 res->sr_bits);
65505
65506- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65507+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65508
65509 BUG_ON(res->sr_bits != 1);
65510
65511@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
65512 mlog_errno(status);
65513 goto bail;
65514 }
65515- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65516+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65517
65518 BUG_ON(res.sr_bits != 1);
65519
65520@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65521 cluster_start,
65522 num_clusters);
65523 if (!status)
65524- atomic_inc(&osb->alloc_stats.local_data);
65525+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
65526 } else {
65527 if (min_clusters > (osb->bitmap_cpg - 1)) {
65528 /* The only paths asking for contiguousness
65529@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65530 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
65531 res.sr_bg_blkno,
65532 res.sr_bit_offset);
65533- atomic_inc(&osb->alloc_stats.bitmap_data);
65534+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
65535 *num_clusters = res.sr_bits;
65536 }
65537 }
65538diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
65539index 8372317..ec86e79 100644
65540--- a/fs/ocfs2/super.c
65541+++ b/fs/ocfs2/super.c
65542@@ -306,11 +306,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
65543 "%10s => GlobalAllocs: %d LocalAllocs: %d "
65544 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
65545 "Stats",
65546- atomic_read(&osb->alloc_stats.bitmap_data),
65547- atomic_read(&osb->alloc_stats.local_data),
65548- atomic_read(&osb->alloc_stats.bg_allocs),
65549- atomic_read(&osb->alloc_stats.moves),
65550- atomic_read(&osb->alloc_stats.bg_extends));
65551+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
65552+ atomic_read_unchecked(&osb->alloc_stats.local_data),
65553+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
65554+ atomic_read_unchecked(&osb->alloc_stats.moves),
65555+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
65556
65557 out += snprintf(buf + out, len - out,
65558 "%10s => State: %u Descriptor: %llu Size: %u bits "
65559@@ -2113,11 +2113,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
65560
65561 mutex_init(&osb->system_file_mutex);
65562
65563- atomic_set(&osb->alloc_stats.moves, 0);
65564- atomic_set(&osb->alloc_stats.local_data, 0);
65565- atomic_set(&osb->alloc_stats.bitmap_data, 0);
65566- atomic_set(&osb->alloc_stats.bg_allocs, 0);
65567- atomic_set(&osb->alloc_stats.bg_extends, 0);
65568+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
65569+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
65570+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
65571+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
65572+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
65573
65574 /* Copy the blockcheck stats from the superblock probe */
65575 osb->osb_ecc_stats = *stats;
65576diff --git a/fs/open.c b/fs/open.c
65577index 813be03..781941d 100644
65578--- a/fs/open.c
65579+++ b/fs/open.c
65580@@ -32,6 +32,8 @@
65581 #include <linux/dnotify.h>
65582 #include <linux/compat.h>
65583
65584+#define CREATE_TRACE_POINTS
65585+#include <trace/events/fs.h>
65586 #include "internal.h"
65587
65588 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
65589@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
65590 error = locks_verify_truncate(inode, NULL, length);
65591 if (!error)
65592 error = security_path_truncate(path);
65593+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
65594+ error = -EACCES;
65595 if (!error)
65596 error = do_truncate(path->dentry, length, 0, NULL);
65597
65598@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
65599 error = locks_verify_truncate(inode, f.file, length);
65600 if (!error)
65601 error = security_path_truncate(&f.file->f_path);
65602+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
65603+ error = -EACCES;
65604 if (!error)
65605 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
65606 sb_end_write(inode->i_sb);
65607@@ -392,6 +398,9 @@ retry:
65608 if (__mnt_is_readonly(path.mnt))
65609 res = -EROFS;
65610
65611+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
65612+ res = -EACCES;
65613+
65614 out_path_release:
65615 path_put(&path);
65616 if (retry_estale(res, lookup_flags)) {
65617@@ -423,6 +432,8 @@ retry:
65618 if (error)
65619 goto dput_and_out;
65620
65621+ gr_log_chdir(path.dentry, path.mnt);
65622+
65623 set_fs_pwd(current->fs, &path);
65624
65625 dput_and_out:
65626@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65627 goto out_putf;
65628
65629 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65630+
65631+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65632+ error = -EPERM;
65633+
65634+ if (!error)
65635+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65636+
65637 if (!error)
65638 set_fs_pwd(current->fs, &f.file->f_path);
65639 out_putf:
65640@@ -481,7 +499,13 @@ retry:
65641 if (error)
65642 goto dput_and_out;
65643
65644+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65645+ goto dput_and_out;
65646+
65647 set_fs_root(current->fs, &path);
65648+
65649+ gr_handle_chroot_chdir(&path);
65650+
65651 error = 0;
65652 dput_and_out:
65653 path_put(&path);
65654@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
65655 return error;
65656 retry_deleg:
65657 mutex_lock(&inode->i_mutex);
65658+
65659+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65660+ error = -EACCES;
65661+ goto out_unlock;
65662+ }
65663+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65664+ error = -EACCES;
65665+ goto out_unlock;
65666+ }
65667+
65668 error = security_path_chmod(path, mode);
65669 if (error)
65670 goto out_unlock;
65671@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65672 uid = make_kuid(current_user_ns(), user);
65673 gid = make_kgid(current_user_ns(), group);
65674
65675+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
65676+ return -EACCES;
65677+
65678 newattrs.ia_valid = ATTR_CTIME;
65679 if (user != (uid_t) -1) {
65680 if (!uid_valid(uid))
65681@@ -1014,6 +1051,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65682 } else {
65683 fsnotify_open(f);
65684 fd_install(fd, f);
65685+ trace_do_sys_open(tmp->name, flags, mode);
65686 }
65687 }
65688 putname(tmp);
65689diff --git a/fs/pipe.c b/fs/pipe.c
65690index 21981e5..3d5f55c 100644
65691--- a/fs/pipe.c
65692+++ b/fs/pipe.c
65693@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65694
65695 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65696 {
65697- if (pipe->files)
65698+ if (atomic_read(&pipe->files))
65699 mutex_lock_nested(&pipe->mutex, subclass);
65700 }
65701
65702@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65703
65704 void pipe_unlock(struct pipe_inode_info *pipe)
65705 {
65706- if (pipe->files)
65707+ if (atomic_read(&pipe->files))
65708 mutex_unlock(&pipe->mutex);
65709 }
65710 EXPORT_SYMBOL(pipe_unlock);
65711@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65712 }
65713 if (bufs) /* More to do? */
65714 continue;
65715- if (!pipe->writers)
65716+ if (!atomic_read(&pipe->writers))
65717 break;
65718- if (!pipe->waiting_writers) {
65719+ if (!atomic_read(&pipe->waiting_writers)) {
65720 /* syscall merging: Usually we must not sleep
65721 * if O_NONBLOCK is set, or if we got some data.
65722 * But if a writer sleeps in kernel space, then
65723@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65724
65725 __pipe_lock(pipe);
65726
65727- if (!pipe->readers) {
65728+ if (!atomic_read(&pipe->readers)) {
65729 send_sig(SIGPIPE, current, 0);
65730 ret = -EPIPE;
65731 goto out;
65732@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65733 for (;;) {
65734 int bufs;
65735
65736- if (!pipe->readers) {
65737+ if (!atomic_read(&pipe->readers)) {
65738 send_sig(SIGPIPE, current, 0);
65739 if (!ret)
65740 ret = -EPIPE;
65741@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65742 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65743 do_wakeup = 0;
65744 }
65745- pipe->waiting_writers++;
65746+ atomic_inc(&pipe->waiting_writers);
65747 pipe_wait(pipe);
65748- pipe->waiting_writers--;
65749+ atomic_dec(&pipe->waiting_writers);
65750 }
65751 out:
65752 __pipe_unlock(pipe);
65753@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65754 mask = 0;
65755 if (filp->f_mode & FMODE_READ) {
65756 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65757- if (!pipe->writers && filp->f_version != pipe->w_counter)
65758+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65759 mask |= POLLHUP;
65760 }
65761
65762@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65763 * Most Unices do not set POLLERR for FIFOs but on Linux they
65764 * behave exactly like pipes for poll().
65765 */
65766- if (!pipe->readers)
65767+ if (!atomic_read(&pipe->readers))
65768 mask |= POLLERR;
65769 }
65770
65771@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65772 int kill = 0;
65773
65774 spin_lock(&inode->i_lock);
65775- if (!--pipe->files) {
65776+ if (atomic_dec_and_test(&pipe->files)) {
65777 inode->i_pipe = NULL;
65778 kill = 1;
65779 }
65780@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65781
65782 __pipe_lock(pipe);
65783 if (file->f_mode & FMODE_READ)
65784- pipe->readers--;
65785+ atomic_dec(&pipe->readers);
65786 if (file->f_mode & FMODE_WRITE)
65787- pipe->writers--;
65788+ atomic_dec(&pipe->writers);
65789
65790- if (pipe->readers || pipe->writers) {
65791+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65792 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65793 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65794 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65795@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65796 kfree(pipe);
65797 }
65798
65799-static struct vfsmount *pipe_mnt __read_mostly;
65800+struct vfsmount *pipe_mnt __read_mostly;
65801
65802 /*
65803 * pipefs_dname() is called from d_path().
65804@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65805 goto fail_iput;
65806
65807 inode->i_pipe = pipe;
65808- pipe->files = 2;
65809- pipe->readers = pipe->writers = 1;
65810+ atomic_set(&pipe->files, 2);
65811+ atomic_set(&pipe->readers, 1);
65812+ atomic_set(&pipe->writers, 1);
65813 inode->i_fop = &pipefifo_fops;
65814
65815 /*
65816@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65817 spin_lock(&inode->i_lock);
65818 if (inode->i_pipe) {
65819 pipe = inode->i_pipe;
65820- pipe->files++;
65821+ atomic_inc(&pipe->files);
65822 spin_unlock(&inode->i_lock);
65823 } else {
65824 spin_unlock(&inode->i_lock);
65825 pipe = alloc_pipe_info();
65826 if (!pipe)
65827 return -ENOMEM;
65828- pipe->files = 1;
65829+ atomic_set(&pipe->files, 1);
65830 spin_lock(&inode->i_lock);
65831 if (unlikely(inode->i_pipe)) {
65832- inode->i_pipe->files++;
65833+ atomic_inc(&inode->i_pipe->files);
65834 spin_unlock(&inode->i_lock);
65835 free_pipe_info(pipe);
65836 pipe = inode->i_pipe;
65837@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65838 * opened, even when there is no process writing the FIFO.
65839 */
65840 pipe->r_counter++;
65841- if (pipe->readers++ == 0)
65842+ if (atomic_inc_return(&pipe->readers) == 1)
65843 wake_up_partner(pipe);
65844
65845- if (!is_pipe && !pipe->writers) {
65846+ if (!is_pipe && !atomic_read(&pipe->writers)) {
65847 if ((filp->f_flags & O_NONBLOCK)) {
65848 /* suppress POLLHUP until we have
65849 * seen a writer */
65850@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65851 * errno=ENXIO when there is no process reading the FIFO.
65852 */
65853 ret = -ENXIO;
65854- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65855+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65856 goto err;
65857
65858 pipe->w_counter++;
65859- if (!pipe->writers++)
65860+ if (atomic_inc_return(&pipe->writers) == 1)
65861 wake_up_partner(pipe);
65862
65863- if (!is_pipe && !pipe->readers) {
65864+ if (!is_pipe && !atomic_read(&pipe->readers)) {
65865 if (wait_for_partner(pipe, &pipe->r_counter))
65866 goto err_wr;
65867 }
65868@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65869 * the process can at least talk to itself.
65870 */
65871
65872- pipe->readers++;
65873- pipe->writers++;
65874+ atomic_inc(&pipe->readers);
65875+ atomic_inc(&pipe->writers);
65876 pipe->r_counter++;
65877 pipe->w_counter++;
65878- if (pipe->readers == 1 || pipe->writers == 1)
65879+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65880 wake_up_partner(pipe);
65881 break;
65882
65883@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65884 return 0;
65885
65886 err_rd:
65887- if (!--pipe->readers)
65888+ if (atomic_dec_and_test(&pipe->readers))
65889 wake_up_interruptible(&pipe->wait);
65890 ret = -ERESTARTSYS;
65891 goto err;
65892
65893 err_wr:
65894- if (!--pipe->writers)
65895+ if (atomic_dec_and_test(&pipe->writers))
65896 wake_up_interruptible(&pipe->wait);
65897 ret = -ERESTARTSYS;
65898 goto err;
65899diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65900index 0855f77..6787d50 100644
65901--- a/fs/posix_acl.c
65902+++ b/fs/posix_acl.c
65903@@ -20,6 +20,7 @@
65904 #include <linux/xattr.h>
65905 #include <linux/export.h>
65906 #include <linux/user_namespace.h>
65907+#include <linux/grsecurity.h>
65908
65909 struct posix_acl **acl_by_type(struct inode *inode, int type)
65910 {
65911@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65912 }
65913 }
65914 if (mode_p)
65915- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65916+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65917 return not_equiv;
65918 }
65919 EXPORT_SYMBOL(posix_acl_equiv_mode);
65920@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65921 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65922 }
65923
65924- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65925+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65926 return not_equiv;
65927 }
65928
65929@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65930 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65931 int err = -ENOMEM;
65932 if (clone) {
65933+ *mode_p &= ~gr_acl_umask();
65934+
65935 err = posix_acl_create_masq(clone, mode_p);
65936 if (err < 0) {
65937 posix_acl_release(clone);
65938@@ -659,11 +662,12 @@ struct posix_acl *
65939 posix_acl_from_xattr(struct user_namespace *user_ns,
65940 const void *value, size_t size)
65941 {
65942- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65943- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65944+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65945+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65946 int count;
65947 struct posix_acl *acl;
65948 struct posix_acl_entry *acl_e;
65949+ umode_t umask = gr_acl_umask();
65950
65951 if (!value)
65952 return NULL;
65953@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65954
65955 switch(acl_e->e_tag) {
65956 case ACL_USER_OBJ:
65957+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65958+ break;
65959 case ACL_GROUP_OBJ:
65960 case ACL_MASK:
65961+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65962+ break;
65963 case ACL_OTHER:
65964+ acl_e->e_perm &= ~(umask & S_IRWXO);
65965 break;
65966
65967 case ACL_USER:
65968+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65969 acl_e->e_uid =
65970 make_kuid(user_ns,
65971 le32_to_cpu(entry->e_id));
65972@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65973 goto fail;
65974 break;
65975 case ACL_GROUP:
65976+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65977 acl_e->e_gid =
65978 make_kgid(user_ns,
65979 le32_to_cpu(entry->e_id));
65980diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65981index 2183fcf..3c32a98 100644
65982--- a/fs/proc/Kconfig
65983+++ b/fs/proc/Kconfig
65984@@ -30,7 +30,7 @@ config PROC_FS
65985
65986 config PROC_KCORE
65987 bool "/proc/kcore support" if !ARM
65988- depends on PROC_FS && MMU
65989+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65990 help
65991 Provides a virtual ELF core file of the live kernel. This can
65992 be read with gdb and other ELF tools. No modifications can be
65993@@ -38,8 +38,8 @@ config PROC_KCORE
65994
65995 config PROC_VMCORE
65996 bool "/proc/vmcore support"
65997- depends on PROC_FS && CRASH_DUMP
65998- default y
65999+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
66000+ default n
66001 help
66002 Exports the dump image of crashed kernel in ELF format.
66003
66004@@ -63,8 +63,8 @@ config PROC_SYSCTL
66005 limited in memory.
66006
66007 config PROC_PAGE_MONITOR
66008- default y
66009- depends on PROC_FS && MMU
66010+ default n
66011+ depends on PROC_FS && MMU && !GRKERNSEC
66012 bool "Enable /proc page monitoring" if EXPERT
66013 help
66014 Various /proc files exist to monitor process memory utilization:
66015diff --git a/fs/proc/array.c b/fs/proc/array.c
66016index bd117d0..e6872d7 100644
66017--- a/fs/proc/array.c
66018+++ b/fs/proc/array.c
66019@@ -60,6 +60,7 @@
66020 #include <linux/tty.h>
66021 #include <linux/string.h>
66022 #include <linux/mman.h>
66023+#include <linux/grsecurity.h>
66024 #include <linux/proc_fs.h>
66025 #include <linux/ioport.h>
66026 #include <linux/uaccess.h>
66027@@ -344,6 +345,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
66028 seq_putc(m, '\n');
66029 }
66030
66031+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66032+static inline void task_pax(struct seq_file *m, struct task_struct *p)
66033+{
66034+ if (p->mm)
66035+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
66036+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
66037+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
66038+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
66039+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
66040+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
66041+ else
66042+ seq_printf(m, "PaX:\t-----\n");
66043+}
66044+#endif
66045+
66046 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66047 struct pid *pid, struct task_struct *task)
66048 {
66049@@ -362,9 +378,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66050 task_cpus_allowed(m, task);
66051 cpuset_task_status_allowed(m, task);
66052 task_context_switch_counts(m, task);
66053+
66054+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66055+ task_pax(m, task);
66056+#endif
66057+
66058+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
66059+ task_grsec_rbac(m, task);
66060+#endif
66061+
66062 return 0;
66063 }
66064
66065+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66066+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66067+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66068+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66069+#endif
66070+
66071 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66072 struct pid *pid, struct task_struct *task, int whole)
66073 {
66074@@ -386,6 +417,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66075 char tcomm[sizeof(task->comm)];
66076 unsigned long flags;
66077
66078+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66079+ if (current->exec_id != m->exec_id) {
66080+ gr_log_badprocpid("stat");
66081+ return 0;
66082+ }
66083+#endif
66084+
66085 state = *get_task_state(task);
66086 vsize = eip = esp = 0;
66087 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66088@@ -456,6 +494,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66089 gtime = task_gtime(task);
66090 }
66091
66092+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66093+ if (PAX_RAND_FLAGS(mm)) {
66094+ eip = 0;
66095+ esp = 0;
66096+ wchan = 0;
66097+ }
66098+#endif
66099+#ifdef CONFIG_GRKERNSEC_HIDESYM
66100+ wchan = 0;
66101+ eip =0;
66102+ esp =0;
66103+#endif
66104+
66105 /* scale priority and nice values from timeslices to -20..20 */
66106 /* to make it look like a "normal" Unix priority/nice value */
66107 priority = task_prio(task);
66108@@ -487,9 +538,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66109 seq_put_decimal_ull(m, ' ', vsize);
66110 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
66111 seq_put_decimal_ull(m, ' ', rsslim);
66112+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66113+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
66114+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
66115+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
66116+#else
66117 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
66118 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
66119 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
66120+#endif
66121 seq_put_decimal_ull(m, ' ', esp);
66122 seq_put_decimal_ull(m, ' ', eip);
66123 /* The signal information here is obsolete.
66124@@ -511,7 +568,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66125 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
66126 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
66127
66128- if (mm && permitted) {
66129+ if (mm && permitted
66130+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66131+ && !PAX_RAND_FLAGS(mm)
66132+#endif
66133+ ) {
66134 seq_put_decimal_ull(m, ' ', mm->start_data);
66135 seq_put_decimal_ull(m, ' ', mm->end_data);
66136 seq_put_decimal_ull(m, ' ', mm->start_brk);
66137@@ -549,8 +610,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66138 struct pid *pid, struct task_struct *task)
66139 {
66140 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
66141- struct mm_struct *mm = get_task_mm(task);
66142+ struct mm_struct *mm;
66143
66144+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66145+ if (current->exec_id != m->exec_id) {
66146+ gr_log_badprocpid("statm");
66147+ return 0;
66148+ }
66149+#endif
66150+ mm = get_task_mm(task);
66151 if (mm) {
66152 size = task_statm(mm, &shared, &text, &data, &resident);
66153 mmput(mm);
66154@@ -573,6 +641,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66155 return 0;
66156 }
66157
66158+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66159+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
66160+{
66161+ unsigned long flags;
66162+ u32 curr_ip = 0;
66163+
66164+ if (lock_task_sighand(task, &flags)) {
66165+ curr_ip = task->signal->curr_ip;
66166+ unlock_task_sighand(task, &flags);
66167+ }
66168+ return seq_printf(m, "%pI4\n", &curr_ip);
66169+}
66170+#endif
66171+
66172 #ifdef CONFIG_CHECKPOINT_RESTORE
66173 static struct pid *
66174 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
66175diff --git a/fs/proc/base.c b/fs/proc/base.c
66176index 3f3d7ae..68de109 100644
66177--- a/fs/proc/base.c
66178+++ b/fs/proc/base.c
66179@@ -113,6 +113,14 @@ struct pid_entry {
66180 union proc_op op;
66181 };
66182
66183+struct getdents_callback {
66184+ struct linux_dirent __user * current_dir;
66185+ struct linux_dirent __user * previous;
66186+ struct file * file;
66187+ int count;
66188+ int error;
66189+};
66190+
66191 #define NOD(NAME, MODE, IOP, FOP, OP) { \
66192 .name = (NAME), \
66193 .len = sizeof(NAME) - 1, \
66194@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
66195 return 0;
66196 }
66197
66198+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66199+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66200+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66201+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66202+#endif
66203+
66204 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66205 struct pid *pid, struct task_struct *task)
66206 {
66207 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
66208 if (mm && !IS_ERR(mm)) {
66209 unsigned int nwords = 0;
66210+
66211+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66212+ /* allow if we're currently ptracing this task */
66213+ if (PAX_RAND_FLAGS(mm) &&
66214+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
66215+ mmput(mm);
66216+ return 0;
66217+ }
66218+#endif
66219+
66220 do {
66221 nwords += 2;
66222 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
66223@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66224 }
66225
66226
66227-#ifdef CONFIG_KALLSYMS
66228+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66229 /*
66230 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
66231 * Returns the resolved symbol. If that fails, simply return the address.
66232@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
66233 mutex_unlock(&task->signal->cred_guard_mutex);
66234 }
66235
66236-#ifdef CONFIG_STACKTRACE
66237+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66238
66239 #define MAX_STACK_TRACE_DEPTH 64
66240
66241@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
66242 return 0;
66243 }
66244
66245-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66246+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66247 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66248 struct pid *pid, struct task_struct *task)
66249 {
66250@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66251 /************************************************************************/
66252
66253 /* permission checks */
66254-static int proc_fd_access_allowed(struct inode *inode)
66255+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
66256 {
66257 struct task_struct *task;
66258 int allowed = 0;
66259@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
66260 */
66261 task = get_proc_task(inode);
66262 if (task) {
66263- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66264+ if (log)
66265+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66266+ else
66267+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66268 put_task_struct(task);
66269 }
66270 return allowed;
66271@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
66272 struct task_struct *task,
66273 int hide_pid_min)
66274 {
66275+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66276+ return false;
66277+
66278+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66279+ rcu_read_lock();
66280+ {
66281+ const struct cred *tmpcred = current_cred();
66282+ const struct cred *cred = __task_cred(task);
66283+
66284+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
66285+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66286+ || in_group_p(grsec_proc_gid)
66287+#endif
66288+ ) {
66289+ rcu_read_unlock();
66290+ return true;
66291+ }
66292+ }
66293+ rcu_read_unlock();
66294+
66295+ if (!pid->hide_pid)
66296+ return false;
66297+#endif
66298+
66299 if (pid->hide_pid < hide_pid_min)
66300 return true;
66301 if (in_group_p(pid->pid_gid))
66302 return true;
66303+
66304 return ptrace_may_access(task, PTRACE_MODE_READ);
66305 }
66306
66307@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
66308 put_task_struct(task);
66309
66310 if (!has_perms) {
66311+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66312+ {
66313+#else
66314 if (pid->hide_pid == 2) {
66315+#endif
66316 /*
66317 * Let's make getdents(), stat(), and open()
66318 * consistent with each other. If a process
66319@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
66320
66321 if (task) {
66322 mm = mm_access(task, mode);
66323+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
66324+ mmput(mm);
66325+ mm = ERR_PTR(-EPERM);
66326+ }
66327 put_task_struct(task);
66328
66329 if (!IS_ERR_OR_NULL(mm)) {
66330@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
66331 return PTR_ERR(mm);
66332
66333 file->private_data = mm;
66334+
66335+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66336+ file->f_version = current->exec_id;
66337+#endif
66338+
66339 return 0;
66340 }
66341
66342@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66343 ssize_t copied;
66344 char *page;
66345
66346+#ifdef CONFIG_GRKERNSEC
66347+ if (write)
66348+ return -EPERM;
66349+#endif
66350+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66351+ if (file->f_version != current->exec_id) {
66352+ gr_log_badprocpid("mem");
66353+ return 0;
66354+ }
66355+#endif
66356+
66357 if (!mm)
66358 return 0;
66359
66360@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66361 goto free;
66362
66363 while (count > 0) {
66364- int this_len = min_t(int, count, PAGE_SIZE);
66365+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
66366
66367 if (write && copy_from_user(page, buf, this_len)) {
66368 copied = -EFAULT;
66369@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
66370 if (!mm)
66371 return 0;
66372
66373+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66374+ if (file->f_version != current->exec_id) {
66375+ gr_log_badprocpid("environ");
66376+ return 0;
66377+ }
66378+#endif
66379+
66380 page = (char *)__get_free_page(GFP_TEMPORARY);
66381 if (!page)
66382 return -ENOMEM;
66383@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
66384 goto free;
66385 while (count > 0) {
66386 size_t this_len, max_len;
66387- int retval;
66388+ ssize_t retval;
66389
66390 if (src >= (mm->env_end - mm->env_start))
66391 break;
66392@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
66393 int error = -EACCES;
66394
66395 /* Are we allowed to snoop on the tasks file descriptors? */
66396- if (!proc_fd_access_allowed(inode))
66397+ if (!proc_fd_access_allowed(inode, 0))
66398 goto out;
66399
66400 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
66401@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
66402 struct path path;
66403
66404 /* Are we allowed to snoop on the tasks file descriptors? */
66405- if (!proc_fd_access_allowed(inode))
66406- goto out;
66407+ /* logging this is needed for learning on chromium to work properly,
66408+ but we don't want to flood the logs from 'ps' which does a readlink
66409+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
66410+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
66411+ */
66412+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
66413+ if (!proc_fd_access_allowed(inode,0))
66414+ goto out;
66415+ } else {
66416+ if (!proc_fd_access_allowed(inode,1))
66417+ goto out;
66418+ }
66419
66420 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
66421 if (error)
66422@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
66423 rcu_read_lock();
66424 cred = __task_cred(task);
66425 inode->i_uid = cred->euid;
66426+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66427+ inode->i_gid = grsec_proc_gid;
66428+#else
66429 inode->i_gid = cred->egid;
66430+#endif
66431 rcu_read_unlock();
66432 }
66433 security_task_to_inode(task, inode);
66434@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
66435 return -ENOENT;
66436 }
66437 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66438+#ifdef CONFIG_GRKERNSEC_PROC_USER
66439+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66440+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66441+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66442+#endif
66443 task_dumpable(task)) {
66444 cred = __task_cred(task);
66445 stat->uid = cred->euid;
66446+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66447+ stat->gid = grsec_proc_gid;
66448+#else
66449 stat->gid = cred->egid;
66450+#endif
66451 }
66452 }
66453 rcu_read_unlock();
66454@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
66455
66456 if (task) {
66457 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66458+#ifdef CONFIG_GRKERNSEC_PROC_USER
66459+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66460+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66461+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66462+#endif
66463 task_dumpable(task)) {
66464 rcu_read_lock();
66465 cred = __task_cred(task);
66466 inode->i_uid = cred->euid;
66467+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66468+ inode->i_gid = grsec_proc_gid;
66469+#else
66470 inode->i_gid = cred->egid;
66471+#endif
66472 rcu_read_unlock();
66473 } else {
66474 inode->i_uid = GLOBAL_ROOT_UID;
66475@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
66476 if (!task)
66477 goto out_no_task;
66478
66479+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66480+ goto out;
66481+
66482 /*
66483 * Yes, it does not scale. And it should not. Don't add
66484 * new entries into /proc/<tgid>/ without very good reasons.
66485@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
66486 if (!task)
66487 return -ENOENT;
66488
66489+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66490+ goto out;
66491+
66492 if (!dir_emit_dots(file, ctx))
66493 goto out;
66494
66495@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
66496 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
66497 #endif
66498 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66499-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66500+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66501 ONE("syscall", S_IRUSR, proc_pid_syscall),
66502 #endif
66503 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66504@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
66505 #ifdef CONFIG_SECURITY
66506 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66507 #endif
66508-#ifdef CONFIG_KALLSYMS
66509+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66510 ONE("wchan", S_IRUGO, proc_pid_wchan),
66511 #endif
66512-#ifdef CONFIG_STACKTRACE
66513+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66514 ONE("stack", S_IRUSR, proc_pid_stack),
66515 #endif
66516 #ifdef CONFIG_SCHEDSTATS
66517@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
66518 #ifdef CONFIG_HARDWALL
66519 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
66520 #endif
66521+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66522+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
66523+#endif
66524 #ifdef CONFIG_USER_NS
66525 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
66526 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
66527@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
66528 if (!inode)
66529 goto out;
66530
66531+#ifdef CONFIG_GRKERNSEC_PROC_USER
66532+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
66533+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66534+ inode->i_gid = grsec_proc_gid;
66535+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
66536+#else
66537 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
66538+#endif
66539 inode->i_op = &proc_tgid_base_inode_operations;
66540 inode->i_fop = &proc_tgid_base_operations;
66541 inode->i_flags|=S_IMMUTABLE;
66542@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
66543 if (!task)
66544 goto out;
66545
66546+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66547+ goto out_put_task;
66548+
66549 result = proc_pid_instantiate(dir, dentry, task, NULL);
66550+out_put_task:
66551 put_task_struct(task);
66552 out:
66553 return ERR_PTR(result);
66554@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
66555 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
66556 #endif
66557 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66558-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66559+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66560 ONE("syscall", S_IRUSR, proc_pid_syscall),
66561 #endif
66562 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66563@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
66564 #ifdef CONFIG_SECURITY
66565 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66566 #endif
66567-#ifdef CONFIG_KALLSYMS
66568+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66569 ONE("wchan", S_IRUGO, proc_pid_wchan),
66570 #endif
66571-#ifdef CONFIG_STACKTRACE
66572+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66573 ONE("stack", S_IRUSR, proc_pid_stack),
66574 #endif
66575 #ifdef CONFIG_SCHEDSTATS
66576diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
66577index cbd82df..c0407d2 100644
66578--- a/fs/proc/cmdline.c
66579+++ b/fs/proc/cmdline.c
66580@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
66581
66582 static int __init proc_cmdline_init(void)
66583 {
66584+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66585+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
66586+#else
66587 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
66588+#endif
66589 return 0;
66590 }
66591 fs_initcall(proc_cmdline_init);
66592diff --git a/fs/proc/devices.c b/fs/proc/devices.c
66593index 50493ed..248166b 100644
66594--- a/fs/proc/devices.c
66595+++ b/fs/proc/devices.c
66596@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
66597
66598 static int __init proc_devices_init(void)
66599 {
66600+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66601+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
66602+#else
66603 proc_create("devices", 0, NULL, &proc_devinfo_operations);
66604+#endif
66605 return 0;
66606 }
66607 fs_initcall(proc_devices_init);
66608diff --git a/fs/proc/fd.c b/fs/proc/fd.c
66609index 8e5ad83..1f07a8c 100644
66610--- a/fs/proc/fd.c
66611+++ b/fs/proc/fd.c
66612@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
66613 if (!task)
66614 return -ENOENT;
66615
66616- files = get_files_struct(task);
66617+ if (!gr_acl_handle_procpidmem(task))
66618+ files = get_files_struct(task);
66619 put_task_struct(task);
66620
66621 if (files) {
66622@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
66623 */
66624 int proc_fd_permission(struct inode *inode, int mask)
66625 {
66626+ struct task_struct *task;
66627 int rv = generic_permission(inode, mask);
66628- if (rv == 0)
66629- return 0;
66630+
66631 if (task_tgid(current) == proc_pid(inode))
66632 rv = 0;
66633+
66634+ task = get_proc_task(inode);
66635+ if (task == NULL)
66636+ return rv;
66637+
66638+ if (gr_acl_handle_procpidmem(task))
66639+ rv = -EACCES;
66640+
66641+ put_task_struct(task);
66642+
66643 return rv;
66644 }
66645
66646diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66647index b502bba..849e216 100644
66648--- a/fs/proc/generic.c
66649+++ b/fs/proc/generic.c
66650@@ -22,6 +22,7 @@
66651 #include <linux/bitops.h>
66652 #include <linux/spinlock.h>
66653 #include <linux/completion.h>
66654+#include <linux/grsecurity.h>
66655 #include <asm/uaccess.h>
66656
66657 #include "internal.h"
66658@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66659 return proc_lookup_de(PDE(dir), dir, dentry);
66660 }
66661
66662+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66663+ unsigned int flags)
66664+{
66665+ if (gr_proc_is_restricted())
66666+ return ERR_PTR(-EACCES);
66667+
66668+ return proc_lookup_de(PDE(dir), dir, dentry);
66669+}
66670+
66671 /*
66672 * This returns non-zero if at EOF, so that the /proc
66673 * root directory can use this and check if it should
66674@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66675 return proc_readdir_de(PDE(inode), file, ctx);
66676 }
66677
66678+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66679+{
66680+ struct inode *inode = file_inode(file);
66681+
66682+ if (gr_proc_is_restricted())
66683+ return -EACCES;
66684+
66685+ return proc_readdir_de(PDE(inode), file, ctx);
66686+}
66687+
66688 /*
66689 * These are the generic /proc directory operations. They
66690 * use the in-memory "struct proc_dir_entry" tree to parse
66691@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
66692 .iterate = proc_readdir,
66693 };
66694
66695+static const struct file_operations proc_dir_restricted_operations = {
66696+ .llseek = generic_file_llseek,
66697+ .read = generic_read_dir,
66698+ .iterate = proc_readdir_restrict,
66699+};
66700+
66701 /*
66702 * proc directories can do almost nothing..
66703 */
66704@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66705 .setattr = proc_notify_change,
66706 };
66707
66708+static const struct inode_operations proc_dir_restricted_inode_operations = {
66709+ .lookup = proc_lookup_restrict,
66710+ .getattr = proc_getattr,
66711+ .setattr = proc_notify_change,
66712+};
66713+
66714 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66715 {
66716 int ret;
66717@@ -339,8 +371,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66718 return ret;
66719
66720 if (S_ISDIR(dp->mode)) {
66721- dp->proc_fops = &proc_dir_operations;
66722- dp->proc_iops = &proc_dir_inode_operations;
66723+ if (dp->restricted) {
66724+ dp->proc_fops = &proc_dir_restricted_operations;
66725+ dp->proc_iops = &proc_dir_restricted_inode_operations;
66726+ } else {
66727+ dp->proc_fops = &proc_dir_operations;
66728+ dp->proc_iops = &proc_dir_inode_operations;
66729+ }
66730 dir->nlink++;
66731 } else if (S_ISLNK(dp->mode)) {
66732 dp->proc_iops = &proc_link_inode_operations;
66733@@ -453,6 +490,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66734 }
66735 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66736
66737+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66738+ struct proc_dir_entry *parent, void *data)
66739+{
66740+ struct proc_dir_entry *ent;
66741+
66742+ if (mode == 0)
66743+ mode = S_IRUGO | S_IXUGO;
66744+
66745+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66746+ if (ent) {
66747+ ent->data = data;
66748+ ent->restricted = 1;
66749+ if (proc_register(parent, ent) < 0) {
66750+ kfree(ent);
66751+ ent = NULL;
66752+ }
66753+ }
66754+ return ent;
66755+}
66756+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66757+
66758 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66759 struct proc_dir_entry *parent)
66760 {
66761@@ -467,6 +525,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66762 }
66763 EXPORT_SYMBOL(proc_mkdir);
66764
66765+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66766+ struct proc_dir_entry *parent)
66767+{
66768+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
66769+}
66770+EXPORT_SYMBOL(proc_mkdir_restrict);
66771+
66772 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66773 struct proc_dir_entry *parent,
66774 const struct file_operations *proc_fops,
66775diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66776index 3b0f838..a0e0f63e 100644
66777--- a/fs/proc/inode.c
66778+++ b/fs/proc/inode.c
66779@@ -24,11 +24,17 @@
66780 #include <linux/mount.h>
66781 #include <linux/magic.h>
66782 #include <linux/namei.h>
66783+#include <linux/grsecurity.h>
66784
66785 #include <asm/uaccess.h>
66786
66787 #include "internal.h"
66788
66789+#ifdef CONFIG_PROC_SYSCTL
66790+extern const struct inode_operations proc_sys_inode_operations;
66791+extern const struct inode_operations proc_sys_dir_operations;
66792+#endif
66793+
66794 static void proc_evict_inode(struct inode *inode)
66795 {
66796 struct proc_dir_entry *de;
66797@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
66798 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
66799 sysctl_head_put(head);
66800 }
66801+
66802+#ifdef CONFIG_PROC_SYSCTL
66803+ if (inode->i_op == &proc_sys_inode_operations ||
66804+ inode->i_op == &proc_sys_dir_operations)
66805+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66806+#endif
66807+
66808 }
66809
66810 static struct kmem_cache * proc_inode_cachep;
66811@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66812 if (de->mode) {
66813 inode->i_mode = de->mode;
66814 inode->i_uid = de->uid;
66815+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66816+ inode->i_gid = grsec_proc_gid;
66817+#else
66818 inode->i_gid = de->gid;
66819+#endif
66820 }
66821 if (de->size)
66822 inode->i_size = de->size;
66823diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66824index c835b94..c9e01a3 100644
66825--- a/fs/proc/internal.h
66826+++ b/fs/proc/internal.h
66827@@ -47,9 +47,10 @@ struct proc_dir_entry {
66828 struct completion *pde_unload_completion;
66829 struct list_head pde_openers; /* who did ->open, but not ->release */
66830 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66831+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66832 u8 namelen;
66833 char name[];
66834-};
66835+} __randomize_layout;
66836
66837 union proc_op {
66838 int (*proc_get_link)(struct dentry *, struct path *);
66839@@ -67,7 +68,7 @@ struct proc_inode {
66840 struct ctl_table *sysctl_entry;
66841 const struct proc_ns_operations *ns_ops;
66842 struct inode vfs_inode;
66843-};
66844+} __randomize_layout;
66845
66846 /*
66847 * General functions
66848@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66849 struct pid *, struct task_struct *);
66850 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66851 struct pid *, struct task_struct *);
66852+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66853+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66854+ struct pid *, struct task_struct *);
66855+#endif
66856
66857 /*
66858 * base.c
66859@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66860 * generic.c
66861 */
66862 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66863+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66864 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66865 struct dentry *);
66866 extern int proc_readdir(struct file *, struct dir_context *);
66867+extern int proc_readdir_restrict(struct file *, struct dir_context *);
66868 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66869
66870 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66871diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66872index a352d57..cb94a5c 100644
66873--- a/fs/proc/interrupts.c
66874+++ b/fs/proc/interrupts.c
66875@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66876
66877 static int __init proc_interrupts_init(void)
66878 {
66879+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66880+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66881+#else
66882 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66883+#endif
66884 return 0;
66885 }
66886 fs_initcall(proc_interrupts_init);
66887diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66888index 91a4e64..cb007c0 100644
66889--- a/fs/proc/kcore.c
66890+++ b/fs/proc/kcore.c
66891@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66892 * the addresses in the elf_phdr on our list.
66893 */
66894 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66895- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66896+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66897+ if (tsz > buflen)
66898 tsz = buflen;
66899-
66900+
66901 while (buflen) {
66902 struct kcore_list *m;
66903
66904@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66905 kfree(elf_buf);
66906 } else {
66907 if (kern_addr_valid(start)) {
66908- unsigned long n;
66909+ char *elf_buf;
66910+ mm_segment_t oldfs;
66911
66912- n = copy_to_user(buffer, (char *)start, tsz);
66913- /*
66914- * We cannot distinguish between fault on source
66915- * and fault on destination. When this happens
66916- * we clear too and hope it will trigger the
66917- * EFAULT again.
66918- */
66919- if (n) {
66920- if (clear_user(buffer + tsz - n,
66921- n))
66922+ elf_buf = kmalloc(tsz, GFP_KERNEL);
66923+ if (!elf_buf)
66924+ return -ENOMEM;
66925+ oldfs = get_fs();
66926+ set_fs(KERNEL_DS);
66927+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66928+ set_fs(oldfs);
66929+ if (copy_to_user(buffer, elf_buf, tsz)) {
66930+ kfree(elf_buf);
66931 return -EFAULT;
66932+ }
66933 }
66934+ set_fs(oldfs);
66935+ kfree(elf_buf);
66936 } else {
66937 if (clear_user(buffer, tsz))
66938 return -EFAULT;
66939@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66940
66941 static int open_kcore(struct inode *inode, struct file *filp)
66942 {
66943+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66944+ return -EPERM;
66945+#endif
66946 if (!capable(CAP_SYS_RAWIO))
66947 return -EPERM;
66948 if (kcore_need_update)
66949diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66950index d3ebf2e..6ad42d1 100644
66951--- a/fs/proc/meminfo.c
66952+++ b/fs/proc/meminfo.c
66953@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66954 vmi.used >> 10,
66955 vmi.largest_chunk >> 10
66956 #ifdef CONFIG_MEMORY_FAILURE
66957- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66958+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66959 #endif
66960 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66961 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66962diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66963index d4a3574..b421ce9 100644
66964--- a/fs/proc/nommu.c
66965+++ b/fs/proc/nommu.c
66966@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66967
66968 if (file) {
66969 seq_pad(m, ' ');
66970- seq_path(m, &file->f_path, "");
66971+ seq_path(m, &file->f_path, "\n\\");
66972 }
66973
66974 seq_putc(m, '\n');
66975diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66976index 1bde894..22ac7eb 100644
66977--- a/fs/proc/proc_net.c
66978+++ b/fs/proc/proc_net.c
66979@@ -23,9 +23,27 @@
66980 #include <linux/nsproxy.h>
66981 #include <net/net_namespace.h>
66982 #include <linux/seq_file.h>
66983+#include <linux/grsecurity.h>
66984
66985 #include "internal.h"
66986
66987+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66988+static struct seq_operations *ipv6_seq_ops_addr;
66989+
66990+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66991+{
66992+ ipv6_seq_ops_addr = addr;
66993+}
66994+
66995+void unregister_ipv6_seq_ops_addr(void)
66996+{
66997+ ipv6_seq_ops_addr = NULL;
66998+}
66999+
67000+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
67001+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
67002+#endif
67003+
67004 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
67005 {
67006 return pde->parent->data;
67007@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
67008 return maybe_get_net(PDE_NET(PDE(inode)));
67009 }
67010
67011+extern const struct seq_operations dev_seq_ops;
67012+
67013 int seq_open_net(struct inode *ino, struct file *f,
67014 const struct seq_operations *ops, int size)
67015 {
67016@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
67017
67018 BUG_ON(size < sizeof(*p));
67019
67020+ /* only permit access to /proc/net/dev */
67021+ if (
67022+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
67023+ ops != ipv6_seq_ops_addr &&
67024+#endif
67025+ ops != &dev_seq_ops && gr_proc_is_restricted())
67026+ return -EACCES;
67027+
67028 net = get_proc_net(ino);
67029 if (net == NULL)
67030 return -ENXIO;
67031@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
67032 int err;
67033 struct net *net;
67034
67035+ if (gr_proc_is_restricted())
67036+ return -EACCES;
67037+
67038 err = -ENXIO;
67039 net = get_proc_net(inode);
67040 if (net == NULL)
67041diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
67042index f92d5dd..26398ac 100644
67043--- a/fs/proc/proc_sysctl.c
67044+++ b/fs/proc/proc_sysctl.c
67045@@ -11,13 +11,21 @@
67046 #include <linux/namei.h>
67047 #include <linux/mm.h>
67048 #include <linux/module.h>
67049+#include <linux/nsproxy.h>
67050+#ifdef CONFIG_GRKERNSEC
67051+#include <net/net_namespace.h>
67052+#endif
67053 #include "internal.h"
67054
67055+extern int gr_handle_chroot_sysctl(const int op);
67056+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
67057+ const int op);
67058+
67059 static const struct dentry_operations proc_sys_dentry_operations;
67060 static const struct file_operations proc_sys_file_operations;
67061-static const struct inode_operations proc_sys_inode_operations;
67062+const struct inode_operations proc_sys_inode_operations;
67063 static const struct file_operations proc_sys_dir_file_operations;
67064-static const struct inode_operations proc_sys_dir_operations;
67065+const struct inode_operations proc_sys_dir_operations;
67066
67067 void proc_sys_poll_notify(struct ctl_table_poll *poll)
67068 {
67069@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
67070
67071 err = NULL;
67072 d_set_d_op(dentry, &proc_sys_dentry_operations);
67073+
67074+ gr_handle_proc_create(dentry, inode);
67075+
67076 d_add(dentry, inode);
67077
67078 out:
67079@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67080 struct inode *inode = file_inode(filp);
67081 struct ctl_table_header *head = grab_header(inode);
67082 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
67083+ int op = write ? MAY_WRITE : MAY_READ;
67084 ssize_t error;
67085 size_t res;
67086
67087@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67088 * and won't be until we finish.
67089 */
67090 error = -EPERM;
67091- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
67092+ if (sysctl_perm(head, table, op))
67093 goto out;
67094
67095 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
67096@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67097 if (!table->proc_handler)
67098 goto out;
67099
67100+#ifdef CONFIG_GRKERNSEC
67101+ error = -EPERM;
67102+ if (gr_handle_chroot_sysctl(op))
67103+ goto out;
67104+ dget(filp->f_path.dentry);
67105+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
67106+ dput(filp->f_path.dentry);
67107+ goto out;
67108+ }
67109+ dput(filp->f_path.dentry);
67110+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
67111+ goto out;
67112+ if (write) {
67113+ if (current->nsproxy->net_ns != table->extra2) {
67114+ if (!capable(CAP_SYS_ADMIN))
67115+ goto out;
67116+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
67117+ goto out;
67118+ }
67119+#endif
67120+
67121 /* careful: calling conventions are nasty here */
67122 res = count;
67123 error = table->proc_handler(table, write, buf, &res, ppos);
67124@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
67125 return false;
67126 } else {
67127 d_set_d_op(child, &proc_sys_dentry_operations);
67128+
67129+ gr_handle_proc_create(child, inode);
67130+
67131 d_add(child, inode);
67132 }
67133 } else {
67134@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
67135 if ((*pos)++ < ctx->pos)
67136 return true;
67137
67138+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
67139+ return 0;
67140+
67141 if (unlikely(S_ISLNK(table->mode)))
67142 res = proc_sys_link_fill_cache(file, ctx, head, table);
67143 else
67144@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
67145 if (IS_ERR(head))
67146 return PTR_ERR(head);
67147
67148+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
67149+ return -ENOENT;
67150+
67151 generic_fillattr(inode, stat);
67152 if (table)
67153 stat->mode = (stat->mode & S_IFMT) | table->mode;
67154@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
67155 .llseek = generic_file_llseek,
67156 };
67157
67158-static const struct inode_operations proc_sys_inode_operations = {
67159+const struct inode_operations proc_sys_inode_operations = {
67160 .permission = proc_sys_permission,
67161 .setattr = proc_sys_setattr,
67162 .getattr = proc_sys_getattr,
67163 };
67164
67165-static const struct inode_operations proc_sys_dir_operations = {
67166+const struct inode_operations proc_sys_dir_operations = {
67167 .lookup = proc_sys_lookup,
67168 .permission = proc_sys_permission,
67169 .setattr = proc_sys_setattr,
67170@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
67171 static struct ctl_dir *new_dir(struct ctl_table_set *set,
67172 const char *name, int namelen)
67173 {
67174- struct ctl_table *table;
67175+ ctl_table_no_const *table;
67176 struct ctl_dir *new;
67177 struct ctl_node *node;
67178 char *new_name;
67179@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
67180 return NULL;
67181
67182 node = (struct ctl_node *)(new + 1);
67183- table = (struct ctl_table *)(node + 1);
67184+ table = (ctl_table_no_const *)(node + 1);
67185 new_name = (char *)(table + 2);
67186 memcpy(new_name, name, namelen);
67187 new_name[namelen] = '\0';
67188@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
67189 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
67190 struct ctl_table_root *link_root)
67191 {
67192- struct ctl_table *link_table, *entry, *link;
67193+ ctl_table_no_const *link_table, *link;
67194+ struct ctl_table *entry;
67195 struct ctl_table_header *links;
67196 struct ctl_node *node;
67197 char *link_name;
67198@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
67199 return NULL;
67200
67201 node = (struct ctl_node *)(links + 1);
67202- link_table = (struct ctl_table *)(node + nr_entries);
67203+ link_table = (ctl_table_no_const *)(node + nr_entries);
67204 link_name = (char *)&link_table[nr_entries + 1];
67205
67206 for (link = link_table, entry = table; entry->procname; link++, entry++) {
67207@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67208 struct ctl_table_header ***subheader, struct ctl_table_set *set,
67209 struct ctl_table *table)
67210 {
67211- struct ctl_table *ctl_table_arg = NULL;
67212- struct ctl_table *entry, *files;
67213+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
67214+ struct ctl_table *entry;
67215 int nr_files = 0;
67216 int nr_dirs = 0;
67217 int err = -ENOMEM;
67218@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67219 nr_files++;
67220 }
67221
67222- files = table;
67223 /* If there are mixed files and directories we need a new table */
67224 if (nr_dirs && nr_files) {
67225- struct ctl_table *new;
67226+ ctl_table_no_const *new;
67227 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
67228 GFP_KERNEL);
67229 if (!files)
67230@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67231 /* Register everything except a directory full of subdirectories */
67232 if (nr_files || !nr_dirs) {
67233 struct ctl_table_header *header;
67234- header = __register_sysctl_table(set, path, files);
67235+ header = __register_sysctl_table(set, path, files ? files : table);
67236 if (!header) {
67237 kfree(ctl_table_arg);
67238 goto out;
67239diff --git a/fs/proc/root.c b/fs/proc/root.c
67240index e74ac9f..35e89f4 100644
67241--- a/fs/proc/root.c
67242+++ b/fs/proc/root.c
67243@@ -188,7 +188,15 @@ void __init proc_root_init(void)
67244 proc_mkdir("openprom", NULL);
67245 #endif
67246 proc_tty_init();
67247+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67248+#ifdef CONFIG_GRKERNSEC_PROC_USER
67249+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
67250+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67251+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
67252+#endif
67253+#else
67254 proc_mkdir("bus", NULL);
67255+#endif
67256 proc_sys_init();
67257 }
67258
67259diff --git a/fs/proc/stat.c b/fs/proc/stat.c
67260index 510413eb..34d9a8c 100644
67261--- a/fs/proc/stat.c
67262+++ b/fs/proc/stat.c
67263@@ -11,6 +11,7 @@
67264 #include <linux/irqnr.h>
67265 #include <linux/cputime.h>
67266 #include <linux/tick.h>
67267+#include <linux/grsecurity.h>
67268
67269 #ifndef arch_irq_stat_cpu
67270 #define arch_irq_stat_cpu(cpu) 0
67271@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
67272 u64 sum_softirq = 0;
67273 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
67274 struct timespec boottime;
67275+ int unrestricted = 1;
67276+
67277+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67278+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67279+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
67280+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67281+ && !in_group_p(grsec_proc_gid)
67282+#endif
67283+ )
67284+ unrestricted = 0;
67285+#endif
67286+#endif
67287
67288 user = nice = system = idle = iowait =
67289 irq = softirq = steal = 0;
67290@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
67291 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67292 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67293 idle += get_idle_time(i);
67294- iowait += get_iowait_time(i);
67295- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67296- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67297- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67298- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67299- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67300- sum += kstat_cpu_irqs_sum(i);
67301- sum += arch_irq_stat_cpu(i);
67302+ if (unrestricted) {
67303+ iowait += get_iowait_time(i);
67304+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67305+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67306+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67307+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67308+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67309+ sum += kstat_cpu_irqs_sum(i);
67310+ sum += arch_irq_stat_cpu(i);
67311+ for (j = 0; j < NR_SOFTIRQS; j++) {
67312+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67313
67314- for (j = 0; j < NR_SOFTIRQS; j++) {
67315- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67316-
67317- per_softirq_sums[j] += softirq_stat;
67318- sum_softirq += softirq_stat;
67319+ per_softirq_sums[j] += softirq_stat;
67320+ sum_softirq += softirq_stat;
67321+ }
67322 }
67323 }
67324- sum += arch_irq_stat();
67325+ if (unrestricted)
67326+ sum += arch_irq_stat();
67327
67328 seq_puts(p, "cpu ");
67329 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67330@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
67331 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67332 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67333 idle = get_idle_time(i);
67334- iowait = get_iowait_time(i);
67335- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67336- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67337- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67338- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67339- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67340+ if (unrestricted) {
67341+ iowait = get_iowait_time(i);
67342+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67343+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67344+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67345+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67346+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67347+ }
67348 seq_printf(p, "cpu%d", i);
67349 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67350 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
67351@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
67352
67353 /* sum again ? it could be updated? */
67354 for_each_irq_nr(j)
67355- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
67356+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
67357
67358 seq_printf(p,
67359 "\nctxt %llu\n"
67360@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
67361 "processes %lu\n"
67362 "procs_running %lu\n"
67363 "procs_blocked %lu\n",
67364- nr_context_switches(),
67365+ unrestricted ? nr_context_switches() : 0ULL,
67366 (unsigned long)jif,
67367- total_forks,
67368- nr_running(),
67369- nr_iowait());
67370+ unrestricted ? total_forks : 0UL,
67371+ unrestricted ? nr_running() : 0UL,
67372+ unrestricted ? nr_iowait() : 0UL);
67373
67374 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
67375
67376diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
67377index f86e549..3a88fcd 100644
67378--- a/fs/proc/task_mmu.c
67379+++ b/fs/proc/task_mmu.c
67380@@ -13,12 +13,19 @@
67381 #include <linux/swap.h>
67382 #include <linux/swapops.h>
67383 #include <linux/mmu_notifier.h>
67384+#include <linux/grsecurity.h>
67385
67386 #include <asm/elf.h>
67387 #include <asm/uaccess.h>
67388 #include <asm/tlbflush.h>
67389 #include "internal.h"
67390
67391+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67392+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
67393+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
67394+ _mm->pax_flags & MF_PAX_SEGMEXEC))
67395+#endif
67396+
67397 void task_mem(struct seq_file *m, struct mm_struct *mm)
67398 {
67399 unsigned long data, text, lib, swap;
67400@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67401 "VmExe:\t%8lu kB\n"
67402 "VmLib:\t%8lu kB\n"
67403 "VmPTE:\t%8lu kB\n"
67404- "VmSwap:\t%8lu kB\n",
67405- hiwater_vm << (PAGE_SHIFT-10),
67406+ "VmSwap:\t%8lu kB\n"
67407+
67408+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
67409+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
67410+#endif
67411+
67412+ ,hiwater_vm << (PAGE_SHIFT-10),
67413 total_vm << (PAGE_SHIFT-10),
67414 mm->locked_vm << (PAGE_SHIFT-10),
67415 mm->pinned_vm << (PAGE_SHIFT-10),
67416@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67417 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
67418 (PTRS_PER_PTE * sizeof(pte_t) *
67419 atomic_long_read(&mm->nr_ptes)) >> 10,
67420- swap << (PAGE_SHIFT-10));
67421+ swap << (PAGE_SHIFT-10)
67422+
67423+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
67424+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67425+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
67426+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
67427+#else
67428+ , mm->context.user_cs_base
67429+ , mm->context.user_cs_limit
67430+#endif
67431+#endif
67432+
67433+ );
67434 }
67435
67436 unsigned long task_vsize(struct mm_struct *mm)
67437@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67438 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
67439 }
67440
67441- /* We don't show the stack guard page in /proc/maps */
67442+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67443+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
67444+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
67445+#else
67446 start = vma->vm_start;
67447- if (stack_guard_page_start(vma, start))
67448- start += PAGE_SIZE;
67449 end = vma->vm_end;
67450- if (stack_guard_page_end(vma, end))
67451- end -= PAGE_SIZE;
67452+#endif
67453
67454 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
67455 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
67456@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67457 flags & VM_WRITE ? 'w' : '-',
67458 flags & VM_EXEC ? 'x' : '-',
67459 flags & VM_MAYSHARE ? 's' : 'p',
67460+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67461+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
67462+#else
67463 pgoff,
67464+#endif
67465 MAJOR(dev), MINOR(dev), ino);
67466
67467 /*
67468@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67469 */
67470 if (file) {
67471 seq_pad(m, ' ');
67472- seq_path(m, &file->f_path, "\n");
67473+ seq_path(m, &file->f_path, "\n\\");
67474 goto done;
67475 }
67476
67477@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67478 * Thread stack in /proc/PID/task/TID/maps or
67479 * the main process stack.
67480 */
67481- if (!is_pid || (vma->vm_start <= mm->start_stack &&
67482- vma->vm_end >= mm->start_stack)) {
67483+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
67484+ (vma->vm_start <= mm->start_stack &&
67485+ vma->vm_end >= mm->start_stack)) {
67486 name = "[stack]";
67487 } else {
67488 /* Thread stack in /proc/PID/maps */
67489@@ -359,6 +388,12 @@ done:
67490
67491 static int show_map(struct seq_file *m, void *v, int is_pid)
67492 {
67493+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67494+ if (current->exec_id != m->exec_id) {
67495+ gr_log_badprocpid("maps");
67496+ return 0;
67497+ }
67498+#endif
67499 show_map_vma(m, v, is_pid);
67500 m_cache_vma(m, v);
67501 return 0;
67502@@ -629,12 +664,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67503 .private = &mss,
67504 };
67505
67506+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67507+ if (current->exec_id != m->exec_id) {
67508+ gr_log_badprocpid("smaps");
67509+ return 0;
67510+ }
67511+#endif
67512 memset(&mss, 0, sizeof mss);
67513- mss.vma = vma;
67514- /* mmap_sem is held in m_start */
67515- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67516- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67517-
67518+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67519+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
67520+#endif
67521+ mss.vma = vma;
67522+ /* mmap_sem is held in m_start */
67523+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67524+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67525+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67526+ }
67527+#endif
67528 show_map_vma(m, vma, is_pid);
67529
67530 seq_printf(m,
67531@@ -652,7 +698,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67532 "KernelPageSize: %8lu kB\n"
67533 "MMUPageSize: %8lu kB\n"
67534 "Locked: %8lu kB\n",
67535+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67536+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
67537+#else
67538 (vma->vm_end - vma->vm_start) >> 10,
67539+#endif
67540 mss.resident >> 10,
67541 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
67542 mss.shared_clean >> 10,
67543@@ -1489,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67544 char buffer[64];
67545 int nid;
67546
67547+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67548+ if (current->exec_id != m->exec_id) {
67549+ gr_log_badprocpid("numa_maps");
67550+ return 0;
67551+ }
67552+#endif
67553+
67554 if (!mm)
67555 return 0;
67556
67557@@ -1510,11 +1567,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67558 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
67559 }
67560
67561+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67562+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
67563+#else
67564 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
67565+#endif
67566
67567 if (file) {
67568 seq_puts(m, " file=");
67569- seq_path(m, &file->f_path, "\n\t= ");
67570+ seq_path(m, &file->f_path, "\n\t\\= ");
67571 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
67572 seq_puts(m, " heap");
67573 } else {
67574diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
67575index 599ec2e..f1413ae 100644
67576--- a/fs/proc/task_nommu.c
67577+++ b/fs/proc/task_nommu.c
67578@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67579 else
67580 bytes += kobjsize(mm);
67581
67582- if (current->fs && current->fs->users > 1)
67583+ if (current->fs && atomic_read(&current->fs->users) > 1)
67584 sbytes += kobjsize(current->fs);
67585 else
67586 bytes += kobjsize(current->fs);
67587@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
67588
67589 if (file) {
67590 seq_pad(m, ' ');
67591- seq_path(m, &file->f_path, "");
67592+ seq_path(m, &file->f_path, "\n\\");
67593 } else if (mm) {
67594 pid_t tid = pid_of_stack(priv, vma, is_pid);
67595
67596diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
67597index a90d6d35..d08047c 100644
67598--- a/fs/proc/vmcore.c
67599+++ b/fs/proc/vmcore.c
67600@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
67601 nr_bytes = count;
67602
67603 /* If pfn is not ram, return zeros for sparse dump files */
67604- if (pfn_is_ram(pfn) == 0)
67605- memset(buf, 0, nr_bytes);
67606- else {
67607+ if (pfn_is_ram(pfn) == 0) {
67608+ if (userbuf) {
67609+ if (clear_user((char __force_user *)buf, nr_bytes))
67610+ return -EFAULT;
67611+ } else
67612+ memset(buf, 0, nr_bytes);
67613+ } else {
67614 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
67615 offset, userbuf);
67616 if (tmp < 0)
67617@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
67618 static int copy_to(void *target, void *src, size_t size, int userbuf)
67619 {
67620 if (userbuf) {
67621- if (copy_to_user((char __user *) target, src, size))
67622+ if (copy_to_user((char __force_user *) target, src, size))
67623 return -EFAULT;
67624 } else {
67625 memcpy(target, src, size);
67626@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67627 if (*fpos < m->offset + m->size) {
67628 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67629 start = m->paddr + *fpos - m->offset;
67630- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67631+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67632 if (tmp < 0)
67633 return tmp;
67634 buflen -= tsz;
67635@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67636 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67637 size_t buflen, loff_t *fpos)
67638 {
67639- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67640+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67641 }
67642
67643 /*
67644diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67645index d3fb2b6..43a8140 100644
67646--- a/fs/qnx6/qnx6.h
67647+++ b/fs/qnx6/qnx6.h
67648@@ -74,7 +74,7 @@ enum {
67649 BYTESEX_BE,
67650 };
67651
67652-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67653+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67654 {
67655 if (sbi->s_bytesex == BYTESEX_LE)
67656 return le64_to_cpu((__force __le64)n);
67657@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67658 return (__force __fs64)cpu_to_be64(n);
67659 }
67660
67661-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67662+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67663 {
67664 if (sbi->s_bytesex == BYTESEX_LE)
67665 return le32_to_cpu((__force __le32)n);
67666diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67667index bb2869f..d34ada8 100644
67668--- a/fs/quota/netlink.c
67669+++ b/fs/quota/netlink.c
67670@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67671 void quota_send_warning(struct kqid qid, dev_t dev,
67672 const char warntype)
67673 {
67674- static atomic_t seq;
67675+ static atomic_unchecked_t seq;
67676 struct sk_buff *skb;
67677 void *msg_head;
67678 int ret;
67679@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67680 "VFS: Not enough memory to send quota warning.\n");
67681 return;
67682 }
67683- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67684+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67685 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67686 if (!msg_head) {
67687 printk(KERN_ERR
67688diff --git a/fs/read_write.c b/fs/read_write.c
67689index c0805c93..d39f2eb 100644
67690--- a/fs/read_write.c
67691+++ b/fs/read_write.c
67692@@ -507,7 +507,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67693
67694 old_fs = get_fs();
67695 set_fs(get_ds());
67696- p = (__force const char __user *)buf;
67697+ p = (const char __force_user *)buf;
67698 if (count > MAX_RW_COUNT)
67699 count = MAX_RW_COUNT;
67700 if (file->f_op->write)
67701diff --git a/fs/readdir.c b/fs/readdir.c
67702index ced6791..936687b 100644
67703--- a/fs/readdir.c
67704+++ b/fs/readdir.c
67705@@ -18,6 +18,7 @@
67706 #include <linux/security.h>
67707 #include <linux/syscalls.h>
67708 #include <linux/unistd.h>
67709+#include <linux/namei.h>
67710
67711 #include <asm/uaccess.h>
67712
67713@@ -71,6 +72,7 @@ struct old_linux_dirent {
67714 struct readdir_callback {
67715 struct dir_context ctx;
67716 struct old_linux_dirent __user * dirent;
67717+ struct file * file;
67718 int result;
67719 };
67720
67721@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
67722 buf->result = -EOVERFLOW;
67723 return -EOVERFLOW;
67724 }
67725+
67726+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67727+ return 0;
67728+
67729 buf->result++;
67730 dirent = buf->dirent;
67731 if (!access_ok(VERIFY_WRITE, dirent,
67732@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67733 if (!f.file)
67734 return -EBADF;
67735
67736+ buf.file = f.file;
67737 error = iterate_dir(f.file, &buf.ctx);
67738 if (buf.result)
67739 error = buf.result;
67740@@ -145,6 +152,7 @@ struct getdents_callback {
67741 struct dir_context ctx;
67742 struct linux_dirent __user * current_dir;
67743 struct linux_dirent __user * previous;
67744+ struct file * file;
67745 int count;
67746 int error;
67747 };
67748@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
67749 buf->error = -EOVERFLOW;
67750 return -EOVERFLOW;
67751 }
67752+
67753+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67754+ return 0;
67755+
67756 dirent = buf->previous;
67757 if (dirent) {
67758 if (__put_user(offset, &dirent->d_off))
67759@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67760 if (!f.file)
67761 return -EBADF;
67762
67763+ buf.file = f.file;
67764 error = iterate_dir(f.file, &buf.ctx);
67765 if (error >= 0)
67766 error = buf.error;
67767@@ -230,6 +243,7 @@ struct getdents_callback64 {
67768 struct dir_context ctx;
67769 struct linux_dirent64 __user * current_dir;
67770 struct linux_dirent64 __user * previous;
67771+ struct file *file;
67772 int count;
67773 int error;
67774 };
67775@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
67776 buf->error = -EINVAL; /* only used if we fail.. */
67777 if (reclen > buf->count)
67778 return -EINVAL;
67779+
67780+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67781+ return 0;
67782+
67783 dirent = buf->previous;
67784 if (dirent) {
67785 if (__put_user(offset, &dirent->d_off))
67786@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67787 if (!f.file)
67788 return -EBADF;
67789
67790+ buf.file = f.file;
67791 error = iterate_dir(f.file, &buf.ctx);
67792 if (error >= 0)
67793 error = buf.error;
67794diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67795index 9c02d96..6562c10 100644
67796--- a/fs/reiserfs/do_balan.c
67797+++ b/fs/reiserfs/do_balan.c
67798@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67799 return;
67800 }
67801
67802- atomic_inc(&fs_generation(tb->tb_sb));
67803+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67804 do_balance_starts(tb);
67805
67806 /*
67807diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67808index aca73dd..e3c558d 100644
67809--- a/fs/reiserfs/item_ops.c
67810+++ b/fs/reiserfs/item_ops.c
67811@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67812 }
67813
67814 static struct item_operations errcatch_ops = {
67815- errcatch_bytes_number,
67816- errcatch_decrement_key,
67817- errcatch_is_left_mergeable,
67818- errcatch_print_item,
67819- errcatch_check_item,
67820+ .bytes_number = errcatch_bytes_number,
67821+ .decrement_key = errcatch_decrement_key,
67822+ .is_left_mergeable = errcatch_is_left_mergeable,
67823+ .print_item = errcatch_print_item,
67824+ .check_item = errcatch_check_item,
67825
67826- errcatch_create_vi,
67827- errcatch_check_left,
67828- errcatch_check_right,
67829- errcatch_part_size,
67830- errcatch_unit_num,
67831- errcatch_print_vi
67832+ .create_vi = errcatch_create_vi,
67833+ .check_left = errcatch_check_left,
67834+ .check_right = errcatch_check_right,
67835+ .part_size = errcatch_part_size,
67836+ .unit_num = errcatch_unit_num,
67837+ .print_vi = errcatch_print_vi
67838 };
67839
67840 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67841diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67842index 621b9f3..af527fd 100644
67843--- a/fs/reiserfs/procfs.c
67844+++ b/fs/reiserfs/procfs.c
67845@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67846 "SMALL_TAILS " : "NO_TAILS ",
67847 replay_only(sb) ? "REPLAY_ONLY " : "",
67848 convert_reiserfs(sb) ? "CONV " : "",
67849- atomic_read(&r->s_generation_counter),
67850+ atomic_read_unchecked(&r->s_generation_counter),
67851 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67852 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67853 SF(s_good_search_by_key_reada), SF(s_bmaps),
67854diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67855index bb79cdd..fcf49ef 100644
67856--- a/fs/reiserfs/reiserfs.h
67857+++ b/fs/reiserfs/reiserfs.h
67858@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
67859 /* Comment? -Hans */
67860 wait_queue_head_t s_wait;
67861 /* increased by one every time the tree gets re-balanced */
67862- atomic_t s_generation_counter;
67863+ atomic_unchecked_t s_generation_counter;
67864
67865 /* File system properties. Currently holds on-disk FS format */
67866 unsigned long s_properties;
67867@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67868 #define REISERFS_USER_MEM 1 /* user memory mode */
67869
67870 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67871-#define get_generation(s) atomic_read (&fs_generation(s))
67872+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67873 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67874 #define __fs_changed(gen,s) (gen != get_generation (s))
67875 #define fs_changed(gen,s) \
67876diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67877index 71fbbe3..eff29ba 100644
67878--- a/fs/reiserfs/super.c
67879+++ b/fs/reiserfs/super.c
67880@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67881 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67882 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67883 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67884+#ifdef CONFIG_REISERFS_FS_XATTR
67885+ /* turn on user xattrs by default */
67886+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67887+#endif
67888 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67889 sbi->s_alloc_options.preallocmin = 0;
67890 /* Preallocate by 16 blocks (17-1) at once */
67891diff --git a/fs/select.c b/fs/select.c
67892index 467bb1c..cf9d65a 100644
67893--- a/fs/select.c
67894+++ b/fs/select.c
67895@@ -20,6 +20,7 @@
67896 #include <linux/export.h>
67897 #include <linux/slab.h>
67898 #include <linux/poll.h>
67899+#include <linux/security.h>
67900 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67901 #include <linux/file.h>
67902 #include <linux/fdtable.h>
67903@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67904 struct poll_list *walk = head;
67905 unsigned long todo = nfds;
67906
67907+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67908 if (nfds > rlimit(RLIMIT_NOFILE))
67909 return -EINVAL;
67910
67911diff --git a/fs/seq_file.c b/fs/seq_file.c
67912index dbf3a59..daf023f 100644
67913--- a/fs/seq_file.c
67914+++ b/fs/seq_file.c
67915@@ -12,6 +12,8 @@
67916 #include <linux/slab.h>
67917 #include <linux/cred.h>
67918 #include <linux/mm.h>
67919+#include <linux/sched.h>
67920+#include <linux/grsecurity.h>
67921
67922 #include <asm/uaccess.h>
67923 #include <asm/page.h>
67924@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
67925
67926 static void *seq_buf_alloc(unsigned long size)
67927 {
67928- void *buf;
67929-
67930- /*
67931- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
67932- * it's better to fall back to vmalloc() than to kill things.
67933- */
67934- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
67935- if (!buf && size > PAGE_SIZE)
67936- buf = vmalloc(size);
67937- return buf;
67938+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67939 }
67940
67941 /**
67942@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67943 #ifdef CONFIG_USER_NS
67944 p->user_ns = file->f_cred->user_ns;
67945 #endif
67946+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67947+ p->exec_id = current->exec_id;
67948+#endif
67949
67950 /*
67951 * Wrappers around seq_open(e.g. swaps_open) need to be
67952@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67953 }
67954 EXPORT_SYMBOL(seq_open);
67955
67956+
67957+int seq_open_restrict(struct file *file, const struct seq_operations *op)
67958+{
67959+ if (gr_proc_is_restricted())
67960+ return -EACCES;
67961+
67962+ return seq_open(file, op);
67963+}
67964+EXPORT_SYMBOL(seq_open_restrict);
67965+
67966 static int traverse(struct seq_file *m, loff_t offset)
67967 {
67968 loff_t pos = 0, index;
67969@@ -158,7 +164,7 @@ Eoverflow:
67970 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67971 {
67972 struct seq_file *m = file->private_data;
67973- size_t copied = 0;
67974+ ssize_t copied = 0;
67975 loff_t pos;
67976 size_t n;
67977 void *p;
67978@@ -589,7 +595,7 @@ static void single_stop(struct seq_file *p, void *v)
67979 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67980 void *data)
67981 {
67982- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67983+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67984 int res = -ENOMEM;
67985
67986 if (op) {
67987@@ -625,6 +631,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67988 }
67989 EXPORT_SYMBOL(single_open_size);
67990
67991+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67992+ void *data)
67993+{
67994+ if (gr_proc_is_restricted())
67995+ return -EACCES;
67996+
67997+ return single_open(file, show, data);
67998+}
67999+EXPORT_SYMBOL(single_open_restrict);
68000+
68001+
68002 int single_release(struct inode *inode, struct file *file)
68003 {
68004 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
68005diff --git a/fs/splice.c b/fs/splice.c
68006index 75c6058..770d40c 100644
68007--- a/fs/splice.c
68008+++ b/fs/splice.c
68009@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68010 pipe_lock(pipe);
68011
68012 for (;;) {
68013- if (!pipe->readers) {
68014+ if (!atomic_read(&pipe->readers)) {
68015 send_sig(SIGPIPE, current, 0);
68016 if (!ret)
68017 ret = -EPIPE;
68018@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68019 page_nr++;
68020 ret += buf->len;
68021
68022- if (pipe->files)
68023+ if (atomic_read(&pipe->files))
68024 do_wakeup = 1;
68025
68026 if (!--spd->nr_pages)
68027@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68028 do_wakeup = 0;
68029 }
68030
68031- pipe->waiting_writers++;
68032+ atomic_inc(&pipe->waiting_writers);
68033 pipe_wait(pipe);
68034- pipe->waiting_writers--;
68035+ atomic_dec(&pipe->waiting_writers);
68036 }
68037
68038 pipe_unlock(pipe);
68039@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
68040 old_fs = get_fs();
68041 set_fs(get_ds());
68042 /* The cast to a user pointer is valid due to the set_fs() */
68043- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
68044+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
68045 set_fs(old_fs);
68046
68047 return res;
68048@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
68049 old_fs = get_fs();
68050 set_fs(get_ds());
68051 /* The cast to a user pointer is valid due to the set_fs() */
68052- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
68053+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
68054 set_fs(old_fs);
68055
68056 return res;
68057@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
68058 goto err;
68059
68060 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
68061- vec[i].iov_base = (void __user *) page_address(page);
68062+ vec[i].iov_base = (void __force_user *) page_address(page);
68063 vec[i].iov_len = this_len;
68064 spd.pages[i] = page;
68065 spd.nr_pages++;
68066@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68067 ops->release(pipe, buf);
68068 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68069 pipe->nrbufs--;
68070- if (pipe->files)
68071+ if (atomic_read(&pipe->files))
68072 sd->need_wakeup = true;
68073 }
68074
68075@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68076 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
68077 {
68078 while (!pipe->nrbufs) {
68079- if (!pipe->writers)
68080+ if (!atomic_read(&pipe->writers))
68081 return 0;
68082
68083- if (!pipe->waiting_writers && sd->num_spliced)
68084+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
68085 return 0;
68086
68087 if (sd->flags & SPLICE_F_NONBLOCK)
68088@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
68089 ops->release(pipe, buf);
68090 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68091 pipe->nrbufs--;
68092- if (pipe->files)
68093+ if (atomic_read(&pipe->files))
68094 sd.need_wakeup = true;
68095 } else {
68096 buf->offset += ret;
68097@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
68098 * out of the pipe right after the splice_to_pipe(). So set
68099 * PIPE_READERS appropriately.
68100 */
68101- pipe->readers = 1;
68102+ atomic_set(&pipe->readers, 1);
68103
68104 current->splice_pipe = pipe;
68105 }
68106@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
68107
68108 partial[buffers].offset = off;
68109 partial[buffers].len = plen;
68110+ partial[buffers].private = 0;
68111
68112 off = 0;
68113 len -= plen;
68114@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68115 ret = -ERESTARTSYS;
68116 break;
68117 }
68118- if (!pipe->writers)
68119+ if (!atomic_read(&pipe->writers))
68120 break;
68121- if (!pipe->waiting_writers) {
68122+ if (!atomic_read(&pipe->waiting_writers)) {
68123 if (flags & SPLICE_F_NONBLOCK) {
68124 ret = -EAGAIN;
68125 break;
68126@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68127 pipe_lock(pipe);
68128
68129 while (pipe->nrbufs >= pipe->buffers) {
68130- if (!pipe->readers) {
68131+ if (!atomic_read(&pipe->readers)) {
68132 send_sig(SIGPIPE, current, 0);
68133 ret = -EPIPE;
68134 break;
68135@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68136 ret = -ERESTARTSYS;
68137 break;
68138 }
68139- pipe->waiting_writers++;
68140+ atomic_inc(&pipe->waiting_writers);
68141 pipe_wait(pipe);
68142- pipe->waiting_writers--;
68143+ atomic_dec(&pipe->waiting_writers);
68144 }
68145
68146 pipe_unlock(pipe);
68147@@ -1818,14 +1819,14 @@ retry:
68148 pipe_double_lock(ipipe, opipe);
68149
68150 do {
68151- if (!opipe->readers) {
68152+ if (!atomic_read(&opipe->readers)) {
68153 send_sig(SIGPIPE, current, 0);
68154 if (!ret)
68155 ret = -EPIPE;
68156 break;
68157 }
68158
68159- if (!ipipe->nrbufs && !ipipe->writers)
68160+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
68161 break;
68162
68163 /*
68164@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
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@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
68174 * return EAGAIN if we have the potential of some data in the
68175 * future, otherwise just return 0
68176 */
68177- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
68178+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
68179 ret = -EAGAIN;
68180
68181 pipe_unlock(ipipe);
68182diff --git a/fs/stat.c b/fs/stat.c
68183index ae0c3ce..9ee641c 100644
68184--- a/fs/stat.c
68185+++ b/fs/stat.c
68186@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
68187 stat->gid = inode->i_gid;
68188 stat->rdev = inode->i_rdev;
68189 stat->size = i_size_read(inode);
68190- stat->atime = inode->i_atime;
68191- stat->mtime = inode->i_mtime;
68192+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68193+ stat->atime = inode->i_ctime;
68194+ stat->mtime = inode->i_ctime;
68195+ } else {
68196+ stat->atime = inode->i_atime;
68197+ stat->mtime = inode->i_mtime;
68198+ }
68199 stat->ctime = inode->i_ctime;
68200 stat->blksize = (1 << inode->i_blkbits);
68201 stat->blocks = inode->i_blocks;
68202@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
68203 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
68204 {
68205 struct inode *inode = path->dentry->d_inode;
68206+ int retval;
68207
68208- if (inode->i_op->getattr)
68209- return inode->i_op->getattr(path->mnt, path->dentry, stat);
68210+ if (inode->i_op->getattr) {
68211+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
68212+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68213+ stat->atime = stat->ctime;
68214+ stat->mtime = stat->ctime;
68215+ }
68216+ return retval;
68217+ }
68218
68219 generic_fillattr(inode, stat);
68220 return 0;
68221diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
68222index 0b45ff4..edf9d3a 100644
68223--- a/fs/sysfs/dir.c
68224+++ b/fs/sysfs/dir.c
68225@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68226 kfree(buf);
68227 }
68228
68229+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68230+extern int grsec_enable_sysfs_restrict;
68231+#endif
68232+
68233 /**
68234 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
68235 * @kobj: object we're creating directory for
68236@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68237 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68238 {
68239 struct kernfs_node *parent, *kn;
68240+ const char *name;
68241+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
68242+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68243+ const char *parent_name;
68244+#endif
68245
68246 BUG_ON(!kobj);
68247
68248+ name = kobject_name(kobj);
68249+
68250 if (kobj->parent)
68251 parent = kobj->parent->sd;
68252 else
68253@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68254 if (!parent)
68255 return -ENOENT;
68256
68257- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
68258- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
68259+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68260+ parent_name = parent->name;
68261+ mode = S_IRWXU;
68262+
68263+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
68264+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
68265+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
68266+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
68267+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68268+ if (!grsec_enable_sysfs_restrict)
68269+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68270+#endif
68271+
68272+ kn = kernfs_create_dir_ns(parent, name,
68273+ mode, kobj, ns);
68274 if (IS_ERR(kn)) {
68275 if (PTR_ERR(kn) == -EEXIST)
68276- sysfs_warn_dup(parent, kobject_name(kobj));
68277+ sysfs_warn_dup(parent, name);
68278 return PTR_ERR(kn);
68279 }
68280
68281diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
68282index 69d4889..a810bd4 100644
68283--- a/fs/sysv/sysv.h
68284+++ b/fs/sysv/sysv.h
68285@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
68286 #endif
68287 }
68288
68289-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68290+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68291 {
68292 if (sbi->s_bytesex == BYTESEX_PDP)
68293 return PDP_swab((__force __u32)n);
68294diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
68295index fb08b0c..65fcc7e 100644
68296--- a/fs/ubifs/io.c
68297+++ b/fs/ubifs/io.c
68298@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
68299 return err;
68300 }
68301
68302-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68303+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68304 {
68305 int err;
68306
68307diff --git a/fs/udf/misc.c b/fs/udf/misc.c
68308index c175b4d..8f36a16 100644
68309--- a/fs/udf/misc.c
68310+++ b/fs/udf/misc.c
68311@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
68312
68313 u8 udf_tag_checksum(const struct tag *t)
68314 {
68315- u8 *data = (u8 *)t;
68316+ const u8 *data = (const u8 *)t;
68317 u8 checksum = 0;
68318 int i;
68319 for (i = 0; i < sizeof(struct tag); ++i)
68320diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
68321index 8d974c4..b82f6ec 100644
68322--- a/fs/ufs/swab.h
68323+++ b/fs/ufs/swab.h
68324@@ -22,7 +22,7 @@ enum {
68325 BYTESEX_BE
68326 };
68327
68328-static inline u64
68329+static inline u64 __intentional_overflow(-1)
68330 fs64_to_cpu(struct super_block *sbp, __fs64 n)
68331 {
68332 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68333@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
68334 return (__force __fs64)cpu_to_be64(n);
68335 }
68336
68337-static inline u32
68338+static inline u32 __intentional_overflow(-1)
68339 fs32_to_cpu(struct super_block *sbp, __fs32 n)
68340 {
68341 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68342diff --git a/fs/utimes.c b/fs/utimes.c
68343index aa138d6..5f3a811 100644
68344--- a/fs/utimes.c
68345+++ b/fs/utimes.c
68346@@ -1,6 +1,7 @@
68347 #include <linux/compiler.h>
68348 #include <linux/file.h>
68349 #include <linux/fs.h>
68350+#include <linux/security.h>
68351 #include <linux/linkage.h>
68352 #include <linux/mount.h>
68353 #include <linux/namei.h>
68354@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
68355 }
68356 }
68357 retry_deleg:
68358+
68359+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
68360+ error = -EACCES;
68361+ goto mnt_drop_write_and_out;
68362+ }
68363+
68364 mutex_lock(&inode->i_mutex);
68365 error = notify_change(path->dentry, &newattrs, &delegated_inode);
68366 mutex_unlock(&inode->i_mutex);
68367diff --git a/fs/xattr.c b/fs/xattr.c
68368index 4ef6985..a6cd6567 100644
68369--- a/fs/xattr.c
68370+++ b/fs/xattr.c
68371@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
68372 return rc;
68373 }
68374
68375+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
68376+ssize_t
68377+pax_getxattr(struct dentry *dentry, void *value, size_t size)
68378+{
68379+ struct inode *inode = dentry->d_inode;
68380+ ssize_t error;
68381+
68382+ error = inode_permission(inode, MAY_EXEC);
68383+ if (error)
68384+ return error;
68385+
68386+ if (inode->i_op->getxattr)
68387+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
68388+ else
68389+ error = -EOPNOTSUPP;
68390+
68391+ return error;
68392+}
68393+EXPORT_SYMBOL(pax_getxattr);
68394+#endif
68395+
68396 ssize_t
68397 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
68398 {
68399@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
68400 * Extended attribute SET operations
68401 */
68402 static long
68403-setxattr(struct dentry *d, const char __user *name, const void __user *value,
68404+setxattr(struct path *path, const char __user *name, const void __user *value,
68405 size_t size, int flags)
68406 {
68407 int error;
68408@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
68409 posix_acl_fix_xattr_from_user(kvalue, size);
68410 }
68411
68412- error = vfs_setxattr(d, kname, kvalue, size, flags);
68413+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
68414+ error = -EACCES;
68415+ goto out;
68416+ }
68417+
68418+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
68419 out:
68420 if (vvalue)
68421 vfree(vvalue);
68422@@ -376,7 +402,7 @@ retry:
68423 return error;
68424 error = mnt_want_write(path.mnt);
68425 if (!error) {
68426- error = setxattr(path.dentry, name, value, size, flags);
68427+ error = setxattr(&path, name, value, size, flags);
68428 mnt_drop_write(path.mnt);
68429 }
68430 path_put(&path);
68431@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
68432 audit_file(f.file);
68433 error = mnt_want_write_file(f.file);
68434 if (!error) {
68435- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
68436+ error = setxattr(&f.file->f_path, name, value, size, flags);
68437 mnt_drop_write_file(f.file);
68438 }
68439 fdput(f);
68440@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
68441 * Extended attribute REMOVE operations
68442 */
68443 static long
68444-removexattr(struct dentry *d, const char __user *name)
68445+removexattr(struct path *path, const char __user *name)
68446 {
68447 int error;
68448 char kname[XATTR_NAME_MAX + 1];
68449@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
68450 if (error < 0)
68451 return error;
68452
68453- return vfs_removexattr(d, kname);
68454+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
68455+ return -EACCES;
68456+
68457+ return vfs_removexattr(path->dentry, kname);
68458 }
68459
68460 static int path_removexattr(const char __user *pathname,
68461@@ -623,7 +652,7 @@ retry:
68462 return error;
68463 error = mnt_want_write(path.mnt);
68464 if (!error) {
68465- error = removexattr(path.dentry, name);
68466+ error = removexattr(&path, name);
68467 mnt_drop_write(path.mnt);
68468 }
68469 path_put(&path);
68470@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
68471 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
68472 {
68473 struct fd f = fdget(fd);
68474+ struct path *path;
68475 int error = -EBADF;
68476
68477 if (!f.file)
68478 return error;
68479+ path = &f.file->f_path;
68480 audit_file(f.file);
68481 error = mnt_want_write_file(f.file);
68482 if (!error) {
68483- error = removexattr(f.file->f_path.dentry, name);
68484+ error = removexattr(path, name);
68485 mnt_drop_write_file(f.file);
68486 }
68487 fdput(f);
68488diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
68489index 4e20fe7..6d1a55a 100644
68490--- a/fs/xfs/libxfs/xfs_bmap.c
68491+++ b/fs/xfs/libxfs/xfs_bmap.c
68492@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
68493
68494 #else
68495 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
68496-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
68497+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
68498 #endif /* DEBUG */
68499
68500 /*
68501diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
68502index 098cd78..724d3f8 100644
68503--- a/fs/xfs/xfs_dir2_readdir.c
68504+++ b/fs/xfs/xfs_dir2_readdir.c
68505@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
68506 ino = dp->d_ops->sf_get_ino(sfp, sfep);
68507 filetype = dp->d_ops->sf_get_ftype(sfep);
68508 ctx->pos = off & 0x7fffffff;
68509- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68510+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
68511+ char name[sfep->namelen];
68512+ memcpy(name, sfep->name, sfep->namelen);
68513+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
68514+ return 0;
68515+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68516 xfs_dir3_get_dtype(dp->i_mount, filetype)))
68517 return 0;
68518 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
68519diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
68520index a183198..6b52f52 100644
68521--- a/fs/xfs/xfs_ioctl.c
68522+++ b/fs/xfs/xfs_ioctl.c
68523@@ -119,7 +119,7 @@ xfs_find_handle(
68524 }
68525
68526 error = -EFAULT;
68527- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
68528+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
68529 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
68530 goto out_put;
68531
68532diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
68533index c31d2c2..6ec8f62 100644
68534--- a/fs/xfs/xfs_linux.h
68535+++ b/fs/xfs/xfs_linux.h
68536@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
68537 * of the compiler which do not like us using do_div in the middle
68538 * of large functions.
68539 */
68540-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68541+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68542 {
68543 __u32 mod;
68544
68545@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
68546 return 0;
68547 }
68548 #else
68549-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68550+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68551 {
68552 __u32 mod;
68553
68554diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
68555new file mode 100644
68556index 0000000..31f8fe4
68557--- /dev/null
68558+++ b/grsecurity/Kconfig
68559@@ -0,0 +1,1182 @@
68560+#
68561+# grecurity configuration
68562+#
68563+menu "Memory Protections"
68564+depends on GRKERNSEC
68565+
68566+config GRKERNSEC_KMEM
68567+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
68568+ default y if GRKERNSEC_CONFIG_AUTO
68569+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
68570+ help
68571+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
68572+ be written to or read from to modify or leak the contents of the running
68573+ kernel. /dev/port will also not be allowed to be opened, writing to
68574+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
68575+ If you have module support disabled, enabling this will close up several
68576+ ways that are currently used to insert malicious code into the running
68577+ kernel.
68578+
68579+ Even with this feature enabled, we still highly recommend that
68580+ you use the RBAC system, as it is still possible for an attacker to
68581+ modify the running kernel through other more obscure methods.
68582+
68583+ It is highly recommended that you say Y here if you meet all the
68584+ conditions above.
68585+
68586+config GRKERNSEC_VM86
68587+ bool "Restrict VM86 mode"
68588+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68589+ depends on X86_32
68590+
68591+ help
68592+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
68593+ make use of a special execution mode on 32bit x86 processors called
68594+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
68595+ video cards and will still work with this option enabled. The purpose
68596+ of the option is to prevent exploitation of emulation errors in
68597+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
68598+ Nearly all users should be able to enable this option.
68599+
68600+config GRKERNSEC_IO
68601+ bool "Disable privileged I/O"
68602+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68603+ depends on X86
68604+ select RTC_CLASS
68605+ select RTC_INTF_DEV
68606+ select RTC_DRV_CMOS
68607+
68608+ help
68609+ If you say Y here, all ioperm and iopl calls will return an error.
68610+ Ioperm and iopl can be used to modify the running kernel.
68611+ Unfortunately, some programs need this access to operate properly,
68612+ the most notable of which are XFree86 and hwclock. hwclock can be
68613+ remedied by having RTC support in the kernel, so real-time
68614+ clock support is enabled if this option is enabled, to ensure
68615+ that hwclock operates correctly. If hwclock still does not work,
68616+ either update udev or symlink /dev/rtc to /dev/rtc0.
68617+
68618+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
68619+ you may not be able to boot into a graphical environment with this
68620+ option enabled. In this case, you should use the RBAC system instead.
68621+
68622+config GRKERNSEC_BPF_HARDEN
68623+ bool "Harden BPF interpreter"
68624+ default y if GRKERNSEC_CONFIG_AUTO
68625+ help
68626+ Unlike previous versions of grsecurity that hardened both the BPF
68627+ interpreted code against corruption at rest as well as the JIT code
68628+ against JIT-spray attacks and attacker-controlled immediate values
68629+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
68630+ and will ensure the interpreted code is read-only at rest. This feature
68631+ may be removed at a later time when eBPF stabilizes to entirely revert
68632+ back to the more secure pre-3.16 BPF interpreter/JIT.
68633+
68634+ If you're using KERNEXEC, it's recommended that you enable this option
68635+ to supplement the hardening of the kernel.
68636+
68637+config GRKERNSEC_PERF_HARDEN
68638+ bool "Disable unprivileged PERF_EVENTS usage by default"
68639+ default y if GRKERNSEC_CONFIG_AUTO
68640+ depends on PERF_EVENTS
68641+ help
68642+ If you say Y here, the range of acceptable values for the
68643+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68644+ default to a new value: 3. When the sysctl is set to this value, no
68645+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68646+
68647+ Though PERF_EVENTS can be used legitimately for performance monitoring
68648+ and low-level application profiling, it is forced on regardless of
68649+ configuration, has been at fault for several vulnerabilities, and
68650+ creates new opportunities for side channels and other information leaks.
68651+
68652+ This feature puts PERF_EVENTS into a secure default state and permits
68653+ the administrator to change out of it temporarily if unprivileged
68654+ application profiling is needed.
68655+
68656+config GRKERNSEC_RAND_THREADSTACK
68657+ bool "Insert random gaps between thread stacks"
68658+ default y if GRKERNSEC_CONFIG_AUTO
68659+ depends on PAX_RANDMMAP && !PPC
68660+ help
68661+ If you say Y here, a random-sized gap will be enforced between allocated
68662+ thread stacks. Glibc's NPTL and other threading libraries that
68663+ pass MAP_STACK to the kernel for thread stack allocation are supported.
68664+ The implementation currently provides 8 bits of entropy for the gap.
68665+
68666+ Many distributions do not compile threaded remote services with the
68667+ -fstack-check argument to GCC, causing the variable-sized stack-based
68668+ allocator, alloca(), to not probe the stack on allocation. This
68669+ permits an unbounded alloca() to skip over any guard page and potentially
68670+ modify another thread's stack reliably. An enforced random gap
68671+ reduces the reliability of such an attack and increases the chance
68672+ that such a read/write to another thread's stack instead lands in
68673+ an unmapped area, causing a crash and triggering grsecurity's
68674+ anti-bruteforcing logic.
68675+
68676+config GRKERNSEC_PROC_MEMMAP
68677+ bool "Harden ASLR against information leaks and entropy reduction"
68678+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68679+ depends on PAX_NOEXEC || PAX_ASLR
68680+ help
68681+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68682+ give no information about the addresses of its mappings if
68683+ PaX features that rely on random addresses are enabled on the task.
68684+ In addition to sanitizing this information and disabling other
68685+ dangerous sources of information, this option causes reads of sensitive
68686+ /proc/<pid> entries where the file descriptor was opened in a different
68687+ task than the one performing the read. Such attempts are logged.
68688+ This option also limits argv/env strings for suid/sgid binaries
68689+ to 512KB to prevent a complete exhaustion of the stack entropy provided
68690+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68691+ binaries to prevent alternative mmap layouts from being abused.
68692+
68693+ If you use PaX it is essential that you say Y here as it closes up
68694+ several holes that make full ASLR useless locally.
68695+
68696+
68697+config GRKERNSEC_KSTACKOVERFLOW
68698+ bool "Prevent kernel stack overflows"
68699+ default y if GRKERNSEC_CONFIG_AUTO
68700+ depends on !IA64 && 64BIT
68701+ help
68702+ If you say Y here, the kernel's process stacks will be allocated
68703+ with vmalloc instead of the kernel's default allocator. This
68704+ introduces guard pages that in combination with the alloca checking
68705+ of the STACKLEAK feature prevents all forms of kernel process stack
68706+ overflow abuse. Note that this is different from kernel stack
68707+ buffer overflows.
68708+
68709+config GRKERNSEC_BRUTE
68710+ bool "Deter exploit bruteforcing"
68711+ default y if GRKERNSEC_CONFIG_AUTO
68712+ help
68713+ If you say Y here, attempts to bruteforce exploits against forking
68714+ daemons such as apache or sshd, as well as against suid/sgid binaries
68715+ will be deterred. When a child of a forking daemon is killed by PaX
68716+ or crashes due to an illegal instruction or other suspicious signal,
68717+ the parent process will be delayed 30 seconds upon every subsequent
68718+ fork until the administrator is able to assess the situation and
68719+ restart the daemon.
68720+ In the suid/sgid case, the attempt is logged, the user has all their
68721+ existing instances of the suid/sgid binary terminated and will
68722+ be unable to execute any suid/sgid binaries for 15 minutes.
68723+
68724+ It is recommended that you also enable signal logging in the auditing
68725+ section so that logs are generated when a process triggers a suspicious
68726+ signal.
68727+ If the sysctl option is enabled, a sysctl option with name
68728+ "deter_bruteforce" is created.
68729+
68730+config GRKERNSEC_MODHARDEN
68731+ bool "Harden module auto-loading"
68732+ default y if GRKERNSEC_CONFIG_AUTO
68733+ depends on MODULES
68734+ help
68735+ If you say Y here, module auto-loading in response to use of some
68736+ feature implemented by an unloaded module will be restricted to
68737+ root users. Enabling this option helps defend against attacks
68738+ by unprivileged users who abuse the auto-loading behavior to
68739+ cause a vulnerable module to load that is then exploited.
68740+
68741+ If this option prevents a legitimate use of auto-loading for a
68742+ non-root user, the administrator can execute modprobe manually
68743+ with the exact name of the module mentioned in the alert log.
68744+ Alternatively, the administrator can add the module to the list
68745+ of modules loaded at boot by modifying init scripts.
68746+
68747+ Modification of init scripts will most likely be needed on
68748+ Ubuntu servers with encrypted home directory support enabled,
68749+ as the first non-root user logging in will cause the ecb(aes),
68750+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68751+
68752+config GRKERNSEC_HIDESYM
68753+ bool "Hide kernel symbols"
68754+ default y if GRKERNSEC_CONFIG_AUTO
68755+ select PAX_USERCOPY_SLABS
68756+ help
68757+ If you say Y here, getting information on loaded modules, and
68758+ displaying all kernel symbols through a syscall will be restricted
68759+ to users with CAP_SYS_MODULE. For software compatibility reasons,
68760+ /proc/kallsyms will be restricted to the root user. The RBAC
68761+ system can hide that entry even from root.
68762+
68763+ This option also prevents leaking of kernel addresses through
68764+ several /proc entries.
68765+
68766+ Note that this option is only effective provided the following
68767+ conditions are met:
68768+ 1) The kernel using grsecurity is not precompiled by some distribution
68769+ 2) You have also enabled GRKERNSEC_DMESG
68770+ 3) You are using the RBAC system and hiding other files such as your
68771+ kernel image and System.map. Alternatively, enabling this option
68772+ causes the permissions on /boot, /lib/modules, and the kernel
68773+ source directory to change at compile time to prevent
68774+ reading by non-root users.
68775+ If the above conditions are met, this option will aid in providing a
68776+ useful protection against local kernel exploitation of overflows
68777+ and arbitrary read/write vulnerabilities.
68778+
68779+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68780+ in addition to this feature.
68781+
68782+config GRKERNSEC_RANDSTRUCT
68783+ bool "Randomize layout of sensitive kernel structures"
68784+ default y if GRKERNSEC_CONFIG_AUTO
68785+ select GRKERNSEC_HIDESYM
68786+ select MODVERSIONS if MODULES
68787+ help
68788+ If you say Y here, the layouts of a number of sensitive kernel
68789+ structures (task, fs, cred, etc) and all structures composed entirely
68790+ of function pointers (aka "ops" structs) will be randomized at compile-time.
68791+ This can introduce the requirement of an additional infoleak
68792+ vulnerability for exploits targeting these structure types.
68793+
68794+ Enabling this feature will introduce some performance impact, slightly
68795+ increase memory usage, and prevent the use of forensic tools like
68796+ Volatility against the system (unless the kernel source tree isn't
68797+ cleaned after kernel installation).
68798+
68799+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68800+ It remains after a make clean to allow for external modules to be compiled
68801+ with the existing seed and will be removed by a make mrproper or
68802+ make distclean.
68803+
68804+ Note that the implementation requires gcc 4.6.4. or newer. You may need
68805+ to install the supporting headers explicitly in addition to the normal
68806+ gcc package.
68807+
68808+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68809+ bool "Use cacheline-aware structure randomization"
68810+ depends on GRKERNSEC_RANDSTRUCT
68811+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68812+ help
68813+ If you say Y here, the RANDSTRUCT randomization will make a best effort
68814+ at restricting randomization to cacheline-sized groups of elements. It
68815+ will further not randomize bitfields in structures. This reduces the
68816+ performance hit of RANDSTRUCT at the cost of weakened randomization.
68817+
68818+config GRKERNSEC_KERN_LOCKOUT
68819+ bool "Active kernel exploit response"
68820+ default y if GRKERNSEC_CONFIG_AUTO
68821+ depends on X86 || ARM || PPC || SPARC
68822+ help
68823+ If you say Y here, when a PaX alert is triggered due to suspicious
68824+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68825+ or an OOPS occurs due to bad memory accesses, instead of just
68826+ terminating the offending process (and potentially allowing
68827+ a subsequent exploit from the same user), we will take one of two
68828+ actions:
68829+ If the user was root, we will panic the system
68830+ If the user was non-root, we will log the attempt, terminate
68831+ all processes owned by the user, then prevent them from creating
68832+ any new processes until the system is restarted
68833+ This deters repeated kernel exploitation/bruteforcing attempts
68834+ and is useful for later forensics.
68835+
68836+config GRKERNSEC_OLD_ARM_USERLAND
68837+ bool "Old ARM userland compatibility"
68838+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68839+ help
68840+ If you say Y here, stubs of executable code to perform such operations
68841+ as "compare-exchange" will be placed at fixed locations in the ARM vector
68842+ table. This is unfortunately needed for old ARM userland meant to run
68843+ across a wide range of processors. Without this option enabled,
68844+ the get_tls and data memory barrier stubs will be emulated by the kernel,
68845+ which is enough for Linaro userlands or other userlands designed for v6
68846+ and newer ARM CPUs. It's recommended that you try without this option enabled
68847+ first, and only enable it if your userland does not boot (it will likely fail
68848+ at init time).
68849+
68850+endmenu
68851+menu "Role Based Access Control Options"
68852+depends on GRKERNSEC
68853+
68854+config GRKERNSEC_RBAC_DEBUG
68855+ bool
68856+
68857+config GRKERNSEC_NO_RBAC
68858+ bool "Disable RBAC system"
68859+ help
68860+ If you say Y here, the /dev/grsec device will be removed from the kernel,
68861+ preventing the RBAC system from being enabled. You should only say Y
68862+ here if you have no intention of using the RBAC system, so as to prevent
68863+ an attacker with root access from misusing the RBAC system to hide files
68864+ and processes when loadable module support and /dev/[k]mem have been
68865+ locked down.
68866+
68867+config GRKERNSEC_ACL_HIDEKERN
68868+ bool "Hide kernel processes"
68869+ help
68870+ If you say Y here, all kernel threads will be hidden to all
68871+ processes but those whose subject has the "view hidden processes"
68872+ flag.
68873+
68874+config GRKERNSEC_ACL_MAXTRIES
68875+ int "Maximum tries before password lockout"
68876+ default 3
68877+ help
68878+ This option enforces the maximum number of times a user can attempt
68879+ to authorize themselves with the grsecurity RBAC system before being
68880+ denied the ability to attempt authorization again for a specified time.
68881+ The lower the number, the harder it will be to brute-force a password.
68882+
68883+config GRKERNSEC_ACL_TIMEOUT
68884+ int "Time to wait after max password tries, in seconds"
68885+ default 30
68886+ help
68887+ This option specifies the time the user must wait after attempting to
68888+ authorize to the RBAC system with the maximum number of invalid
68889+ passwords. The higher the number, the harder it will be to brute-force
68890+ a password.
68891+
68892+endmenu
68893+menu "Filesystem Protections"
68894+depends on GRKERNSEC
68895+
68896+config GRKERNSEC_PROC
68897+ bool "Proc restrictions"
68898+ default y if GRKERNSEC_CONFIG_AUTO
68899+ help
68900+ If you say Y here, the permissions of the /proc filesystem
68901+ will be altered to enhance system security and privacy. You MUST
68902+ choose either a user only restriction or a user and group restriction.
68903+ Depending upon the option you choose, you can either restrict users to
68904+ see only the processes they themselves run, or choose a group that can
68905+ view all processes and files normally restricted to root if you choose
68906+ the "restrict to user only" option. NOTE: If you're running identd or
68907+ ntpd as a non-root user, you will have to run it as the group you
68908+ specify here.
68909+
68910+config GRKERNSEC_PROC_USER
68911+ bool "Restrict /proc to user only"
68912+ depends on GRKERNSEC_PROC
68913+ help
68914+ If you say Y here, non-root users will only be able to view their own
68915+ processes, and restricts them from viewing network-related information,
68916+ and viewing kernel symbol and module information.
68917+
68918+config GRKERNSEC_PROC_USERGROUP
68919+ bool "Allow special group"
68920+ default y if GRKERNSEC_CONFIG_AUTO
68921+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68922+ help
68923+ If you say Y here, you will be able to select a group that will be
68924+ able to view all processes and network-related information. If you've
68925+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68926+ remain hidden. This option is useful if you want to run identd as
68927+ a non-root user. The group you select may also be chosen at boot time
68928+ via "grsec_proc_gid=" on the kernel commandline.
68929+
68930+config GRKERNSEC_PROC_GID
68931+ int "GID for special group"
68932+ depends on GRKERNSEC_PROC_USERGROUP
68933+ default 1001
68934+
68935+config GRKERNSEC_PROC_ADD
68936+ bool "Additional restrictions"
68937+ default y if GRKERNSEC_CONFIG_AUTO
68938+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68939+ help
68940+ If you say Y here, additional restrictions will be placed on
68941+ /proc that keep normal users from viewing device information and
68942+ slabinfo information that could be useful for exploits.
68943+
68944+config GRKERNSEC_LINK
68945+ bool "Linking restrictions"
68946+ default y if GRKERNSEC_CONFIG_AUTO
68947+ help
68948+ If you say Y here, /tmp race exploits will be prevented, since users
68949+ will no longer be able to follow symlinks owned by other users in
68950+ world-writable +t directories (e.g. /tmp), unless the owner of the
68951+ symlink is the owner of the directory. users will also not be
68952+ able to hardlink to files they do not own. If the sysctl option is
68953+ enabled, a sysctl option with name "linking_restrictions" is created.
68954+
68955+config GRKERNSEC_SYMLINKOWN
68956+ bool "Kernel-enforced SymlinksIfOwnerMatch"
68957+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68958+ help
68959+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
68960+ that prevents it from being used as a security feature. As Apache
68961+ verifies the symlink by performing a stat() against the target of
68962+ the symlink before it is followed, an attacker can setup a symlink
68963+ to point to a same-owned file, then replace the symlink with one
68964+ that targets another user's file just after Apache "validates" the
68965+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
68966+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68967+ will be in place for the group you specify. If the sysctl option
68968+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
68969+ created.
68970+
68971+config GRKERNSEC_SYMLINKOWN_GID
68972+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68973+ depends on GRKERNSEC_SYMLINKOWN
68974+ default 1006
68975+ help
68976+ Setting this GID determines what group kernel-enforced
68977+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68978+ is enabled, a sysctl option with name "symlinkown_gid" is created.
68979+
68980+config GRKERNSEC_FIFO
68981+ bool "FIFO restrictions"
68982+ default y if GRKERNSEC_CONFIG_AUTO
68983+ help
68984+ If you say Y here, users will not be able to write to FIFOs they don't
68985+ own in world-writable +t directories (e.g. /tmp), unless the owner of
68986+ the FIFO is the same owner of the directory it's held in. If the sysctl
68987+ option is enabled, a sysctl option with name "fifo_restrictions" is
68988+ created.
68989+
68990+config GRKERNSEC_SYSFS_RESTRICT
68991+ bool "Sysfs/debugfs restriction"
68992+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68993+ depends on SYSFS
68994+ help
68995+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68996+ any filesystem normally mounted under it (e.g. debugfs) will be
68997+ mostly accessible only by root. These filesystems generally provide access
68998+ to hardware and debug information that isn't appropriate for unprivileged
68999+ users of the system. Sysfs and debugfs have also become a large source
69000+ of new vulnerabilities, ranging from infoleaks to local compromise.
69001+ There has been very little oversight with an eye toward security involved
69002+ in adding new exporters of information to these filesystems, so their
69003+ use is discouraged.
69004+ For reasons of compatibility, a few directories have been whitelisted
69005+ for access by non-root users:
69006+ /sys/fs/selinux
69007+ /sys/fs/fuse
69008+ /sys/devices/system/cpu
69009+
69010+config GRKERNSEC_ROFS
69011+ bool "Runtime read-only mount protection"
69012+ depends on SYSCTL
69013+ help
69014+ If you say Y here, a sysctl option with name "romount_protect" will
69015+ be created. By setting this option to 1 at runtime, filesystems
69016+ will be protected in the following ways:
69017+ * No new writable mounts will be allowed
69018+ * Existing read-only mounts won't be able to be remounted read/write
69019+ * Write operations will be denied on all block devices
69020+ This option acts independently of grsec_lock: once it is set to 1,
69021+ it cannot be turned off. Therefore, please be mindful of the resulting
69022+ behavior if this option is enabled in an init script on a read-only
69023+ filesystem.
69024+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
69025+ and GRKERNSEC_IO should be enabled and module loading disabled via
69026+ config or at runtime.
69027+ This feature is mainly intended for secure embedded systems.
69028+
69029+
69030+config GRKERNSEC_DEVICE_SIDECHANNEL
69031+ bool "Eliminate stat/notify-based device sidechannels"
69032+ default y if GRKERNSEC_CONFIG_AUTO
69033+ help
69034+ If you say Y here, timing analyses on block or character
69035+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
69036+ will be thwarted for unprivileged users. If a process without
69037+ CAP_MKNOD stats such a device, the last access and last modify times
69038+ will match the device's create time. No access or modify events
69039+ will be triggered through inotify/dnotify/fanotify for such devices.
69040+ This feature will prevent attacks that may at a minimum
69041+ allow an attacker to determine the administrator's password length.
69042+
69043+config GRKERNSEC_CHROOT
69044+ bool "Chroot jail restrictions"
69045+ default y if GRKERNSEC_CONFIG_AUTO
69046+ help
69047+ If you say Y here, you will be able to choose several options that will
69048+ make breaking out of a chrooted jail much more difficult. If you
69049+ encounter no software incompatibilities with the following options, it
69050+ is recommended that you enable each one.
69051+
69052+ Note that the chroot restrictions are not intended to apply to "chroots"
69053+ to directories that are simple bind mounts of the global root filesystem.
69054+ For several other reasons, a user shouldn't expect any significant
69055+ security by performing such a chroot.
69056+
69057+config GRKERNSEC_CHROOT_MOUNT
69058+ bool "Deny mounts"
69059+ default y if GRKERNSEC_CONFIG_AUTO
69060+ depends on GRKERNSEC_CHROOT
69061+ help
69062+ If you say Y here, processes inside a chroot will not be able to
69063+ mount or remount filesystems. If the sysctl option is enabled, a
69064+ sysctl option with name "chroot_deny_mount" is created.
69065+
69066+config GRKERNSEC_CHROOT_DOUBLE
69067+ bool "Deny double-chroots"
69068+ default y if GRKERNSEC_CONFIG_AUTO
69069+ depends on GRKERNSEC_CHROOT
69070+ help
69071+ If you say Y here, processes inside a chroot will not be able to chroot
69072+ again outside the chroot. This is a widely used method of breaking
69073+ out of a chroot jail and should not be allowed. If the sysctl
69074+ option is enabled, a sysctl option with name
69075+ "chroot_deny_chroot" is created.
69076+
69077+config GRKERNSEC_CHROOT_PIVOT
69078+ bool "Deny pivot_root in chroot"
69079+ default y if GRKERNSEC_CONFIG_AUTO
69080+ depends on GRKERNSEC_CHROOT
69081+ help
69082+ If you say Y here, processes inside a chroot will not be able to use
69083+ a function called pivot_root() that was introduced in Linux 2.3.41. It
69084+ works similar to chroot in that it changes the root filesystem. This
69085+ function could be misused in a chrooted process to attempt to break out
69086+ of the chroot, and therefore should not be allowed. If the sysctl
69087+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
69088+ created.
69089+
69090+config GRKERNSEC_CHROOT_CHDIR
69091+ bool "Enforce chdir(\"/\") on all chroots"
69092+ default y if GRKERNSEC_CONFIG_AUTO
69093+ depends on GRKERNSEC_CHROOT
69094+ help
69095+ If you say Y here, the current working directory of all newly-chrooted
69096+ applications will be set to the the root directory of the chroot.
69097+ The man page on chroot(2) states:
69098+ Note that this call does not change the current working
69099+ directory, so that `.' can be outside the tree rooted at
69100+ `/'. In particular, the super-user can escape from a
69101+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
69102+
69103+ It is recommended that you say Y here, since it's not known to break
69104+ any software. If the sysctl option is enabled, a sysctl option with
69105+ name "chroot_enforce_chdir" is created.
69106+
69107+config GRKERNSEC_CHROOT_CHMOD
69108+ bool "Deny (f)chmod +s"
69109+ default y if GRKERNSEC_CONFIG_AUTO
69110+ depends on GRKERNSEC_CHROOT
69111+ help
69112+ If you say Y here, processes inside a chroot will not be able to chmod
69113+ or fchmod files to make them have suid or sgid bits. This protects
69114+ against another published method of breaking a chroot. If the sysctl
69115+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
69116+ created.
69117+
69118+config GRKERNSEC_CHROOT_FCHDIR
69119+ bool "Deny fchdir and fhandle out of chroot"
69120+ default y if GRKERNSEC_CONFIG_AUTO
69121+ depends on GRKERNSEC_CHROOT
69122+ help
69123+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
69124+ to a file descriptor of the chrooting process that points to a directory
69125+ outside the filesystem will be stopped. Additionally, this option prevents
69126+ use of the recently-created syscall for opening files by a guessable "file
69127+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
69128+ with name "chroot_deny_fchdir" is created.
69129+
69130+config GRKERNSEC_CHROOT_MKNOD
69131+ bool "Deny mknod"
69132+ default y if GRKERNSEC_CONFIG_AUTO
69133+ depends on GRKERNSEC_CHROOT
69134+ help
69135+ If you say Y here, processes inside a chroot will not be allowed to
69136+ mknod. The problem with using mknod inside a chroot is that it
69137+ would allow an attacker to create a device entry that is the same
69138+ as one on the physical root of your system, which could range from
69139+ anything from the console device to a device for your harddrive (which
69140+ they could then use to wipe the drive or steal data). It is recommended
69141+ that you say Y here, unless you run into software incompatibilities.
69142+ If the sysctl option is enabled, a sysctl option with name
69143+ "chroot_deny_mknod" is created.
69144+
69145+config GRKERNSEC_CHROOT_SHMAT
69146+ bool "Deny shmat() out of chroot"
69147+ default y if GRKERNSEC_CONFIG_AUTO
69148+ depends on GRKERNSEC_CHROOT
69149+ help
69150+ If you say Y here, processes inside a chroot will not be able to attach
69151+ to shared memory segments that were created outside of the chroot jail.
69152+ It is recommended that you say Y here. If the sysctl option is enabled,
69153+ a sysctl option with name "chroot_deny_shmat" is created.
69154+
69155+config GRKERNSEC_CHROOT_UNIX
69156+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
69157+ default y if GRKERNSEC_CONFIG_AUTO
69158+ depends on GRKERNSEC_CHROOT
69159+ help
69160+ If you say Y here, processes inside a chroot will not be able to
69161+ connect to abstract (meaning not belonging to a filesystem) Unix
69162+ domain sockets that were bound outside of a chroot. It is recommended
69163+ that you say Y here. If the sysctl option is enabled, a sysctl option
69164+ with name "chroot_deny_unix" is created.
69165+
69166+config GRKERNSEC_CHROOT_FINDTASK
69167+ bool "Protect outside processes"
69168+ default y if GRKERNSEC_CONFIG_AUTO
69169+ depends on GRKERNSEC_CHROOT
69170+ help
69171+ If you say Y here, processes inside a chroot will not be able to
69172+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
69173+ getsid, or view any process outside of the chroot. If the sysctl
69174+ option is enabled, a sysctl option with name "chroot_findtask" is
69175+ created.
69176+
69177+config GRKERNSEC_CHROOT_NICE
69178+ bool "Restrict priority changes"
69179+ default y if GRKERNSEC_CONFIG_AUTO
69180+ depends on GRKERNSEC_CHROOT
69181+ help
69182+ If you say Y here, processes inside a chroot will not be able to raise
69183+ the priority of processes in the chroot, or alter the priority of
69184+ processes outside the chroot. This provides more security than simply
69185+ removing CAP_SYS_NICE from the process' capability set. If the
69186+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
69187+ is created.
69188+
69189+config GRKERNSEC_CHROOT_SYSCTL
69190+ bool "Deny sysctl writes"
69191+ default y if GRKERNSEC_CONFIG_AUTO
69192+ depends on GRKERNSEC_CHROOT
69193+ help
69194+ If you say Y here, an attacker in a chroot will not be able to
69195+ write to sysctl entries, either by sysctl(2) or through a /proc
69196+ interface. It is strongly recommended that you say Y here. If the
69197+ sysctl option is enabled, a sysctl option with name
69198+ "chroot_deny_sysctl" is created.
69199+
69200+config GRKERNSEC_CHROOT_RENAME
69201+ bool "Deny bad renames"
69202+ default y if GRKERNSEC_CONFIG_AUTO
69203+ depends on GRKERNSEC_CHROOT
69204+ help
69205+ If you say Y here, an attacker in a chroot will not be able to
69206+ abuse the ability to create double chroots to break out of the
69207+ chroot by exploiting a race condition between a rename of a directory
69208+ within a chroot against an open of a symlink with relative path
69209+ components. This feature will likewise prevent an accomplice outside
69210+ a chroot from enabling a user inside the chroot to break out and make
69211+ use of their credentials on the global filesystem. Enabling this
69212+ feature is essential to prevent root users from breaking out of a
69213+ chroot. If the sysctl option is enabled, a sysctl option with name
69214+ "chroot_deny_bad_rename" is created.
69215+
69216+config GRKERNSEC_CHROOT_CAPS
69217+ bool "Capability restrictions"
69218+ default y if GRKERNSEC_CONFIG_AUTO
69219+ depends on GRKERNSEC_CHROOT
69220+ help
69221+ If you say Y here, the capabilities on all processes within a
69222+ chroot jail will be lowered to stop module insertion, raw i/o,
69223+ system and net admin tasks, rebooting the system, modifying immutable
69224+ files, modifying IPC owned by another, and changing the system time.
69225+ This is left an option because it can break some apps. Disable this
69226+ if your chrooted apps are having problems performing those kinds of
69227+ tasks. If the sysctl option is enabled, a sysctl option with
69228+ name "chroot_caps" is created.
69229+
69230+config GRKERNSEC_CHROOT_INITRD
69231+ bool "Exempt initrd tasks from restrictions"
69232+ default y if GRKERNSEC_CONFIG_AUTO
69233+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
69234+ help
69235+ If you say Y here, tasks started prior to init will be exempted from
69236+ grsecurity's chroot restrictions. This option is mainly meant to
69237+ resolve Plymouth's performing privileged operations unnecessarily
69238+ in a chroot.
69239+
69240+endmenu
69241+menu "Kernel Auditing"
69242+depends on GRKERNSEC
69243+
69244+config GRKERNSEC_AUDIT_GROUP
69245+ bool "Single group for auditing"
69246+ help
69247+ If you say Y here, the exec and chdir logging features will only operate
69248+ on a group you specify. This option is recommended if you only want to
69249+ watch certain users instead of having a large amount of logs from the
69250+ entire system. If the sysctl option is enabled, a sysctl option with
69251+ name "audit_group" is created.
69252+
69253+config GRKERNSEC_AUDIT_GID
69254+ int "GID for auditing"
69255+ depends on GRKERNSEC_AUDIT_GROUP
69256+ default 1007
69257+
69258+config GRKERNSEC_EXECLOG
69259+ bool "Exec logging"
69260+ help
69261+ If you say Y here, all execve() calls will be logged (since the
69262+ other exec*() calls are frontends to execve(), all execution
69263+ will be logged). Useful for shell-servers that like to keep track
69264+ of their users. If the sysctl option is enabled, a sysctl option with
69265+ name "exec_logging" is created.
69266+ WARNING: This option when enabled will produce a LOT of logs, especially
69267+ on an active system.
69268+
69269+config GRKERNSEC_RESLOG
69270+ bool "Resource logging"
69271+ default y if GRKERNSEC_CONFIG_AUTO
69272+ help
69273+ If you say Y here, all attempts to overstep resource limits will
69274+ be logged with the resource name, the requested size, and the current
69275+ limit. It is highly recommended that you say Y here. If the sysctl
69276+ option is enabled, a sysctl option with name "resource_logging" is
69277+ created. If the RBAC system is enabled, the sysctl value is ignored.
69278+
69279+config GRKERNSEC_CHROOT_EXECLOG
69280+ bool "Log execs within chroot"
69281+ help
69282+ If you say Y here, all executions inside a chroot jail will be logged
69283+ to syslog. This can cause a large amount of logs if certain
69284+ applications (eg. djb's daemontools) are installed on the system, and
69285+ is therefore left as an option. If the sysctl option is enabled, a
69286+ sysctl option with name "chroot_execlog" is created.
69287+
69288+config GRKERNSEC_AUDIT_PTRACE
69289+ bool "Ptrace logging"
69290+ help
69291+ If you say Y here, all attempts to attach to a process via ptrace
69292+ will be logged. If the sysctl option is enabled, a sysctl option
69293+ with name "audit_ptrace" is created.
69294+
69295+config GRKERNSEC_AUDIT_CHDIR
69296+ bool "Chdir logging"
69297+ help
69298+ If you say Y here, all chdir() calls will be logged. If the sysctl
69299+ option is enabled, a sysctl option with name "audit_chdir" is created.
69300+
69301+config GRKERNSEC_AUDIT_MOUNT
69302+ bool "(Un)Mount logging"
69303+ help
69304+ If you say Y here, all mounts and unmounts will be logged. If the
69305+ sysctl option is enabled, a sysctl option with name "audit_mount" is
69306+ created.
69307+
69308+config GRKERNSEC_SIGNAL
69309+ bool "Signal logging"
69310+ default y if GRKERNSEC_CONFIG_AUTO
69311+ help
69312+ If you say Y here, certain important signals will be logged, such as
69313+ SIGSEGV, which will as a result inform you of when a error in a program
69314+ occurred, which in some cases could mean a possible exploit attempt.
69315+ If the sysctl option is enabled, a sysctl option with name
69316+ "signal_logging" is created.
69317+
69318+config GRKERNSEC_FORKFAIL
69319+ bool "Fork failure logging"
69320+ help
69321+ If you say Y here, all failed fork() attempts will be logged.
69322+ This could suggest a fork bomb, or someone attempting to overstep
69323+ their process limit. If the sysctl option is enabled, a sysctl option
69324+ with name "forkfail_logging" is created.
69325+
69326+config GRKERNSEC_TIME
69327+ bool "Time change logging"
69328+ default y if GRKERNSEC_CONFIG_AUTO
69329+ help
69330+ If you say Y here, any changes of the system clock will be logged.
69331+ If the sysctl option is enabled, a sysctl option with name
69332+ "timechange_logging" is created.
69333+
69334+config GRKERNSEC_PROC_IPADDR
69335+ bool "/proc/<pid>/ipaddr support"
69336+ default y if GRKERNSEC_CONFIG_AUTO
69337+ help
69338+ If you say Y here, a new entry will be added to each /proc/<pid>
69339+ directory that contains the IP address of the person using the task.
69340+ The IP is carried across local TCP and AF_UNIX stream sockets.
69341+ This information can be useful for IDS/IPSes to perform remote response
69342+ to a local attack. The entry is readable by only the owner of the
69343+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
69344+ the RBAC system), and thus does not create privacy concerns.
69345+
69346+config GRKERNSEC_RWXMAP_LOG
69347+ bool 'Denied RWX mmap/mprotect logging'
69348+ default y if GRKERNSEC_CONFIG_AUTO
69349+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
69350+ help
69351+ If you say Y here, calls to mmap() and mprotect() with explicit
69352+ usage of PROT_WRITE and PROT_EXEC together will be logged when
69353+ denied by the PAX_MPROTECT feature. This feature will also
69354+ log other problematic scenarios that can occur when PAX_MPROTECT
69355+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
69356+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
69357+ is created.
69358+
69359+endmenu
69360+
69361+menu "Executable Protections"
69362+depends on GRKERNSEC
69363+
69364+config GRKERNSEC_DMESG
69365+ bool "Dmesg(8) restriction"
69366+ default y if GRKERNSEC_CONFIG_AUTO
69367+ help
69368+ If you say Y here, non-root users will not be able to use dmesg(8)
69369+ to view the contents of the kernel's circular log buffer.
69370+ The kernel's log buffer often contains kernel addresses and other
69371+ identifying information useful to an attacker in fingerprinting a
69372+ system for a targeted exploit.
69373+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
69374+ created.
69375+
69376+config GRKERNSEC_HARDEN_PTRACE
69377+ bool "Deter ptrace-based process snooping"
69378+ default y if GRKERNSEC_CONFIG_AUTO
69379+ help
69380+ If you say Y here, TTY sniffers and other malicious monitoring
69381+ programs implemented through ptrace will be defeated. If you
69382+ have been using the RBAC system, this option has already been
69383+ enabled for several years for all users, with the ability to make
69384+ fine-grained exceptions.
69385+
69386+ This option only affects the ability of non-root users to ptrace
69387+ processes that are not a descendent of the ptracing process.
69388+ This means that strace ./binary and gdb ./binary will still work,
69389+ but attaching to arbitrary processes will not. If the sysctl
69390+ option is enabled, a sysctl option with name "harden_ptrace" is
69391+ created.
69392+
69393+config GRKERNSEC_PTRACE_READEXEC
69394+ bool "Require read access to ptrace sensitive binaries"
69395+ default y if GRKERNSEC_CONFIG_AUTO
69396+ help
69397+ If you say Y here, unprivileged users will not be able to ptrace unreadable
69398+ binaries. This option is useful in environments that
69399+ remove the read bits (e.g. file mode 4711) from suid binaries to
69400+ prevent infoleaking of their contents. This option adds
69401+ consistency to the use of that file mode, as the binary could normally
69402+ be read out when run without privileges while ptracing.
69403+
69404+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
69405+ is created.
69406+
69407+config GRKERNSEC_SETXID
69408+ bool "Enforce consistent multithreaded privileges"
69409+ default y if GRKERNSEC_CONFIG_AUTO
69410+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
69411+ help
69412+ If you say Y here, a change from a root uid to a non-root uid
69413+ in a multithreaded application will cause the resulting uids,
69414+ gids, supplementary groups, and capabilities in that thread
69415+ to be propagated to the other threads of the process. In most
69416+ cases this is unnecessary, as glibc will emulate this behavior
69417+ on behalf of the application. Other libcs do not act in the
69418+ same way, allowing the other threads of the process to continue
69419+ running with root privileges. If the sysctl option is enabled,
69420+ a sysctl option with name "consistent_setxid" is created.
69421+
69422+config GRKERNSEC_HARDEN_IPC
69423+ bool "Disallow access to overly-permissive IPC objects"
69424+ default y if GRKERNSEC_CONFIG_AUTO
69425+ depends on SYSVIPC
69426+ help
69427+ If you say Y here, access to overly-permissive IPC objects (shared
69428+ memory, message queues, and semaphores) will be denied for processes
69429+ given the following criteria beyond normal permission checks:
69430+ 1) If the IPC object is world-accessible and the euid doesn't match
69431+ that of the creator or current uid for the IPC object
69432+ 2) If the IPC object is group-accessible and the egid doesn't
69433+ match that of the creator or current gid for the IPC object
69434+ It's a common error to grant too much permission to these objects,
69435+ with impact ranging from denial of service and information leaking to
69436+ privilege escalation. This feature was developed in response to
69437+ research by Tim Brown:
69438+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
69439+ who found hundreds of such insecure usages. Processes with
69440+ CAP_IPC_OWNER are still permitted to access these IPC objects.
69441+ If the sysctl option is enabled, a sysctl option with name
69442+ "harden_ipc" is created.
69443+
69444+config GRKERNSEC_TPE
69445+ bool "Trusted Path Execution (TPE)"
69446+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
69447+ help
69448+ If you say Y here, you will be able to choose a gid to add to the
69449+ supplementary groups of users you want to mark as "untrusted."
69450+ These users will not be able to execute any files that are not in
69451+ root-owned directories writable only by root. If the sysctl option
69452+ is enabled, a sysctl option with name "tpe" is created.
69453+
69454+config GRKERNSEC_TPE_ALL
69455+ bool "Partially restrict all non-root users"
69456+ depends on GRKERNSEC_TPE
69457+ help
69458+ If you say Y here, all non-root users will be covered under
69459+ a weaker TPE restriction. This is separate from, and in addition to,
69460+ the main TPE options that you have selected elsewhere. Thus, if a
69461+ "trusted" GID is chosen, this restriction applies to even that GID.
69462+ Under this restriction, all non-root users will only be allowed to
69463+ execute files in directories they own that are not group or
69464+ world-writable, or in directories owned by root and writable only by
69465+ root. If the sysctl option is enabled, a sysctl option with name
69466+ "tpe_restrict_all" is created.
69467+
69468+config GRKERNSEC_TPE_INVERT
69469+ bool "Invert GID option"
69470+ depends on GRKERNSEC_TPE
69471+ help
69472+ If you say Y here, the group you specify in the TPE configuration will
69473+ decide what group TPE restrictions will be *disabled* for. This
69474+ option is useful if you want TPE restrictions to be applied to most
69475+ users on the system. If the sysctl option is enabled, a sysctl option
69476+ with name "tpe_invert" is created. Unlike other sysctl options, this
69477+ entry will default to on for backward-compatibility.
69478+
69479+config GRKERNSEC_TPE_GID
69480+ int
69481+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
69482+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
69483+
69484+config GRKERNSEC_TPE_UNTRUSTED_GID
69485+ int "GID for TPE-untrusted users"
69486+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
69487+ default 1005
69488+ help
69489+ Setting this GID determines what group TPE restrictions will be
69490+ *enabled* for. If the sysctl option is enabled, a sysctl option
69491+ with name "tpe_gid" is created.
69492+
69493+config GRKERNSEC_TPE_TRUSTED_GID
69494+ int "GID for TPE-trusted users"
69495+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
69496+ default 1005
69497+ help
69498+ Setting this GID determines what group TPE restrictions will be
69499+ *disabled* for. If the sysctl option is enabled, a sysctl option
69500+ with name "tpe_gid" is created.
69501+
69502+endmenu
69503+menu "Network Protections"
69504+depends on GRKERNSEC
69505+
69506+config GRKERNSEC_BLACKHOLE
69507+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
69508+ default y if GRKERNSEC_CONFIG_AUTO
69509+ depends on NET
69510+ help
69511+ If you say Y here, neither TCP resets nor ICMP
69512+ destination-unreachable packets will be sent in response to packets
69513+ sent to ports for which no associated listening process exists.
69514+ It will also prevent the sending of ICMP protocol unreachable packets
69515+ in response to packets with unknown protocols.
69516+ This feature supports both IPV4 and IPV6 and exempts the
69517+ loopback interface from blackholing. Enabling this feature
69518+ makes a host more resilient to DoS attacks and reduces network
69519+ visibility against scanners.
69520+
69521+ The blackhole feature as-implemented is equivalent to the FreeBSD
69522+ blackhole feature, as it prevents RST responses to all packets, not
69523+ just SYNs. Under most application behavior this causes no
69524+ problems, but applications (like haproxy) may not close certain
69525+ connections in a way that cleanly terminates them on the remote
69526+ end, leaving the remote host in LAST_ACK state. Because of this
69527+ side-effect and to prevent intentional LAST_ACK DoSes, this
69528+ feature also adds automatic mitigation against such attacks.
69529+ The mitigation drastically reduces the amount of time a socket
69530+ can spend in LAST_ACK state. If you're using haproxy and not
69531+ all servers it connects to have this option enabled, consider
69532+ disabling this feature on the haproxy host.
69533+
69534+ If the sysctl option is enabled, two sysctl options with names
69535+ "ip_blackhole" and "lastack_retries" will be created.
69536+ While "ip_blackhole" takes the standard zero/non-zero on/off
69537+ toggle, "lastack_retries" uses the same kinds of values as
69538+ "tcp_retries1" and "tcp_retries2". The default value of 4
69539+ prevents a socket from lasting more than 45 seconds in LAST_ACK
69540+ state.
69541+
69542+config GRKERNSEC_NO_SIMULT_CONNECT
69543+ bool "Disable TCP Simultaneous Connect"
69544+ default y if GRKERNSEC_CONFIG_AUTO
69545+ depends on NET
69546+ help
69547+ If you say Y here, a feature by Willy Tarreau will be enabled that
69548+ removes a weakness in Linux's strict implementation of TCP that
69549+ allows two clients to connect to each other without either entering
69550+ a listening state. The weakness allows an attacker to easily prevent
69551+ a client from connecting to a known server provided the source port
69552+ for the connection is guessed correctly.
69553+
69554+ As the weakness could be used to prevent an antivirus or IPS from
69555+ fetching updates, or prevent an SSL gateway from fetching a CRL,
69556+ it should be eliminated by enabling this option. Though Linux is
69557+ one of few operating systems supporting simultaneous connect, it
69558+ has no legitimate use in practice and is rarely supported by firewalls.
69559+
69560+config GRKERNSEC_SOCKET
69561+ bool "Socket restrictions"
69562+ depends on NET
69563+ help
69564+ If you say Y here, you will be able to choose from several options.
69565+ If you assign a GID on your system and add it to the supplementary
69566+ groups of users you want to restrict socket access to, this patch
69567+ will perform up to three things, based on the option(s) you choose.
69568+
69569+config GRKERNSEC_SOCKET_ALL
69570+ bool "Deny any sockets to group"
69571+ depends on GRKERNSEC_SOCKET
69572+ help
69573+ If you say Y here, you will be able to choose a GID of whose users will
69574+ be unable to connect to other hosts from your machine or run server
69575+ applications from your machine. If the sysctl option is enabled, a
69576+ sysctl option with name "socket_all" is created.
69577+
69578+config GRKERNSEC_SOCKET_ALL_GID
69579+ int "GID to deny all sockets for"
69580+ depends on GRKERNSEC_SOCKET_ALL
69581+ default 1004
69582+ help
69583+ Here you can choose the GID to disable socket access for. Remember to
69584+ add the users you want socket access disabled for to the GID
69585+ specified here. If the sysctl option is enabled, a sysctl option
69586+ with name "socket_all_gid" is created.
69587+
69588+config GRKERNSEC_SOCKET_CLIENT
69589+ bool "Deny client sockets to group"
69590+ depends on GRKERNSEC_SOCKET
69591+ help
69592+ If you say Y here, you will be able to choose a GID of whose users will
69593+ be unable to connect to other hosts from your machine, but will be
69594+ able to run servers. If this option is enabled, all users in the group
69595+ you specify will have to use passive mode when initiating ftp transfers
69596+ from the shell on your machine. If the sysctl option is enabled, a
69597+ sysctl option with name "socket_client" is created.
69598+
69599+config GRKERNSEC_SOCKET_CLIENT_GID
69600+ int "GID to deny client sockets for"
69601+ depends on GRKERNSEC_SOCKET_CLIENT
69602+ default 1003
69603+ help
69604+ Here you can choose the GID to disable client socket access for.
69605+ Remember to add the users you want client socket access disabled for to
69606+ the GID specified here. If the sysctl option is enabled, a sysctl
69607+ option with name "socket_client_gid" is created.
69608+
69609+config GRKERNSEC_SOCKET_SERVER
69610+ bool "Deny server sockets to group"
69611+ depends on GRKERNSEC_SOCKET
69612+ help
69613+ If you say Y here, you will be able to choose a GID of whose users will
69614+ be unable to run server applications from your machine. If the sysctl
69615+ option is enabled, a sysctl option with name "socket_server" is created.
69616+
69617+config GRKERNSEC_SOCKET_SERVER_GID
69618+ int "GID to deny server sockets for"
69619+ depends on GRKERNSEC_SOCKET_SERVER
69620+ default 1002
69621+ help
69622+ Here you can choose the GID to disable server socket access for.
69623+ Remember to add the users you want server socket access disabled for to
69624+ the GID specified here. If the sysctl option is enabled, a sysctl
69625+ option with name "socket_server_gid" is created.
69626+
69627+endmenu
69628+
69629+menu "Physical Protections"
69630+depends on GRKERNSEC
69631+
69632+config GRKERNSEC_DENYUSB
69633+ bool "Deny new USB connections after toggle"
69634+ default y if GRKERNSEC_CONFIG_AUTO
69635+ depends on SYSCTL && USB_SUPPORT
69636+ help
69637+ If you say Y here, a new sysctl option with name "deny_new_usb"
69638+ will be created. Setting its value to 1 will prevent any new
69639+ USB devices from being recognized by the OS. Any attempted USB
69640+ device insertion will be logged. This option is intended to be
69641+ used against custom USB devices designed to exploit vulnerabilities
69642+ in various USB device drivers.
69643+
69644+ For greatest effectiveness, this sysctl should be set after any
69645+ relevant init scripts. This option is safe to enable in distros
69646+ as each user can choose whether or not to toggle the sysctl.
69647+
69648+config GRKERNSEC_DENYUSB_FORCE
69649+ bool "Reject all USB devices not connected at boot"
69650+ select USB
69651+ depends on GRKERNSEC_DENYUSB
69652+ help
69653+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69654+ that doesn't involve a sysctl entry. This option should only be
69655+ enabled if you're sure you want to deny all new USB connections
69656+ at runtime and don't want to modify init scripts. This should not
69657+ be enabled by distros. It forces the core USB code to be built
69658+ into the kernel image so that all devices connected at boot time
69659+ can be recognized and new USB device connections can be prevented
69660+ prior to init running.
69661+
69662+endmenu
69663+
69664+menu "Sysctl Support"
69665+depends on GRKERNSEC && SYSCTL
69666+
69667+config GRKERNSEC_SYSCTL
69668+ bool "Sysctl support"
69669+ default y if GRKERNSEC_CONFIG_AUTO
69670+ help
69671+ If you say Y here, you will be able to change the options that
69672+ grsecurity runs with at bootup, without having to recompile your
69673+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69674+ to enable (1) or disable (0) various features. All the sysctl entries
69675+ are mutable until the "grsec_lock" entry is set to a non-zero value.
69676+ All features enabled in the kernel configuration are disabled at boot
69677+ if you do not say Y to the "Turn on features by default" option.
69678+ All options should be set at startup, and the grsec_lock entry should
69679+ be set to a non-zero value after all the options are set.
69680+ *THIS IS EXTREMELY IMPORTANT*
69681+
69682+config GRKERNSEC_SYSCTL_DISTRO
69683+ bool "Extra sysctl support for distro makers (READ HELP)"
69684+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69685+ help
69686+ If you say Y here, additional sysctl options will be created
69687+ for features that affect processes running as root. Therefore,
69688+ it is critical when using this option that the grsec_lock entry be
69689+ enabled after boot. Only distros with prebuilt kernel packages
69690+ with this option enabled that can ensure grsec_lock is enabled
69691+ after boot should use this option.
69692+ *Failure to set grsec_lock after boot makes all grsec features
69693+ this option covers useless*
69694+
69695+ Currently this option creates the following sysctl entries:
69696+ "Disable Privileged I/O": "disable_priv_io"
69697+
69698+config GRKERNSEC_SYSCTL_ON
69699+ bool "Turn on features by default"
69700+ default y if GRKERNSEC_CONFIG_AUTO
69701+ depends on GRKERNSEC_SYSCTL
69702+ help
69703+ If you say Y here, instead of having all features enabled in the
69704+ kernel configuration disabled at boot time, the features will be
69705+ enabled at boot time. It is recommended you say Y here unless
69706+ there is some reason you would want all sysctl-tunable features to
69707+ be disabled by default. As mentioned elsewhere, it is important
69708+ to enable the grsec_lock entry once you have finished modifying
69709+ the sysctl entries.
69710+
69711+endmenu
69712+menu "Logging Options"
69713+depends on GRKERNSEC
69714+
69715+config GRKERNSEC_FLOODTIME
69716+ int "Seconds in between log messages (minimum)"
69717+ default 10
69718+ help
69719+ This option allows you to enforce the number of seconds between
69720+ grsecurity log messages. The default should be suitable for most
69721+ people, however, if you choose to change it, choose a value small enough
69722+ to allow informative logs to be produced, but large enough to
69723+ prevent flooding.
69724+
69725+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69726+ any rate limiting on grsecurity log messages.
69727+
69728+config GRKERNSEC_FLOODBURST
69729+ int "Number of messages in a burst (maximum)"
69730+ default 6
69731+ help
69732+ This option allows you to choose the maximum number of messages allowed
69733+ within the flood time interval you chose in a separate option. The
69734+ default should be suitable for most people, however if you find that
69735+ many of your logs are being interpreted as flooding, you may want to
69736+ raise this value.
69737+
69738+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69739+ any rate limiting on grsecurity log messages.
69740+
69741+endmenu
69742diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69743new file mode 100644
69744index 0000000..30ababb
69745--- /dev/null
69746+++ b/grsecurity/Makefile
69747@@ -0,0 +1,54 @@
69748+# grsecurity – access control and security hardening for Linux
69749+# All code in this directory and various hooks located throughout the Linux kernel are
69750+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69751+# http://www.grsecurity.net spender@grsecurity.net
69752+#
69753+# This program is free software; you can redistribute it and/or
69754+# modify it under the terms of the GNU General Public License version 2
69755+# as published by the Free Software Foundation.
69756+#
69757+# This program is distributed in the hope that it will be useful,
69758+# but WITHOUT ANY WARRANTY; without even the implied warranty of
69759+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69760+# GNU General Public License for more details.
69761+#
69762+# You should have received a copy of the GNU General Public License
69763+# along with this program; if not, write to the Free Software
69764+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69765+
69766+KBUILD_CFLAGS += -Werror
69767+
69768+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69769+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
69770+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69771+ grsec_usb.o grsec_ipc.o grsec_proc.o
69772+
69773+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69774+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69775+ gracl_learn.o grsec_log.o gracl_policy.o
69776+ifdef CONFIG_COMPAT
69777+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69778+endif
69779+
69780+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69781+
69782+ifdef CONFIG_NET
69783+obj-y += grsec_sock.o
69784+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69785+endif
69786+
69787+ifndef CONFIG_GRKERNSEC
69788+obj-y += grsec_disabled.o
69789+endif
69790+
69791+ifdef CONFIG_GRKERNSEC_HIDESYM
69792+extra-y := grsec_hidesym.o
69793+$(obj)/grsec_hidesym.o:
69794+ @-chmod -f 500 /boot
69795+ @-chmod -f 500 /lib/modules
69796+ @-chmod -f 500 /lib64/modules
69797+ @-chmod -f 500 /lib32/modules
69798+ @-chmod -f 700 .
69799+ @-chmod -f 700 $(objtree)
69800+ @echo ' grsec: protected kernel image paths'
69801+endif
69802diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69803new file mode 100644
69804index 0000000..6c1e154
69805--- /dev/null
69806+++ b/grsecurity/gracl.c
69807@@ -0,0 +1,2749 @@
69808+#include <linux/kernel.h>
69809+#include <linux/module.h>
69810+#include <linux/sched.h>
69811+#include <linux/mm.h>
69812+#include <linux/file.h>
69813+#include <linux/fs.h>
69814+#include <linux/namei.h>
69815+#include <linux/mount.h>
69816+#include <linux/tty.h>
69817+#include <linux/proc_fs.h>
69818+#include <linux/lglock.h>
69819+#include <linux/slab.h>
69820+#include <linux/vmalloc.h>
69821+#include <linux/types.h>
69822+#include <linux/sysctl.h>
69823+#include <linux/netdevice.h>
69824+#include <linux/ptrace.h>
69825+#include <linux/gracl.h>
69826+#include <linux/gralloc.h>
69827+#include <linux/security.h>
69828+#include <linux/grinternal.h>
69829+#include <linux/pid_namespace.h>
69830+#include <linux/stop_machine.h>
69831+#include <linux/fdtable.h>
69832+#include <linux/percpu.h>
69833+#include <linux/lglock.h>
69834+#include <linux/hugetlb.h>
69835+#include <linux/posix-timers.h>
69836+#include <linux/prefetch.h>
69837+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69838+#include <linux/magic.h>
69839+#include <linux/pagemap.h>
69840+#include "../fs/btrfs/async-thread.h"
69841+#include "../fs/btrfs/ctree.h"
69842+#include "../fs/btrfs/btrfs_inode.h"
69843+#endif
69844+#include "../fs/mount.h"
69845+
69846+#include <asm/uaccess.h>
69847+#include <asm/errno.h>
69848+#include <asm/mman.h>
69849+
69850+#define FOR_EACH_ROLE_START(role) \
69851+ role = running_polstate.role_list; \
69852+ while (role) {
69853+
69854+#define FOR_EACH_ROLE_END(role) \
69855+ role = role->prev; \
69856+ }
69857+
69858+extern struct path gr_real_root;
69859+
69860+static struct gr_policy_state running_polstate;
69861+struct gr_policy_state *polstate = &running_polstate;
69862+extern struct gr_alloc_state *current_alloc_state;
69863+
69864+extern char *gr_shared_page[4];
69865+DEFINE_RWLOCK(gr_inode_lock);
69866+
69867+static unsigned int gr_status __read_only = GR_STATUS_INIT;
69868+
69869+#ifdef CONFIG_NET
69870+extern struct vfsmount *sock_mnt;
69871+#endif
69872+
69873+extern struct vfsmount *pipe_mnt;
69874+extern struct vfsmount *shm_mnt;
69875+
69876+#ifdef CONFIG_HUGETLBFS
69877+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69878+#endif
69879+
69880+extern u16 acl_sp_role_value;
69881+extern struct acl_object_label *fakefs_obj_rw;
69882+extern struct acl_object_label *fakefs_obj_rwx;
69883+
69884+int gr_acl_is_enabled(void)
69885+{
69886+ return (gr_status & GR_READY);
69887+}
69888+
69889+void gr_enable_rbac_system(void)
69890+{
69891+ pax_open_kernel();
69892+ gr_status |= GR_READY;
69893+ pax_close_kernel();
69894+}
69895+
69896+int gr_rbac_disable(void *unused)
69897+{
69898+ pax_open_kernel();
69899+ gr_status &= ~GR_READY;
69900+ pax_close_kernel();
69901+
69902+ return 0;
69903+}
69904+
69905+static inline dev_t __get_dev(const struct dentry *dentry)
69906+{
69907+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69908+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69909+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69910+ else
69911+#endif
69912+ return dentry->d_sb->s_dev;
69913+}
69914+
69915+static inline u64 __get_ino(const struct dentry *dentry)
69916+{
69917+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69918+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69919+ return btrfs_ino(dentry->d_inode);
69920+ else
69921+#endif
69922+ return dentry->d_inode->i_ino;
69923+}
69924+
69925+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69926+{
69927+ return __get_dev(dentry);
69928+}
69929+
69930+u64 gr_get_ino_from_dentry(struct dentry *dentry)
69931+{
69932+ return __get_ino(dentry);
69933+}
69934+
69935+static char gr_task_roletype_to_char(struct task_struct *task)
69936+{
69937+ switch (task->role->roletype &
69938+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69939+ GR_ROLE_SPECIAL)) {
69940+ case GR_ROLE_DEFAULT:
69941+ return 'D';
69942+ case GR_ROLE_USER:
69943+ return 'U';
69944+ case GR_ROLE_GROUP:
69945+ return 'G';
69946+ case GR_ROLE_SPECIAL:
69947+ return 'S';
69948+ }
69949+
69950+ return 'X';
69951+}
69952+
69953+char gr_roletype_to_char(void)
69954+{
69955+ return gr_task_roletype_to_char(current);
69956+}
69957+
69958+__inline__ int
69959+gr_acl_tpe_check(void)
69960+{
69961+ if (unlikely(!(gr_status & GR_READY)))
69962+ return 0;
69963+ if (current->role->roletype & GR_ROLE_TPE)
69964+ return 1;
69965+ else
69966+ return 0;
69967+}
69968+
69969+int
69970+gr_handle_rawio(const struct inode *inode)
69971+{
69972+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69973+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69974+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69975+ !capable(CAP_SYS_RAWIO))
69976+ return 1;
69977+#endif
69978+ return 0;
69979+}
69980+
69981+int
69982+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69983+{
69984+ if (likely(lena != lenb))
69985+ return 0;
69986+
69987+ return !memcmp(a, b, lena);
69988+}
69989+
69990+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69991+{
69992+ *buflen -= namelen;
69993+ if (*buflen < 0)
69994+ return -ENAMETOOLONG;
69995+ *buffer -= namelen;
69996+ memcpy(*buffer, str, namelen);
69997+ return 0;
69998+}
69999+
70000+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
70001+{
70002+ return prepend(buffer, buflen, name->name, name->len);
70003+}
70004+
70005+static int prepend_path(const struct path *path, struct path *root,
70006+ char **buffer, int *buflen)
70007+{
70008+ struct dentry *dentry = path->dentry;
70009+ struct vfsmount *vfsmnt = path->mnt;
70010+ struct mount *mnt = real_mount(vfsmnt);
70011+ bool slash = false;
70012+ int error = 0;
70013+
70014+ while (dentry != root->dentry || vfsmnt != root->mnt) {
70015+ struct dentry * parent;
70016+
70017+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
70018+ /* Global root? */
70019+ if (!mnt_has_parent(mnt)) {
70020+ goto out;
70021+ }
70022+ dentry = mnt->mnt_mountpoint;
70023+ mnt = mnt->mnt_parent;
70024+ vfsmnt = &mnt->mnt;
70025+ continue;
70026+ }
70027+ parent = dentry->d_parent;
70028+ prefetch(parent);
70029+ spin_lock(&dentry->d_lock);
70030+ error = prepend_name(buffer, buflen, &dentry->d_name);
70031+ spin_unlock(&dentry->d_lock);
70032+ if (!error)
70033+ error = prepend(buffer, buflen, "/", 1);
70034+ if (error)
70035+ break;
70036+
70037+ slash = true;
70038+ dentry = parent;
70039+ }
70040+
70041+out:
70042+ if (!error && !slash)
70043+ error = prepend(buffer, buflen, "/", 1);
70044+
70045+ return error;
70046+}
70047+
70048+/* this must be called with mount_lock and rename_lock held */
70049+
70050+static char *__our_d_path(const struct path *path, struct path *root,
70051+ char *buf, int buflen)
70052+{
70053+ char *res = buf + buflen;
70054+ int error;
70055+
70056+ prepend(&res, &buflen, "\0", 1);
70057+ error = prepend_path(path, root, &res, &buflen);
70058+ if (error)
70059+ return ERR_PTR(error);
70060+
70061+ return res;
70062+}
70063+
70064+static char *
70065+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
70066+{
70067+ char *retval;
70068+
70069+ retval = __our_d_path(path, root, buf, buflen);
70070+ if (unlikely(IS_ERR(retval)))
70071+ retval = strcpy(buf, "<path too long>");
70072+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
70073+ retval[1] = '\0';
70074+
70075+ return retval;
70076+}
70077+
70078+static char *
70079+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70080+ char *buf, int buflen)
70081+{
70082+ struct path path;
70083+ char *res;
70084+
70085+ path.dentry = (struct dentry *)dentry;
70086+ path.mnt = (struct vfsmount *)vfsmnt;
70087+
70088+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
70089+ by the RBAC system */
70090+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
70091+
70092+ return res;
70093+}
70094+
70095+static char *
70096+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70097+ char *buf, int buflen)
70098+{
70099+ char *res;
70100+ struct path path;
70101+ struct path root;
70102+ struct task_struct *reaper = init_pid_ns.child_reaper;
70103+
70104+ path.dentry = (struct dentry *)dentry;
70105+ path.mnt = (struct vfsmount *)vfsmnt;
70106+
70107+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
70108+ get_fs_root(reaper->fs, &root);
70109+
70110+ read_seqlock_excl(&mount_lock);
70111+ write_seqlock(&rename_lock);
70112+ res = gen_full_path(&path, &root, buf, buflen);
70113+ write_sequnlock(&rename_lock);
70114+ read_sequnlock_excl(&mount_lock);
70115+
70116+ path_put(&root);
70117+ return res;
70118+}
70119+
70120+char *
70121+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70122+{
70123+ char *ret;
70124+ read_seqlock_excl(&mount_lock);
70125+ write_seqlock(&rename_lock);
70126+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70127+ PAGE_SIZE);
70128+ write_sequnlock(&rename_lock);
70129+ read_sequnlock_excl(&mount_lock);
70130+ return ret;
70131+}
70132+
70133+static char *
70134+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70135+{
70136+ char *ret;
70137+ char *buf;
70138+ int buflen;
70139+
70140+ read_seqlock_excl(&mount_lock);
70141+ write_seqlock(&rename_lock);
70142+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
70143+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
70144+ buflen = (int)(ret - buf);
70145+ if (buflen >= 5)
70146+ prepend(&ret, &buflen, "/proc", 5);
70147+ else
70148+ ret = strcpy(buf, "<path too long>");
70149+ write_sequnlock(&rename_lock);
70150+ read_sequnlock_excl(&mount_lock);
70151+ return ret;
70152+}
70153+
70154+char *
70155+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
70156+{
70157+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70158+ PAGE_SIZE);
70159+}
70160+
70161+char *
70162+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
70163+{
70164+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
70165+ PAGE_SIZE);
70166+}
70167+
70168+char *
70169+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
70170+{
70171+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
70172+ PAGE_SIZE);
70173+}
70174+
70175+char *
70176+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
70177+{
70178+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
70179+ PAGE_SIZE);
70180+}
70181+
70182+char *
70183+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
70184+{
70185+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
70186+ PAGE_SIZE);
70187+}
70188+
70189+__inline__ __u32
70190+to_gr_audit(const __u32 reqmode)
70191+{
70192+ /* masks off auditable permission flags, then shifts them to create
70193+ auditing flags, and adds the special case of append auditing if
70194+ we're requesting write */
70195+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
70196+}
70197+
70198+struct acl_role_label *
70199+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
70200+ const gid_t gid)
70201+{
70202+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
70203+ struct acl_role_label *match;
70204+ struct role_allowed_ip *ipp;
70205+ unsigned int x;
70206+ u32 curr_ip = task->signal->saved_ip;
70207+
70208+ match = state->acl_role_set.r_hash[index];
70209+
70210+ while (match) {
70211+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
70212+ for (x = 0; x < match->domain_child_num; x++) {
70213+ if (match->domain_children[x] == uid)
70214+ goto found;
70215+ }
70216+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
70217+ break;
70218+ match = match->next;
70219+ }
70220+found:
70221+ if (match == NULL) {
70222+ try_group:
70223+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
70224+ match = state->acl_role_set.r_hash[index];
70225+
70226+ while (match) {
70227+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
70228+ for (x = 0; x < match->domain_child_num; x++) {
70229+ if (match->domain_children[x] == gid)
70230+ goto found2;
70231+ }
70232+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
70233+ break;
70234+ match = match->next;
70235+ }
70236+found2:
70237+ if (match == NULL)
70238+ match = state->default_role;
70239+ if (match->allowed_ips == NULL)
70240+ return match;
70241+ else {
70242+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70243+ if (likely
70244+ ((ntohl(curr_ip) & ipp->netmask) ==
70245+ (ntohl(ipp->addr) & ipp->netmask)))
70246+ return match;
70247+ }
70248+ match = state->default_role;
70249+ }
70250+ } else if (match->allowed_ips == NULL) {
70251+ return match;
70252+ } else {
70253+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70254+ if (likely
70255+ ((ntohl(curr_ip) & ipp->netmask) ==
70256+ (ntohl(ipp->addr) & ipp->netmask)))
70257+ return match;
70258+ }
70259+ goto try_group;
70260+ }
70261+
70262+ return match;
70263+}
70264+
70265+static struct acl_role_label *
70266+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
70267+ const gid_t gid)
70268+{
70269+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
70270+}
70271+
70272+struct acl_subject_label *
70273+lookup_acl_subj_label(const u64 ino, const dev_t dev,
70274+ const struct acl_role_label *role)
70275+{
70276+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70277+ struct acl_subject_label *match;
70278+
70279+ match = role->subj_hash[index];
70280+
70281+ while (match && (match->inode != ino || match->device != dev ||
70282+ (match->mode & GR_DELETED))) {
70283+ match = match->next;
70284+ }
70285+
70286+ if (match && !(match->mode & GR_DELETED))
70287+ return match;
70288+ else
70289+ return NULL;
70290+}
70291+
70292+struct acl_subject_label *
70293+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
70294+ const struct acl_role_label *role)
70295+{
70296+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70297+ struct acl_subject_label *match;
70298+
70299+ match = role->subj_hash[index];
70300+
70301+ while (match && (match->inode != ino || match->device != dev ||
70302+ !(match->mode & GR_DELETED))) {
70303+ match = match->next;
70304+ }
70305+
70306+ if (match && (match->mode & GR_DELETED))
70307+ return match;
70308+ else
70309+ return NULL;
70310+}
70311+
70312+static struct acl_object_label *
70313+lookup_acl_obj_label(const u64 ino, const dev_t dev,
70314+ const struct acl_subject_label *subj)
70315+{
70316+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70317+ struct acl_object_label *match;
70318+
70319+ match = subj->obj_hash[index];
70320+
70321+ while (match && (match->inode != ino || match->device != dev ||
70322+ (match->mode & GR_DELETED))) {
70323+ match = match->next;
70324+ }
70325+
70326+ if (match && !(match->mode & GR_DELETED))
70327+ return match;
70328+ else
70329+ return NULL;
70330+}
70331+
70332+static struct acl_object_label *
70333+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
70334+ const struct acl_subject_label *subj)
70335+{
70336+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70337+ struct acl_object_label *match;
70338+
70339+ match = subj->obj_hash[index];
70340+
70341+ while (match && (match->inode != ino || match->device != dev ||
70342+ !(match->mode & GR_DELETED))) {
70343+ match = match->next;
70344+ }
70345+
70346+ if (match && (match->mode & GR_DELETED))
70347+ return match;
70348+
70349+ match = subj->obj_hash[index];
70350+
70351+ while (match && (match->inode != ino || match->device != dev ||
70352+ (match->mode & GR_DELETED))) {
70353+ match = match->next;
70354+ }
70355+
70356+ if (match && !(match->mode & GR_DELETED))
70357+ return match;
70358+ else
70359+ return NULL;
70360+}
70361+
70362+struct name_entry *
70363+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
70364+{
70365+ unsigned int len = strlen(name);
70366+ unsigned int key = full_name_hash(name, len);
70367+ unsigned int index = key % state->name_set.n_size;
70368+ struct name_entry *match;
70369+
70370+ match = state->name_set.n_hash[index];
70371+
70372+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
70373+ match = match->next;
70374+
70375+ return match;
70376+}
70377+
70378+static struct name_entry *
70379+lookup_name_entry(const char *name)
70380+{
70381+ return __lookup_name_entry(&running_polstate, name);
70382+}
70383+
70384+static struct name_entry *
70385+lookup_name_entry_create(const char *name)
70386+{
70387+ unsigned int len = strlen(name);
70388+ unsigned int key = full_name_hash(name, len);
70389+ unsigned int index = key % running_polstate.name_set.n_size;
70390+ struct name_entry *match;
70391+
70392+ match = running_polstate.name_set.n_hash[index];
70393+
70394+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
70395+ !match->deleted))
70396+ match = match->next;
70397+
70398+ if (match && match->deleted)
70399+ return match;
70400+
70401+ match = running_polstate.name_set.n_hash[index];
70402+
70403+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
70404+ match->deleted))
70405+ match = match->next;
70406+
70407+ if (match && !match->deleted)
70408+ return match;
70409+ else
70410+ return NULL;
70411+}
70412+
70413+static struct inodev_entry *
70414+lookup_inodev_entry(const u64 ino, const dev_t dev)
70415+{
70416+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
70417+ struct inodev_entry *match;
70418+
70419+ match = running_polstate.inodev_set.i_hash[index];
70420+
70421+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
70422+ match = match->next;
70423+
70424+ return match;
70425+}
70426+
70427+void
70428+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
70429+{
70430+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
70431+ state->inodev_set.i_size);
70432+ struct inodev_entry **curr;
70433+
70434+ entry->prev = NULL;
70435+
70436+ curr = &state->inodev_set.i_hash[index];
70437+ if (*curr != NULL)
70438+ (*curr)->prev = entry;
70439+
70440+ entry->next = *curr;
70441+ *curr = entry;
70442+
70443+ return;
70444+}
70445+
70446+static void
70447+insert_inodev_entry(struct inodev_entry *entry)
70448+{
70449+ __insert_inodev_entry(&running_polstate, entry);
70450+}
70451+
70452+void
70453+insert_acl_obj_label(struct acl_object_label *obj,
70454+ struct acl_subject_label *subj)
70455+{
70456+ unsigned int index =
70457+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
70458+ struct acl_object_label **curr;
70459+
70460+ obj->prev = NULL;
70461+
70462+ curr = &subj->obj_hash[index];
70463+ if (*curr != NULL)
70464+ (*curr)->prev = obj;
70465+
70466+ obj->next = *curr;
70467+ *curr = obj;
70468+
70469+ return;
70470+}
70471+
70472+void
70473+insert_acl_subj_label(struct acl_subject_label *obj,
70474+ struct acl_role_label *role)
70475+{
70476+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
70477+ struct acl_subject_label **curr;
70478+
70479+ obj->prev = NULL;
70480+
70481+ curr = &role->subj_hash[index];
70482+ if (*curr != NULL)
70483+ (*curr)->prev = obj;
70484+
70485+ obj->next = *curr;
70486+ *curr = obj;
70487+
70488+ return;
70489+}
70490+
70491+/* derived from glibc fnmatch() 0: match, 1: no match*/
70492+
70493+static int
70494+glob_match(const char *p, const char *n)
70495+{
70496+ char c;
70497+
70498+ while ((c = *p++) != '\0') {
70499+ switch (c) {
70500+ case '?':
70501+ if (*n == '\0')
70502+ return 1;
70503+ else if (*n == '/')
70504+ return 1;
70505+ break;
70506+ case '\\':
70507+ if (*n != c)
70508+ return 1;
70509+ break;
70510+ case '*':
70511+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
70512+ if (*n == '/')
70513+ return 1;
70514+ else if (c == '?') {
70515+ if (*n == '\0')
70516+ return 1;
70517+ else
70518+ ++n;
70519+ }
70520+ }
70521+ if (c == '\0') {
70522+ return 0;
70523+ } else {
70524+ const char *endp;
70525+
70526+ if ((endp = strchr(n, '/')) == NULL)
70527+ endp = n + strlen(n);
70528+
70529+ if (c == '[') {
70530+ for (--p; n < endp; ++n)
70531+ if (!glob_match(p, n))
70532+ return 0;
70533+ } else if (c == '/') {
70534+ while (*n != '\0' && *n != '/')
70535+ ++n;
70536+ if (*n == '/' && !glob_match(p, n + 1))
70537+ return 0;
70538+ } else {
70539+ for (--p; n < endp; ++n)
70540+ if (*n == c && !glob_match(p, n))
70541+ return 0;
70542+ }
70543+
70544+ return 1;
70545+ }
70546+ case '[':
70547+ {
70548+ int not;
70549+ char cold;
70550+
70551+ if (*n == '\0' || *n == '/')
70552+ return 1;
70553+
70554+ not = (*p == '!' || *p == '^');
70555+ if (not)
70556+ ++p;
70557+
70558+ c = *p++;
70559+ for (;;) {
70560+ unsigned char fn = (unsigned char)*n;
70561+
70562+ if (c == '\0')
70563+ return 1;
70564+ else {
70565+ if (c == fn)
70566+ goto matched;
70567+ cold = c;
70568+ c = *p++;
70569+
70570+ if (c == '-' && *p != ']') {
70571+ unsigned char cend = *p++;
70572+
70573+ if (cend == '\0')
70574+ return 1;
70575+
70576+ if (cold <= fn && fn <= cend)
70577+ goto matched;
70578+
70579+ c = *p++;
70580+ }
70581+ }
70582+
70583+ if (c == ']')
70584+ break;
70585+ }
70586+ if (!not)
70587+ return 1;
70588+ break;
70589+ matched:
70590+ while (c != ']') {
70591+ if (c == '\0')
70592+ return 1;
70593+
70594+ c = *p++;
70595+ }
70596+ if (not)
70597+ return 1;
70598+ }
70599+ break;
70600+ default:
70601+ if (c != *n)
70602+ return 1;
70603+ }
70604+
70605+ ++n;
70606+ }
70607+
70608+ if (*n == '\0')
70609+ return 0;
70610+
70611+ if (*n == '/')
70612+ return 0;
70613+
70614+ return 1;
70615+}
70616+
70617+static struct acl_object_label *
70618+chk_glob_label(struct acl_object_label *globbed,
70619+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
70620+{
70621+ struct acl_object_label *tmp;
70622+
70623+ if (*path == NULL)
70624+ *path = gr_to_filename_nolock(dentry, mnt);
70625+
70626+ tmp = globbed;
70627+
70628+ while (tmp) {
70629+ if (!glob_match(tmp->filename, *path))
70630+ return tmp;
70631+ tmp = tmp->next;
70632+ }
70633+
70634+ return NULL;
70635+}
70636+
70637+static struct acl_object_label *
70638+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70639+ const u64 curr_ino, const dev_t curr_dev,
70640+ const struct acl_subject_label *subj, char **path, const int checkglob)
70641+{
70642+ struct acl_subject_label *tmpsubj;
70643+ struct acl_object_label *retval;
70644+ struct acl_object_label *retval2;
70645+
70646+ tmpsubj = (struct acl_subject_label *) subj;
70647+ read_lock(&gr_inode_lock);
70648+ do {
70649+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
70650+ if (retval) {
70651+ if (checkglob && retval->globbed) {
70652+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
70653+ if (retval2)
70654+ retval = retval2;
70655+ }
70656+ break;
70657+ }
70658+ } while ((tmpsubj = tmpsubj->parent_subject));
70659+ read_unlock(&gr_inode_lock);
70660+
70661+ return retval;
70662+}
70663+
70664+static __inline__ struct acl_object_label *
70665+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70666+ struct dentry *curr_dentry,
70667+ const struct acl_subject_label *subj, char **path, const int checkglob)
70668+{
70669+ int newglob = checkglob;
70670+ u64 inode;
70671+ dev_t device;
70672+
70673+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70674+ as we don't want a / * rule to match instead of the / object
70675+ don't do this for create lookups that call this function though, since they're looking up
70676+ on the parent and thus need globbing checks on all paths
70677+ */
70678+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70679+ newglob = GR_NO_GLOB;
70680+
70681+ spin_lock(&curr_dentry->d_lock);
70682+ inode = __get_ino(curr_dentry);
70683+ device = __get_dev(curr_dentry);
70684+ spin_unlock(&curr_dentry->d_lock);
70685+
70686+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70687+}
70688+
70689+#ifdef CONFIG_HUGETLBFS
70690+static inline bool
70691+is_hugetlbfs_mnt(const struct vfsmount *mnt)
70692+{
70693+ int i;
70694+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70695+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70696+ return true;
70697+ }
70698+
70699+ return false;
70700+}
70701+#endif
70702+
70703+static struct acl_object_label *
70704+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70705+ const struct acl_subject_label *subj, char *path, const int checkglob)
70706+{
70707+ struct dentry *dentry = (struct dentry *) l_dentry;
70708+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70709+ struct mount *real_mnt = real_mount(mnt);
70710+ struct acl_object_label *retval;
70711+ struct dentry *parent;
70712+
70713+ read_seqlock_excl(&mount_lock);
70714+ write_seqlock(&rename_lock);
70715+
70716+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70717+#ifdef CONFIG_NET
70718+ mnt == sock_mnt ||
70719+#endif
70720+#ifdef CONFIG_HUGETLBFS
70721+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70722+#endif
70723+ /* ignore Eric Biederman */
70724+ IS_PRIVATE(l_dentry->d_inode))) {
70725+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70726+ goto out;
70727+ }
70728+
70729+ for (;;) {
70730+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70731+ break;
70732+
70733+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70734+ if (!mnt_has_parent(real_mnt))
70735+ break;
70736+
70737+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70738+ if (retval != NULL)
70739+ goto out;
70740+
70741+ dentry = real_mnt->mnt_mountpoint;
70742+ real_mnt = real_mnt->mnt_parent;
70743+ mnt = &real_mnt->mnt;
70744+ continue;
70745+ }
70746+
70747+ parent = dentry->d_parent;
70748+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70749+ if (retval != NULL)
70750+ goto out;
70751+
70752+ dentry = parent;
70753+ }
70754+
70755+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70756+
70757+ /* gr_real_root is pinned so we don't have to hold a reference */
70758+ if (retval == NULL)
70759+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70760+out:
70761+ write_sequnlock(&rename_lock);
70762+ read_sequnlock_excl(&mount_lock);
70763+
70764+ BUG_ON(retval == NULL);
70765+
70766+ return retval;
70767+}
70768+
70769+static __inline__ struct acl_object_label *
70770+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70771+ const struct acl_subject_label *subj)
70772+{
70773+ char *path = NULL;
70774+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70775+}
70776+
70777+static __inline__ struct acl_object_label *
70778+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70779+ const struct acl_subject_label *subj)
70780+{
70781+ char *path = NULL;
70782+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70783+}
70784+
70785+static __inline__ struct acl_object_label *
70786+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70787+ const struct acl_subject_label *subj, char *path)
70788+{
70789+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70790+}
70791+
70792+struct acl_subject_label *
70793+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70794+ const struct acl_role_label *role)
70795+{
70796+ struct dentry *dentry = (struct dentry *) l_dentry;
70797+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70798+ struct mount *real_mnt = real_mount(mnt);
70799+ struct acl_subject_label *retval;
70800+ struct dentry *parent;
70801+
70802+ read_seqlock_excl(&mount_lock);
70803+ write_seqlock(&rename_lock);
70804+
70805+ for (;;) {
70806+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70807+ break;
70808+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70809+ if (!mnt_has_parent(real_mnt))
70810+ break;
70811+
70812+ spin_lock(&dentry->d_lock);
70813+ read_lock(&gr_inode_lock);
70814+ retval =
70815+ lookup_acl_subj_label(__get_ino(dentry),
70816+ __get_dev(dentry), role);
70817+ read_unlock(&gr_inode_lock);
70818+ spin_unlock(&dentry->d_lock);
70819+ if (retval != NULL)
70820+ goto out;
70821+
70822+ dentry = real_mnt->mnt_mountpoint;
70823+ real_mnt = real_mnt->mnt_parent;
70824+ mnt = &real_mnt->mnt;
70825+ continue;
70826+ }
70827+
70828+ spin_lock(&dentry->d_lock);
70829+ read_lock(&gr_inode_lock);
70830+ retval = lookup_acl_subj_label(__get_ino(dentry),
70831+ __get_dev(dentry), role);
70832+ read_unlock(&gr_inode_lock);
70833+ parent = dentry->d_parent;
70834+ spin_unlock(&dentry->d_lock);
70835+
70836+ if (retval != NULL)
70837+ goto out;
70838+
70839+ dentry = parent;
70840+ }
70841+
70842+ spin_lock(&dentry->d_lock);
70843+ read_lock(&gr_inode_lock);
70844+ retval = lookup_acl_subj_label(__get_ino(dentry),
70845+ __get_dev(dentry), role);
70846+ read_unlock(&gr_inode_lock);
70847+ spin_unlock(&dentry->d_lock);
70848+
70849+ if (unlikely(retval == NULL)) {
70850+ /* gr_real_root is pinned, we don't need to hold a reference */
70851+ read_lock(&gr_inode_lock);
70852+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
70853+ __get_dev(gr_real_root.dentry), role);
70854+ read_unlock(&gr_inode_lock);
70855+ }
70856+out:
70857+ write_sequnlock(&rename_lock);
70858+ read_sequnlock_excl(&mount_lock);
70859+
70860+ BUG_ON(retval == NULL);
70861+
70862+ return retval;
70863+}
70864+
70865+void
70866+assign_special_role(const char *rolename)
70867+{
70868+ struct acl_object_label *obj;
70869+ struct acl_role_label *r;
70870+ struct acl_role_label *assigned = NULL;
70871+ struct task_struct *tsk;
70872+ struct file *filp;
70873+
70874+ FOR_EACH_ROLE_START(r)
70875+ if (!strcmp(rolename, r->rolename) &&
70876+ (r->roletype & GR_ROLE_SPECIAL)) {
70877+ assigned = r;
70878+ break;
70879+ }
70880+ FOR_EACH_ROLE_END(r)
70881+
70882+ if (!assigned)
70883+ return;
70884+
70885+ read_lock(&tasklist_lock);
70886+ read_lock(&grsec_exec_file_lock);
70887+
70888+ tsk = current->real_parent;
70889+ if (tsk == NULL)
70890+ goto out_unlock;
70891+
70892+ filp = tsk->exec_file;
70893+ if (filp == NULL)
70894+ goto out_unlock;
70895+
70896+ tsk->is_writable = 0;
70897+ tsk->inherited = 0;
70898+
70899+ tsk->acl_sp_role = 1;
70900+ tsk->acl_role_id = ++acl_sp_role_value;
70901+ tsk->role = assigned;
70902+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70903+
70904+ /* ignore additional mmap checks for processes that are writable
70905+ by the default ACL */
70906+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70907+ if (unlikely(obj->mode & GR_WRITE))
70908+ tsk->is_writable = 1;
70909+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70910+ if (unlikely(obj->mode & GR_WRITE))
70911+ tsk->is_writable = 1;
70912+
70913+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70914+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70915+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70916+#endif
70917+
70918+out_unlock:
70919+ read_unlock(&grsec_exec_file_lock);
70920+ read_unlock(&tasklist_lock);
70921+ return;
70922+}
70923+
70924+
70925+static void
70926+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70927+{
70928+ struct task_struct *task = current;
70929+ const struct cred *cred = current_cred();
70930+
70931+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70932+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70933+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70934+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70935+
70936+ return;
70937+}
70938+
70939+static void
70940+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70941+{
70942+ struct task_struct *task = current;
70943+ const struct cred *cred = current_cred();
70944+
70945+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70946+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70947+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70948+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70949+
70950+ return;
70951+}
70952+
70953+static void
70954+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70955+{
70956+ struct task_struct *task = current;
70957+ const struct cred *cred = current_cred();
70958+
70959+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70960+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70961+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70962+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70963+
70964+ return;
70965+}
70966+
70967+static void
70968+gr_set_proc_res(struct task_struct *task)
70969+{
70970+ struct acl_subject_label *proc;
70971+ unsigned short i;
70972+
70973+ proc = task->acl;
70974+
70975+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70976+ return;
70977+
70978+ for (i = 0; i < RLIM_NLIMITS; i++) {
70979+ unsigned long rlim_cur, rlim_max;
70980+
70981+ if (!(proc->resmask & (1U << i)))
70982+ continue;
70983+
70984+ rlim_cur = proc->res[i].rlim_cur;
70985+ rlim_max = proc->res[i].rlim_max;
70986+
70987+ if (i == RLIMIT_NOFILE) {
70988+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
70989+ if (rlim_cur > saved_sysctl_nr_open)
70990+ rlim_cur = saved_sysctl_nr_open;
70991+ if (rlim_max > saved_sysctl_nr_open)
70992+ rlim_max = saved_sysctl_nr_open;
70993+ }
70994+
70995+ task->signal->rlim[i].rlim_cur = rlim_cur;
70996+ task->signal->rlim[i].rlim_max = rlim_max;
70997+
70998+ if (i == RLIMIT_CPU)
70999+ update_rlimit_cpu(task, rlim_cur);
71000+ }
71001+
71002+ return;
71003+}
71004+
71005+/* both of the below must be called with
71006+ rcu_read_lock();
71007+ read_lock(&tasklist_lock);
71008+ read_lock(&grsec_exec_file_lock);
71009+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
71010+*/
71011+
71012+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
71013+{
71014+ char *tmpname;
71015+ struct acl_subject_label *tmpsubj;
71016+ struct file *filp;
71017+ struct name_entry *nmatch;
71018+
71019+ filp = task->exec_file;
71020+ if (filp == NULL)
71021+ return NULL;
71022+
71023+ /* the following is to apply the correct subject
71024+ on binaries running when the RBAC system
71025+ is enabled, when the binaries have been
71026+ replaced or deleted since their execution
71027+ -----
71028+ when the RBAC system starts, the inode/dev
71029+ from exec_file will be one the RBAC system
71030+ is unaware of. It only knows the inode/dev
71031+ of the present file on disk, or the absence
71032+ of it.
71033+ */
71034+
71035+ if (filename)
71036+ nmatch = __lookup_name_entry(state, filename);
71037+ else {
71038+ preempt_disable();
71039+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
71040+
71041+ nmatch = __lookup_name_entry(state, tmpname);
71042+ preempt_enable();
71043+ }
71044+ tmpsubj = NULL;
71045+ if (nmatch) {
71046+ if (nmatch->deleted)
71047+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
71048+ else
71049+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
71050+ }
71051+ /* this also works for the reload case -- if we don't match a potentially inherited subject
71052+ then we fall back to a normal lookup based on the binary's ino/dev
71053+ */
71054+ if (tmpsubj == NULL && fallback)
71055+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
71056+
71057+ return tmpsubj;
71058+}
71059+
71060+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
71061+{
71062+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
71063+}
71064+
71065+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
71066+{
71067+ struct acl_object_label *obj;
71068+ struct file *filp;
71069+
71070+ filp = task->exec_file;
71071+
71072+ task->acl = subj;
71073+ task->is_writable = 0;
71074+ /* ignore additional mmap checks for processes that are writable
71075+ by the default ACL */
71076+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
71077+ if (unlikely(obj->mode & GR_WRITE))
71078+ task->is_writable = 1;
71079+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71080+ if (unlikely(obj->mode & GR_WRITE))
71081+ task->is_writable = 1;
71082+
71083+ gr_set_proc_res(task);
71084+
71085+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71086+ 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);
71087+#endif
71088+}
71089+
71090+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
71091+{
71092+ __gr_apply_subject_to_task(&running_polstate, task, subj);
71093+}
71094+
71095+__u32
71096+gr_search_file(const struct dentry * dentry, const __u32 mode,
71097+ const struct vfsmount * mnt)
71098+{
71099+ __u32 retval = mode;
71100+ struct acl_subject_label *curracl;
71101+ struct acl_object_label *currobj;
71102+
71103+ if (unlikely(!(gr_status & GR_READY)))
71104+ return (mode & ~GR_AUDITS);
71105+
71106+ curracl = current->acl;
71107+
71108+ currobj = chk_obj_label(dentry, mnt, curracl);
71109+ retval = currobj->mode & mode;
71110+
71111+ /* if we're opening a specified transfer file for writing
71112+ (e.g. /dev/initctl), then transfer our role to init
71113+ */
71114+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
71115+ current->role->roletype & GR_ROLE_PERSIST)) {
71116+ struct task_struct *task = init_pid_ns.child_reaper;
71117+
71118+ if (task->role != current->role) {
71119+ struct acl_subject_label *subj;
71120+
71121+ task->acl_sp_role = 0;
71122+ task->acl_role_id = current->acl_role_id;
71123+ task->role = current->role;
71124+ rcu_read_lock();
71125+ read_lock(&grsec_exec_file_lock);
71126+ subj = gr_get_subject_for_task(task, NULL, 1);
71127+ gr_apply_subject_to_task(task, subj);
71128+ read_unlock(&grsec_exec_file_lock);
71129+ rcu_read_unlock();
71130+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
71131+ }
71132+ }
71133+
71134+ if (unlikely
71135+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
71136+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
71137+ __u32 new_mode = mode;
71138+
71139+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71140+
71141+ retval = new_mode;
71142+
71143+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
71144+ new_mode |= GR_INHERIT;
71145+
71146+ if (!(mode & GR_NOLEARN))
71147+ gr_log_learn(dentry, mnt, new_mode);
71148+ }
71149+
71150+ return retval;
71151+}
71152+
71153+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
71154+ const struct dentry *parent,
71155+ const struct vfsmount *mnt)
71156+{
71157+ struct name_entry *match;
71158+ struct acl_object_label *matchpo;
71159+ struct acl_subject_label *curracl;
71160+ char *path;
71161+
71162+ if (unlikely(!(gr_status & GR_READY)))
71163+ return NULL;
71164+
71165+ preempt_disable();
71166+ path = gr_to_filename_rbac(new_dentry, mnt);
71167+ match = lookup_name_entry_create(path);
71168+
71169+ curracl = current->acl;
71170+
71171+ if (match) {
71172+ read_lock(&gr_inode_lock);
71173+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
71174+ read_unlock(&gr_inode_lock);
71175+
71176+ if (matchpo) {
71177+ preempt_enable();
71178+ return matchpo;
71179+ }
71180+ }
71181+
71182+ // lookup parent
71183+
71184+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
71185+
71186+ preempt_enable();
71187+ return matchpo;
71188+}
71189+
71190+__u32
71191+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
71192+ const struct vfsmount * mnt, const __u32 mode)
71193+{
71194+ struct acl_object_label *matchpo;
71195+ __u32 retval;
71196+
71197+ if (unlikely(!(gr_status & GR_READY)))
71198+ return (mode & ~GR_AUDITS);
71199+
71200+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
71201+
71202+ retval = matchpo->mode & mode;
71203+
71204+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
71205+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71206+ __u32 new_mode = mode;
71207+
71208+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71209+
71210+ gr_log_learn(new_dentry, mnt, new_mode);
71211+ return new_mode;
71212+ }
71213+
71214+ return retval;
71215+}
71216+
71217+__u32
71218+gr_check_link(const struct dentry * new_dentry,
71219+ const struct dentry * parent_dentry,
71220+ const struct vfsmount * parent_mnt,
71221+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
71222+{
71223+ struct acl_object_label *obj;
71224+ __u32 oldmode, newmode;
71225+ __u32 needmode;
71226+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
71227+ GR_DELETE | GR_INHERIT;
71228+
71229+ if (unlikely(!(gr_status & GR_READY)))
71230+ return (GR_CREATE | GR_LINK);
71231+
71232+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
71233+ oldmode = obj->mode;
71234+
71235+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
71236+ newmode = obj->mode;
71237+
71238+ needmode = newmode & checkmodes;
71239+
71240+ // old name for hardlink must have at least the permissions of the new name
71241+ if ((oldmode & needmode) != needmode)
71242+ goto bad;
71243+
71244+ // if old name had restrictions/auditing, make sure the new name does as well
71245+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
71246+
71247+ // don't allow hardlinking of suid/sgid/fcapped files without permission
71248+ if (is_privileged_binary(old_dentry))
71249+ needmode |= GR_SETID;
71250+
71251+ if ((newmode & needmode) != needmode)
71252+ goto bad;
71253+
71254+ // enforce minimum permissions
71255+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
71256+ return newmode;
71257+bad:
71258+ needmode = oldmode;
71259+ if (is_privileged_binary(old_dentry))
71260+ needmode |= GR_SETID;
71261+
71262+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
71263+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
71264+ return (GR_CREATE | GR_LINK);
71265+ } else if (newmode & GR_SUPPRESS)
71266+ return GR_SUPPRESS;
71267+ else
71268+ return 0;
71269+}
71270+
71271+int
71272+gr_check_hidden_task(const struct task_struct *task)
71273+{
71274+ if (unlikely(!(gr_status & GR_READY)))
71275+ return 0;
71276+
71277+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
71278+ return 1;
71279+
71280+ return 0;
71281+}
71282+
71283+int
71284+gr_check_protected_task(const struct task_struct *task)
71285+{
71286+ if (unlikely(!(gr_status & GR_READY) || !task))
71287+ return 0;
71288+
71289+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71290+ task->acl != current->acl)
71291+ return 1;
71292+
71293+ return 0;
71294+}
71295+
71296+int
71297+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
71298+{
71299+ struct task_struct *p;
71300+ int ret = 0;
71301+
71302+ if (unlikely(!(gr_status & GR_READY) || !pid))
71303+ return ret;
71304+
71305+ read_lock(&tasklist_lock);
71306+ do_each_pid_task(pid, type, p) {
71307+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71308+ p->acl != current->acl) {
71309+ ret = 1;
71310+ goto out;
71311+ }
71312+ } while_each_pid_task(pid, type, p);
71313+out:
71314+ read_unlock(&tasklist_lock);
71315+
71316+ return ret;
71317+}
71318+
71319+void
71320+gr_copy_label(struct task_struct *tsk)
71321+{
71322+ struct task_struct *p = current;
71323+
71324+ tsk->inherited = p->inherited;
71325+ tsk->acl_sp_role = 0;
71326+ tsk->acl_role_id = p->acl_role_id;
71327+ tsk->acl = p->acl;
71328+ tsk->role = p->role;
71329+ tsk->signal->used_accept = 0;
71330+ tsk->signal->curr_ip = p->signal->curr_ip;
71331+ tsk->signal->saved_ip = p->signal->saved_ip;
71332+ if (p->exec_file)
71333+ get_file(p->exec_file);
71334+ tsk->exec_file = p->exec_file;
71335+ tsk->is_writable = p->is_writable;
71336+ if (unlikely(p->signal->used_accept)) {
71337+ p->signal->curr_ip = 0;
71338+ p->signal->saved_ip = 0;
71339+ }
71340+
71341+ return;
71342+}
71343+
71344+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
71345+
71346+int
71347+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
71348+{
71349+ unsigned int i;
71350+ __u16 num;
71351+ uid_t *uidlist;
71352+ uid_t curuid;
71353+ int realok = 0;
71354+ int effectiveok = 0;
71355+ int fsok = 0;
71356+ uid_t globalreal, globaleffective, globalfs;
71357+
71358+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
71359+ struct user_struct *user;
71360+
71361+ if (!uid_valid(real))
71362+ goto skipit;
71363+
71364+ /* find user based on global namespace */
71365+
71366+ globalreal = GR_GLOBAL_UID(real);
71367+
71368+ user = find_user(make_kuid(&init_user_ns, globalreal));
71369+ if (user == NULL)
71370+ goto skipit;
71371+
71372+ if (gr_process_kernel_setuid_ban(user)) {
71373+ /* for find_user */
71374+ free_uid(user);
71375+ return 1;
71376+ }
71377+
71378+ /* for find_user */
71379+ free_uid(user);
71380+
71381+skipit:
71382+#endif
71383+
71384+ if (unlikely(!(gr_status & GR_READY)))
71385+ return 0;
71386+
71387+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71388+ gr_log_learn_uid_change(real, effective, fs);
71389+
71390+ num = current->acl->user_trans_num;
71391+ uidlist = current->acl->user_transitions;
71392+
71393+ if (uidlist == NULL)
71394+ return 0;
71395+
71396+ if (!uid_valid(real)) {
71397+ realok = 1;
71398+ globalreal = (uid_t)-1;
71399+ } else {
71400+ globalreal = GR_GLOBAL_UID(real);
71401+ }
71402+ if (!uid_valid(effective)) {
71403+ effectiveok = 1;
71404+ globaleffective = (uid_t)-1;
71405+ } else {
71406+ globaleffective = GR_GLOBAL_UID(effective);
71407+ }
71408+ if (!uid_valid(fs)) {
71409+ fsok = 1;
71410+ globalfs = (uid_t)-1;
71411+ } else {
71412+ globalfs = GR_GLOBAL_UID(fs);
71413+ }
71414+
71415+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
71416+ for (i = 0; i < num; i++) {
71417+ curuid = uidlist[i];
71418+ if (globalreal == curuid)
71419+ realok = 1;
71420+ if (globaleffective == curuid)
71421+ effectiveok = 1;
71422+ if (globalfs == curuid)
71423+ fsok = 1;
71424+ }
71425+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
71426+ for (i = 0; i < num; i++) {
71427+ curuid = uidlist[i];
71428+ if (globalreal == curuid)
71429+ break;
71430+ if (globaleffective == curuid)
71431+ break;
71432+ if (globalfs == curuid)
71433+ break;
71434+ }
71435+ /* not in deny list */
71436+ if (i == num) {
71437+ realok = 1;
71438+ effectiveok = 1;
71439+ fsok = 1;
71440+ }
71441+ }
71442+
71443+ if (realok && effectiveok && fsok)
71444+ return 0;
71445+ else {
71446+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
71447+ return 1;
71448+ }
71449+}
71450+
71451+int
71452+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
71453+{
71454+ unsigned int i;
71455+ __u16 num;
71456+ gid_t *gidlist;
71457+ gid_t curgid;
71458+ int realok = 0;
71459+ int effectiveok = 0;
71460+ int fsok = 0;
71461+ gid_t globalreal, globaleffective, globalfs;
71462+
71463+ if (unlikely(!(gr_status & GR_READY)))
71464+ return 0;
71465+
71466+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71467+ gr_log_learn_gid_change(real, effective, fs);
71468+
71469+ num = current->acl->group_trans_num;
71470+ gidlist = current->acl->group_transitions;
71471+
71472+ if (gidlist == NULL)
71473+ return 0;
71474+
71475+ if (!gid_valid(real)) {
71476+ realok = 1;
71477+ globalreal = (gid_t)-1;
71478+ } else {
71479+ globalreal = GR_GLOBAL_GID(real);
71480+ }
71481+ if (!gid_valid(effective)) {
71482+ effectiveok = 1;
71483+ globaleffective = (gid_t)-1;
71484+ } else {
71485+ globaleffective = GR_GLOBAL_GID(effective);
71486+ }
71487+ if (!gid_valid(fs)) {
71488+ fsok = 1;
71489+ globalfs = (gid_t)-1;
71490+ } else {
71491+ globalfs = GR_GLOBAL_GID(fs);
71492+ }
71493+
71494+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
71495+ for (i = 0; i < num; i++) {
71496+ curgid = gidlist[i];
71497+ if (globalreal == curgid)
71498+ realok = 1;
71499+ if (globaleffective == curgid)
71500+ effectiveok = 1;
71501+ if (globalfs == curgid)
71502+ fsok = 1;
71503+ }
71504+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
71505+ for (i = 0; i < num; i++) {
71506+ curgid = gidlist[i];
71507+ if (globalreal == curgid)
71508+ break;
71509+ if (globaleffective == curgid)
71510+ break;
71511+ if (globalfs == curgid)
71512+ break;
71513+ }
71514+ /* not in deny list */
71515+ if (i == num) {
71516+ realok = 1;
71517+ effectiveok = 1;
71518+ fsok = 1;
71519+ }
71520+ }
71521+
71522+ if (realok && effectiveok && fsok)
71523+ return 0;
71524+ else {
71525+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
71526+ return 1;
71527+ }
71528+}
71529+
71530+extern int gr_acl_is_capable(const int cap);
71531+
71532+void
71533+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
71534+{
71535+ struct acl_role_label *role = task->role;
71536+ struct acl_role_label *origrole = role;
71537+ struct acl_subject_label *subj = NULL;
71538+ struct acl_object_label *obj;
71539+ struct file *filp;
71540+ uid_t uid;
71541+ gid_t gid;
71542+
71543+ if (unlikely(!(gr_status & GR_READY)))
71544+ return;
71545+
71546+ uid = GR_GLOBAL_UID(kuid);
71547+ gid = GR_GLOBAL_GID(kgid);
71548+
71549+ filp = task->exec_file;
71550+
71551+ /* kernel process, we'll give them the kernel role */
71552+ if (unlikely(!filp)) {
71553+ task->role = running_polstate.kernel_role;
71554+ task->acl = running_polstate.kernel_role->root_label;
71555+ return;
71556+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
71557+ /* save the current ip at time of role lookup so that the proper
71558+ IP will be learned for role_allowed_ip */
71559+ task->signal->saved_ip = task->signal->curr_ip;
71560+ role = lookup_acl_role_label(task, uid, gid);
71561+ }
71562+
71563+ /* don't change the role if we're not a privileged process */
71564+ if (role && task->role != role &&
71565+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
71566+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
71567+ return;
71568+
71569+ task->role = role;
71570+
71571+ if (task->inherited) {
71572+ /* if we reached our subject through inheritance, then first see
71573+ if there's a subject of the same name in the new role that has
71574+ an object that would result in the same inherited subject
71575+ */
71576+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
71577+ if (subj) {
71578+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
71579+ if (!(obj->mode & GR_INHERIT))
71580+ subj = NULL;
71581+ }
71582+
71583+ }
71584+ if (subj == NULL) {
71585+ /* otherwise:
71586+ perform subject lookup in possibly new role
71587+ we can use this result below in the case where role == task->role
71588+ */
71589+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
71590+ }
71591+
71592+ /* if we changed uid/gid, but result in the same role
71593+ and are using inheritance, don't lose the inherited subject
71594+ if current subject is other than what normal lookup
71595+ would result in, we arrived via inheritance, don't
71596+ lose subject
71597+ */
71598+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
71599+ (subj == task->acl)))
71600+ task->acl = subj;
71601+
71602+ /* leave task->inherited unaffected */
71603+
71604+ task->is_writable = 0;
71605+
71606+ /* ignore additional mmap checks for processes that are writable
71607+ by the default ACL */
71608+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71609+ if (unlikely(obj->mode & GR_WRITE))
71610+ task->is_writable = 1;
71611+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71612+ if (unlikely(obj->mode & GR_WRITE))
71613+ task->is_writable = 1;
71614+
71615+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71616+ 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);
71617+#endif
71618+
71619+ gr_set_proc_res(task);
71620+
71621+ return;
71622+}
71623+
71624+int
71625+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
71626+ const int unsafe_flags)
71627+{
71628+ struct task_struct *task = current;
71629+ struct acl_subject_label *newacl;
71630+ struct acl_object_label *obj;
71631+ __u32 retmode;
71632+
71633+ if (unlikely(!(gr_status & GR_READY)))
71634+ return 0;
71635+
71636+ newacl = chk_subj_label(dentry, mnt, task->role);
71637+
71638+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
71639+ did an exec
71640+ */
71641+ rcu_read_lock();
71642+ read_lock(&tasklist_lock);
71643+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
71644+ (task->parent->acl->mode & GR_POVERRIDE))) {
71645+ read_unlock(&tasklist_lock);
71646+ rcu_read_unlock();
71647+ goto skip_check;
71648+ }
71649+ read_unlock(&tasklist_lock);
71650+ rcu_read_unlock();
71651+
71652+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
71653+ !(task->role->roletype & GR_ROLE_GOD) &&
71654+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
71655+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71656+ if (unsafe_flags & LSM_UNSAFE_SHARE)
71657+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
71658+ else
71659+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
71660+ return -EACCES;
71661+ }
71662+
71663+skip_check:
71664+
71665+ obj = chk_obj_label(dentry, mnt, task->acl);
71666+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
71667+
71668+ if (!(task->acl->mode & GR_INHERITLEARN) &&
71669+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
71670+ if (obj->nested)
71671+ task->acl = obj->nested;
71672+ else
71673+ task->acl = newacl;
71674+ task->inherited = 0;
71675+ } else {
71676+ task->inherited = 1;
71677+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
71678+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
71679+ }
71680+
71681+ task->is_writable = 0;
71682+
71683+ /* ignore additional mmap checks for processes that are writable
71684+ by the default ACL */
71685+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
71686+ if (unlikely(obj->mode & GR_WRITE))
71687+ task->is_writable = 1;
71688+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
71689+ if (unlikely(obj->mode & GR_WRITE))
71690+ task->is_writable = 1;
71691+
71692+ gr_set_proc_res(task);
71693+
71694+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71695+ 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);
71696+#endif
71697+ return 0;
71698+}
71699+
71700+/* always called with valid inodev ptr */
71701+static void
71702+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
71703+{
71704+ struct acl_object_label *matchpo;
71705+ struct acl_subject_label *matchps;
71706+ struct acl_subject_label *subj;
71707+ struct acl_role_label *role;
71708+ unsigned int x;
71709+
71710+ FOR_EACH_ROLE_START(role)
71711+ FOR_EACH_SUBJECT_START(role, subj, x)
71712+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71713+ matchpo->mode |= GR_DELETED;
71714+ FOR_EACH_SUBJECT_END(subj,x)
71715+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71716+ /* nested subjects aren't in the role's subj_hash table */
71717+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71718+ matchpo->mode |= GR_DELETED;
71719+ FOR_EACH_NESTED_SUBJECT_END(subj)
71720+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71721+ matchps->mode |= GR_DELETED;
71722+ FOR_EACH_ROLE_END(role)
71723+
71724+ inodev->nentry->deleted = 1;
71725+
71726+ return;
71727+}
71728+
71729+void
71730+gr_handle_delete(const u64 ino, const dev_t dev)
71731+{
71732+ struct inodev_entry *inodev;
71733+
71734+ if (unlikely(!(gr_status & GR_READY)))
71735+ return;
71736+
71737+ write_lock(&gr_inode_lock);
71738+ inodev = lookup_inodev_entry(ino, dev);
71739+ if (inodev != NULL)
71740+ do_handle_delete(inodev, ino, dev);
71741+ write_unlock(&gr_inode_lock);
71742+
71743+ return;
71744+}
71745+
71746+static void
71747+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
71748+ const u64 newinode, const dev_t newdevice,
71749+ struct acl_subject_label *subj)
71750+{
71751+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71752+ struct acl_object_label *match;
71753+
71754+ match = subj->obj_hash[index];
71755+
71756+ while (match && (match->inode != oldinode ||
71757+ match->device != olddevice ||
71758+ !(match->mode & GR_DELETED)))
71759+ match = match->next;
71760+
71761+ if (match && (match->inode == oldinode)
71762+ && (match->device == olddevice)
71763+ && (match->mode & GR_DELETED)) {
71764+ if (match->prev == NULL) {
71765+ subj->obj_hash[index] = match->next;
71766+ if (match->next != NULL)
71767+ match->next->prev = NULL;
71768+ } else {
71769+ match->prev->next = match->next;
71770+ if (match->next != NULL)
71771+ match->next->prev = match->prev;
71772+ }
71773+ match->prev = NULL;
71774+ match->next = NULL;
71775+ match->inode = newinode;
71776+ match->device = newdevice;
71777+ match->mode &= ~GR_DELETED;
71778+
71779+ insert_acl_obj_label(match, subj);
71780+ }
71781+
71782+ return;
71783+}
71784+
71785+static void
71786+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
71787+ const u64 newinode, const dev_t newdevice,
71788+ struct acl_role_label *role)
71789+{
71790+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71791+ struct acl_subject_label *match;
71792+
71793+ match = role->subj_hash[index];
71794+
71795+ while (match && (match->inode != oldinode ||
71796+ match->device != olddevice ||
71797+ !(match->mode & GR_DELETED)))
71798+ match = match->next;
71799+
71800+ if (match && (match->inode == oldinode)
71801+ && (match->device == olddevice)
71802+ && (match->mode & GR_DELETED)) {
71803+ if (match->prev == NULL) {
71804+ role->subj_hash[index] = match->next;
71805+ if (match->next != NULL)
71806+ match->next->prev = NULL;
71807+ } else {
71808+ match->prev->next = match->next;
71809+ if (match->next != NULL)
71810+ match->next->prev = match->prev;
71811+ }
71812+ match->prev = NULL;
71813+ match->next = NULL;
71814+ match->inode = newinode;
71815+ match->device = newdevice;
71816+ match->mode &= ~GR_DELETED;
71817+
71818+ insert_acl_subj_label(match, role);
71819+ }
71820+
71821+ return;
71822+}
71823+
71824+static void
71825+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
71826+ const u64 newinode, const dev_t newdevice)
71827+{
71828+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71829+ struct inodev_entry *match;
71830+
71831+ match = running_polstate.inodev_set.i_hash[index];
71832+
71833+ while (match && (match->nentry->inode != oldinode ||
71834+ match->nentry->device != olddevice || !match->nentry->deleted))
71835+ match = match->next;
71836+
71837+ if (match && (match->nentry->inode == oldinode)
71838+ && (match->nentry->device == olddevice) &&
71839+ match->nentry->deleted) {
71840+ if (match->prev == NULL) {
71841+ running_polstate.inodev_set.i_hash[index] = match->next;
71842+ if (match->next != NULL)
71843+ match->next->prev = NULL;
71844+ } else {
71845+ match->prev->next = match->next;
71846+ if (match->next != NULL)
71847+ match->next->prev = match->prev;
71848+ }
71849+ match->prev = NULL;
71850+ match->next = NULL;
71851+ match->nentry->inode = newinode;
71852+ match->nentry->device = newdevice;
71853+ match->nentry->deleted = 0;
71854+
71855+ insert_inodev_entry(match);
71856+ }
71857+
71858+ return;
71859+}
71860+
71861+static void
71862+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
71863+{
71864+ struct acl_subject_label *subj;
71865+ struct acl_role_label *role;
71866+ unsigned int x;
71867+
71868+ FOR_EACH_ROLE_START(role)
71869+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71870+
71871+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71872+ if ((subj->inode == ino) && (subj->device == dev)) {
71873+ subj->inode = ino;
71874+ subj->device = dev;
71875+ }
71876+ /* nested subjects aren't in the role's subj_hash table */
71877+ update_acl_obj_label(matchn->inode, matchn->device,
71878+ ino, dev, subj);
71879+ FOR_EACH_NESTED_SUBJECT_END(subj)
71880+ FOR_EACH_SUBJECT_START(role, subj, x)
71881+ update_acl_obj_label(matchn->inode, matchn->device,
71882+ ino, dev, subj);
71883+ FOR_EACH_SUBJECT_END(subj,x)
71884+ FOR_EACH_ROLE_END(role)
71885+
71886+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71887+
71888+ return;
71889+}
71890+
71891+static void
71892+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71893+ const struct vfsmount *mnt)
71894+{
71895+ u64 ino = __get_ino(dentry);
71896+ dev_t dev = __get_dev(dentry);
71897+
71898+ __do_handle_create(matchn, ino, dev);
71899+
71900+ return;
71901+}
71902+
71903+void
71904+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71905+{
71906+ struct name_entry *matchn;
71907+
71908+ if (unlikely(!(gr_status & GR_READY)))
71909+ return;
71910+
71911+ preempt_disable();
71912+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71913+
71914+ if (unlikely((unsigned long)matchn)) {
71915+ write_lock(&gr_inode_lock);
71916+ do_handle_create(matchn, dentry, mnt);
71917+ write_unlock(&gr_inode_lock);
71918+ }
71919+ preempt_enable();
71920+
71921+ return;
71922+}
71923+
71924+void
71925+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71926+{
71927+ struct name_entry *matchn;
71928+
71929+ if (unlikely(!(gr_status & GR_READY)))
71930+ return;
71931+
71932+ preempt_disable();
71933+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71934+
71935+ if (unlikely((unsigned long)matchn)) {
71936+ write_lock(&gr_inode_lock);
71937+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71938+ write_unlock(&gr_inode_lock);
71939+ }
71940+ preempt_enable();
71941+
71942+ return;
71943+}
71944+
71945+void
71946+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71947+ struct dentry *old_dentry,
71948+ struct dentry *new_dentry,
71949+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71950+{
71951+ struct name_entry *matchn;
71952+ struct name_entry *matchn2 = NULL;
71953+ struct inodev_entry *inodev;
71954+ struct inode *inode = new_dentry->d_inode;
71955+ u64 old_ino = __get_ino(old_dentry);
71956+ dev_t old_dev = __get_dev(old_dentry);
71957+ unsigned int exchange = flags & RENAME_EXCHANGE;
71958+
71959+ /* vfs_rename swaps the name and parent link for old_dentry and
71960+ new_dentry
71961+ at this point, old_dentry has the new name, parent link, and inode
71962+ for the renamed file
71963+ if a file is being replaced by a rename, new_dentry has the inode
71964+ and name for the replaced file
71965+ */
71966+
71967+ if (unlikely(!(gr_status & GR_READY)))
71968+ return;
71969+
71970+ preempt_disable();
71971+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71972+
71973+ /* exchange cases:
71974+ a filename exists for the source, but not dest
71975+ do a recreate on source
71976+ a filename exists for the dest, but not source
71977+ do a recreate on dest
71978+ a filename exists for both source and dest
71979+ delete source and dest, then create source and dest
71980+ a filename exists for neither source nor dest
71981+ no updates needed
71982+
71983+ the name entry lookups get us the old inode/dev associated with
71984+ each name, so do the deletes first (if possible) so that when
71985+ we do the create, we pick up on the right entries
71986+ */
71987+
71988+ if (exchange)
71989+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71990+
71991+ /* we wouldn't have to check d_inode if it weren't for
71992+ NFS silly-renaming
71993+ */
71994+
71995+ write_lock(&gr_inode_lock);
71996+ if (unlikely((replace || exchange) && inode)) {
71997+ u64 new_ino = __get_ino(new_dentry);
71998+ dev_t new_dev = __get_dev(new_dentry);
71999+
72000+ inodev = lookup_inodev_entry(new_ino, new_dev);
72001+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
72002+ do_handle_delete(inodev, new_ino, new_dev);
72003+ }
72004+
72005+ inodev = lookup_inodev_entry(old_ino, old_dev);
72006+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
72007+ do_handle_delete(inodev, old_ino, old_dev);
72008+
72009+ if (unlikely(matchn != NULL))
72010+ do_handle_create(matchn, old_dentry, mnt);
72011+
72012+ if (unlikely(matchn2 != NULL))
72013+ do_handle_create(matchn2, new_dentry, mnt);
72014+
72015+ write_unlock(&gr_inode_lock);
72016+ preempt_enable();
72017+
72018+ return;
72019+}
72020+
72021+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
72022+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
72023+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
72024+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
72025+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
72026+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
72027+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
72028+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
72029+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
72030+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
72031+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
72032+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
72033+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
72034+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
72035+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
72036+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
72037+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
72038+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
72039+};
72040+
72041+void
72042+gr_learn_resource(const struct task_struct *task,
72043+ const int res, const unsigned long wanted, const int gt)
72044+{
72045+ struct acl_subject_label *acl;
72046+ const struct cred *cred;
72047+
72048+ if (unlikely((gr_status & GR_READY) &&
72049+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
72050+ goto skip_reslog;
72051+
72052+ gr_log_resource(task, res, wanted, gt);
72053+skip_reslog:
72054+
72055+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
72056+ return;
72057+
72058+ acl = task->acl;
72059+
72060+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
72061+ !(acl->resmask & (1U << (unsigned short) res))))
72062+ return;
72063+
72064+ if (wanted >= acl->res[res].rlim_cur) {
72065+ unsigned long res_add;
72066+
72067+ res_add = wanted + res_learn_bumps[res];
72068+
72069+ acl->res[res].rlim_cur = res_add;
72070+
72071+ if (wanted > acl->res[res].rlim_max)
72072+ acl->res[res].rlim_max = res_add;
72073+
72074+ /* only log the subject filename, since resource logging is supported for
72075+ single-subject learning only */
72076+ rcu_read_lock();
72077+ cred = __task_cred(task);
72078+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72079+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
72080+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
72081+ "", (unsigned long) res, &task->signal->saved_ip);
72082+ rcu_read_unlock();
72083+ }
72084+
72085+ return;
72086+}
72087+EXPORT_SYMBOL_GPL(gr_learn_resource);
72088+#endif
72089+
72090+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
72091+void
72092+pax_set_initial_flags(struct linux_binprm *bprm)
72093+{
72094+ struct task_struct *task = current;
72095+ struct acl_subject_label *proc;
72096+ unsigned long flags;
72097+
72098+ if (unlikely(!(gr_status & GR_READY)))
72099+ return;
72100+
72101+ flags = pax_get_flags(task);
72102+
72103+ proc = task->acl;
72104+
72105+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
72106+ flags &= ~MF_PAX_PAGEEXEC;
72107+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
72108+ flags &= ~MF_PAX_SEGMEXEC;
72109+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
72110+ flags &= ~MF_PAX_RANDMMAP;
72111+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
72112+ flags &= ~MF_PAX_EMUTRAMP;
72113+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
72114+ flags &= ~MF_PAX_MPROTECT;
72115+
72116+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
72117+ flags |= MF_PAX_PAGEEXEC;
72118+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
72119+ flags |= MF_PAX_SEGMEXEC;
72120+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
72121+ flags |= MF_PAX_RANDMMAP;
72122+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
72123+ flags |= MF_PAX_EMUTRAMP;
72124+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
72125+ flags |= MF_PAX_MPROTECT;
72126+
72127+ pax_set_flags(task, flags);
72128+
72129+ return;
72130+}
72131+#endif
72132+
72133+int
72134+gr_handle_proc_ptrace(struct task_struct *task)
72135+{
72136+ struct file *filp;
72137+ struct task_struct *tmp = task;
72138+ struct task_struct *curtemp = current;
72139+ __u32 retmode;
72140+
72141+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72142+ if (unlikely(!(gr_status & GR_READY)))
72143+ return 0;
72144+#endif
72145+
72146+ read_lock(&tasklist_lock);
72147+ read_lock(&grsec_exec_file_lock);
72148+ filp = task->exec_file;
72149+
72150+ while (task_pid_nr(tmp) > 0) {
72151+ if (tmp == curtemp)
72152+ break;
72153+ tmp = tmp->real_parent;
72154+ }
72155+
72156+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72157+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
72158+ read_unlock(&grsec_exec_file_lock);
72159+ read_unlock(&tasklist_lock);
72160+ return 1;
72161+ }
72162+
72163+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72164+ if (!(gr_status & GR_READY)) {
72165+ read_unlock(&grsec_exec_file_lock);
72166+ read_unlock(&tasklist_lock);
72167+ return 0;
72168+ }
72169+#endif
72170+
72171+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
72172+ read_unlock(&grsec_exec_file_lock);
72173+ read_unlock(&tasklist_lock);
72174+
72175+ if (retmode & GR_NOPTRACE)
72176+ return 1;
72177+
72178+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
72179+ && (current->acl != task->acl || (current->acl != current->role->root_label
72180+ && task_pid_nr(current) != task_pid_nr(task))))
72181+ return 1;
72182+
72183+ return 0;
72184+}
72185+
72186+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
72187+{
72188+ if (unlikely(!(gr_status & GR_READY)))
72189+ return;
72190+
72191+ if (!(current->role->roletype & GR_ROLE_GOD))
72192+ return;
72193+
72194+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
72195+ p->role->rolename, gr_task_roletype_to_char(p),
72196+ p->acl->filename);
72197+}
72198+
72199+int
72200+gr_handle_ptrace(struct task_struct *task, const long request)
72201+{
72202+ struct task_struct *tmp = task;
72203+ struct task_struct *curtemp = current;
72204+ __u32 retmode;
72205+
72206+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72207+ if (unlikely(!(gr_status & GR_READY)))
72208+ return 0;
72209+#endif
72210+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
72211+ read_lock(&tasklist_lock);
72212+ while (task_pid_nr(tmp) > 0) {
72213+ if (tmp == curtemp)
72214+ break;
72215+ tmp = tmp->real_parent;
72216+ }
72217+
72218+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72219+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
72220+ read_unlock(&tasklist_lock);
72221+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72222+ return 1;
72223+ }
72224+ read_unlock(&tasklist_lock);
72225+ }
72226+
72227+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72228+ if (!(gr_status & GR_READY))
72229+ return 0;
72230+#endif
72231+
72232+ read_lock(&grsec_exec_file_lock);
72233+ if (unlikely(!task->exec_file)) {
72234+ read_unlock(&grsec_exec_file_lock);
72235+ return 0;
72236+ }
72237+
72238+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
72239+ read_unlock(&grsec_exec_file_lock);
72240+
72241+ if (retmode & GR_NOPTRACE) {
72242+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72243+ return 1;
72244+ }
72245+
72246+ if (retmode & GR_PTRACERD) {
72247+ switch (request) {
72248+ case PTRACE_SEIZE:
72249+ case PTRACE_POKETEXT:
72250+ case PTRACE_POKEDATA:
72251+ case PTRACE_POKEUSR:
72252+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
72253+ case PTRACE_SETREGS:
72254+ case PTRACE_SETFPREGS:
72255+#endif
72256+#ifdef CONFIG_X86
72257+ case PTRACE_SETFPXREGS:
72258+#endif
72259+#ifdef CONFIG_ALTIVEC
72260+ case PTRACE_SETVRREGS:
72261+#endif
72262+ return 1;
72263+ default:
72264+ return 0;
72265+ }
72266+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
72267+ !(current->role->roletype & GR_ROLE_GOD) &&
72268+ (current->acl != task->acl)) {
72269+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72270+ return 1;
72271+ }
72272+
72273+ return 0;
72274+}
72275+
72276+static int is_writable_mmap(const struct file *filp)
72277+{
72278+ struct task_struct *task = current;
72279+ struct acl_object_label *obj, *obj2;
72280+
72281+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
72282+ !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))) {
72283+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
72284+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
72285+ task->role->root_label);
72286+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
72287+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
72288+ return 1;
72289+ }
72290+ }
72291+ return 0;
72292+}
72293+
72294+int
72295+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
72296+{
72297+ __u32 mode;
72298+
72299+ if (unlikely(!file || !(prot & PROT_EXEC)))
72300+ return 1;
72301+
72302+ if (is_writable_mmap(file))
72303+ return 0;
72304+
72305+ mode =
72306+ gr_search_file(file->f_path.dentry,
72307+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72308+ file->f_path.mnt);
72309+
72310+ if (!gr_tpe_allow(file))
72311+ return 0;
72312+
72313+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72314+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72315+ return 0;
72316+ } else if (unlikely(!(mode & GR_EXEC))) {
72317+ return 0;
72318+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72319+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72320+ return 1;
72321+ }
72322+
72323+ return 1;
72324+}
72325+
72326+int
72327+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
72328+{
72329+ __u32 mode;
72330+
72331+ if (unlikely(!file || !(prot & PROT_EXEC)))
72332+ return 1;
72333+
72334+ if (is_writable_mmap(file))
72335+ return 0;
72336+
72337+ mode =
72338+ gr_search_file(file->f_path.dentry,
72339+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72340+ file->f_path.mnt);
72341+
72342+ if (!gr_tpe_allow(file))
72343+ return 0;
72344+
72345+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72346+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72347+ return 0;
72348+ } else if (unlikely(!(mode & GR_EXEC))) {
72349+ return 0;
72350+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72351+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72352+ return 1;
72353+ }
72354+
72355+ return 1;
72356+}
72357+
72358+void
72359+gr_acl_handle_psacct(struct task_struct *task, const long code)
72360+{
72361+ unsigned long runtime, cputime;
72362+ cputime_t utime, stime;
72363+ unsigned int wday, cday;
72364+ __u8 whr, chr;
72365+ __u8 wmin, cmin;
72366+ __u8 wsec, csec;
72367+ struct timespec curtime, starttime;
72368+
72369+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
72370+ !(task->acl->mode & GR_PROCACCT)))
72371+ return;
72372+
72373+ curtime = ns_to_timespec(ktime_get_ns());
72374+ starttime = ns_to_timespec(task->start_time);
72375+ runtime = curtime.tv_sec - starttime.tv_sec;
72376+ wday = runtime / (60 * 60 * 24);
72377+ runtime -= wday * (60 * 60 * 24);
72378+ whr = runtime / (60 * 60);
72379+ runtime -= whr * (60 * 60);
72380+ wmin = runtime / 60;
72381+ runtime -= wmin * 60;
72382+ wsec = runtime;
72383+
72384+ task_cputime(task, &utime, &stime);
72385+ cputime = cputime_to_secs(utime + stime);
72386+ cday = cputime / (60 * 60 * 24);
72387+ cputime -= cday * (60 * 60 * 24);
72388+ chr = cputime / (60 * 60);
72389+ cputime -= chr * (60 * 60);
72390+ cmin = cputime / 60;
72391+ cputime -= cmin * 60;
72392+ csec = cputime;
72393+
72394+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
72395+
72396+ return;
72397+}
72398+
72399+#ifdef CONFIG_TASKSTATS
72400+int gr_is_taskstats_denied(int pid)
72401+{
72402+ struct task_struct *task;
72403+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72404+ const struct cred *cred;
72405+#endif
72406+ int ret = 0;
72407+
72408+ /* restrict taskstats viewing to un-chrooted root users
72409+ who have the 'view' subject flag if the RBAC system is enabled
72410+ */
72411+
72412+ rcu_read_lock();
72413+ read_lock(&tasklist_lock);
72414+ task = find_task_by_vpid(pid);
72415+ if (task) {
72416+#ifdef CONFIG_GRKERNSEC_CHROOT
72417+ if (proc_is_chrooted(task))
72418+ ret = -EACCES;
72419+#endif
72420+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72421+ cred = __task_cred(task);
72422+#ifdef CONFIG_GRKERNSEC_PROC_USER
72423+ if (gr_is_global_nonroot(cred->uid))
72424+ ret = -EACCES;
72425+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72426+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
72427+ ret = -EACCES;
72428+#endif
72429+#endif
72430+ if (gr_status & GR_READY) {
72431+ if (!(task->acl->mode & GR_VIEW))
72432+ ret = -EACCES;
72433+ }
72434+ } else
72435+ ret = -ENOENT;
72436+
72437+ read_unlock(&tasklist_lock);
72438+ rcu_read_unlock();
72439+
72440+ return ret;
72441+}
72442+#endif
72443+
72444+/* AUXV entries are filled via a descendant of search_binary_handler
72445+ after we've already applied the subject for the target
72446+*/
72447+int gr_acl_enable_at_secure(void)
72448+{
72449+ if (unlikely(!(gr_status & GR_READY)))
72450+ return 0;
72451+
72452+ if (current->acl->mode & GR_ATSECURE)
72453+ return 1;
72454+
72455+ return 0;
72456+}
72457+
72458+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
72459+{
72460+ struct task_struct *task = current;
72461+ struct dentry *dentry = file->f_path.dentry;
72462+ struct vfsmount *mnt = file->f_path.mnt;
72463+ struct acl_object_label *obj, *tmp;
72464+ struct acl_subject_label *subj;
72465+ unsigned int bufsize;
72466+ int is_not_root;
72467+ char *path;
72468+ dev_t dev = __get_dev(dentry);
72469+
72470+ if (unlikely(!(gr_status & GR_READY)))
72471+ return 1;
72472+
72473+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
72474+ return 1;
72475+
72476+ /* ignore Eric Biederman */
72477+ if (IS_PRIVATE(dentry->d_inode))
72478+ return 1;
72479+
72480+ subj = task->acl;
72481+ read_lock(&gr_inode_lock);
72482+ do {
72483+ obj = lookup_acl_obj_label(ino, dev, subj);
72484+ if (obj != NULL) {
72485+ read_unlock(&gr_inode_lock);
72486+ return (obj->mode & GR_FIND) ? 1 : 0;
72487+ }
72488+ } while ((subj = subj->parent_subject));
72489+ read_unlock(&gr_inode_lock);
72490+
72491+ /* this is purely an optimization since we're looking for an object
72492+ for the directory we're doing a readdir on
72493+ if it's possible for any globbed object to match the entry we're
72494+ filling into the directory, then the object we find here will be
72495+ an anchor point with attached globbed objects
72496+ */
72497+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
72498+ if (obj->globbed == NULL)
72499+ return (obj->mode & GR_FIND) ? 1 : 0;
72500+
72501+ is_not_root = ((obj->filename[0] == '/') &&
72502+ (obj->filename[1] == '\0')) ? 0 : 1;
72503+ bufsize = PAGE_SIZE - namelen - is_not_root;
72504+
72505+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
72506+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
72507+ return 1;
72508+
72509+ preempt_disable();
72510+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
72511+ bufsize);
72512+
72513+ bufsize = strlen(path);
72514+
72515+ /* if base is "/", don't append an additional slash */
72516+ if (is_not_root)
72517+ *(path + bufsize) = '/';
72518+ memcpy(path + bufsize + is_not_root, name, namelen);
72519+ *(path + bufsize + namelen + is_not_root) = '\0';
72520+
72521+ tmp = obj->globbed;
72522+ while (tmp) {
72523+ if (!glob_match(tmp->filename, path)) {
72524+ preempt_enable();
72525+ return (tmp->mode & GR_FIND) ? 1 : 0;
72526+ }
72527+ tmp = tmp->next;
72528+ }
72529+ preempt_enable();
72530+ return (obj->mode & GR_FIND) ? 1 : 0;
72531+}
72532+
72533+void gr_put_exec_file(struct task_struct *task)
72534+{
72535+ struct file *filp;
72536+
72537+ write_lock(&grsec_exec_file_lock);
72538+ filp = task->exec_file;
72539+ task->exec_file = NULL;
72540+ write_unlock(&grsec_exec_file_lock);
72541+
72542+ if (filp)
72543+ fput(filp);
72544+
72545+ return;
72546+}
72547+
72548+
72549+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
72550+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
72551+#endif
72552+#ifdef CONFIG_SECURITY
72553+EXPORT_SYMBOL_GPL(gr_check_user_change);
72554+EXPORT_SYMBOL_GPL(gr_check_group_change);
72555+#endif
72556+
72557diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
72558new file mode 100644
72559index 0000000..18ffbbd
72560--- /dev/null
72561+++ b/grsecurity/gracl_alloc.c
72562@@ -0,0 +1,105 @@
72563+#include <linux/kernel.h>
72564+#include <linux/mm.h>
72565+#include <linux/slab.h>
72566+#include <linux/vmalloc.h>
72567+#include <linux/gracl.h>
72568+#include <linux/grsecurity.h>
72569+
72570+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
72571+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
72572+
72573+static __inline__ int
72574+alloc_pop(void)
72575+{
72576+ if (current_alloc_state->alloc_stack_next == 1)
72577+ return 0;
72578+
72579+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
72580+
72581+ current_alloc_state->alloc_stack_next--;
72582+
72583+ return 1;
72584+}
72585+
72586+static __inline__ int
72587+alloc_push(void *buf)
72588+{
72589+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
72590+ return 1;
72591+
72592+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
72593+
72594+ current_alloc_state->alloc_stack_next++;
72595+
72596+ return 0;
72597+}
72598+
72599+void *
72600+acl_alloc(unsigned long len)
72601+{
72602+ void *ret = NULL;
72603+
72604+ if (!len || len > PAGE_SIZE)
72605+ goto out;
72606+
72607+ ret = kmalloc(len, GFP_KERNEL);
72608+
72609+ if (ret) {
72610+ if (alloc_push(ret)) {
72611+ kfree(ret);
72612+ ret = NULL;
72613+ }
72614+ }
72615+
72616+out:
72617+ return ret;
72618+}
72619+
72620+void *
72621+acl_alloc_num(unsigned long num, unsigned long len)
72622+{
72623+ if (!len || (num > (PAGE_SIZE / len)))
72624+ return NULL;
72625+
72626+ return acl_alloc(num * len);
72627+}
72628+
72629+void
72630+acl_free_all(void)
72631+{
72632+ if (!current_alloc_state->alloc_stack)
72633+ return;
72634+
72635+ while (alloc_pop()) ;
72636+
72637+ if (current_alloc_state->alloc_stack) {
72638+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
72639+ kfree(current_alloc_state->alloc_stack);
72640+ else
72641+ vfree(current_alloc_state->alloc_stack);
72642+ }
72643+
72644+ current_alloc_state->alloc_stack = NULL;
72645+ current_alloc_state->alloc_stack_size = 1;
72646+ current_alloc_state->alloc_stack_next = 1;
72647+
72648+ return;
72649+}
72650+
72651+int
72652+acl_alloc_stack_init(unsigned long size)
72653+{
72654+ if ((size * sizeof (void *)) <= PAGE_SIZE)
72655+ current_alloc_state->alloc_stack =
72656+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
72657+ else
72658+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
72659+
72660+ current_alloc_state->alloc_stack_size = size;
72661+ current_alloc_state->alloc_stack_next = 1;
72662+
72663+ if (!current_alloc_state->alloc_stack)
72664+ return 0;
72665+ else
72666+ return 1;
72667+}
72668diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
72669new file mode 100644
72670index 0000000..1a94c11
72671--- /dev/null
72672+++ b/grsecurity/gracl_cap.c
72673@@ -0,0 +1,127 @@
72674+#include <linux/kernel.h>
72675+#include <linux/module.h>
72676+#include <linux/sched.h>
72677+#include <linux/gracl.h>
72678+#include <linux/grsecurity.h>
72679+#include <linux/grinternal.h>
72680+
72681+extern const char *captab_log[];
72682+extern int captab_log_entries;
72683+
72684+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
72685+{
72686+ struct acl_subject_label *curracl;
72687+
72688+ if (!gr_acl_is_enabled())
72689+ return 1;
72690+
72691+ curracl = task->acl;
72692+
72693+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72694+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72695+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
72696+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
72697+ gr_to_filename(task->exec_file->f_path.dentry,
72698+ task->exec_file->f_path.mnt) : curracl->filename,
72699+ curracl->filename, 0UL,
72700+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72701+ return 1;
72702+ }
72703+
72704+ return 0;
72705+}
72706+
72707+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72708+{
72709+ struct acl_subject_label *curracl;
72710+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72711+ kernel_cap_t cap_audit = __cap_empty_set;
72712+
72713+ if (!gr_acl_is_enabled())
72714+ return 1;
72715+
72716+ curracl = task->acl;
72717+
72718+ cap_drop = curracl->cap_lower;
72719+ cap_mask = curracl->cap_mask;
72720+ cap_audit = curracl->cap_invert_audit;
72721+
72722+ while ((curracl = curracl->parent_subject)) {
72723+ /* if the cap isn't specified in the current computed mask but is specified in the
72724+ current level subject, and is lowered in the current level subject, then add
72725+ it to the set of dropped capabilities
72726+ otherwise, add the current level subject's mask to the current computed mask
72727+ */
72728+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72729+ cap_raise(cap_mask, cap);
72730+ if (cap_raised(curracl->cap_lower, cap))
72731+ cap_raise(cap_drop, cap);
72732+ if (cap_raised(curracl->cap_invert_audit, cap))
72733+ cap_raise(cap_audit, cap);
72734+ }
72735+ }
72736+
72737+ if (!cap_raised(cap_drop, cap)) {
72738+ if (cap_raised(cap_audit, cap))
72739+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72740+ return 1;
72741+ }
72742+
72743+ /* only learn the capability use if the process has the capability in the
72744+ general case, the two uses in sys.c of gr_learn_cap are an exception
72745+ to this rule to ensure any role transition involves what the full-learned
72746+ policy believes in a privileged process
72747+ */
72748+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72749+ return 1;
72750+
72751+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72752+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72753+
72754+ return 0;
72755+}
72756+
72757+int
72758+gr_acl_is_capable(const int cap)
72759+{
72760+ return gr_task_acl_is_capable(current, current_cred(), cap);
72761+}
72762+
72763+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72764+{
72765+ struct acl_subject_label *curracl;
72766+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72767+
72768+ if (!gr_acl_is_enabled())
72769+ return 1;
72770+
72771+ curracl = task->acl;
72772+
72773+ cap_drop = curracl->cap_lower;
72774+ cap_mask = curracl->cap_mask;
72775+
72776+ while ((curracl = curracl->parent_subject)) {
72777+ /* if the cap isn't specified in the current computed mask but is specified in the
72778+ current level subject, and is lowered in the current level subject, then add
72779+ it to the set of dropped capabilities
72780+ otherwise, add the current level subject's mask to the current computed mask
72781+ */
72782+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72783+ cap_raise(cap_mask, cap);
72784+ if (cap_raised(curracl->cap_lower, cap))
72785+ cap_raise(cap_drop, cap);
72786+ }
72787+ }
72788+
72789+ if (!cap_raised(cap_drop, cap))
72790+ return 1;
72791+
72792+ return 0;
72793+}
72794+
72795+int
72796+gr_acl_is_capable_nolog(const int cap)
72797+{
72798+ return gr_task_acl_is_capable_nolog(current, cap);
72799+}
72800+
72801diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72802new file mode 100644
72803index 0000000..a43dd06
72804--- /dev/null
72805+++ b/grsecurity/gracl_compat.c
72806@@ -0,0 +1,269 @@
72807+#include <linux/kernel.h>
72808+#include <linux/gracl.h>
72809+#include <linux/compat.h>
72810+#include <linux/gracl_compat.h>
72811+
72812+#include <asm/uaccess.h>
72813+
72814+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72815+{
72816+ struct gr_arg_wrapper_compat uwrapcompat;
72817+
72818+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72819+ return -EFAULT;
72820+
72821+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
72822+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72823+ return -EINVAL;
72824+
72825+ uwrap->arg = compat_ptr(uwrapcompat.arg);
72826+ uwrap->version = uwrapcompat.version;
72827+ uwrap->size = sizeof(struct gr_arg);
72828+
72829+ return 0;
72830+}
72831+
72832+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72833+{
72834+ struct gr_arg_compat argcompat;
72835+
72836+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72837+ return -EFAULT;
72838+
72839+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72840+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72841+ arg->role_db.num_roles = argcompat.role_db.num_roles;
72842+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72843+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72844+ arg->role_db.num_objects = argcompat.role_db.num_objects;
72845+
72846+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72847+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72848+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72849+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72850+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72851+ arg->segv_device = argcompat.segv_device;
72852+ arg->segv_inode = argcompat.segv_inode;
72853+ arg->segv_uid = argcompat.segv_uid;
72854+ arg->num_sprole_pws = argcompat.num_sprole_pws;
72855+ arg->mode = argcompat.mode;
72856+
72857+ return 0;
72858+}
72859+
72860+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72861+{
72862+ struct acl_object_label_compat objcompat;
72863+
72864+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72865+ return -EFAULT;
72866+
72867+ obj->filename = compat_ptr(objcompat.filename);
72868+ obj->inode = objcompat.inode;
72869+ obj->device = objcompat.device;
72870+ obj->mode = objcompat.mode;
72871+
72872+ obj->nested = compat_ptr(objcompat.nested);
72873+ obj->globbed = compat_ptr(objcompat.globbed);
72874+
72875+ obj->prev = compat_ptr(objcompat.prev);
72876+ obj->next = compat_ptr(objcompat.next);
72877+
72878+ return 0;
72879+}
72880+
72881+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72882+{
72883+ unsigned int i;
72884+ struct acl_subject_label_compat subjcompat;
72885+
72886+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72887+ return -EFAULT;
72888+
72889+ subj->filename = compat_ptr(subjcompat.filename);
72890+ subj->inode = subjcompat.inode;
72891+ subj->device = subjcompat.device;
72892+ subj->mode = subjcompat.mode;
72893+ subj->cap_mask = subjcompat.cap_mask;
72894+ subj->cap_lower = subjcompat.cap_lower;
72895+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
72896+
72897+ for (i = 0; i < GR_NLIMITS; i++) {
72898+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72899+ subj->res[i].rlim_cur = RLIM_INFINITY;
72900+ else
72901+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72902+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72903+ subj->res[i].rlim_max = RLIM_INFINITY;
72904+ else
72905+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72906+ }
72907+ subj->resmask = subjcompat.resmask;
72908+
72909+ subj->user_trans_type = subjcompat.user_trans_type;
72910+ subj->group_trans_type = subjcompat.group_trans_type;
72911+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72912+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72913+ subj->user_trans_num = subjcompat.user_trans_num;
72914+ subj->group_trans_num = subjcompat.group_trans_num;
72915+
72916+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72917+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72918+ subj->ip_type = subjcompat.ip_type;
72919+ subj->ips = compat_ptr(subjcompat.ips);
72920+ subj->ip_num = subjcompat.ip_num;
72921+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
72922+
72923+ subj->crashes = subjcompat.crashes;
72924+ subj->expires = subjcompat.expires;
72925+
72926+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72927+ subj->hash = compat_ptr(subjcompat.hash);
72928+ subj->prev = compat_ptr(subjcompat.prev);
72929+ subj->next = compat_ptr(subjcompat.next);
72930+
72931+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72932+ subj->obj_hash_size = subjcompat.obj_hash_size;
72933+ subj->pax_flags = subjcompat.pax_flags;
72934+
72935+ return 0;
72936+}
72937+
72938+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72939+{
72940+ struct acl_role_label_compat rolecompat;
72941+
72942+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72943+ return -EFAULT;
72944+
72945+ role->rolename = compat_ptr(rolecompat.rolename);
72946+ role->uidgid = rolecompat.uidgid;
72947+ role->roletype = rolecompat.roletype;
72948+
72949+ role->auth_attempts = rolecompat.auth_attempts;
72950+ role->expires = rolecompat.expires;
72951+
72952+ role->root_label = compat_ptr(rolecompat.root_label);
72953+ role->hash = compat_ptr(rolecompat.hash);
72954+
72955+ role->prev = compat_ptr(rolecompat.prev);
72956+ role->next = compat_ptr(rolecompat.next);
72957+
72958+ role->transitions = compat_ptr(rolecompat.transitions);
72959+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72960+ role->domain_children = compat_ptr(rolecompat.domain_children);
72961+ role->domain_child_num = rolecompat.domain_child_num;
72962+
72963+ role->umask = rolecompat.umask;
72964+
72965+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
72966+ role->subj_hash_size = rolecompat.subj_hash_size;
72967+
72968+ return 0;
72969+}
72970+
72971+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72972+{
72973+ struct role_allowed_ip_compat roleip_compat;
72974+
72975+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72976+ return -EFAULT;
72977+
72978+ roleip->addr = roleip_compat.addr;
72979+ roleip->netmask = roleip_compat.netmask;
72980+
72981+ roleip->prev = compat_ptr(roleip_compat.prev);
72982+ roleip->next = compat_ptr(roleip_compat.next);
72983+
72984+ return 0;
72985+}
72986+
72987+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72988+{
72989+ struct role_transition_compat trans_compat;
72990+
72991+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72992+ return -EFAULT;
72993+
72994+ trans->rolename = compat_ptr(trans_compat.rolename);
72995+
72996+ trans->prev = compat_ptr(trans_compat.prev);
72997+ trans->next = compat_ptr(trans_compat.next);
72998+
72999+ return 0;
73000+
73001+}
73002+
73003+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73004+{
73005+ struct gr_hash_struct_compat hash_compat;
73006+
73007+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
73008+ return -EFAULT;
73009+
73010+ hash->table = compat_ptr(hash_compat.table);
73011+ hash->nametable = compat_ptr(hash_compat.nametable);
73012+ hash->first = compat_ptr(hash_compat.first);
73013+
73014+ hash->table_size = hash_compat.table_size;
73015+ hash->used_size = hash_compat.used_size;
73016+
73017+ hash->type = hash_compat.type;
73018+
73019+ return 0;
73020+}
73021+
73022+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
73023+{
73024+ compat_uptr_t ptrcompat;
73025+
73026+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
73027+ return -EFAULT;
73028+
73029+ *(void **)ptr = compat_ptr(ptrcompat);
73030+
73031+ return 0;
73032+}
73033+
73034+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73035+{
73036+ struct acl_ip_label_compat ip_compat;
73037+
73038+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
73039+ return -EFAULT;
73040+
73041+ ip->iface = compat_ptr(ip_compat.iface);
73042+ ip->addr = ip_compat.addr;
73043+ ip->netmask = ip_compat.netmask;
73044+ ip->low = ip_compat.low;
73045+ ip->high = ip_compat.high;
73046+ ip->mode = ip_compat.mode;
73047+ ip->type = ip_compat.type;
73048+
73049+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
73050+
73051+ ip->prev = compat_ptr(ip_compat.prev);
73052+ ip->next = compat_ptr(ip_compat.next);
73053+
73054+ return 0;
73055+}
73056+
73057+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73058+{
73059+ struct sprole_pw_compat pw_compat;
73060+
73061+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
73062+ return -EFAULT;
73063+
73064+ pw->rolename = compat_ptr(pw_compat.rolename);
73065+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
73066+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
73067+
73068+ return 0;
73069+}
73070+
73071+size_t get_gr_arg_wrapper_size_compat(void)
73072+{
73073+ return sizeof(struct gr_arg_wrapper_compat);
73074+}
73075+
73076diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
73077new file mode 100644
73078index 0000000..8ee8e4f
73079--- /dev/null
73080+++ b/grsecurity/gracl_fs.c
73081@@ -0,0 +1,447 @@
73082+#include <linux/kernel.h>
73083+#include <linux/sched.h>
73084+#include <linux/types.h>
73085+#include <linux/fs.h>
73086+#include <linux/file.h>
73087+#include <linux/stat.h>
73088+#include <linux/grsecurity.h>
73089+#include <linux/grinternal.h>
73090+#include <linux/gracl.h>
73091+
73092+umode_t
73093+gr_acl_umask(void)
73094+{
73095+ if (unlikely(!gr_acl_is_enabled()))
73096+ return 0;
73097+
73098+ return current->role->umask;
73099+}
73100+
73101+__u32
73102+gr_acl_handle_hidden_file(const struct dentry * dentry,
73103+ const struct vfsmount * mnt)
73104+{
73105+ __u32 mode;
73106+
73107+ if (unlikely(d_is_negative(dentry)))
73108+ return GR_FIND;
73109+
73110+ mode =
73111+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
73112+
73113+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
73114+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73115+ return mode;
73116+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
73117+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73118+ return 0;
73119+ } else if (unlikely(!(mode & GR_FIND)))
73120+ return 0;
73121+
73122+ return GR_FIND;
73123+}
73124+
73125+__u32
73126+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
73127+ int acc_mode)
73128+{
73129+ __u32 reqmode = GR_FIND;
73130+ __u32 mode;
73131+
73132+ if (unlikely(d_is_negative(dentry)))
73133+ return reqmode;
73134+
73135+ if (acc_mode & MAY_APPEND)
73136+ reqmode |= GR_APPEND;
73137+ else if (acc_mode & MAY_WRITE)
73138+ reqmode |= GR_WRITE;
73139+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
73140+ reqmode |= GR_READ;
73141+
73142+ mode =
73143+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73144+ mnt);
73145+
73146+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73147+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73148+ reqmode & GR_READ ? " reading" : "",
73149+ reqmode & GR_WRITE ? " writing" : reqmode &
73150+ GR_APPEND ? " appending" : "");
73151+ return reqmode;
73152+ } else
73153+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73154+ {
73155+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73156+ reqmode & GR_READ ? " reading" : "",
73157+ reqmode & GR_WRITE ? " writing" : reqmode &
73158+ GR_APPEND ? " appending" : "");
73159+ return 0;
73160+ } else if (unlikely((mode & reqmode) != reqmode))
73161+ return 0;
73162+
73163+ return reqmode;
73164+}
73165+
73166+__u32
73167+gr_acl_handle_creat(const struct dentry * dentry,
73168+ const struct dentry * p_dentry,
73169+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
73170+ const int imode)
73171+{
73172+ __u32 reqmode = GR_WRITE | GR_CREATE;
73173+ __u32 mode;
73174+
73175+ if (acc_mode & MAY_APPEND)
73176+ reqmode |= GR_APPEND;
73177+ // if a directory was required or the directory already exists, then
73178+ // don't count this open as a read
73179+ if ((acc_mode & MAY_READ) &&
73180+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
73181+ reqmode |= GR_READ;
73182+ if ((open_flags & O_CREAT) &&
73183+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
73184+ reqmode |= GR_SETID;
73185+
73186+ mode =
73187+ gr_check_create(dentry, p_dentry, p_mnt,
73188+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
73189+
73190+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73191+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73192+ reqmode & GR_READ ? " reading" : "",
73193+ reqmode & GR_WRITE ? " writing" : reqmode &
73194+ GR_APPEND ? " appending" : "");
73195+ return reqmode;
73196+ } else
73197+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73198+ {
73199+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73200+ reqmode & GR_READ ? " reading" : "",
73201+ reqmode & GR_WRITE ? " writing" : reqmode &
73202+ GR_APPEND ? " appending" : "");
73203+ return 0;
73204+ } else if (unlikely((mode & reqmode) != reqmode))
73205+ return 0;
73206+
73207+ return reqmode;
73208+}
73209+
73210+__u32
73211+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
73212+ const int fmode)
73213+{
73214+ __u32 mode, reqmode = GR_FIND;
73215+
73216+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
73217+ reqmode |= GR_EXEC;
73218+ if (fmode & S_IWOTH)
73219+ reqmode |= GR_WRITE;
73220+ if (fmode & S_IROTH)
73221+ reqmode |= GR_READ;
73222+
73223+ mode =
73224+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73225+ mnt);
73226+
73227+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73228+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73229+ reqmode & GR_READ ? " reading" : "",
73230+ reqmode & GR_WRITE ? " writing" : "",
73231+ reqmode & GR_EXEC ? " executing" : "");
73232+ return reqmode;
73233+ } else
73234+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73235+ {
73236+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73237+ reqmode & GR_READ ? " reading" : "",
73238+ reqmode & GR_WRITE ? " writing" : "",
73239+ reqmode & GR_EXEC ? " executing" : "");
73240+ return 0;
73241+ } else if (unlikely((mode & reqmode) != reqmode))
73242+ return 0;
73243+
73244+ return reqmode;
73245+}
73246+
73247+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
73248+{
73249+ __u32 mode;
73250+
73251+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
73252+
73253+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
73254+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
73255+ return mode;
73256+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
73257+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
73258+ return 0;
73259+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
73260+ return 0;
73261+
73262+ return (reqmode);
73263+}
73264+
73265+__u32
73266+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
73267+{
73268+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
73269+}
73270+
73271+__u32
73272+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
73273+{
73274+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
73275+}
73276+
73277+__u32
73278+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
73279+{
73280+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
73281+}
73282+
73283+__u32
73284+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
73285+{
73286+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
73287+}
73288+
73289+__u32
73290+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
73291+ umode_t *modeptr)
73292+{
73293+ umode_t mode;
73294+
73295+ *modeptr &= ~gr_acl_umask();
73296+ mode = *modeptr;
73297+
73298+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
73299+ return 1;
73300+
73301+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
73302+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
73303+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
73304+ GR_CHMOD_ACL_MSG);
73305+ } else {
73306+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
73307+ }
73308+}
73309+
73310+__u32
73311+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
73312+{
73313+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
73314+}
73315+
73316+__u32
73317+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
73318+{
73319+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
73320+}
73321+
73322+__u32
73323+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
73324+{
73325+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
73326+}
73327+
73328+__u32
73329+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
73330+{
73331+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
73332+}
73333+
73334+__u32
73335+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
73336+{
73337+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
73338+ GR_UNIXCONNECT_ACL_MSG);
73339+}
73340+
73341+/* hardlinks require at minimum create and link permission,
73342+ any additional privilege required is based on the
73343+ privilege of the file being linked to
73344+*/
73345+__u32
73346+gr_acl_handle_link(const struct dentry * new_dentry,
73347+ const struct dentry * parent_dentry,
73348+ const struct vfsmount * parent_mnt,
73349+ const struct dentry * old_dentry,
73350+ const struct vfsmount * old_mnt, const struct filename *to)
73351+{
73352+ __u32 mode;
73353+ __u32 needmode = GR_CREATE | GR_LINK;
73354+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
73355+
73356+ mode =
73357+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
73358+ old_mnt);
73359+
73360+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
73361+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73362+ return mode;
73363+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73364+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73365+ return 0;
73366+ } else if (unlikely((mode & needmode) != needmode))
73367+ return 0;
73368+
73369+ return 1;
73370+}
73371+
73372+__u32
73373+gr_acl_handle_symlink(const struct dentry * new_dentry,
73374+ const struct dentry * parent_dentry,
73375+ const struct vfsmount * parent_mnt, const struct filename *from)
73376+{
73377+ __u32 needmode = GR_WRITE | GR_CREATE;
73378+ __u32 mode;
73379+
73380+ mode =
73381+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
73382+ GR_CREATE | GR_AUDIT_CREATE |
73383+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
73384+
73385+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
73386+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73387+ return mode;
73388+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73389+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73390+ return 0;
73391+ } else if (unlikely((mode & needmode) != needmode))
73392+ return 0;
73393+
73394+ return (GR_WRITE | GR_CREATE);
73395+}
73396+
73397+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)
73398+{
73399+ __u32 mode;
73400+
73401+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
73402+
73403+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
73404+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
73405+ return mode;
73406+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
73407+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
73408+ return 0;
73409+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
73410+ return 0;
73411+
73412+ return (reqmode);
73413+}
73414+
73415+__u32
73416+gr_acl_handle_mknod(const struct dentry * new_dentry,
73417+ const struct dentry * parent_dentry,
73418+ const struct vfsmount * parent_mnt,
73419+ const int mode)
73420+{
73421+ __u32 reqmode = GR_WRITE | GR_CREATE;
73422+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
73423+ reqmode |= GR_SETID;
73424+
73425+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
73426+ reqmode, GR_MKNOD_ACL_MSG);
73427+}
73428+
73429+__u32
73430+gr_acl_handle_mkdir(const struct dentry *new_dentry,
73431+ const struct dentry *parent_dentry,
73432+ const struct vfsmount *parent_mnt)
73433+{
73434+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
73435+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
73436+}
73437+
73438+#define RENAME_CHECK_SUCCESS(old, new) \
73439+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
73440+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
73441+
73442+int
73443+gr_acl_handle_rename(struct dentry *new_dentry,
73444+ struct dentry *parent_dentry,
73445+ const struct vfsmount *parent_mnt,
73446+ struct dentry *old_dentry,
73447+ struct inode *old_parent_inode,
73448+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
73449+{
73450+ __u32 comp1, comp2;
73451+ int error = 0;
73452+
73453+ if (unlikely(!gr_acl_is_enabled()))
73454+ return 0;
73455+
73456+ if (flags & RENAME_EXCHANGE) {
73457+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
73458+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73459+ GR_SUPPRESS, parent_mnt);
73460+ comp2 =
73461+ gr_search_file(old_dentry,
73462+ GR_READ | GR_WRITE | GR_AUDIT_READ |
73463+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73464+ } else if (d_is_negative(new_dentry)) {
73465+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
73466+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
73467+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
73468+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
73469+ GR_DELETE | GR_AUDIT_DELETE |
73470+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73471+ GR_SUPPRESS, old_mnt);
73472+ } else {
73473+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
73474+ GR_CREATE | GR_DELETE |
73475+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
73476+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73477+ GR_SUPPRESS, parent_mnt);
73478+ comp2 =
73479+ gr_search_file(old_dentry,
73480+ GR_READ | GR_WRITE | GR_AUDIT_READ |
73481+ GR_DELETE | GR_AUDIT_DELETE |
73482+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73483+ }
73484+
73485+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
73486+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
73487+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73488+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
73489+ && !(comp2 & GR_SUPPRESS)) {
73490+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73491+ error = -EACCES;
73492+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
73493+ error = -EACCES;
73494+
73495+ return error;
73496+}
73497+
73498+void
73499+gr_acl_handle_exit(void)
73500+{
73501+ u16 id;
73502+ char *rolename;
73503+
73504+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
73505+ !(current->role->roletype & GR_ROLE_PERSIST))) {
73506+ id = current->acl_role_id;
73507+ rolename = current->role->rolename;
73508+ gr_set_acls(1);
73509+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
73510+ }
73511+
73512+ gr_put_exec_file(current);
73513+ return;
73514+}
73515+
73516+int
73517+gr_acl_handle_procpidmem(const struct task_struct *task)
73518+{
73519+ if (unlikely(!gr_acl_is_enabled()))
73520+ return 0;
73521+
73522+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
73523+ !(current->acl->mode & GR_POVERRIDE) &&
73524+ !(current->role->roletype & GR_ROLE_GOD))
73525+ return -EACCES;
73526+
73527+ return 0;
73528+}
73529diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
73530new file mode 100644
73531index 0000000..f056b81
73532--- /dev/null
73533+++ b/grsecurity/gracl_ip.c
73534@@ -0,0 +1,386 @@
73535+#include <linux/kernel.h>
73536+#include <asm/uaccess.h>
73537+#include <asm/errno.h>
73538+#include <net/sock.h>
73539+#include <linux/file.h>
73540+#include <linux/fs.h>
73541+#include <linux/net.h>
73542+#include <linux/in.h>
73543+#include <linux/skbuff.h>
73544+#include <linux/ip.h>
73545+#include <linux/udp.h>
73546+#include <linux/types.h>
73547+#include <linux/sched.h>
73548+#include <linux/netdevice.h>
73549+#include <linux/inetdevice.h>
73550+#include <linux/gracl.h>
73551+#include <linux/grsecurity.h>
73552+#include <linux/grinternal.h>
73553+
73554+#define GR_BIND 0x01
73555+#define GR_CONNECT 0x02
73556+#define GR_INVERT 0x04
73557+#define GR_BINDOVERRIDE 0x08
73558+#define GR_CONNECTOVERRIDE 0x10
73559+#define GR_SOCK_FAMILY 0x20
73560+
73561+static const char * gr_protocols[IPPROTO_MAX] = {
73562+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
73563+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
73564+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
73565+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
73566+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
73567+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
73568+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
73569+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
73570+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
73571+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
73572+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
73573+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
73574+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
73575+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
73576+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
73577+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
73578+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
73579+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
73580+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
73581+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
73582+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
73583+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
73584+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
73585+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
73586+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
73587+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
73588+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
73589+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
73590+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
73591+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
73592+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
73593+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
73594+ };
73595+
73596+static const char * gr_socktypes[SOCK_MAX] = {
73597+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
73598+ "unknown:7", "unknown:8", "unknown:9", "packet"
73599+ };
73600+
73601+static const char * gr_sockfamilies[AF_MAX+1] = {
73602+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
73603+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
73604+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
73605+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
73606+ };
73607+
73608+const char *
73609+gr_proto_to_name(unsigned char proto)
73610+{
73611+ return gr_protocols[proto];
73612+}
73613+
73614+const char *
73615+gr_socktype_to_name(unsigned char type)
73616+{
73617+ return gr_socktypes[type];
73618+}
73619+
73620+const char *
73621+gr_sockfamily_to_name(unsigned char family)
73622+{
73623+ return gr_sockfamilies[family];
73624+}
73625+
73626+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
73627+
73628+int
73629+gr_search_socket(const int domain, const int type, const int protocol)
73630+{
73631+ struct acl_subject_label *curr;
73632+ const struct cred *cred = current_cred();
73633+
73634+ if (unlikely(!gr_acl_is_enabled()))
73635+ goto exit;
73636+
73637+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
73638+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
73639+ goto exit; // let the kernel handle it
73640+
73641+ curr = current->acl;
73642+
73643+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
73644+ /* the family is allowed, if this is PF_INET allow it only if
73645+ the extra sock type/protocol checks pass */
73646+ if (domain == PF_INET)
73647+ goto inet_check;
73648+ goto exit;
73649+ } else {
73650+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73651+ __u32 fakeip = 0;
73652+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73653+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73654+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73655+ gr_to_filename(current->exec_file->f_path.dentry,
73656+ current->exec_file->f_path.mnt) :
73657+ curr->filename, curr->filename,
73658+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
73659+ &current->signal->saved_ip);
73660+ goto exit;
73661+ }
73662+ goto exit_fail;
73663+ }
73664+
73665+inet_check:
73666+ /* the rest of this checking is for IPv4 only */
73667+ if (!curr->ips)
73668+ goto exit;
73669+
73670+ if ((curr->ip_type & (1U << type)) &&
73671+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
73672+ goto exit;
73673+
73674+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73675+ /* we don't place acls on raw sockets , and sometimes
73676+ dgram/ip sockets are opened for ioctl and not
73677+ bind/connect, so we'll fake a bind learn log */
73678+ if (type == SOCK_RAW || type == SOCK_PACKET) {
73679+ __u32 fakeip = 0;
73680+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73681+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73682+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73683+ gr_to_filename(current->exec_file->f_path.dentry,
73684+ current->exec_file->f_path.mnt) :
73685+ curr->filename, curr->filename,
73686+ &fakeip, 0, type,
73687+ protocol, GR_CONNECT, &current->signal->saved_ip);
73688+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
73689+ __u32 fakeip = 0;
73690+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73691+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73692+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73693+ gr_to_filename(current->exec_file->f_path.dentry,
73694+ current->exec_file->f_path.mnt) :
73695+ curr->filename, curr->filename,
73696+ &fakeip, 0, type,
73697+ protocol, GR_BIND, &current->signal->saved_ip);
73698+ }
73699+ /* we'll log when they use connect or bind */
73700+ goto exit;
73701+ }
73702+
73703+exit_fail:
73704+ if (domain == PF_INET)
73705+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73706+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
73707+ else if (rcu_access_pointer(net_families[domain]) != NULL)
73708+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73709+ gr_socktype_to_name(type), protocol);
73710+
73711+ return 0;
73712+exit:
73713+ return 1;
73714+}
73715+
73716+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)
73717+{
73718+ if ((ip->mode & mode) &&
73719+ (ip_port >= ip->low) &&
73720+ (ip_port <= ip->high) &&
73721+ ((ntohl(ip_addr) & our_netmask) ==
73722+ (ntohl(our_addr) & our_netmask))
73723+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73724+ && (ip->type & (1U << type))) {
73725+ if (ip->mode & GR_INVERT)
73726+ return 2; // specifically denied
73727+ else
73728+ return 1; // allowed
73729+ }
73730+
73731+ return 0; // not specifically allowed, may continue parsing
73732+}
73733+
73734+static int
73735+gr_search_connectbind(const int full_mode, struct sock *sk,
73736+ struct sockaddr_in *addr, const int type)
73737+{
73738+ char iface[IFNAMSIZ] = {0};
73739+ struct acl_subject_label *curr;
73740+ struct acl_ip_label *ip;
73741+ struct inet_sock *isk;
73742+ struct net_device *dev;
73743+ struct in_device *idev;
73744+ unsigned long i;
73745+ int ret;
73746+ int mode = full_mode & (GR_BIND | GR_CONNECT);
73747+ __u32 ip_addr = 0;
73748+ __u32 our_addr;
73749+ __u32 our_netmask;
73750+ char *p;
73751+ __u16 ip_port = 0;
73752+ const struct cred *cred = current_cred();
73753+
73754+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73755+ return 0;
73756+
73757+ curr = current->acl;
73758+ isk = inet_sk(sk);
73759+
73760+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73761+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73762+ addr->sin_addr.s_addr = curr->inaddr_any_override;
73763+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73764+ struct sockaddr_in saddr;
73765+ int err;
73766+
73767+ saddr.sin_family = AF_INET;
73768+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
73769+ saddr.sin_port = isk->inet_sport;
73770+
73771+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73772+ if (err)
73773+ return err;
73774+
73775+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73776+ if (err)
73777+ return err;
73778+ }
73779+
73780+ if (!curr->ips)
73781+ return 0;
73782+
73783+ ip_addr = addr->sin_addr.s_addr;
73784+ ip_port = ntohs(addr->sin_port);
73785+
73786+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73787+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73788+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73789+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73790+ gr_to_filename(current->exec_file->f_path.dentry,
73791+ current->exec_file->f_path.mnt) :
73792+ curr->filename, curr->filename,
73793+ &ip_addr, ip_port, type,
73794+ sk->sk_protocol, mode, &current->signal->saved_ip);
73795+ return 0;
73796+ }
73797+
73798+ for (i = 0; i < curr->ip_num; i++) {
73799+ ip = *(curr->ips + i);
73800+ if (ip->iface != NULL) {
73801+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
73802+ p = strchr(iface, ':');
73803+ if (p != NULL)
73804+ *p = '\0';
73805+ dev = dev_get_by_name(sock_net(sk), iface);
73806+ if (dev == NULL)
73807+ continue;
73808+ idev = in_dev_get(dev);
73809+ if (idev == NULL) {
73810+ dev_put(dev);
73811+ continue;
73812+ }
73813+ rcu_read_lock();
73814+ for_ifa(idev) {
73815+ if (!strcmp(ip->iface, ifa->ifa_label)) {
73816+ our_addr = ifa->ifa_address;
73817+ our_netmask = 0xffffffff;
73818+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73819+ if (ret == 1) {
73820+ rcu_read_unlock();
73821+ in_dev_put(idev);
73822+ dev_put(dev);
73823+ return 0;
73824+ } else if (ret == 2) {
73825+ rcu_read_unlock();
73826+ in_dev_put(idev);
73827+ dev_put(dev);
73828+ goto denied;
73829+ }
73830+ }
73831+ } endfor_ifa(idev);
73832+ rcu_read_unlock();
73833+ in_dev_put(idev);
73834+ dev_put(dev);
73835+ } else {
73836+ our_addr = ip->addr;
73837+ our_netmask = ip->netmask;
73838+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73839+ if (ret == 1)
73840+ return 0;
73841+ else if (ret == 2)
73842+ goto denied;
73843+ }
73844+ }
73845+
73846+denied:
73847+ if (mode == GR_BIND)
73848+ 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));
73849+ else if (mode == GR_CONNECT)
73850+ 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));
73851+
73852+ return -EACCES;
73853+}
73854+
73855+int
73856+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73857+{
73858+ /* always allow disconnection of dgram sockets with connect */
73859+ if (addr->sin_family == AF_UNSPEC)
73860+ return 0;
73861+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73862+}
73863+
73864+int
73865+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73866+{
73867+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73868+}
73869+
73870+int gr_search_listen(struct socket *sock)
73871+{
73872+ struct sock *sk = sock->sk;
73873+ struct sockaddr_in addr;
73874+
73875+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73876+ addr.sin_port = inet_sk(sk)->inet_sport;
73877+
73878+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73879+}
73880+
73881+int gr_search_accept(struct socket *sock)
73882+{
73883+ struct sock *sk = sock->sk;
73884+ struct sockaddr_in addr;
73885+
73886+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73887+ addr.sin_port = inet_sk(sk)->inet_sport;
73888+
73889+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73890+}
73891+
73892+int
73893+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73894+{
73895+ if (addr)
73896+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73897+ else {
73898+ struct sockaddr_in sin;
73899+ const struct inet_sock *inet = inet_sk(sk);
73900+
73901+ sin.sin_addr.s_addr = inet->inet_daddr;
73902+ sin.sin_port = inet->inet_dport;
73903+
73904+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73905+ }
73906+}
73907+
73908+int
73909+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73910+{
73911+ struct sockaddr_in sin;
73912+
73913+ if (unlikely(skb->len < sizeof (struct udphdr)))
73914+ return 0; // skip this packet
73915+
73916+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73917+ sin.sin_port = udp_hdr(skb)->source;
73918+
73919+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73920+}
73921diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73922new file mode 100644
73923index 0000000..25f54ef
73924--- /dev/null
73925+++ b/grsecurity/gracl_learn.c
73926@@ -0,0 +1,207 @@
73927+#include <linux/kernel.h>
73928+#include <linux/mm.h>
73929+#include <linux/sched.h>
73930+#include <linux/poll.h>
73931+#include <linux/string.h>
73932+#include <linux/file.h>
73933+#include <linux/types.h>
73934+#include <linux/vmalloc.h>
73935+#include <linux/grinternal.h>
73936+
73937+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73938+ size_t count, loff_t *ppos);
73939+extern int gr_acl_is_enabled(void);
73940+
73941+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73942+static int gr_learn_attached;
73943+
73944+/* use a 512k buffer */
73945+#define LEARN_BUFFER_SIZE (512 * 1024)
73946+
73947+static DEFINE_SPINLOCK(gr_learn_lock);
73948+static DEFINE_MUTEX(gr_learn_user_mutex);
73949+
73950+/* we need to maintain two buffers, so that the kernel context of grlearn
73951+ uses a semaphore around the userspace copying, and the other kernel contexts
73952+ use a spinlock when copying into the buffer, since they cannot sleep
73953+*/
73954+static char *learn_buffer;
73955+static char *learn_buffer_user;
73956+static int learn_buffer_len;
73957+static int learn_buffer_user_len;
73958+
73959+static ssize_t
73960+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73961+{
73962+ DECLARE_WAITQUEUE(wait, current);
73963+ ssize_t retval = 0;
73964+
73965+ add_wait_queue(&learn_wait, &wait);
73966+ set_current_state(TASK_INTERRUPTIBLE);
73967+ do {
73968+ mutex_lock(&gr_learn_user_mutex);
73969+ spin_lock(&gr_learn_lock);
73970+ if (learn_buffer_len)
73971+ break;
73972+ spin_unlock(&gr_learn_lock);
73973+ mutex_unlock(&gr_learn_user_mutex);
73974+ if (file->f_flags & O_NONBLOCK) {
73975+ retval = -EAGAIN;
73976+ goto out;
73977+ }
73978+ if (signal_pending(current)) {
73979+ retval = -ERESTARTSYS;
73980+ goto out;
73981+ }
73982+
73983+ schedule();
73984+ } while (1);
73985+
73986+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73987+ learn_buffer_user_len = learn_buffer_len;
73988+ retval = learn_buffer_len;
73989+ learn_buffer_len = 0;
73990+
73991+ spin_unlock(&gr_learn_lock);
73992+
73993+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73994+ retval = -EFAULT;
73995+
73996+ mutex_unlock(&gr_learn_user_mutex);
73997+out:
73998+ set_current_state(TASK_RUNNING);
73999+ remove_wait_queue(&learn_wait, &wait);
74000+ return retval;
74001+}
74002+
74003+static unsigned int
74004+poll_learn(struct file * file, poll_table * wait)
74005+{
74006+ poll_wait(file, &learn_wait, wait);
74007+
74008+ if (learn_buffer_len)
74009+ return (POLLIN | POLLRDNORM);
74010+
74011+ return 0;
74012+}
74013+
74014+void
74015+gr_clear_learn_entries(void)
74016+{
74017+ char *tmp;
74018+
74019+ mutex_lock(&gr_learn_user_mutex);
74020+ spin_lock(&gr_learn_lock);
74021+ tmp = learn_buffer;
74022+ learn_buffer = NULL;
74023+ spin_unlock(&gr_learn_lock);
74024+ if (tmp)
74025+ vfree(tmp);
74026+ if (learn_buffer_user != NULL) {
74027+ vfree(learn_buffer_user);
74028+ learn_buffer_user = NULL;
74029+ }
74030+ learn_buffer_len = 0;
74031+ mutex_unlock(&gr_learn_user_mutex);
74032+
74033+ return;
74034+}
74035+
74036+void
74037+gr_add_learn_entry(const char *fmt, ...)
74038+{
74039+ va_list args;
74040+ unsigned int len;
74041+
74042+ if (!gr_learn_attached)
74043+ return;
74044+
74045+ spin_lock(&gr_learn_lock);
74046+
74047+ /* leave a gap at the end so we know when it's "full" but don't have to
74048+ compute the exact length of the string we're trying to append
74049+ */
74050+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
74051+ spin_unlock(&gr_learn_lock);
74052+ wake_up_interruptible(&learn_wait);
74053+ return;
74054+ }
74055+ if (learn_buffer == NULL) {
74056+ spin_unlock(&gr_learn_lock);
74057+ return;
74058+ }
74059+
74060+ va_start(args, fmt);
74061+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
74062+ va_end(args);
74063+
74064+ learn_buffer_len += len + 1;
74065+
74066+ spin_unlock(&gr_learn_lock);
74067+ wake_up_interruptible(&learn_wait);
74068+
74069+ return;
74070+}
74071+
74072+static int
74073+open_learn(struct inode *inode, struct file *file)
74074+{
74075+ if (file->f_mode & FMODE_READ && gr_learn_attached)
74076+ return -EBUSY;
74077+ if (file->f_mode & FMODE_READ) {
74078+ int retval = 0;
74079+ mutex_lock(&gr_learn_user_mutex);
74080+ if (learn_buffer == NULL)
74081+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
74082+ if (learn_buffer_user == NULL)
74083+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
74084+ if (learn_buffer == NULL) {
74085+ retval = -ENOMEM;
74086+ goto out_error;
74087+ }
74088+ if (learn_buffer_user == NULL) {
74089+ retval = -ENOMEM;
74090+ goto out_error;
74091+ }
74092+ learn_buffer_len = 0;
74093+ learn_buffer_user_len = 0;
74094+ gr_learn_attached = 1;
74095+out_error:
74096+ mutex_unlock(&gr_learn_user_mutex);
74097+ return retval;
74098+ }
74099+ return 0;
74100+}
74101+
74102+static int
74103+close_learn(struct inode *inode, struct file *file)
74104+{
74105+ if (file->f_mode & FMODE_READ) {
74106+ char *tmp = NULL;
74107+ mutex_lock(&gr_learn_user_mutex);
74108+ spin_lock(&gr_learn_lock);
74109+ tmp = learn_buffer;
74110+ learn_buffer = NULL;
74111+ spin_unlock(&gr_learn_lock);
74112+ if (tmp)
74113+ vfree(tmp);
74114+ if (learn_buffer_user != NULL) {
74115+ vfree(learn_buffer_user);
74116+ learn_buffer_user = NULL;
74117+ }
74118+ learn_buffer_len = 0;
74119+ learn_buffer_user_len = 0;
74120+ gr_learn_attached = 0;
74121+ mutex_unlock(&gr_learn_user_mutex);
74122+ }
74123+
74124+ return 0;
74125+}
74126+
74127+const struct file_operations grsec_fops = {
74128+ .read = read_learn,
74129+ .write = write_grsec_handler,
74130+ .open = open_learn,
74131+ .release = close_learn,
74132+ .poll = poll_learn,
74133+};
74134diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
74135new file mode 100644
74136index 0000000..fd26052
74137--- /dev/null
74138+++ b/grsecurity/gracl_policy.c
74139@@ -0,0 +1,1781 @@
74140+#include <linux/kernel.h>
74141+#include <linux/module.h>
74142+#include <linux/sched.h>
74143+#include <linux/mm.h>
74144+#include <linux/file.h>
74145+#include <linux/fs.h>
74146+#include <linux/namei.h>
74147+#include <linux/mount.h>
74148+#include <linux/tty.h>
74149+#include <linux/proc_fs.h>
74150+#include <linux/lglock.h>
74151+#include <linux/slab.h>
74152+#include <linux/vmalloc.h>
74153+#include <linux/types.h>
74154+#include <linux/sysctl.h>
74155+#include <linux/netdevice.h>
74156+#include <linux/ptrace.h>
74157+#include <linux/gracl.h>
74158+#include <linux/gralloc.h>
74159+#include <linux/security.h>
74160+#include <linux/grinternal.h>
74161+#include <linux/pid_namespace.h>
74162+#include <linux/stop_machine.h>
74163+#include <linux/fdtable.h>
74164+#include <linux/percpu.h>
74165+#include <linux/lglock.h>
74166+#include <linux/hugetlb.h>
74167+#include <linux/posix-timers.h>
74168+#include "../fs/mount.h"
74169+
74170+#include <asm/uaccess.h>
74171+#include <asm/errno.h>
74172+#include <asm/mman.h>
74173+
74174+extern struct gr_policy_state *polstate;
74175+
74176+#define FOR_EACH_ROLE_START(role) \
74177+ role = polstate->role_list; \
74178+ while (role) {
74179+
74180+#define FOR_EACH_ROLE_END(role) \
74181+ role = role->prev; \
74182+ }
74183+
74184+struct path gr_real_root;
74185+
74186+extern struct gr_alloc_state *current_alloc_state;
74187+
74188+u16 acl_sp_role_value;
74189+
74190+static DEFINE_MUTEX(gr_dev_mutex);
74191+
74192+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
74193+extern void gr_clear_learn_entries(void);
74194+
74195+struct gr_arg *gr_usermode __read_only;
74196+unsigned char *gr_system_salt __read_only;
74197+unsigned char *gr_system_sum __read_only;
74198+
74199+static unsigned int gr_auth_attempts = 0;
74200+static unsigned long gr_auth_expires = 0UL;
74201+
74202+struct acl_object_label *fakefs_obj_rw;
74203+struct acl_object_label *fakefs_obj_rwx;
74204+
74205+extern int gr_init_uidset(void);
74206+extern void gr_free_uidset(void);
74207+extern void gr_remove_uid(uid_t uid);
74208+extern int gr_find_uid(uid_t uid);
74209+
74210+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);
74211+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
74212+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
74213+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
74214+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);
74215+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
74216+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
74217+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
74218+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
74219+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74220+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74221+extern void assign_special_role(const char *rolename);
74222+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
74223+extern int gr_rbac_disable(void *unused);
74224+extern void gr_enable_rbac_system(void);
74225+
74226+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
74227+{
74228+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
74229+ return -EFAULT;
74230+
74231+ return 0;
74232+}
74233+
74234+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
74235+{
74236+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
74237+ return -EFAULT;
74238+
74239+ return 0;
74240+}
74241+
74242+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
74243+{
74244+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
74245+ return -EFAULT;
74246+
74247+ return 0;
74248+}
74249+
74250+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
74251+{
74252+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
74253+ return -EFAULT;
74254+
74255+ return 0;
74256+}
74257+
74258+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
74259+{
74260+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
74261+ return -EFAULT;
74262+
74263+ return 0;
74264+}
74265+
74266+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
74267+{
74268+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
74269+ return -EFAULT;
74270+
74271+ return 0;
74272+}
74273+
74274+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
74275+{
74276+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
74277+ return -EFAULT;
74278+
74279+ return 0;
74280+}
74281+
74282+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
74283+{
74284+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
74285+ return -EFAULT;
74286+
74287+ return 0;
74288+}
74289+
74290+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
74291+{
74292+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
74293+ return -EFAULT;
74294+
74295+ return 0;
74296+}
74297+
74298+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
74299+{
74300+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
74301+ return -EFAULT;
74302+
74303+ if ((uwrap->version != GRSECURITY_VERSION) ||
74304+ (uwrap->size != sizeof(struct gr_arg)))
74305+ return -EINVAL;
74306+
74307+ return 0;
74308+}
74309+
74310+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
74311+{
74312+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
74313+ return -EFAULT;
74314+
74315+ return 0;
74316+}
74317+
74318+static size_t get_gr_arg_wrapper_size_normal(void)
74319+{
74320+ return sizeof(struct gr_arg_wrapper);
74321+}
74322+
74323+#ifdef CONFIG_COMPAT
74324+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
74325+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
74326+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
74327+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
74328+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
74329+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
74330+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
74331+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
74332+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
74333+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
74334+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
74335+extern size_t get_gr_arg_wrapper_size_compat(void);
74336+
74337+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
74338+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
74339+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
74340+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
74341+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
74342+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
74343+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
74344+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
74345+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
74346+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
74347+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
74348+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
74349+
74350+#else
74351+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
74352+#define copy_gr_arg copy_gr_arg_normal
74353+#define copy_gr_hash_struct copy_gr_hash_struct_normal
74354+#define copy_acl_object_label copy_acl_object_label_normal
74355+#define copy_acl_subject_label copy_acl_subject_label_normal
74356+#define copy_acl_role_label copy_acl_role_label_normal
74357+#define copy_acl_ip_label copy_acl_ip_label_normal
74358+#define copy_pointer_from_array copy_pointer_from_array_normal
74359+#define copy_sprole_pw copy_sprole_pw_normal
74360+#define copy_role_transition copy_role_transition_normal
74361+#define copy_role_allowed_ip copy_role_allowed_ip_normal
74362+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
74363+#endif
74364+
74365+static struct acl_subject_label *
74366+lookup_subject_map(const struct acl_subject_label *userp)
74367+{
74368+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
74369+ struct subject_map *match;
74370+
74371+ match = polstate->subj_map_set.s_hash[index];
74372+
74373+ while (match && match->user != userp)
74374+ match = match->next;
74375+
74376+ if (match != NULL)
74377+ return match->kernel;
74378+ else
74379+ return NULL;
74380+}
74381+
74382+static void
74383+insert_subj_map_entry(struct subject_map *subjmap)
74384+{
74385+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
74386+ struct subject_map **curr;
74387+
74388+ subjmap->prev = NULL;
74389+
74390+ curr = &polstate->subj_map_set.s_hash[index];
74391+ if (*curr != NULL)
74392+ (*curr)->prev = subjmap;
74393+
74394+ subjmap->next = *curr;
74395+ *curr = subjmap;
74396+
74397+ return;
74398+}
74399+
74400+static void
74401+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
74402+{
74403+ unsigned int index =
74404+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
74405+ struct acl_role_label **curr;
74406+ struct acl_role_label *tmp, *tmp2;
74407+
74408+ curr = &polstate->acl_role_set.r_hash[index];
74409+
74410+ /* simple case, slot is empty, just set it to our role */
74411+ if (*curr == NULL) {
74412+ *curr = role;
74413+ } else {
74414+ /* example:
74415+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
74416+ 2 -> 3
74417+ */
74418+ /* first check to see if we can already be reached via this slot */
74419+ tmp = *curr;
74420+ while (tmp && tmp != role)
74421+ tmp = tmp->next;
74422+ if (tmp == role) {
74423+ /* we don't need to add ourselves to this slot's chain */
74424+ return;
74425+ }
74426+ /* we need to add ourselves to this chain, two cases */
74427+ if (role->next == NULL) {
74428+ /* simple case, append the current chain to our role */
74429+ role->next = *curr;
74430+ *curr = role;
74431+ } else {
74432+ /* 1 -> 2 -> 3 -> 4
74433+ 2 -> 3 -> 4
74434+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
74435+ */
74436+ /* trickier case: walk our role's chain until we find
74437+ the role for the start of the current slot's chain */
74438+ tmp = role;
74439+ tmp2 = *curr;
74440+ while (tmp->next && tmp->next != tmp2)
74441+ tmp = tmp->next;
74442+ if (tmp->next == tmp2) {
74443+ /* from example above, we found 3, so just
74444+ replace this slot's chain with ours */
74445+ *curr = role;
74446+ } else {
74447+ /* we didn't find a subset of our role's chain
74448+ in the current slot's chain, so append their
74449+ chain to ours, and set us as the first role in
74450+ the slot's chain
74451+
74452+ we could fold this case with the case above,
74453+ but making it explicit for clarity
74454+ */
74455+ tmp->next = tmp2;
74456+ *curr = role;
74457+ }
74458+ }
74459+ }
74460+
74461+ return;
74462+}
74463+
74464+static void
74465+insert_acl_role_label(struct acl_role_label *role)
74466+{
74467+ int i;
74468+
74469+ if (polstate->role_list == NULL) {
74470+ polstate->role_list = role;
74471+ role->prev = NULL;
74472+ } else {
74473+ role->prev = polstate->role_list;
74474+ polstate->role_list = role;
74475+ }
74476+
74477+ /* used for hash chains */
74478+ role->next = NULL;
74479+
74480+ if (role->roletype & GR_ROLE_DOMAIN) {
74481+ for (i = 0; i < role->domain_child_num; i++)
74482+ __insert_acl_role_label(role, role->domain_children[i]);
74483+ } else
74484+ __insert_acl_role_label(role, role->uidgid);
74485+}
74486+
74487+static int
74488+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
74489+{
74490+ struct name_entry **curr, *nentry;
74491+ struct inodev_entry *ientry;
74492+ unsigned int len = strlen(name);
74493+ unsigned int key = full_name_hash(name, len);
74494+ unsigned int index = key % polstate->name_set.n_size;
74495+
74496+ curr = &polstate->name_set.n_hash[index];
74497+
74498+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
74499+ curr = &((*curr)->next);
74500+
74501+ if (*curr != NULL)
74502+ return 1;
74503+
74504+ nentry = acl_alloc(sizeof (struct name_entry));
74505+ if (nentry == NULL)
74506+ return 0;
74507+ ientry = acl_alloc(sizeof (struct inodev_entry));
74508+ if (ientry == NULL)
74509+ return 0;
74510+ ientry->nentry = nentry;
74511+
74512+ nentry->key = key;
74513+ nentry->name = name;
74514+ nentry->inode = inode;
74515+ nentry->device = device;
74516+ nentry->len = len;
74517+ nentry->deleted = deleted;
74518+
74519+ nentry->prev = NULL;
74520+ curr = &polstate->name_set.n_hash[index];
74521+ if (*curr != NULL)
74522+ (*curr)->prev = nentry;
74523+ nentry->next = *curr;
74524+ *curr = nentry;
74525+
74526+ /* insert us into the table searchable by inode/dev */
74527+ __insert_inodev_entry(polstate, ientry);
74528+
74529+ return 1;
74530+}
74531+
74532+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
74533+
74534+static void *
74535+create_table(__u32 * len, int elementsize)
74536+{
74537+ unsigned int table_sizes[] = {
74538+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
74539+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
74540+ 4194301, 8388593, 16777213, 33554393, 67108859
74541+ };
74542+ void *newtable = NULL;
74543+ unsigned int pwr = 0;
74544+
74545+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
74546+ table_sizes[pwr] <= *len)
74547+ pwr++;
74548+
74549+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
74550+ return newtable;
74551+
74552+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
74553+ newtable =
74554+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
74555+ else
74556+ newtable = vmalloc(table_sizes[pwr] * elementsize);
74557+
74558+ *len = table_sizes[pwr];
74559+
74560+ return newtable;
74561+}
74562+
74563+static int
74564+init_variables(const struct gr_arg *arg, bool reload)
74565+{
74566+ struct task_struct *reaper = init_pid_ns.child_reaper;
74567+ unsigned int stacksize;
74568+
74569+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
74570+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
74571+ polstate->name_set.n_size = arg->role_db.num_objects;
74572+ polstate->inodev_set.i_size = arg->role_db.num_objects;
74573+
74574+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
74575+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
74576+ return 1;
74577+
74578+ if (!reload) {
74579+ if (!gr_init_uidset())
74580+ return 1;
74581+ }
74582+
74583+ /* set up the stack that holds allocation info */
74584+
74585+ stacksize = arg->role_db.num_pointers + 5;
74586+
74587+ if (!acl_alloc_stack_init(stacksize))
74588+ return 1;
74589+
74590+ if (!reload) {
74591+ /* grab reference for the real root dentry and vfsmount */
74592+ get_fs_root(reaper->fs, &gr_real_root);
74593+
74594+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74595+ 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);
74596+#endif
74597+
74598+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74599+ if (fakefs_obj_rw == NULL)
74600+ return 1;
74601+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
74602+
74603+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74604+ if (fakefs_obj_rwx == NULL)
74605+ return 1;
74606+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
74607+ }
74608+
74609+ polstate->subj_map_set.s_hash =
74610+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
74611+ polstate->acl_role_set.r_hash =
74612+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
74613+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
74614+ polstate->inodev_set.i_hash =
74615+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
74616+
74617+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
74618+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
74619+ return 1;
74620+
74621+ memset(polstate->subj_map_set.s_hash, 0,
74622+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
74623+ memset(polstate->acl_role_set.r_hash, 0,
74624+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
74625+ memset(polstate->name_set.n_hash, 0,
74626+ sizeof (struct name_entry *) * polstate->name_set.n_size);
74627+ memset(polstate->inodev_set.i_hash, 0,
74628+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
74629+
74630+ return 0;
74631+}
74632+
74633+/* free information not needed after startup
74634+ currently contains user->kernel pointer mappings for subjects
74635+*/
74636+
74637+static void
74638+free_init_variables(void)
74639+{
74640+ __u32 i;
74641+
74642+ if (polstate->subj_map_set.s_hash) {
74643+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
74644+ if (polstate->subj_map_set.s_hash[i]) {
74645+ kfree(polstate->subj_map_set.s_hash[i]);
74646+ polstate->subj_map_set.s_hash[i] = NULL;
74647+ }
74648+ }
74649+
74650+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
74651+ PAGE_SIZE)
74652+ kfree(polstate->subj_map_set.s_hash);
74653+ else
74654+ vfree(polstate->subj_map_set.s_hash);
74655+ }
74656+
74657+ return;
74658+}
74659+
74660+static void
74661+free_variables(bool reload)
74662+{
74663+ struct acl_subject_label *s;
74664+ struct acl_role_label *r;
74665+ struct task_struct *task, *task2;
74666+ unsigned int x;
74667+
74668+ if (!reload) {
74669+ gr_clear_learn_entries();
74670+
74671+ read_lock(&tasklist_lock);
74672+ do_each_thread(task2, task) {
74673+ task->acl_sp_role = 0;
74674+ task->acl_role_id = 0;
74675+ task->inherited = 0;
74676+ task->acl = NULL;
74677+ task->role = NULL;
74678+ } while_each_thread(task2, task);
74679+ read_unlock(&tasklist_lock);
74680+
74681+ kfree(fakefs_obj_rw);
74682+ fakefs_obj_rw = NULL;
74683+ kfree(fakefs_obj_rwx);
74684+ fakefs_obj_rwx = NULL;
74685+
74686+ /* release the reference to the real root dentry and vfsmount */
74687+ path_put(&gr_real_root);
74688+ memset(&gr_real_root, 0, sizeof(gr_real_root));
74689+ }
74690+
74691+ /* free all object hash tables */
74692+
74693+ FOR_EACH_ROLE_START(r)
74694+ if (r->subj_hash == NULL)
74695+ goto next_role;
74696+ FOR_EACH_SUBJECT_START(r, s, x)
74697+ if (s->obj_hash == NULL)
74698+ break;
74699+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74700+ kfree(s->obj_hash);
74701+ else
74702+ vfree(s->obj_hash);
74703+ FOR_EACH_SUBJECT_END(s, x)
74704+ FOR_EACH_NESTED_SUBJECT_START(r, s)
74705+ if (s->obj_hash == NULL)
74706+ break;
74707+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74708+ kfree(s->obj_hash);
74709+ else
74710+ vfree(s->obj_hash);
74711+ FOR_EACH_NESTED_SUBJECT_END(s)
74712+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74713+ kfree(r->subj_hash);
74714+ else
74715+ vfree(r->subj_hash);
74716+ r->subj_hash = NULL;
74717+next_role:
74718+ FOR_EACH_ROLE_END(r)
74719+
74720+ acl_free_all();
74721+
74722+ if (polstate->acl_role_set.r_hash) {
74723+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74724+ PAGE_SIZE)
74725+ kfree(polstate->acl_role_set.r_hash);
74726+ else
74727+ vfree(polstate->acl_role_set.r_hash);
74728+ }
74729+ if (polstate->name_set.n_hash) {
74730+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74731+ PAGE_SIZE)
74732+ kfree(polstate->name_set.n_hash);
74733+ else
74734+ vfree(polstate->name_set.n_hash);
74735+ }
74736+
74737+ if (polstate->inodev_set.i_hash) {
74738+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74739+ PAGE_SIZE)
74740+ kfree(polstate->inodev_set.i_hash);
74741+ else
74742+ vfree(polstate->inodev_set.i_hash);
74743+ }
74744+
74745+ if (!reload)
74746+ gr_free_uidset();
74747+
74748+ memset(&polstate->name_set, 0, sizeof (struct name_db));
74749+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74750+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74751+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74752+
74753+ polstate->default_role = NULL;
74754+ polstate->kernel_role = NULL;
74755+ polstate->role_list = NULL;
74756+
74757+ return;
74758+}
74759+
74760+static struct acl_subject_label *
74761+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74762+
74763+static int alloc_and_copy_string(char **name, unsigned int maxlen)
74764+{
74765+ unsigned int len = strnlen_user(*name, maxlen);
74766+ char *tmp;
74767+
74768+ if (!len || len >= maxlen)
74769+ return -EINVAL;
74770+
74771+ if ((tmp = (char *) acl_alloc(len)) == NULL)
74772+ return -ENOMEM;
74773+
74774+ if (copy_from_user(tmp, *name, len))
74775+ return -EFAULT;
74776+
74777+ tmp[len-1] = '\0';
74778+ *name = tmp;
74779+
74780+ return 0;
74781+}
74782+
74783+static int
74784+copy_user_glob(struct acl_object_label *obj)
74785+{
74786+ struct acl_object_label *g_tmp, **guser;
74787+ int error;
74788+
74789+ if (obj->globbed == NULL)
74790+ return 0;
74791+
74792+ guser = &obj->globbed;
74793+ while (*guser) {
74794+ g_tmp = (struct acl_object_label *)
74795+ acl_alloc(sizeof (struct acl_object_label));
74796+ if (g_tmp == NULL)
74797+ return -ENOMEM;
74798+
74799+ if (copy_acl_object_label(g_tmp, *guser))
74800+ return -EFAULT;
74801+
74802+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74803+ if (error)
74804+ return error;
74805+
74806+ *guser = g_tmp;
74807+ guser = &(g_tmp->next);
74808+ }
74809+
74810+ return 0;
74811+}
74812+
74813+static int
74814+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74815+ struct acl_role_label *role)
74816+{
74817+ struct acl_object_label *o_tmp;
74818+ int ret;
74819+
74820+ while (userp) {
74821+ if ((o_tmp = (struct acl_object_label *)
74822+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
74823+ return -ENOMEM;
74824+
74825+ if (copy_acl_object_label(o_tmp, userp))
74826+ return -EFAULT;
74827+
74828+ userp = o_tmp->prev;
74829+
74830+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74831+ if (ret)
74832+ return ret;
74833+
74834+ insert_acl_obj_label(o_tmp, subj);
74835+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74836+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74837+ return -ENOMEM;
74838+
74839+ ret = copy_user_glob(o_tmp);
74840+ if (ret)
74841+ return ret;
74842+
74843+ if (o_tmp->nested) {
74844+ int already_copied;
74845+
74846+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74847+ if (IS_ERR(o_tmp->nested))
74848+ return PTR_ERR(o_tmp->nested);
74849+
74850+ /* insert into nested subject list if we haven't copied this one yet
74851+ to prevent duplicate entries */
74852+ if (!already_copied) {
74853+ o_tmp->nested->next = role->hash->first;
74854+ role->hash->first = o_tmp->nested;
74855+ }
74856+ }
74857+ }
74858+
74859+ return 0;
74860+}
74861+
74862+static __u32
74863+count_user_subjs(struct acl_subject_label *userp)
74864+{
74865+ struct acl_subject_label s_tmp;
74866+ __u32 num = 0;
74867+
74868+ while (userp) {
74869+ if (copy_acl_subject_label(&s_tmp, userp))
74870+ break;
74871+
74872+ userp = s_tmp.prev;
74873+ }
74874+
74875+ return num;
74876+}
74877+
74878+static int
74879+copy_user_allowedips(struct acl_role_label *rolep)
74880+{
74881+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74882+
74883+ ruserip = rolep->allowed_ips;
74884+
74885+ while (ruserip) {
74886+ rlast = rtmp;
74887+
74888+ if ((rtmp = (struct role_allowed_ip *)
74889+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74890+ return -ENOMEM;
74891+
74892+ if (copy_role_allowed_ip(rtmp, ruserip))
74893+ return -EFAULT;
74894+
74895+ ruserip = rtmp->prev;
74896+
74897+ if (!rlast) {
74898+ rtmp->prev = NULL;
74899+ rolep->allowed_ips = rtmp;
74900+ } else {
74901+ rlast->next = rtmp;
74902+ rtmp->prev = rlast;
74903+ }
74904+
74905+ if (!ruserip)
74906+ rtmp->next = NULL;
74907+ }
74908+
74909+ return 0;
74910+}
74911+
74912+static int
74913+copy_user_transitions(struct acl_role_label *rolep)
74914+{
74915+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
74916+ int error;
74917+
74918+ rusertp = rolep->transitions;
74919+
74920+ while (rusertp) {
74921+ rlast = rtmp;
74922+
74923+ if ((rtmp = (struct role_transition *)
74924+ acl_alloc(sizeof (struct role_transition))) == NULL)
74925+ return -ENOMEM;
74926+
74927+ if (copy_role_transition(rtmp, rusertp))
74928+ return -EFAULT;
74929+
74930+ rusertp = rtmp->prev;
74931+
74932+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74933+ if (error)
74934+ return error;
74935+
74936+ if (!rlast) {
74937+ rtmp->prev = NULL;
74938+ rolep->transitions = rtmp;
74939+ } else {
74940+ rlast->next = rtmp;
74941+ rtmp->prev = rlast;
74942+ }
74943+
74944+ if (!rusertp)
74945+ rtmp->next = NULL;
74946+ }
74947+
74948+ return 0;
74949+}
74950+
74951+static __u32 count_user_objs(const struct acl_object_label __user *userp)
74952+{
74953+ struct acl_object_label o_tmp;
74954+ __u32 num = 0;
74955+
74956+ while (userp) {
74957+ if (copy_acl_object_label(&o_tmp, userp))
74958+ break;
74959+
74960+ userp = o_tmp.prev;
74961+ num++;
74962+ }
74963+
74964+ return num;
74965+}
74966+
74967+static struct acl_subject_label *
74968+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74969+{
74970+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74971+ __u32 num_objs;
74972+ struct acl_ip_label **i_tmp, *i_utmp2;
74973+ struct gr_hash_struct ghash;
74974+ struct subject_map *subjmap;
74975+ unsigned int i_num;
74976+ int err;
74977+
74978+ if (already_copied != NULL)
74979+ *already_copied = 0;
74980+
74981+ s_tmp = lookup_subject_map(userp);
74982+
74983+ /* we've already copied this subject into the kernel, just return
74984+ the reference to it, and don't copy it over again
74985+ */
74986+ if (s_tmp) {
74987+ if (already_copied != NULL)
74988+ *already_copied = 1;
74989+ return(s_tmp);
74990+ }
74991+
74992+ if ((s_tmp = (struct acl_subject_label *)
74993+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74994+ return ERR_PTR(-ENOMEM);
74995+
74996+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74997+ if (subjmap == NULL)
74998+ return ERR_PTR(-ENOMEM);
74999+
75000+ subjmap->user = userp;
75001+ subjmap->kernel = s_tmp;
75002+ insert_subj_map_entry(subjmap);
75003+
75004+ if (copy_acl_subject_label(s_tmp, userp))
75005+ return ERR_PTR(-EFAULT);
75006+
75007+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
75008+ if (err)
75009+ return ERR_PTR(err);
75010+
75011+ if (!strcmp(s_tmp->filename, "/"))
75012+ role->root_label = s_tmp;
75013+
75014+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
75015+ return ERR_PTR(-EFAULT);
75016+
75017+ /* copy user and group transition tables */
75018+
75019+ if (s_tmp->user_trans_num) {
75020+ uid_t *uidlist;
75021+
75022+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
75023+ if (uidlist == NULL)
75024+ return ERR_PTR(-ENOMEM);
75025+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
75026+ return ERR_PTR(-EFAULT);
75027+
75028+ s_tmp->user_transitions = uidlist;
75029+ }
75030+
75031+ if (s_tmp->group_trans_num) {
75032+ gid_t *gidlist;
75033+
75034+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
75035+ if (gidlist == NULL)
75036+ return ERR_PTR(-ENOMEM);
75037+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
75038+ return ERR_PTR(-EFAULT);
75039+
75040+ s_tmp->group_transitions = gidlist;
75041+ }
75042+
75043+ /* set up object hash table */
75044+ num_objs = count_user_objs(ghash.first);
75045+
75046+ s_tmp->obj_hash_size = num_objs;
75047+ s_tmp->obj_hash =
75048+ (struct acl_object_label **)
75049+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
75050+
75051+ if (!s_tmp->obj_hash)
75052+ return ERR_PTR(-ENOMEM);
75053+
75054+ memset(s_tmp->obj_hash, 0,
75055+ s_tmp->obj_hash_size *
75056+ sizeof (struct acl_object_label *));
75057+
75058+ /* add in objects */
75059+ err = copy_user_objs(ghash.first, s_tmp, role);
75060+
75061+ if (err)
75062+ return ERR_PTR(err);
75063+
75064+ /* set pointer for parent subject */
75065+ if (s_tmp->parent_subject) {
75066+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
75067+
75068+ if (IS_ERR(s_tmp2))
75069+ return s_tmp2;
75070+
75071+ s_tmp->parent_subject = s_tmp2;
75072+ }
75073+
75074+ /* add in ip acls */
75075+
75076+ if (!s_tmp->ip_num) {
75077+ s_tmp->ips = NULL;
75078+ goto insert;
75079+ }
75080+
75081+ i_tmp =
75082+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
75083+ sizeof (struct acl_ip_label *));
75084+
75085+ if (!i_tmp)
75086+ return ERR_PTR(-ENOMEM);
75087+
75088+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
75089+ *(i_tmp + i_num) =
75090+ (struct acl_ip_label *)
75091+ acl_alloc(sizeof (struct acl_ip_label));
75092+ if (!*(i_tmp + i_num))
75093+ return ERR_PTR(-ENOMEM);
75094+
75095+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
75096+ return ERR_PTR(-EFAULT);
75097+
75098+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
75099+ return ERR_PTR(-EFAULT);
75100+
75101+ if ((*(i_tmp + i_num))->iface == NULL)
75102+ continue;
75103+
75104+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
75105+ if (err)
75106+ return ERR_PTR(err);
75107+ }
75108+
75109+ s_tmp->ips = i_tmp;
75110+
75111+insert:
75112+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
75113+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
75114+ return ERR_PTR(-ENOMEM);
75115+
75116+ return s_tmp;
75117+}
75118+
75119+static int
75120+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
75121+{
75122+ struct acl_subject_label s_pre;
75123+ struct acl_subject_label * ret;
75124+ int err;
75125+
75126+ while (userp) {
75127+ if (copy_acl_subject_label(&s_pre, userp))
75128+ return -EFAULT;
75129+
75130+ ret = do_copy_user_subj(userp, role, NULL);
75131+
75132+ err = PTR_ERR(ret);
75133+ if (IS_ERR(ret))
75134+ return err;
75135+
75136+ insert_acl_subj_label(ret, role);
75137+
75138+ userp = s_pre.prev;
75139+ }
75140+
75141+ return 0;
75142+}
75143+
75144+static int
75145+copy_user_acl(struct gr_arg *arg)
75146+{
75147+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
75148+ struct acl_subject_label *subj_list;
75149+ struct sprole_pw *sptmp;
75150+ struct gr_hash_struct *ghash;
75151+ uid_t *domainlist;
75152+ unsigned int r_num;
75153+ int err = 0;
75154+ __u16 i;
75155+ __u32 num_subjs;
75156+
75157+ /* we need a default and kernel role */
75158+ if (arg->role_db.num_roles < 2)
75159+ return -EINVAL;
75160+
75161+ /* copy special role authentication info from userspace */
75162+
75163+ polstate->num_sprole_pws = arg->num_sprole_pws;
75164+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
75165+
75166+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
75167+ return -ENOMEM;
75168+
75169+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75170+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
75171+ if (!sptmp)
75172+ return -ENOMEM;
75173+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
75174+ return -EFAULT;
75175+
75176+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
75177+ if (err)
75178+ return err;
75179+
75180+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
75181+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
75182+#endif
75183+
75184+ polstate->acl_special_roles[i] = sptmp;
75185+ }
75186+
75187+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
75188+
75189+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
75190+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
75191+
75192+ if (!r_tmp)
75193+ return -ENOMEM;
75194+
75195+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
75196+ return -EFAULT;
75197+
75198+ if (copy_acl_role_label(r_tmp, r_utmp2))
75199+ return -EFAULT;
75200+
75201+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
75202+ if (err)
75203+ return err;
75204+
75205+ if (!strcmp(r_tmp->rolename, "default")
75206+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
75207+ polstate->default_role = r_tmp;
75208+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
75209+ polstate->kernel_role = r_tmp;
75210+ }
75211+
75212+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
75213+ return -ENOMEM;
75214+
75215+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
75216+ return -EFAULT;
75217+
75218+ r_tmp->hash = ghash;
75219+
75220+ num_subjs = count_user_subjs(r_tmp->hash->first);
75221+
75222+ r_tmp->subj_hash_size = num_subjs;
75223+ r_tmp->subj_hash =
75224+ (struct acl_subject_label **)
75225+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
75226+
75227+ if (!r_tmp->subj_hash)
75228+ return -ENOMEM;
75229+
75230+ err = copy_user_allowedips(r_tmp);
75231+ if (err)
75232+ return err;
75233+
75234+ /* copy domain info */
75235+ if (r_tmp->domain_children != NULL) {
75236+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
75237+ if (domainlist == NULL)
75238+ return -ENOMEM;
75239+
75240+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
75241+ return -EFAULT;
75242+
75243+ r_tmp->domain_children = domainlist;
75244+ }
75245+
75246+ err = copy_user_transitions(r_tmp);
75247+ if (err)
75248+ return err;
75249+
75250+ memset(r_tmp->subj_hash, 0,
75251+ r_tmp->subj_hash_size *
75252+ sizeof (struct acl_subject_label *));
75253+
75254+ /* acquire the list of subjects, then NULL out
75255+ the list prior to parsing the subjects for this role,
75256+ as during this parsing the list is replaced with a list
75257+ of *nested* subjects for the role
75258+ */
75259+ subj_list = r_tmp->hash->first;
75260+
75261+ /* set nested subject list to null */
75262+ r_tmp->hash->first = NULL;
75263+
75264+ err = copy_user_subjs(subj_list, r_tmp);
75265+
75266+ if (err)
75267+ return err;
75268+
75269+ insert_acl_role_label(r_tmp);
75270+ }
75271+
75272+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
75273+ return -EINVAL;
75274+
75275+ return err;
75276+}
75277+
75278+static int gracl_reload_apply_policies(void *reload)
75279+{
75280+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
75281+ struct task_struct *task, *task2;
75282+ struct acl_role_label *role, *rtmp;
75283+ struct acl_subject_label *subj;
75284+ const struct cred *cred;
75285+ int role_applied;
75286+ int ret = 0;
75287+
75288+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
75289+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
75290+
75291+ /* first make sure we'll be able to apply the new policy cleanly */
75292+ do_each_thread(task2, task) {
75293+ if (task->exec_file == NULL)
75294+ continue;
75295+ role_applied = 0;
75296+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75297+ /* preserve special roles */
75298+ FOR_EACH_ROLE_START(role)
75299+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75300+ rtmp = task->role;
75301+ task->role = role;
75302+ role_applied = 1;
75303+ break;
75304+ }
75305+ FOR_EACH_ROLE_END(role)
75306+ }
75307+ if (!role_applied) {
75308+ cred = __task_cred(task);
75309+ rtmp = task->role;
75310+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75311+ }
75312+ /* this handles non-nested inherited subjects, nested subjects will still
75313+ be dropped currently */
75314+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75315+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
75316+ /* change the role back so that we've made no modifications to the policy */
75317+ task->role = rtmp;
75318+
75319+ if (subj == NULL || task->tmpacl == NULL) {
75320+ ret = -EINVAL;
75321+ goto out;
75322+ }
75323+ } while_each_thread(task2, task);
75324+
75325+ /* now actually apply the policy */
75326+
75327+ do_each_thread(task2, task) {
75328+ if (task->exec_file) {
75329+ role_applied = 0;
75330+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75331+ /* preserve special roles */
75332+ FOR_EACH_ROLE_START(role)
75333+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75334+ task->role = role;
75335+ role_applied = 1;
75336+ break;
75337+ }
75338+ FOR_EACH_ROLE_END(role)
75339+ }
75340+ if (!role_applied) {
75341+ cred = __task_cred(task);
75342+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75343+ }
75344+ /* this handles non-nested inherited subjects, nested subjects will still
75345+ be dropped currently */
75346+ if (!reload_state->oldmode && task->inherited)
75347+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75348+ else {
75349+ /* looked up and tagged to the task previously */
75350+ subj = task->tmpacl;
75351+ }
75352+ /* subj will be non-null */
75353+ __gr_apply_subject_to_task(polstate, task, subj);
75354+ if (reload_state->oldmode) {
75355+ task->acl_role_id = 0;
75356+ task->acl_sp_role = 0;
75357+ task->inherited = 0;
75358+ }
75359+ } else {
75360+ // it's a kernel process
75361+ task->role = polstate->kernel_role;
75362+ task->acl = polstate->kernel_role->root_label;
75363+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75364+ task->acl->mode &= ~GR_PROCFIND;
75365+#endif
75366+ }
75367+ } while_each_thread(task2, task);
75368+
75369+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
75370+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
75371+
75372+out:
75373+
75374+ return ret;
75375+}
75376+
75377+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
75378+{
75379+ struct gr_reload_state new_reload_state = { };
75380+ int err;
75381+
75382+ new_reload_state.oldpolicy_ptr = polstate;
75383+ new_reload_state.oldalloc_ptr = current_alloc_state;
75384+ new_reload_state.oldmode = oldmode;
75385+
75386+ current_alloc_state = &new_reload_state.newalloc;
75387+ polstate = &new_reload_state.newpolicy;
75388+
75389+ /* everything relevant is now saved off, copy in the new policy */
75390+ if (init_variables(args, true)) {
75391+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
75392+ err = -ENOMEM;
75393+ goto error;
75394+ }
75395+
75396+ err = copy_user_acl(args);
75397+ free_init_variables();
75398+ if (err)
75399+ goto error;
75400+ /* the new policy is copied in, with the old policy available via saved_state
75401+ first go through applying roles, making sure to preserve special roles
75402+ then apply new subjects, making sure to preserve inherited and nested subjects,
75403+ though currently only inherited subjects will be preserved
75404+ */
75405+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
75406+ if (err)
75407+ goto error;
75408+
75409+ /* we've now applied the new policy, so restore the old policy state to free it */
75410+ polstate = &new_reload_state.oldpolicy;
75411+ current_alloc_state = &new_reload_state.oldalloc;
75412+ free_variables(true);
75413+
75414+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
75415+ to running_polstate/current_alloc_state inside stop_machine
75416+ */
75417+ err = 0;
75418+ goto out;
75419+error:
75420+ /* on error of loading the new policy, we'll just keep the previous
75421+ policy set around
75422+ */
75423+ free_variables(true);
75424+
75425+ /* doesn't affect runtime, but maintains consistent state */
75426+out:
75427+ polstate = new_reload_state.oldpolicy_ptr;
75428+ current_alloc_state = new_reload_state.oldalloc_ptr;
75429+
75430+ return err;
75431+}
75432+
75433+static int
75434+gracl_init(struct gr_arg *args)
75435+{
75436+ int error = 0;
75437+
75438+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
75439+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
75440+
75441+ if (init_variables(args, false)) {
75442+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
75443+ error = -ENOMEM;
75444+ goto out;
75445+ }
75446+
75447+ error = copy_user_acl(args);
75448+ free_init_variables();
75449+ if (error)
75450+ goto out;
75451+
75452+ error = gr_set_acls(0);
75453+ if (error)
75454+ goto out;
75455+
75456+ gr_enable_rbac_system();
75457+
75458+ return 0;
75459+
75460+out:
75461+ free_variables(false);
75462+ return error;
75463+}
75464+
75465+static int
75466+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
75467+ unsigned char **sum)
75468+{
75469+ struct acl_role_label *r;
75470+ struct role_allowed_ip *ipp;
75471+ struct role_transition *trans;
75472+ unsigned int i;
75473+ int found = 0;
75474+ u32 curr_ip = current->signal->curr_ip;
75475+
75476+ current->signal->saved_ip = curr_ip;
75477+
75478+ /* check transition table */
75479+
75480+ for (trans = current->role->transitions; trans; trans = trans->next) {
75481+ if (!strcmp(rolename, trans->rolename)) {
75482+ found = 1;
75483+ break;
75484+ }
75485+ }
75486+
75487+ if (!found)
75488+ return 0;
75489+
75490+ /* handle special roles that do not require authentication
75491+ and check ip */
75492+
75493+ FOR_EACH_ROLE_START(r)
75494+ if (!strcmp(rolename, r->rolename) &&
75495+ (r->roletype & GR_ROLE_SPECIAL)) {
75496+ found = 0;
75497+ if (r->allowed_ips != NULL) {
75498+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
75499+ if ((ntohl(curr_ip) & ipp->netmask) ==
75500+ (ntohl(ipp->addr) & ipp->netmask))
75501+ found = 1;
75502+ }
75503+ } else
75504+ found = 2;
75505+ if (!found)
75506+ return 0;
75507+
75508+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
75509+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
75510+ *salt = NULL;
75511+ *sum = NULL;
75512+ return 1;
75513+ }
75514+ }
75515+ FOR_EACH_ROLE_END(r)
75516+
75517+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75518+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
75519+ *salt = polstate->acl_special_roles[i]->salt;
75520+ *sum = polstate->acl_special_roles[i]->sum;
75521+ return 1;
75522+ }
75523+ }
75524+
75525+ return 0;
75526+}
75527+
75528+int gr_check_secure_terminal(struct task_struct *task)
75529+{
75530+ struct task_struct *p, *p2, *p3;
75531+ struct files_struct *files;
75532+ struct fdtable *fdt;
75533+ struct file *our_file = NULL, *file;
75534+ int i;
75535+
75536+ if (task->signal->tty == NULL)
75537+ return 1;
75538+
75539+ files = get_files_struct(task);
75540+ if (files != NULL) {
75541+ rcu_read_lock();
75542+ fdt = files_fdtable(files);
75543+ for (i=0; i < fdt->max_fds; i++) {
75544+ file = fcheck_files(files, i);
75545+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
75546+ get_file(file);
75547+ our_file = file;
75548+ }
75549+ }
75550+ rcu_read_unlock();
75551+ put_files_struct(files);
75552+ }
75553+
75554+ if (our_file == NULL)
75555+ return 1;
75556+
75557+ read_lock(&tasklist_lock);
75558+ do_each_thread(p2, p) {
75559+ files = get_files_struct(p);
75560+ if (files == NULL ||
75561+ (p->signal && p->signal->tty == task->signal->tty)) {
75562+ if (files != NULL)
75563+ put_files_struct(files);
75564+ continue;
75565+ }
75566+ rcu_read_lock();
75567+ fdt = files_fdtable(files);
75568+ for (i=0; i < fdt->max_fds; i++) {
75569+ file = fcheck_files(files, i);
75570+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
75571+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
75572+ p3 = task;
75573+ while (task_pid_nr(p3) > 0) {
75574+ if (p3 == p)
75575+ break;
75576+ p3 = p3->real_parent;
75577+ }
75578+ if (p3 == p)
75579+ break;
75580+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
75581+ gr_handle_alertkill(p);
75582+ rcu_read_unlock();
75583+ put_files_struct(files);
75584+ read_unlock(&tasklist_lock);
75585+ fput(our_file);
75586+ return 0;
75587+ }
75588+ }
75589+ rcu_read_unlock();
75590+ put_files_struct(files);
75591+ } while_each_thread(p2, p);
75592+ read_unlock(&tasklist_lock);
75593+
75594+ fput(our_file);
75595+ return 1;
75596+}
75597+
75598+ssize_t
75599+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
75600+{
75601+ struct gr_arg_wrapper uwrap;
75602+ unsigned char *sprole_salt = NULL;
75603+ unsigned char *sprole_sum = NULL;
75604+ int error = 0;
75605+ int error2 = 0;
75606+ size_t req_count = 0;
75607+ unsigned char oldmode = 0;
75608+
75609+ mutex_lock(&gr_dev_mutex);
75610+
75611+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
75612+ error = -EPERM;
75613+ goto out;
75614+ }
75615+
75616+#ifdef CONFIG_COMPAT
75617+ pax_open_kernel();
75618+ if (is_compat_task()) {
75619+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
75620+ copy_gr_arg = &copy_gr_arg_compat;
75621+ copy_acl_object_label = &copy_acl_object_label_compat;
75622+ copy_acl_subject_label = &copy_acl_subject_label_compat;
75623+ copy_acl_role_label = &copy_acl_role_label_compat;
75624+ copy_acl_ip_label = &copy_acl_ip_label_compat;
75625+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
75626+ copy_role_transition = &copy_role_transition_compat;
75627+ copy_sprole_pw = &copy_sprole_pw_compat;
75628+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
75629+ copy_pointer_from_array = &copy_pointer_from_array_compat;
75630+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
75631+ } else {
75632+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
75633+ copy_gr_arg = &copy_gr_arg_normal;
75634+ copy_acl_object_label = &copy_acl_object_label_normal;
75635+ copy_acl_subject_label = &copy_acl_subject_label_normal;
75636+ copy_acl_role_label = &copy_acl_role_label_normal;
75637+ copy_acl_ip_label = &copy_acl_ip_label_normal;
75638+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
75639+ copy_role_transition = &copy_role_transition_normal;
75640+ copy_sprole_pw = &copy_sprole_pw_normal;
75641+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
75642+ copy_pointer_from_array = &copy_pointer_from_array_normal;
75643+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
75644+ }
75645+ pax_close_kernel();
75646+#endif
75647+
75648+ req_count = get_gr_arg_wrapper_size();
75649+
75650+ if (count != req_count) {
75651+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
75652+ error = -EINVAL;
75653+ goto out;
75654+ }
75655+
75656+
75657+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
75658+ gr_auth_expires = 0;
75659+ gr_auth_attempts = 0;
75660+ }
75661+
75662+ error = copy_gr_arg_wrapper(buf, &uwrap);
75663+ if (error)
75664+ goto out;
75665+
75666+ error = copy_gr_arg(uwrap.arg, gr_usermode);
75667+ if (error)
75668+ goto out;
75669+
75670+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75671+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75672+ time_after(gr_auth_expires, get_seconds())) {
75673+ error = -EBUSY;
75674+ goto out;
75675+ }
75676+
75677+ /* if non-root trying to do anything other than use a special role,
75678+ do not attempt authentication, do not count towards authentication
75679+ locking
75680+ */
75681+
75682+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
75683+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75684+ gr_is_global_nonroot(current_uid())) {
75685+ error = -EPERM;
75686+ goto out;
75687+ }
75688+
75689+ /* ensure pw and special role name are null terminated */
75690+
75691+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75692+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75693+
75694+ /* Okay.
75695+ * We have our enough of the argument structure..(we have yet
75696+ * to copy_from_user the tables themselves) . Copy the tables
75697+ * only if we need them, i.e. for loading operations. */
75698+
75699+ switch (gr_usermode->mode) {
75700+ case GR_STATUS:
75701+ if (gr_acl_is_enabled()) {
75702+ error = 1;
75703+ if (!gr_check_secure_terminal(current))
75704+ error = 3;
75705+ } else
75706+ error = 2;
75707+ goto out;
75708+ case GR_SHUTDOWN:
75709+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75710+ stop_machine(gr_rbac_disable, NULL, NULL);
75711+ free_variables(false);
75712+ memset(gr_usermode, 0, sizeof(struct gr_arg));
75713+ memset(gr_system_salt, 0, GR_SALT_LEN);
75714+ memset(gr_system_sum, 0, GR_SHA_LEN);
75715+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75716+ } else if (gr_acl_is_enabled()) {
75717+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75718+ error = -EPERM;
75719+ } else {
75720+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75721+ error = -EAGAIN;
75722+ }
75723+ break;
75724+ case GR_ENABLE:
75725+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75726+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75727+ else {
75728+ if (gr_acl_is_enabled())
75729+ error = -EAGAIN;
75730+ else
75731+ error = error2;
75732+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75733+ }
75734+ break;
75735+ case GR_OLDRELOAD:
75736+ oldmode = 1;
75737+ case GR_RELOAD:
75738+ if (!gr_acl_is_enabled()) {
75739+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75740+ error = -EAGAIN;
75741+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75742+ error2 = gracl_reload(gr_usermode, oldmode);
75743+ if (!error2)
75744+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75745+ else {
75746+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75747+ error = error2;
75748+ }
75749+ } else {
75750+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75751+ error = -EPERM;
75752+ }
75753+ break;
75754+ case GR_SEGVMOD:
75755+ if (unlikely(!gr_acl_is_enabled())) {
75756+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75757+ error = -EAGAIN;
75758+ break;
75759+ }
75760+
75761+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75762+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75763+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75764+ struct acl_subject_label *segvacl;
75765+ segvacl =
75766+ lookup_acl_subj_label(gr_usermode->segv_inode,
75767+ gr_usermode->segv_device,
75768+ current->role);
75769+ if (segvacl) {
75770+ segvacl->crashes = 0;
75771+ segvacl->expires = 0;
75772+ }
75773+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75774+ gr_remove_uid(gr_usermode->segv_uid);
75775+ }
75776+ } else {
75777+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75778+ error = -EPERM;
75779+ }
75780+ break;
75781+ case GR_SPROLE:
75782+ case GR_SPROLEPAM:
75783+ if (unlikely(!gr_acl_is_enabled())) {
75784+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75785+ error = -EAGAIN;
75786+ break;
75787+ }
75788+
75789+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75790+ current->role->expires = 0;
75791+ current->role->auth_attempts = 0;
75792+ }
75793+
75794+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75795+ time_after(current->role->expires, get_seconds())) {
75796+ error = -EBUSY;
75797+ goto out;
75798+ }
75799+
75800+ if (lookup_special_role_auth
75801+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75802+ && ((!sprole_salt && !sprole_sum)
75803+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75804+ char *p = "";
75805+ assign_special_role(gr_usermode->sp_role);
75806+ read_lock(&tasklist_lock);
75807+ if (current->real_parent)
75808+ p = current->real_parent->role->rolename;
75809+ read_unlock(&tasklist_lock);
75810+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75811+ p, acl_sp_role_value);
75812+ } else {
75813+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75814+ error = -EPERM;
75815+ if(!(current->role->auth_attempts++))
75816+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75817+
75818+ goto out;
75819+ }
75820+ break;
75821+ case GR_UNSPROLE:
75822+ if (unlikely(!gr_acl_is_enabled())) {
75823+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75824+ error = -EAGAIN;
75825+ break;
75826+ }
75827+
75828+ if (current->role->roletype & GR_ROLE_SPECIAL) {
75829+ char *p = "";
75830+ int i = 0;
75831+
75832+ read_lock(&tasklist_lock);
75833+ if (current->real_parent) {
75834+ p = current->real_parent->role->rolename;
75835+ i = current->real_parent->acl_role_id;
75836+ }
75837+ read_unlock(&tasklist_lock);
75838+
75839+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75840+ gr_set_acls(1);
75841+ } else {
75842+ error = -EPERM;
75843+ goto out;
75844+ }
75845+ break;
75846+ default:
75847+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75848+ error = -EINVAL;
75849+ break;
75850+ }
75851+
75852+ if (error != -EPERM)
75853+ goto out;
75854+
75855+ if(!(gr_auth_attempts++))
75856+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75857+
75858+ out:
75859+ mutex_unlock(&gr_dev_mutex);
75860+
75861+ if (!error)
75862+ error = req_count;
75863+
75864+ return error;
75865+}
75866+
75867+int
75868+gr_set_acls(const int type)
75869+{
75870+ struct task_struct *task, *task2;
75871+ struct acl_role_label *role = current->role;
75872+ struct acl_subject_label *subj;
75873+ __u16 acl_role_id = current->acl_role_id;
75874+ const struct cred *cred;
75875+ int ret;
75876+
75877+ rcu_read_lock();
75878+ read_lock(&tasklist_lock);
75879+ read_lock(&grsec_exec_file_lock);
75880+ do_each_thread(task2, task) {
75881+ /* check to see if we're called from the exit handler,
75882+ if so, only replace ACLs that have inherited the admin
75883+ ACL */
75884+
75885+ if (type && (task->role != role ||
75886+ task->acl_role_id != acl_role_id))
75887+ continue;
75888+
75889+ task->acl_role_id = 0;
75890+ task->acl_sp_role = 0;
75891+ task->inherited = 0;
75892+
75893+ if (task->exec_file) {
75894+ cred = __task_cred(task);
75895+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75896+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
75897+ if (subj == NULL) {
75898+ ret = -EINVAL;
75899+ read_unlock(&grsec_exec_file_lock);
75900+ read_unlock(&tasklist_lock);
75901+ rcu_read_unlock();
75902+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75903+ return ret;
75904+ }
75905+ __gr_apply_subject_to_task(polstate, task, subj);
75906+ } else {
75907+ // it's a kernel process
75908+ task->role = polstate->kernel_role;
75909+ task->acl = polstate->kernel_role->root_label;
75910+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75911+ task->acl->mode &= ~GR_PROCFIND;
75912+#endif
75913+ }
75914+ } while_each_thread(task2, task);
75915+ read_unlock(&grsec_exec_file_lock);
75916+ read_unlock(&tasklist_lock);
75917+ rcu_read_unlock();
75918+
75919+ return 0;
75920+}
75921diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75922new file mode 100644
75923index 0000000..39645c9
75924--- /dev/null
75925+++ b/grsecurity/gracl_res.c
75926@@ -0,0 +1,68 @@
75927+#include <linux/kernel.h>
75928+#include <linux/sched.h>
75929+#include <linux/gracl.h>
75930+#include <linux/grinternal.h>
75931+
75932+static const char *restab_log[] = {
75933+ [RLIMIT_CPU] = "RLIMIT_CPU",
75934+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75935+ [RLIMIT_DATA] = "RLIMIT_DATA",
75936+ [RLIMIT_STACK] = "RLIMIT_STACK",
75937+ [RLIMIT_CORE] = "RLIMIT_CORE",
75938+ [RLIMIT_RSS] = "RLIMIT_RSS",
75939+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
75940+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75941+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75942+ [RLIMIT_AS] = "RLIMIT_AS",
75943+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75944+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75945+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75946+ [RLIMIT_NICE] = "RLIMIT_NICE",
75947+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75948+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75949+ [GR_CRASH_RES] = "RLIMIT_CRASH"
75950+};
75951+
75952+void
75953+gr_log_resource(const struct task_struct *task,
75954+ const int res, const unsigned long wanted, const int gt)
75955+{
75956+ const struct cred *cred;
75957+ unsigned long rlim;
75958+
75959+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
75960+ return;
75961+
75962+ // not yet supported resource
75963+ if (unlikely(!restab_log[res]))
75964+ return;
75965+
75966+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75967+ rlim = task_rlimit_max(task, res);
75968+ else
75969+ rlim = task_rlimit(task, res);
75970+
75971+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75972+ return;
75973+
75974+ rcu_read_lock();
75975+ cred = __task_cred(task);
75976+
75977+ if (res == RLIMIT_NPROC &&
75978+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75979+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75980+ goto out_rcu_unlock;
75981+ else if (res == RLIMIT_MEMLOCK &&
75982+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75983+ goto out_rcu_unlock;
75984+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75985+ goto out_rcu_unlock;
75986+ rcu_read_unlock();
75987+
75988+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75989+
75990+ return;
75991+out_rcu_unlock:
75992+ rcu_read_unlock();
75993+ return;
75994+}
75995diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75996new file mode 100644
75997index 0000000..218b66b
75998--- /dev/null
75999+++ b/grsecurity/gracl_segv.c
76000@@ -0,0 +1,324 @@
76001+#include <linux/kernel.h>
76002+#include <linux/mm.h>
76003+#include <asm/uaccess.h>
76004+#include <asm/errno.h>
76005+#include <asm/mman.h>
76006+#include <net/sock.h>
76007+#include <linux/file.h>
76008+#include <linux/fs.h>
76009+#include <linux/net.h>
76010+#include <linux/in.h>
76011+#include <linux/slab.h>
76012+#include <linux/types.h>
76013+#include <linux/sched.h>
76014+#include <linux/timer.h>
76015+#include <linux/gracl.h>
76016+#include <linux/grsecurity.h>
76017+#include <linux/grinternal.h>
76018+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76019+#include <linux/magic.h>
76020+#include <linux/pagemap.h>
76021+#include "../fs/btrfs/async-thread.h"
76022+#include "../fs/btrfs/ctree.h"
76023+#include "../fs/btrfs/btrfs_inode.h"
76024+#endif
76025+
76026+static struct crash_uid *uid_set;
76027+static unsigned short uid_used;
76028+static DEFINE_SPINLOCK(gr_uid_lock);
76029+extern rwlock_t gr_inode_lock;
76030+extern struct acl_subject_label *
76031+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
76032+ struct acl_role_label *role);
76033+
76034+static inline dev_t __get_dev(const struct dentry *dentry)
76035+{
76036+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76037+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76038+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
76039+ else
76040+#endif
76041+ return dentry->d_sb->s_dev;
76042+}
76043+
76044+static inline u64 __get_ino(const struct dentry *dentry)
76045+{
76046+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76047+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76048+ return btrfs_ino(dentry->d_inode);
76049+ else
76050+#endif
76051+ return dentry->d_inode->i_ino;
76052+}
76053+
76054+int
76055+gr_init_uidset(void)
76056+{
76057+ uid_set =
76058+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
76059+ uid_used = 0;
76060+
76061+ return uid_set ? 1 : 0;
76062+}
76063+
76064+void
76065+gr_free_uidset(void)
76066+{
76067+ if (uid_set) {
76068+ struct crash_uid *tmpset;
76069+ spin_lock(&gr_uid_lock);
76070+ tmpset = uid_set;
76071+ uid_set = NULL;
76072+ uid_used = 0;
76073+ spin_unlock(&gr_uid_lock);
76074+ if (tmpset)
76075+ kfree(tmpset);
76076+ }
76077+
76078+ return;
76079+}
76080+
76081+int
76082+gr_find_uid(const uid_t uid)
76083+{
76084+ struct crash_uid *tmp = uid_set;
76085+ uid_t buid;
76086+ int low = 0, high = uid_used - 1, mid;
76087+
76088+ while (high >= low) {
76089+ mid = (low + high) >> 1;
76090+ buid = tmp[mid].uid;
76091+ if (buid == uid)
76092+ return mid;
76093+ if (buid > uid)
76094+ high = mid - 1;
76095+ if (buid < uid)
76096+ low = mid + 1;
76097+ }
76098+
76099+ return -1;
76100+}
76101+
76102+static __inline__ void
76103+gr_insertsort(void)
76104+{
76105+ unsigned short i, j;
76106+ struct crash_uid index;
76107+
76108+ for (i = 1; i < uid_used; i++) {
76109+ index = uid_set[i];
76110+ j = i;
76111+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
76112+ uid_set[j] = uid_set[j - 1];
76113+ j--;
76114+ }
76115+ uid_set[j] = index;
76116+ }
76117+
76118+ return;
76119+}
76120+
76121+static __inline__ void
76122+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
76123+{
76124+ int loc;
76125+ uid_t uid = GR_GLOBAL_UID(kuid);
76126+
76127+ if (uid_used == GR_UIDTABLE_MAX)
76128+ return;
76129+
76130+ loc = gr_find_uid(uid);
76131+
76132+ if (loc >= 0) {
76133+ uid_set[loc].expires = expires;
76134+ return;
76135+ }
76136+
76137+ uid_set[uid_used].uid = uid;
76138+ uid_set[uid_used].expires = expires;
76139+ uid_used++;
76140+
76141+ gr_insertsort();
76142+
76143+ return;
76144+}
76145+
76146+void
76147+gr_remove_uid(const unsigned short loc)
76148+{
76149+ unsigned short i;
76150+
76151+ for (i = loc + 1; i < uid_used; i++)
76152+ uid_set[i - 1] = uid_set[i];
76153+
76154+ uid_used--;
76155+
76156+ return;
76157+}
76158+
76159+int
76160+gr_check_crash_uid(const kuid_t kuid)
76161+{
76162+ int loc;
76163+ int ret = 0;
76164+ uid_t uid;
76165+
76166+ if (unlikely(!gr_acl_is_enabled()))
76167+ return 0;
76168+
76169+ uid = GR_GLOBAL_UID(kuid);
76170+
76171+ spin_lock(&gr_uid_lock);
76172+ loc = gr_find_uid(uid);
76173+
76174+ if (loc < 0)
76175+ goto out_unlock;
76176+
76177+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
76178+ gr_remove_uid(loc);
76179+ else
76180+ ret = 1;
76181+
76182+out_unlock:
76183+ spin_unlock(&gr_uid_lock);
76184+ return ret;
76185+}
76186+
76187+static __inline__ int
76188+proc_is_setxid(const struct cred *cred)
76189+{
76190+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
76191+ !uid_eq(cred->uid, cred->fsuid))
76192+ return 1;
76193+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
76194+ !gid_eq(cred->gid, cred->fsgid))
76195+ return 1;
76196+
76197+ return 0;
76198+}
76199+
76200+extern int gr_fake_force_sig(int sig, struct task_struct *t);
76201+
76202+void
76203+gr_handle_crash(struct task_struct *task, const int sig)
76204+{
76205+ struct acl_subject_label *curr;
76206+ struct task_struct *tsk, *tsk2;
76207+ const struct cred *cred;
76208+ const struct cred *cred2;
76209+
76210+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
76211+ return;
76212+
76213+ if (unlikely(!gr_acl_is_enabled()))
76214+ return;
76215+
76216+ curr = task->acl;
76217+
76218+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
76219+ return;
76220+
76221+ if (time_before_eq(curr->expires, get_seconds())) {
76222+ curr->expires = 0;
76223+ curr->crashes = 0;
76224+ }
76225+
76226+ curr->crashes++;
76227+
76228+ if (!curr->expires)
76229+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
76230+
76231+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76232+ time_after(curr->expires, get_seconds())) {
76233+ rcu_read_lock();
76234+ cred = __task_cred(task);
76235+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
76236+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76237+ spin_lock(&gr_uid_lock);
76238+ gr_insert_uid(cred->uid, curr->expires);
76239+ spin_unlock(&gr_uid_lock);
76240+ curr->expires = 0;
76241+ curr->crashes = 0;
76242+ read_lock(&tasklist_lock);
76243+ do_each_thread(tsk2, tsk) {
76244+ cred2 = __task_cred(tsk);
76245+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
76246+ gr_fake_force_sig(SIGKILL, tsk);
76247+ } while_each_thread(tsk2, tsk);
76248+ read_unlock(&tasklist_lock);
76249+ } else {
76250+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76251+ read_lock(&tasklist_lock);
76252+ read_lock(&grsec_exec_file_lock);
76253+ do_each_thread(tsk2, tsk) {
76254+ if (likely(tsk != task)) {
76255+ // if this thread has the same subject as the one that triggered
76256+ // RES_CRASH and it's the same binary, kill it
76257+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
76258+ gr_fake_force_sig(SIGKILL, tsk);
76259+ }
76260+ } while_each_thread(tsk2, tsk);
76261+ read_unlock(&grsec_exec_file_lock);
76262+ read_unlock(&tasklist_lock);
76263+ }
76264+ rcu_read_unlock();
76265+ }
76266+
76267+ return;
76268+}
76269+
76270+int
76271+gr_check_crash_exec(const struct file *filp)
76272+{
76273+ struct acl_subject_label *curr;
76274+ struct dentry *dentry;
76275+
76276+ if (unlikely(!gr_acl_is_enabled()))
76277+ return 0;
76278+
76279+ read_lock(&gr_inode_lock);
76280+ dentry = filp->f_path.dentry;
76281+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
76282+ current->role);
76283+ read_unlock(&gr_inode_lock);
76284+
76285+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
76286+ (!curr->crashes && !curr->expires))
76287+ return 0;
76288+
76289+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76290+ time_after(curr->expires, get_seconds()))
76291+ return 1;
76292+ else if (time_before_eq(curr->expires, get_seconds())) {
76293+ curr->crashes = 0;
76294+ curr->expires = 0;
76295+ }
76296+
76297+ return 0;
76298+}
76299+
76300+void
76301+gr_handle_alertkill(struct task_struct *task)
76302+{
76303+ struct acl_subject_label *curracl;
76304+ __u32 curr_ip;
76305+ struct task_struct *p, *p2;
76306+
76307+ if (unlikely(!gr_acl_is_enabled()))
76308+ return;
76309+
76310+ curracl = task->acl;
76311+ curr_ip = task->signal->curr_ip;
76312+
76313+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
76314+ read_lock(&tasklist_lock);
76315+ do_each_thread(p2, p) {
76316+ if (p->signal->curr_ip == curr_ip)
76317+ gr_fake_force_sig(SIGKILL, p);
76318+ } while_each_thread(p2, p);
76319+ read_unlock(&tasklist_lock);
76320+ } else if (curracl->mode & GR_KILLPROC)
76321+ gr_fake_force_sig(SIGKILL, task);
76322+
76323+ return;
76324+}
76325diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
76326new file mode 100644
76327index 0000000..6b0c9cc
76328--- /dev/null
76329+++ b/grsecurity/gracl_shm.c
76330@@ -0,0 +1,40 @@
76331+#include <linux/kernel.h>
76332+#include <linux/mm.h>
76333+#include <linux/sched.h>
76334+#include <linux/file.h>
76335+#include <linux/ipc.h>
76336+#include <linux/gracl.h>
76337+#include <linux/grsecurity.h>
76338+#include <linux/grinternal.h>
76339+
76340+int
76341+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76342+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76343+{
76344+ struct task_struct *task;
76345+
76346+ if (!gr_acl_is_enabled())
76347+ return 1;
76348+
76349+ rcu_read_lock();
76350+ read_lock(&tasklist_lock);
76351+
76352+ task = find_task_by_vpid(shm_cprid);
76353+
76354+ if (unlikely(!task))
76355+ task = find_task_by_vpid(shm_lapid);
76356+
76357+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
76358+ (task_pid_nr(task) == shm_lapid)) &&
76359+ (task->acl->mode & GR_PROTSHM) &&
76360+ (task->acl != current->acl))) {
76361+ read_unlock(&tasklist_lock);
76362+ rcu_read_unlock();
76363+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
76364+ return 0;
76365+ }
76366+ read_unlock(&tasklist_lock);
76367+ rcu_read_unlock();
76368+
76369+ return 1;
76370+}
76371diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
76372new file mode 100644
76373index 0000000..bc0be01
76374--- /dev/null
76375+++ b/grsecurity/grsec_chdir.c
76376@@ -0,0 +1,19 @@
76377+#include <linux/kernel.h>
76378+#include <linux/sched.h>
76379+#include <linux/fs.h>
76380+#include <linux/file.h>
76381+#include <linux/grsecurity.h>
76382+#include <linux/grinternal.h>
76383+
76384+void
76385+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
76386+{
76387+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76388+ if ((grsec_enable_chdir && grsec_enable_group &&
76389+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
76390+ !grsec_enable_group)) {
76391+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
76392+ }
76393+#endif
76394+ return;
76395+}
76396diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
76397new file mode 100644
76398index 0000000..114ea4f
76399--- /dev/null
76400+++ b/grsecurity/grsec_chroot.c
76401@@ -0,0 +1,467 @@
76402+#include <linux/kernel.h>
76403+#include <linux/module.h>
76404+#include <linux/sched.h>
76405+#include <linux/file.h>
76406+#include <linux/fs.h>
76407+#include <linux/mount.h>
76408+#include <linux/types.h>
76409+#include "../fs/mount.h"
76410+#include <linux/grsecurity.h>
76411+#include <linux/grinternal.h>
76412+
76413+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76414+int gr_init_ran;
76415+#endif
76416+
76417+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
76418+{
76419+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76420+ struct dentry *tmpd = dentry;
76421+
76422+ read_seqlock_excl(&mount_lock);
76423+ write_seqlock(&rename_lock);
76424+
76425+ while (tmpd != mnt->mnt_root) {
76426+ atomic_inc(&tmpd->chroot_refcnt);
76427+ tmpd = tmpd->d_parent;
76428+ }
76429+ atomic_inc(&tmpd->chroot_refcnt);
76430+
76431+ write_sequnlock(&rename_lock);
76432+ read_sequnlock_excl(&mount_lock);
76433+#endif
76434+}
76435+
76436+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
76437+{
76438+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76439+ struct dentry *tmpd = dentry;
76440+
76441+ read_seqlock_excl(&mount_lock);
76442+ write_seqlock(&rename_lock);
76443+
76444+ while (tmpd != mnt->mnt_root) {
76445+ atomic_dec(&tmpd->chroot_refcnt);
76446+ tmpd = tmpd->d_parent;
76447+ }
76448+ atomic_dec(&tmpd->chroot_refcnt);
76449+
76450+ write_sequnlock(&rename_lock);
76451+ read_sequnlock_excl(&mount_lock);
76452+#endif
76453+}
76454+
76455+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76456+static struct dentry *get_closest_chroot(struct dentry *dentry)
76457+{
76458+ write_seqlock(&rename_lock);
76459+ do {
76460+ if (atomic_read(&dentry->chroot_refcnt)) {
76461+ write_sequnlock(&rename_lock);
76462+ return dentry;
76463+ }
76464+ dentry = dentry->d_parent;
76465+ } while (!IS_ROOT(dentry));
76466+ write_sequnlock(&rename_lock);
76467+ return NULL;
76468+}
76469+#endif
76470+
76471+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
76472+ struct dentry *newdentry, struct vfsmount *newmnt)
76473+{
76474+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76475+ struct dentry *chroot;
76476+
76477+ if (unlikely(!grsec_enable_chroot_rename))
76478+ return 0;
76479+
76480+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
76481+ return 0;
76482+
76483+ chroot = get_closest_chroot(olddentry);
76484+
76485+ if (chroot == NULL)
76486+ return 0;
76487+
76488+ if (is_subdir(newdentry, chroot))
76489+ return 0;
76490+
76491+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
76492+
76493+ return 1;
76494+#else
76495+ return 0;
76496+#endif
76497+}
76498+
76499+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
76500+{
76501+#ifdef CONFIG_GRKERNSEC
76502+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
76503+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
76504+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76505+ && gr_init_ran
76506+#endif
76507+ )
76508+ task->gr_is_chrooted = 1;
76509+ else {
76510+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76511+ if (task_pid_nr(task) == 1 && !gr_init_ran)
76512+ gr_init_ran = 1;
76513+#endif
76514+ task->gr_is_chrooted = 0;
76515+ }
76516+
76517+ task->gr_chroot_dentry = path->dentry;
76518+#endif
76519+ return;
76520+}
76521+
76522+void gr_clear_chroot_entries(struct task_struct *task)
76523+{
76524+#ifdef CONFIG_GRKERNSEC
76525+ task->gr_is_chrooted = 0;
76526+ task->gr_chroot_dentry = NULL;
76527+#endif
76528+ return;
76529+}
76530+
76531+int
76532+gr_handle_chroot_unix(const pid_t pid)
76533+{
76534+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76535+ struct task_struct *p;
76536+
76537+ if (unlikely(!grsec_enable_chroot_unix))
76538+ return 1;
76539+
76540+ if (likely(!proc_is_chrooted(current)))
76541+ return 1;
76542+
76543+ rcu_read_lock();
76544+ read_lock(&tasklist_lock);
76545+ p = find_task_by_vpid_unrestricted(pid);
76546+ if (unlikely(p && !have_same_root(current, p))) {
76547+ read_unlock(&tasklist_lock);
76548+ rcu_read_unlock();
76549+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
76550+ return 0;
76551+ }
76552+ read_unlock(&tasklist_lock);
76553+ rcu_read_unlock();
76554+#endif
76555+ return 1;
76556+}
76557+
76558+int
76559+gr_handle_chroot_nice(void)
76560+{
76561+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76562+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
76563+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
76564+ return -EPERM;
76565+ }
76566+#endif
76567+ return 0;
76568+}
76569+
76570+int
76571+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
76572+{
76573+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76574+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
76575+ && proc_is_chrooted(current)) {
76576+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
76577+ return -EACCES;
76578+ }
76579+#endif
76580+ return 0;
76581+}
76582+
76583+int
76584+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
76585+{
76586+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76587+ struct task_struct *p;
76588+ int ret = 0;
76589+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
76590+ return ret;
76591+
76592+ read_lock(&tasklist_lock);
76593+ do_each_pid_task(pid, type, p) {
76594+ if (!have_same_root(current, p)) {
76595+ ret = 1;
76596+ goto out;
76597+ }
76598+ } while_each_pid_task(pid, type, p);
76599+out:
76600+ read_unlock(&tasklist_lock);
76601+ return ret;
76602+#endif
76603+ return 0;
76604+}
76605+
76606+int
76607+gr_pid_is_chrooted(struct task_struct *p)
76608+{
76609+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76610+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
76611+ return 0;
76612+
76613+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
76614+ !have_same_root(current, p)) {
76615+ return 1;
76616+ }
76617+#endif
76618+ return 0;
76619+}
76620+
76621+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
76622+
76623+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
76624+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
76625+{
76626+ struct path path, currentroot;
76627+ int ret = 0;
76628+
76629+ path.dentry = (struct dentry *)u_dentry;
76630+ path.mnt = (struct vfsmount *)u_mnt;
76631+ get_fs_root(current->fs, &currentroot);
76632+ if (path_is_under(&path, &currentroot))
76633+ ret = 1;
76634+ path_put(&currentroot);
76635+
76636+ return ret;
76637+}
76638+#endif
76639+
76640+int
76641+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
76642+{
76643+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76644+ if (!grsec_enable_chroot_fchdir)
76645+ return 1;
76646+
76647+ if (!proc_is_chrooted(current))
76648+ return 1;
76649+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
76650+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
76651+ return 0;
76652+ }
76653+#endif
76654+ return 1;
76655+}
76656+
76657+int
76658+gr_chroot_fhandle(void)
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 {
76667+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
76668+ return 0;
76669+ }
76670+#endif
76671+ return 1;
76672+}
76673+
76674+int
76675+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76676+ const u64 shm_createtime)
76677+{
76678+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76679+ struct task_struct *p;
76680+
76681+ if (unlikely(!grsec_enable_chroot_shmat))
76682+ return 1;
76683+
76684+ if (likely(!proc_is_chrooted(current)))
76685+ return 1;
76686+
76687+ rcu_read_lock();
76688+ read_lock(&tasklist_lock);
76689+
76690+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
76691+ if (time_before_eq64(p->start_time, shm_createtime)) {
76692+ if (have_same_root(current, p)) {
76693+ goto allow;
76694+ } else {
76695+ read_unlock(&tasklist_lock);
76696+ rcu_read_unlock();
76697+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76698+ return 0;
76699+ }
76700+ }
76701+ /* creator exited, pid reuse, fall through to next check */
76702+ }
76703+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
76704+ if (unlikely(!have_same_root(current, p))) {
76705+ read_unlock(&tasklist_lock);
76706+ rcu_read_unlock();
76707+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76708+ return 0;
76709+ }
76710+ }
76711+
76712+allow:
76713+ read_unlock(&tasklist_lock);
76714+ rcu_read_unlock();
76715+#endif
76716+ return 1;
76717+}
76718+
76719+void
76720+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
76721+{
76722+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76723+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
76724+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
76725+#endif
76726+ return;
76727+}
76728+
76729+int
76730+gr_handle_chroot_mknod(const struct dentry *dentry,
76731+ const struct vfsmount *mnt, const int mode)
76732+{
76733+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76734+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
76735+ proc_is_chrooted(current)) {
76736+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
76737+ return -EPERM;
76738+ }
76739+#endif
76740+ return 0;
76741+}
76742+
76743+int
76744+gr_handle_chroot_mount(const struct dentry *dentry,
76745+ const struct vfsmount *mnt, const char *dev_name)
76746+{
76747+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76748+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
76749+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
76750+ return -EPERM;
76751+ }
76752+#endif
76753+ return 0;
76754+}
76755+
76756+int
76757+gr_handle_chroot_pivot(void)
76758+{
76759+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76760+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
76761+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
76762+ return -EPERM;
76763+ }
76764+#endif
76765+ return 0;
76766+}
76767+
76768+int
76769+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
76770+{
76771+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76772+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
76773+ !gr_is_outside_chroot(dentry, mnt)) {
76774+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
76775+ return -EPERM;
76776+ }
76777+#endif
76778+ return 0;
76779+}
76780+
76781+extern const char *captab_log[];
76782+extern int captab_log_entries;
76783+
76784+int
76785+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76786+{
76787+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76788+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76789+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76790+ if (cap_raised(chroot_caps, cap)) {
76791+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76792+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76793+ }
76794+ return 0;
76795+ }
76796+ }
76797+#endif
76798+ return 1;
76799+}
76800+
76801+int
76802+gr_chroot_is_capable(const int cap)
76803+{
76804+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76805+ return gr_task_chroot_is_capable(current, current_cred(), cap);
76806+#endif
76807+ return 1;
76808+}
76809+
76810+int
76811+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76812+{
76813+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76814+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76815+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76816+ if (cap_raised(chroot_caps, cap)) {
76817+ return 0;
76818+ }
76819+ }
76820+#endif
76821+ return 1;
76822+}
76823+
76824+int
76825+gr_chroot_is_capable_nolog(const int cap)
76826+{
76827+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76828+ return gr_task_chroot_is_capable_nolog(current, cap);
76829+#endif
76830+ return 1;
76831+}
76832+
76833+int
76834+gr_handle_chroot_sysctl(const int op)
76835+{
76836+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76837+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76838+ proc_is_chrooted(current))
76839+ return -EACCES;
76840+#endif
76841+ return 0;
76842+}
76843+
76844+void
76845+gr_handle_chroot_chdir(const struct path *path)
76846+{
76847+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76848+ if (grsec_enable_chroot_chdir)
76849+ set_fs_pwd(current->fs, path);
76850+#endif
76851+ return;
76852+}
76853+
76854+int
76855+gr_handle_chroot_chmod(const struct dentry *dentry,
76856+ const struct vfsmount *mnt, const int mode)
76857+{
76858+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76859+ /* allow chmod +s on directories, but not files */
76860+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76861+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76862+ proc_is_chrooted(current)) {
76863+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76864+ return -EPERM;
76865+ }
76866+#endif
76867+ return 0;
76868+}
76869diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76870new file mode 100644
76871index 0000000..946f750
76872--- /dev/null
76873+++ b/grsecurity/grsec_disabled.c
76874@@ -0,0 +1,445 @@
76875+#include <linux/kernel.h>
76876+#include <linux/module.h>
76877+#include <linux/sched.h>
76878+#include <linux/file.h>
76879+#include <linux/fs.h>
76880+#include <linux/kdev_t.h>
76881+#include <linux/net.h>
76882+#include <linux/in.h>
76883+#include <linux/ip.h>
76884+#include <linux/skbuff.h>
76885+#include <linux/sysctl.h>
76886+
76887+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76888+void
76889+pax_set_initial_flags(struct linux_binprm *bprm)
76890+{
76891+ return;
76892+}
76893+#endif
76894+
76895+#ifdef CONFIG_SYSCTL
76896+__u32
76897+gr_handle_sysctl(const struct ctl_table * table, const int op)
76898+{
76899+ return 0;
76900+}
76901+#endif
76902+
76903+#ifdef CONFIG_TASKSTATS
76904+int gr_is_taskstats_denied(int pid)
76905+{
76906+ return 0;
76907+}
76908+#endif
76909+
76910+int
76911+gr_acl_is_enabled(void)
76912+{
76913+ return 0;
76914+}
76915+
76916+int
76917+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76918+{
76919+ return 0;
76920+}
76921+
76922+void
76923+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76924+{
76925+ return;
76926+}
76927+
76928+int
76929+gr_handle_rawio(const struct inode *inode)
76930+{
76931+ return 0;
76932+}
76933+
76934+void
76935+gr_acl_handle_psacct(struct task_struct *task, const long code)
76936+{
76937+ return;
76938+}
76939+
76940+int
76941+gr_handle_ptrace(struct task_struct *task, const long request)
76942+{
76943+ return 0;
76944+}
76945+
76946+int
76947+gr_handle_proc_ptrace(struct task_struct *task)
76948+{
76949+ return 0;
76950+}
76951+
76952+int
76953+gr_set_acls(const int type)
76954+{
76955+ return 0;
76956+}
76957+
76958+int
76959+gr_check_hidden_task(const struct task_struct *tsk)
76960+{
76961+ return 0;
76962+}
76963+
76964+int
76965+gr_check_protected_task(const struct task_struct *task)
76966+{
76967+ return 0;
76968+}
76969+
76970+int
76971+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76972+{
76973+ return 0;
76974+}
76975+
76976+void
76977+gr_copy_label(struct task_struct *tsk)
76978+{
76979+ return;
76980+}
76981+
76982+void
76983+gr_set_pax_flags(struct task_struct *task)
76984+{
76985+ return;
76986+}
76987+
76988+int
76989+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76990+ const int unsafe_share)
76991+{
76992+ return 0;
76993+}
76994+
76995+void
76996+gr_handle_delete(const u64 ino, const dev_t dev)
76997+{
76998+ return;
76999+}
77000+
77001+void
77002+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
77003+{
77004+ return;
77005+}
77006+
77007+void
77008+gr_handle_crash(struct task_struct *task, const int sig)
77009+{
77010+ return;
77011+}
77012+
77013+int
77014+gr_check_crash_exec(const struct file *filp)
77015+{
77016+ return 0;
77017+}
77018+
77019+int
77020+gr_check_crash_uid(const kuid_t uid)
77021+{
77022+ return 0;
77023+}
77024+
77025+void
77026+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
77027+ struct dentry *old_dentry,
77028+ struct dentry *new_dentry,
77029+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
77030+{
77031+ return;
77032+}
77033+
77034+int
77035+gr_search_socket(const int family, const int type, const int protocol)
77036+{
77037+ return 1;
77038+}
77039+
77040+int
77041+gr_search_connectbind(const int mode, const struct socket *sock,
77042+ const struct sockaddr_in *addr)
77043+{
77044+ return 0;
77045+}
77046+
77047+void
77048+gr_handle_alertkill(struct task_struct *task)
77049+{
77050+ return;
77051+}
77052+
77053+__u32
77054+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
77055+{
77056+ return 1;
77057+}
77058+
77059+__u32
77060+gr_acl_handle_hidden_file(const struct dentry * dentry,
77061+ const struct vfsmount * mnt)
77062+{
77063+ return 1;
77064+}
77065+
77066+__u32
77067+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
77068+ int acc_mode)
77069+{
77070+ return 1;
77071+}
77072+
77073+__u32
77074+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
77075+{
77076+ return 1;
77077+}
77078+
77079+__u32
77080+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
77081+{
77082+ return 1;
77083+}
77084+
77085+int
77086+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
77087+ unsigned int *vm_flags)
77088+{
77089+ return 1;
77090+}
77091+
77092+__u32
77093+gr_acl_handle_truncate(const struct dentry * dentry,
77094+ const struct vfsmount * mnt)
77095+{
77096+ return 1;
77097+}
77098+
77099+__u32
77100+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
77101+{
77102+ return 1;
77103+}
77104+
77105+__u32
77106+gr_acl_handle_access(const struct dentry * dentry,
77107+ const struct vfsmount * mnt, const int fmode)
77108+{
77109+ return 1;
77110+}
77111+
77112+__u32
77113+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
77114+ umode_t *mode)
77115+{
77116+ return 1;
77117+}
77118+
77119+__u32
77120+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
77121+{
77122+ return 1;
77123+}
77124+
77125+__u32
77126+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
77127+{
77128+ return 1;
77129+}
77130+
77131+__u32
77132+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
77133+{
77134+ return 1;
77135+}
77136+
77137+void
77138+grsecurity_init(void)
77139+{
77140+ return;
77141+}
77142+
77143+umode_t gr_acl_umask(void)
77144+{
77145+ return 0;
77146+}
77147+
77148+__u32
77149+gr_acl_handle_mknod(const struct dentry * new_dentry,
77150+ const struct dentry * parent_dentry,
77151+ const struct vfsmount * parent_mnt,
77152+ const int mode)
77153+{
77154+ return 1;
77155+}
77156+
77157+__u32
77158+gr_acl_handle_mkdir(const struct dentry * new_dentry,
77159+ const struct dentry * parent_dentry,
77160+ const struct vfsmount * parent_mnt)
77161+{
77162+ return 1;
77163+}
77164+
77165+__u32
77166+gr_acl_handle_symlink(const struct dentry * new_dentry,
77167+ const struct dentry * parent_dentry,
77168+ const struct vfsmount * parent_mnt, const struct filename *from)
77169+{
77170+ return 1;
77171+}
77172+
77173+__u32
77174+gr_acl_handle_link(const struct dentry * new_dentry,
77175+ const struct dentry * parent_dentry,
77176+ const struct vfsmount * parent_mnt,
77177+ const struct dentry * old_dentry,
77178+ const struct vfsmount * old_mnt, const struct filename *to)
77179+{
77180+ return 1;
77181+}
77182+
77183+int
77184+gr_acl_handle_rename(const struct dentry *new_dentry,
77185+ const struct dentry *parent_dentry,
77186+ const struct vfsmount *parent_mnt,
77187+ const struct dentry *old_dentry,
77188+ const struct inode *old_parent_inode,
77189+ const struct vfsmount *old_mnt, const struct filename *newname,
77190+ unsigned int flags)
77191+{
77192+ return 0;
77193+}
77194+
77195+int
77196+gr_acl_handle_filldir(const struct file *file, const char *name,
77197+ const int namelen, const u64 ino)
77198+{
77199+ return 1;
77200+}
77201+
77202+int
77203+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77204+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
77205+{
77206+ return 1;
77207+}
77208+
77209+int
77210+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
77211+{
77212+ return 0;
77213+}
77214+
77215+int
77216+gr_search_accept(const struct socket *sock)
77217+{
77218+ return 0;
77219+}
77220+
77221+int
77222+gr_search_listen(const struct socket *sock)
77223+{
77224+ return 0;
77225+}
77226+
77227+int
77228+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
77229+{
77230+ return 0;
77231+}
77232+
77233+__u32
77234+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
77235+{
77236+ return 1;
77237+}
77238+
77239+__u32
77240+gr_acl_handle_creat(const struct dentry * dentry,
77241+ const struct dentry * p_dentry,
77242+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
77243+ const int imode)
77244+{
77245+ return 1;
77246+}
77247+
77248+void
77249+gr_acl_handle_exit(void)
77250+{
77251+ return;
77252+}
77253+
77254+int
77255+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
77256+{
77257+ return 1;
77258+}
77259+
77260+void
77261+gr_set_role_label(const kuid_t uid, const kgid_t gid)
77262+{
77263+ return;
77264+}
77265+
77266+int
77267+gr_acl_handle_procpidmem(const struct task_struct *task)
77268+{
77269+ return 0;
77270+}
77271+
77272+int
77273+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
77274+{
77275+ return 0;
77276+}
77277+
77278+int
77279+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
77280+{
77281+ return 0;
77282+}
77283+
77284+int
77285+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
77286+{
77287+ return 0;
77288+}
77289+
77290+int
77291+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
77292+{
77293+ return 0;
77294+}
77295+
77296+int gr_acl_enable_at_secure(void)
77297+{
77298+ return 0;
77299+}
77300+
77301+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77302+{
77303+ return dentry->d_sb->s_dev;
77304+}
77305+
77306+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77307+{
77308+ return dentry->d_inode->i_ino;
77309+}
77310+
77311+void gr_put_exec_file(struct task_struct *task)
77312+{
77313+ return;
77314+}
77315+
77316+#ifdef CONFIG_SECURITY
77317+EXPORT_SYMBOL_GPL(gr_check_user_change);
77318+EXPORT_SYMBOL_GPL(gr_check_group_change);
77319+#endif
77320diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
77321new file mode 100644
77322index 0000000..fb7531e
77323--- /dev/null
77324+++ b/grsecurity/grsec_exec.c
77325@@ -0,0 +1,189 @@
77326+#include <linux/kernel.h>
77327+#include <linux/sched.h>
77328+#include <linux/file.h>
77329+#include <linux/binfmts.h>
77330+#include <linux/fs.h>
77331+#include <linux/types.h>
77332+#include <linux/grdefs.h>
77333+#include <linux/grsecurity.h>
77334+#include <linux/grinternal.h>
77335+#include <linux/capability.h>
77336+#include <linux/module.h>
77337+#include <linux/compat.h>
77338+
77339+#include <asm/uaccess.h>
77340+
77341+#ifdef CONFIG_GRKERNSEC_EXECLOG
77342+static char gr_exec_arg_buf[132];
77343+static DEFINE_MUTEX(gr_exec_arg_mutex);
77344+#endif
77345+
77346+struct user_arg_ptr {
77347+#ifdef CONFIG_COMPAT
77348+ bool is_compat;
77349+#endif
77350+ union {
77351+ const char __user *const __user *native;
77352+#ifdef CONFIG_COMPAT
77353+ const compat_uptr_t __user *compat;
77354+#endif
77355+ } ptr;
77356+};
77357+
77358+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
77359+
77360+void
77361+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
77362+{
77363+#ifdef CONFIG_GRKERNSEC_EXECLOG
77364+ char *grarg = gr_exec_arg_buf;
77365+ unsigned int i, x, execlen = 0;
77366+ char c;
77367+
77368+ if (!((grsec_enable_execlog && grsec_enable_group &&
77369+ in_group_p(grsec_audit_gid))
77370+ || (grsec_enable_execlog && !grsec_enable_group)))
77371+ return;
77372+
77373+ mutex_lock(&gr_exec_arg_mutex);
77374+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
77375+
77376+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
77377+ const char __user *p;
77378+ unsigned int len;
77379+
77380+ p = get_user_arg_ptr(argv, i);
77381+ if (IS_ERR(p))
77382+ goto log;
77383+
77384+ len = strnlen_user(p, 128 - execlen);
77385+ if (len > 128 - execlen)
77386+ len = 128 - execlen;
77387+ else if (len > 0)
77388+ len--;
77389+ if (copy_from_user(grarg + execlen, p, len))
77390+ goto log;
77391+
77392+ /* rewrite unprintable characters */
77393+ for (x = 0; x < len; x++) {
77394+ c = *(grarg + execlen + x);
77395+ if (c < 32 || c > 126)
77396+ *(grarg + execlen + x) = ' ';
77397+ }
77398+
77399+ execlen += len;
77400+ *(grarg + execlen) = ' ';
77401+ *(grarg + execlen + 1) = '\0';
77402+ execlen++;
77403+ }
77404+
77405+ log:
77406+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
77407+ bprm->file->f_path.mnt, grarg);
77408+ mutex_unlock(&gr_exec_arg_mutex);
77409+#endif
77410+ return;
77411+}
77412+
77413+#ifdef CONFIG_GRKERNSEC
77414+extern int gr_acl_is_capable(const int cap);
77415+extern int gr_acl_is_capable_nolog(const int cap);
77416+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
77417+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
77418+extern int gr_chroot_is_capable(const int cap);
77419+extern int gr_chroot_is_capable_nolog(const int cap);
77420+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
77421+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
77422+#endif
77423+
77424+const char *captab_log[] = {
77425+ "CAP_CHOWN",
77426+ "CAP_DAC_OVERRIDE",
77427+ "CAP_DAC_READ_SEARCH",
77428+ "CAP_FOWNER",
77429+ "CAP_FSETID",
77430+ "CAP_KILL",
77431+ "CAP_SETGID",
77432+ "CAP_SETUID",
77433+ "CAP_SETPCAP",
77434+ "CAP_LINUX_IMMUTABLE",
77435+ "CAP_NET_BIND_SERVICE",
77436+ "CAP_NET_BROADCAST",
77437+ "CAP_NET_ADMIN",
77438+ "CAP_NET_RAW",
77439+ "CAP_IPC_LOCK",
77440+ "CAP_IPC_OWNER",
77441+ "CAP_SYS_MODULE",
77442+ "CAP_SYS_RAWIO",
77443+ "CAP_SYS_CHROOT",
77444+ "CAP_SYS_PTRACE",
77445+ "CAP_SYS_PACCT",
77446+ "CAP_SYS_ADMIN",
77447+ "CAP_SYS_BOOT",
77448+ "CAP_SYS_NICE",
77449+ "CAP_SYS_RESOURCE",
77450+ "CAP_SYS_TIME",
77451+ "CAP_SYS_TTY_CONFIG",
77452+ "CAP_MKNOD",
77453+ "CAP_LEASE",
77454+ "CAP_AUDIT_WRITE",
77455+ "CAP_AUDIT_CONTROL",
77456+ "CAP_SETFCAP",
77457+ "CAP_MAC_OVERRIDE",
77458+ "CAP_MAC_ADMIN",
77459+ "CAP_SYSLOG",
77460+ "CAP_WAKE_ALARM",
77461+ "CAP_BLOCK_SUSPEND",
77462+ "CAP_AUDIT_READ"
77463+};
77464+
77465+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
77466+
77467+int gr_is_capable(const int cap)
77468+{
77469+#ifdef CONFIG_GRKERNSEC
77470+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
77471+ return 1;
77472+ return 0;
77473+#else
77474+ return 1;
77475+#endif
77476+}
77477+
77478+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
77479+{
77480+#ifdef CONFIG_GRKERNSEC
77481+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
77482+ return 1;
77483+ return 0;
77484+#else
77485+ return 1;
77486+#endif
77487+}
77488+
77489+int gr_is_capable_nolog(const int cap)
77490+{
77491+#ifdef CONFIG_GRKERNSEC
77492+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
77493+ return 1;
77494+ return 0;
77495+#else
77496+ return 1;
77497+#endif
77498+}
77499+
77500+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
77501+{
77502+#ifdef CONFIG_GRKERNSEC
77503+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
77504+ return 1;
77505+ return 0;
77506+#else
77507+ return 1;
77508+#endif
77509+}
77510+
77511+EXPORT_SYMBOL_GPL(gr_is_capable);
77512+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
77513+EXPORT_SYMBOL_GPL(gr_task_is_capable);
77514+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
77515diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
77516new file mode 100644
77517index 0000000..06cc6ea
77518--- /dev/null
77519+++ b/grsecurity/grsec_fifo.c
77520@@ -0,0 +1,24 @@
77521+#include <linux/kernel.h>
77522+#include <linux/sched.h>
77523+#include <linux/fs.h>
77524+#include <linux/file.h>
77525+#include <linux/grinternal.h>
77526+
77527+int
77528+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
77529+ const struct dentry *dir, const int flag, const int acc_mode)
77530+{
77531+#ifdef CONFIG_GRKERNSEC_FIFO
77532+ const struct cred *cred = current_cred();
77533+
77534+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
77535+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
77536+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
77537+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
77538+ if (!inode_permission(dentry->d_inode, acc_mode))
77539+ 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));
77540+ return -EACCES;
77541+ }
77542+#endif
77543+ return 0;
77544+}
77545diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
77546new file mode 100644
77547index 0000000..8ca18bf
77548--- /dev/null
77549+++ b/grsecurity/grsec_fork.c
77550@@ -0,0 +1,23 @@
77551+#include <linux/kernel.h>
77552+#include <linux/sched.h>
77553+#include <linux/grsecurity.h>
77554+#include <linux/grinternal.h>
77555+#include <linux/errno.h>
77556+
77557+void
77558+gr_log_forkfail(const int retval)
77559+{
77560+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77561+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
77562+ switch (retval) {
77563+ case -EAGAIN:
77564+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
77565+ break;
77566+ case -ENOMEM:
77567+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
77568+ break;
77569+ }
77570+ }
77571+#endif
77572+ return;
77573+}
77574diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
77575new file mode 100644
77576index 0000000..4ed9e7d
77577--- /dev/null
77578+++ b/grsecurity/grsec_init.c
77579@@ -0,0 +1,290 @@
77580+#include <linux/kernel.h>
77581+#include <linux/sched.h>
77582+#include <linux/mm.h>
77583+#include <linux/gracl.h>
77584+#include <linux/slab.h>
77585+#include <linux/vmalloc.h>
77586+#include <linux/percpu.h>
77587+#include <linux/module.h>
77588+
77589+int grsec_enable_ptrace_readexec;
77590+int grsec_enable_setxid;
77591+int grsec_enable_symlinkown;
77592+kgid_t grsec_symlinkown_gid;
77593+int grsec_enable_brute;
77594+int grsec_enable_link;
77595+int grsec_enable_dmesg;
77596+int grsec_enable_harden_ptrace;
77597+int grsec_enable_harden_ipc;
77598+int grsec_enable_fifo;
77599+int grsec_enable_execlog;
77600+int grsec_enable_signal;
77601+int grsec_enable_forkfail;
77602+int grsec_enable_audit_ptrace;
77603+int grsec_enable_time;
77604+int grsec_enable_group;
77605+kgid_t grsec_audit_gid;
77606+int grsec_enable_chdir;
77607+int grsec_enable_mount;
77608+int grsec_enable_rofs;
77609+int grsec_deny_new_usb;
77610+int grsec_enable_chroot_findtask;
77611+int grsec_enable_chroot_mount;
77612+int grsec_enable_chroot_shmat;
77613+int grsec_enable_chroot_fchdir;
77614+int grsec_enable_chroot_double;
77615+int grsec_enable_chroot_pivot;
77616+int grsec_enable_chroot_chdir;
77617+int grsec_enable_chroot_chmod;
77618+int grsec_enable_chroot_mknod;
77619+int grsec_enable_chroot_nice;
77620+int grsec_enable_chroot_execlog;
77621+int grsec_enable_chroot_caps;
77622+int grsec_enable_chroot_rename;
77623+int grsec_enable_chroot_sysctl;
77624+int grsec_enable_chroot_unix;
77625+int grsec_enable_tpe;
77626+kgid_t grsec_tpe_gid;
77627+int grsec_enable_blackhole;
77628+#ifdef CONFIG_IPV6_MODULE
77629+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
77630+#endif
77631+int grsec_lastack_retries;
77632+int grsec_enable_tpe_all;
77633+int grsec_enable_tpe_invert;
77634+int grsec_enable_socket_all;
77635+kgid_t grsec_socket_all_gid;
77636+int grsec_enable_socket_client;
77637+kgid_t grsec_socket_client_gid;
77638+int grsec_enable_socket_server;
77639+kgid_t grsec_socket_server_gid;
77640+int grsec_resource_logging;
77641+int grsec_disable_privio;
77642+int grsec_enable_log_rwxmaps;
77643+int grsec_lock;
77644+
77645+DEFINE_SPINLOCK(grsec_alert_lock);
77646+unsigned long grsec_alert_wtime = 0;
77647+unsigned long grsec_alert_fyet = 0;
77648+
77649+DEFINE_SPINLOCK(grsec_audit_lock);
77650+
77651+DEFINE_RWLOCK(grsec_exec_file_lock);
77652+
77653+char *gr_shared_page[4];
77654+
77655+char *gr_alert_log_fmt;
77656+char *gr_audit_log_fmt;
77657+char *gr_alert_log_buf;
77658+char *gr_audit_log_buf;
77659+
77660+extern struct gr_arg *gr_usermode;
77661+extern unsigned char *gr_system_salt;
77662+extern unsigned char *gr_system_sum;
77663+
77664+void __init
77665+grsecurity_init(void)
77666+{
77667+ int j;
77668+ /* create the per-cpu shared pages */
77669+
77670+#ifdef CONFIG_X86
77671+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
77672+#endif
77673+
77674+ for (j = 0; j < 4; j++) {
77675+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
77676+ if (gr_shared_page[j] == NULL) {
77677+ panic("Unable to allocate grsecurity shared page");
77678+ return;
77679+ }
77680+ }
77681+
77682+ /* allocate log buffers */
77683+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
77684+ if (!gr_alert_log_fmt) {
77685+ panic("Unable to allocate grsecurity alert log format buffer");
77686+ return;
77687+ }
77688+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
77689+ if (!gr_audit_log_fmt) {
77690+ panic("Unable to allocate grsecurity audit log format buffer");
77691+ return;
77692+ }
77693+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77694+ if (!gr_alert_log_buf) {
77695+ panic("Unable to allocate grsecurity alert log buffer");
77696+ return;
77697+ }
77698+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77699+ if (!gr_audit_log_buf) {
77700+ panic("Unable to allocate grsecurity audit log buffer");
77701+ return;
77702+ }
77703+
77704+ /* allocate memory for authentication structure */
77705+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
77706+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
77707+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
77708+
77709+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
77710+ panic("Unable to allocate grsecurity authentication structure");
77711+ return;
77712+ }
77713+
77714+#ifdef CONFIG_GRKERNSEC_IO
77715+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
77716+ grsec_disable_privio = 1;
77717+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77718+ grsec_disable_privio = 1;
77719+#else
77720+ grsec_disable_privio = 0;
77721+#endif
77722+#endif
77723+
77724+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
77725+ /* for backward compatibility, tpe_invert always defaults to on if
77726+ enabled in the kernel
77727+ */
77728+ grsec_enable_tpe_invert = 1;
77729+#endif
77730+
77731+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77732+#ifndef CONFIG_GRKERNSEC_SYSCTL
77733+ grsec_lock = 1;
77734+#endif
77735+
77736+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77737+ grsec_enable_log_rwxmaps = 1;
77738+#endif
77739+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
77740+ grsec_enable_group = 1;
77741+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
77742+#endif
77743+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77744+ grsec_enable_ptrace_readexec = 1;
77745+#endif
77746+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
77747+ grsec_enable_chdir = 1;
77748+#endif
77749+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
77750+ grsec_enable_harden_ptrace = 1;
77751+#endif
77752+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77753+ grsec_enable_harden_ipc = 1;
77754+#endif
77755+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77756+ grsec_enable_mount = 1;
77757+#endif
77758+#ifdef CONFIG_GRKERNSEC_LINK
77759+ grsec_enable_link = 1;
77760+#endif
77761+#ifdef CONFIG_GRKERNSEC_BRUTE
77762+ grsec_enable_brute = 1;
77763+#endif
77764+#ifdef CONFIG_GRKERNSEC_DMESG
77765+ grsec_enable_dmesg = 1;
77766+#endif
77767+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77768+ grsec_enable_blackhole = 1;
77769+ grsec_lastack_retries = 4;
77770+#endif
77771+#ifdef CONFIG_GRKERNSEC_FIFO
77772+ grsec_enable_fifo = 1;
77773+#endif
77774+#ifdef CONFIG_GRKERNSEC_EXECLOG
77775+ grsec_enable_execlog = 1;
77776+#endif
77777+#ifdef CONFIG_GRKERNSEC_SETXID
77778+ grsec_enable_setxid = 1;
77779+#endif
77780+#ifdef CONFIG_GRKERNSEC_SIGNAL
77781+ grsec_enable_signal = 1;
77782+#endif
77783+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77784+ grsec_enable_forkfail = 1;
77785+#endif
77786+#ifdef CONFIG_GRKERNSEC_TIME
77787+ grsec_enable_time = 1;
77788+#endif
77789+#ifdef CONFIG_GRKERNSEC_RESLOG
77790+ grsec_resource_logging = 1;
77791+#endif
77792+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77793+ grsec_enable_chroot_findtask = 1;
77794+#endif
77795+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77796+ grsec_enable_chroot_unix = 1;
77797+#endif
77798+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77799+ grsec_enable_chroot_mount = 1;
77800+#endif
77801+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77802+ grsec_enable_chroot_fchdir = 1;
77803+#endif
77804+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77805+ grsec_enable_chroot_shmat = 1;
77806+#endif
77807+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77808+ grsec_enable_audit_ptrace = 1;
77809+#endif
77810+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77811+ grsec_enable_chroot_double = 1;
77812+#endif
77813+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77814+ grsec_enable_chroot_pivot = 1;
77815+#endif
77816+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77817+ grsec_enable_chroot_chdir = 1;
77818+#endif
77819+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77820+ grsec_enable_chroot_chmod = 1;
77821+#endif
77822+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77823+ grsec_enable_chroot_mknod = 1;
77824+#endif
77825+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77826+ grsec_enable_chroot_nice = 1;
77827+#endif
77828+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77829+ grsec_enable_chroot_execlog = 1;
77830+#endif
77831+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77832+ grsec_enable_chroot_caps = 1;
77833+#endif
77834+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77835+ grsec_enable_chroot_rename = 1;
77836+#endif
77837+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77838+ grsec_enable_chroot_sysctl = 1;
77839+#endif
77840+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77841+ grsec_enable_symlinkown = 1;
77842+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77843+#endif
77844+#ifdef CONFIG_GRKERNSEC_TPE
77845+ grsec_enable_tpe = 1;
77846+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77847+#ifdef CONFIG_GRKERNSEC_TPE_ALL
77848+ grsec_enable_tpe_all = 1;
77849+#endif
77850+#endif
77851+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77852+ grsec_enable_socket_all = 1;
77853+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77854+#endif
77855+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77856+ grsec_enable_socket_client = 1;
77857+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77858+#endif
77859+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77860+ grsec_enable_socket_server = 1;
77861+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77862+#endif
77863+#endif
77864+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77865+ grsec_deny_new_usb = 1;
77866+#endif
77867+
77868+ return;
77869+}
77870diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77871new file mode 100644
77872index 0000000..1773300
77873--- /dev/null
77874+++ b/grsecurity/grsec_ipc.c
77875@@ -0,0 +1,48 @@
77876+#include <linux/kernel.h>
77877+#include <linux/mm.h>
77878+#include <linux/sched.h>
77879+#include <linux/file.h>
77880+#include <linux/ipc.h>
77881+#include <linux/ipc_namespace.h>
77882+#include <linux/grsecurity.h>
77883+#include <linux/grinternal.h>
77884+
77885+int
77886+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77887+{
77888+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77889+ int write;
77890+ int orig_granted_mode;
77891+ kuid_t euid;
77892+ kgid_t egid;
77893+
77894+ if (!grsec_enable_harden_ipc)
77895+ return 1;
77896+
77897+ euid = current_euid();
77898+ egid = current_egid();
77899+
77900+ write = requested_mode & 00002;
77901+ orig_granted_mode = ipcp->mode;
77902+
77903+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77904+ orig_granted_mode >>= 6;
77905+ else {
77906+ /* if likely wrong permissions, lock to user */
77907+ if (orig_granted_mode & 0007)
77908+ orig_granted_mode = 0;
77909+ /* otherwise do a egid-only check */
77910+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77911+ orig_granted_mode >>= 3;
77912+ /* otherwise, no access */
77913+ else
77914+ orig_granted_mode = 0;
77915+ }
77916+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77917+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77918+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77919+ return 0;
77920+ }
77921+#endif
77922+ return 1;
77923+}
77924diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77925new file mode 100644
77926index 0000000..5e05e20
77927--- /dev/null
77928+++ b/grsecurity/grsec_link.c
77929@@ -0,0 +1,58 @@
77930+#include <linux/kernel.h>
77931+#include <linux/sched.h>
77932+#include <linux/fs.h>
77933+#include <linux/file.h>
77934+#include <linux/grinternal.h>
77935+
77936+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77937+{
77938+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77939+ const struct inode *link_inode = link->dentry->d_inode;
77940+
77941+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77942+ /* ignore root-owned links, e.g. /proc/self */
77943+ gr_is_global_nonroot(link_inode->i_uid) && target &&
77944+ !uid_eq(link_inode->i_uid, target->i_uid)) {
77945+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77946+ return 1;
77947+ }
77948+#endif
77949+ return 0;
77950+}
77951+
77952+int
77953+gr_handle_follow_link(const struct inode *parent,
77954+ const struct inode *inode,
77955+ const struct dentry *dentry, const struct vfsmount *mnt)
77956+{
77957+#ifdef CONFIG_GRKERNSEC_LINK
77958+ const struct cred *cred = current_cred();
77959+
77960+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77961+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77962+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77963+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77964+ return -EACCES;
77965+ }
77966+#endif
77967+ return 0;
77968+}
77969+
77970+int
77971+gr_handle_hardlink(const struct dentry *dentry,
77972+ const struct vfsmount *mnt,
77973+ struct inode *inode, const int mode, const struct filename *to)
77974+{
77975+#ifdef CONFIG_GRKERNSEC_LINK
77976+ const struct cred *cred = current_cred();
77977+
77978+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77979+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77980+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77981+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77982+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77983+ return -EPERM;
77984+ }
77985+#endif
77986+ return 0;
77987+}
77988diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77989new file mode 100644
77990index 0000000..dbe0a6b
77991--- /dev/null
77992+++ b/grsecurity/grsec_log.c
77993@@ -0,0 +1,341 @@
77994+#include <linux/kernel.h>
77995+#include <linux/sched.h>
77996+#include <linux/file.h>
77997+#include <linux/tty.h>
77998+#include <linux/fs.h>
77999+#include <linux/mm.h>
78000+#include <linux/grinternal.h>
78001+
78002+#ifdef CONFIG_TREE_PREEMPT_RCU
78003+#define DISABLE_PREEMPT() preempt_disable()
78004+#define ENABLE_PREEMPT() preempt_enable()
78005+#else
78006+#define DISABLE_PREEMPT()
78007+#define ENABLE_PREEMPT()
78008+#endif
78009+
78010+#define BEGIN_LOCKS(x) \
78011+ DISABLE_PREEMPT(); \
78012+ rcu_read_lock(); \
78013+ read_lock(&tasklist_lock); \
78014+ read_lock(&grsec_exec_file_lock); \
78015+ if (x != GR_DO_AUDIT) \
78016+ spin_lock(&grsec_alert_lock); \
78017+ else \
78018+ spin_lock(&grsec_audit_lock)
78019+
78020+#define END_LOCKS(x) \
78021+ if (x != GR_DO_AUDIT) \
78022+ spin_unlock(&grsec_alert_lock); \
78023+ else \
78024+ spin_unlock(&grsec_audit_lock); \
78025+ read_unlock(&grsec_exec_file_lock); \
78026+ read_unlock(&tasklist_lock); \
78027+ rcu_read_unlock(); \
78028+ ENABLE_PREEMPT(); \
78029+ if (x == GR_DONT_AUDIT) \
78030+ gr_handle_alertkill(current)
78031+
78032+enum {
78033+ FLOODING,
78034+ NO_FLOODING
78035+};
78036+
78037+extern char *gr_alert_log_fmt;
78038+extern char *gr_audit_log_fmt;
78039+extern char *gr_alert_log_buf;
78040+extern char *gr_audit_log_buf;
78041+
78042+static int gr_log_start(int audit)
78043+{
78044+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
78045+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
78046+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78047+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
78048+ unsigned long curr_secs = get_seconds();
78049+
78050+ if (audit == GR_DO_AUDIT)
78051+ goto set_fmt;
78052+
78053+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
78054+ grsec_alert_wtime = curr_secs;
78055+ grsec_alert_fyet = 0;
78056+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
78057+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
78058+ grsec_alert_fyet++;
78059+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
78060+ grsec_alert_wtime = curr_secs;
78061+ grsec_alert_fyet++;
78062+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
78063+ return FLOODING;
78064+ }
78065+ else return FLOODING;
78066+
78067+set_fmt:
78068+#endif
78069+ memset(buf, 0, PAGE_SIZE);
78070+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
78071+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
78072+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78073+ } else if (current->signal->curr_ip) {
78074+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
78075+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
78076+ } else if (gr_acl_is_enabled()) {
78077+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
78078+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78079+ } else {
78080+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
78081+ strcpy(buf, fmt);
78082+ }
78083+
78084+ return NO_FLOODING;
78085+}
78086+
78087+static void gr_log_middle(int audit, const char *msg, va_list ap)
78088+ __attribute__ ((format (printf, 2, 0)));
78089+
78090+static void gr_log_middle(int audit, const char *msg, va_list ap)
78091+{
78092+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78093+ unsigned int len = strlen(buf);
78094+
78095+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78096+
78097+ return;
78098+}
78099+
78100+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78101+ __attribute__ ((format (printf, 2, 3)));
78102+
78103+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78104+{
78105+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78106+ unsigned int len = strlen(buf);
78107+ va_list ap;
78108+
78109+ va_start(ap, msg);
78110+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78111+ va_end(ap);
78112+
78113+ return;
78114+}
78115+
78116+static void gr_log_end(int audit, int append_default)
78117+{
78118+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78119+ if (append_default) {
78120+ struct task_struct *task = current;
78121+ struct task_struct *parent = task->real_parent;
78122+ const struct cred *cred = __task_cred(task);
78123+ const struct cred *pcred = __task_cred(parent);
78124+ unsigned int len = strlen(buf);
78125+
78126+ 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));
78127+ }
78128+
78129+ printk("%s\n", buf);
78130+
78131+ return;
78132+}
78133+
78134+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
78135+{
78136+ int logtype;
78137+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
78138+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
78139+ void *voidptr = NULL;
78140+ int num1 = 0, num2 = 0;
78141+ unsigned long ulong1 = 0, ulong2 = 0;
78142+ struct dentry *dentry = NULL;
78143+ struct vfsmount *mnt = NULL;
78144+ struct file *file = NULL;
78145+ struct task_struct *task = NULL;
78146+ struct vm_area_struct *vma = NULL;
78147+ const struct cred *cred, *pcred;
78148+ va_list ap;
78149+
78150+ BEGIN_LOCKS(audit);
78151+ logtype = gr_log_start(audit);
78152+ if (logtype == FLOODING) {
78153+ END_LOCKS(audit);
78154+ return;
78155+ }
78156+ va_start(ap, argtypes);
78157+ switch (argtypes) {
78158+ case GR_TTYSNIFF:
78159+ task = va_arg(ap, struct task_struct *);
78160+ 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));
78161+ break;
78162+ case GR_SYSCTL_HIDDEN:
78163+ str1 = va_arg(ap, char *);
78164+ gr_log_middle_varargs(audit, msg, result, str1);
78165+ break;
78166+ case GR_RBAC:
78167+ dentry = va_arg(ap, struct dentry *);
78168+ mnt = va_arg(ap, struct vfsmount *);
78169+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
78170+ break;
78171+ case GR_RBAC_STR:
78172+ dentry = va_arg(ap, struct dentry *);
78173+ mnt = va_arg(ap, struct vfsmount *);
78174+ str1 = va_arg(ap, char *);
78175+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
78176+ break;
78177+ case GR_STR_RBAC:
78178+ str1 = va_arg(ap, char *);
78179+ dentry = va_arg(ap, struct dentry *);
78180+ mnt = va_arg(ap, struct vfsmount *);
78181+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
78182+ break;
78183+ case GR_RBAC_MODE2:
78184+ dentry = va_arg(ap, struct dentry *);
78185+ mnt = va_arg(ap, struct vfsmount *);
78186+ str1 = va_arg(ap, char *);
78187+ str2 = va_arg(ap, char *);
78188+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
78189+ break;
78190+ case GR_RBAC_MODE3:
78191+ dentry = va_arg(ap, struct dentry *);
78192+ mnt = va_arg(ap, struct vfsmount *);
78193+ str1 = va_arg(ap, char *);
78194+ str2 = va_arg(ap, char *);
78195+ str3 = va_arg(ap, char *);
78196+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
78197+ break;
78198+ case GR_FILENAME:
78199+ dentry = va_arg(ap, struct dentry *);
78200+ mnt = va_arg(ap, struct vfsmount *);
78201+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
78202+ break;
78203+ case GR_STR_FILENAME:
78204+ str1 = va_arg(ap, char *);
78205+ dentry = va_arg(ap, struct dentry *);
78206+ mnt = va_arg(ap, struct vfsmount *);
78207+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
78208+ break;
78209+ case GR_FILENAME_STR:
78210+ dentry = va_arg(ap, struct dentry *);
78211+ mnt = va_arg(ap, struct vfsmount *);
78212+ str1 = va_arg(ap, char *);
78213+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
78214+ break;
78215+ case GR_FILENAME_TWO_INT:
78216+ dentry = va_arg(ap, struct dentry *);
78217+ mnt = va_arg(ap, struct vfsmount *);
78218+ num1 = va_arg(ap, int);
78219+ num2 = va_arg(ap, int);
78220+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
78221+ break;
78222+ case GR_FILENAME_TWO_INT_STR:
78223+ dentry = va_arg(ap, struct dentry *);
78224+ mnt = va_arg(ap, struct vfsmount *);
78225+ num1 = va_arg(ap, int);
78226+ num2 = va_arg(ap, int);
78227+ str1 = va_arg(ap, char *);
78228+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
78229+ break;
78230+ case GR_TEXTREL:
78231+ file = va_arg(ap, struct file *);
78232+ ulong1 = va_arg(ap, unsigned long);
78233+ ulong2 = va_arg(ap, unsigned long);
78234+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
78235+ break;
78236+ case GR_PTRACE:
78237+ task = va_arg(ap, struct task_struct *);
78238+ 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));
78239+ break;
78240+ case GR_RESOURCE:
78241+ task = va_arg(ap, struct task_struct *);
78242+ cred = __task_cred(task);
78243+ pcred = __task_cred(task->real_parent);
78244+ ulong1 = va_arg(ap, unsigned long);
78245+ str1 = va_arg(ap, char *);
78246+ ulong2 = va_arg(ap, unsigned long);
78247+ 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));
78248+ break;
78249+ case GR_CAP:
78250+ task = va_arg(ap, struct task_struct *);
78251+ cred = __task_cred(task);
78252+ pcred = __task_cred(task->real_parent);
78253+ str1 = va_arg(ap, char *);
78254+ 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));
78255+ break;
78256+ case GR_SIG:
78257+ str1 = va_arg(ap, char *);
78258+ voidptr = va_arg(ap, void *);
78259+ gr_log_middle_varargs(audit, msg, str1, voidptr);
78260+ break;
78261+ case GR_SIG2:
78262+ task = va_arg(ap, struct task_struct *);
78263+ cred = __task_cred(task);
78264+ pcred = __task_cred(task->real_parent);
78265+ num1 = va_arg(ap, int);
78266+ 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));
78267+ break;
78268+ case GR_CRASH1:
78269+ task = va_arg(ap, struct task_struct *);
78270+ cred = __task_cred(task);
78271+ pcred = __task_cred(task->real_parent);
78272+ ulong1 = va_arg(ap, unsigned long);
78273+ 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);
78274+ break;
78275+ case GR_CRASH2:
78276+ task = va_arg(ap, struct task_struct *);
78277+ cred = __task_cred(task);
78278+ pcred = __task_cred(task->real_parent);
78279+ ulong1 = va_arg(ap, unsigned long);
78280+ 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);
78281+ break;
78282+ case GR_RWXMAP:
78283+ file = va_arg(ap, struct file *);
78284+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
78285+ break;
78286+ case GR_RWXMAPVMA:
78287+ vma = va_arg(ap, struct vm_area_struct *);
78288+ if (vma->vm_file)
78289+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
78290+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
78291+ str1 = "<stack>";
78292+ else if (vma->vm_start <= current->mm->brk &&
78293+ vma->vm_end >= current->mm->start_brk)
78294+ str1 = "<heap>";
78295+ else
78296+ str1 = "<anonymous mapping>";
78297+ gr_log_middle_varargs(audit, msg, str1);
78298+ break;
78299+ case GR_PSACCT:
78300+ {
78301+ unsigned int wday, cday;
78302+ __u8 whr, chr;
78303+ __u8 wmin, cmin;
78304+ __u8 wsec, csec;
78305+ char cur_tty[64] = { 0 };
78306+ char parent_tty[64] = { 0 };
78307+
78308+ task = va_arg(ap, struct task_struct *);
78309+ wday = va_arg(ap, unsigned int);
78310+ cday = va_arg(ap, unsigned int);
78311+ whr = va_arg(ap, int);
78312+ chr = va_arg(ap, int);
78313+ wmin = va_arg(ap, int);
78314+ cmin = va_arg(ap, int);
78315+ wsec = va_arg(ap, int);
78316+ csec = va_arg(ap, int);
78317+ ulong1 = va_arg(ap, unsigned long);
78318+ cred = __task_cred(task);
78319+ pcred = __task_cred(task->real_parent);
78320+
78321+ 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));
78322+ }
78323+ break;
78324+ default:
78325+ gr_log_middle(audit, msg, ap);
78326+ }
78327+ va_end(ap);
78328+ // these don't need DEFAULTSECARGS printed on the end
78329+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
78330+ gr_log_end(audit, 0);
78331+ else
78332+ gr_log_end(audit, 1);
78333+ END_LOCKS(audit);
78334+}
78335diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
78336new file mode 100644
78337index 0000000..0e39d8c
78338--- /dev/null
78339+++ b/grsecurity/grsec_mem.c
78340@@ -0,0 +1,48 @@
78341+#include <linux/kernel.h>
78342+#include <linux/sched.h>
78343+#include <linux/mm.h>
78344+#include <linux/mman.h>
78345+#include <linux/module.h>
78346+#include <linux/grinternal.h>
78347+
78348+void gr_handle_msr_write(void)
78349+{
78350+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
78351+ return;
78352+}
78353+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
78354+
78355+void
78356+gr_handle_ioperm(void)
78357+{
78358+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
78359+ return;
78360+}
78361+
78362+void
78363+gr_handle_iopl(void)
78364+{
78365+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
78366+ return;
78367+}
78368+
78369+void
78370+gr_handle_mem_readwrite(u64 from, u64 to)
78371+{
78372+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
78373+ return;
78374+}
78375+
78376+void
78377+gr_handle_vm86(void)
78378+{
78379+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
78380+ return;
78381+}
78382+
78383+void
78384+gr_log_badprocpid(const char *entry)
78385+{
78386+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
78387+ return;
78388+}
78389diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
78390new file mode 100644
78391index 0000000..6f9eb73
78392--- /dev/null
78393+++ b/grsecurity/grsec_mount.c
78394@@ -0,0 +1,65 @@
78395+#include <linux/kernel.h>
78396+#include <linux/sched.h>
78397+#include <linux/mount.h>
78398+#include <linux/major.h>
78399+#include <linux/grsecurity.h>
78400+#include <linux/grinternal.h>
78401+
78402+void
78403+gr_log_remount(const char *devname, const int retval)
78404+{
78405+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78406+ if (grsec_enable_mount && (retval >= 0))
78407+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
78408+#endif
78409+ return;
78410+}
78411+
78412+void
78413+gr_log_unmount(const char *devname, const int retval)
78414+{
78415+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78416+ if (grsec_enable_mount && (retval >= 0))
78417+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
78418+#endif
78419+ return;
78420+}
78421+
78422+void
78423+gr_log_mount(const char *from, struct path *to, const int retval)
78424+{
78425+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78426+ if (grsec_enable_mount && (retval >= 0))
78427+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
78428+#endif
78429+ return;
78430+}
78431+
78432+int
78433+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
78434+{
78435+#ifdef CONFIG_GRKERNSEC_ROFS
78436+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
78437+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
78438+ return -EPERM;
78439+ } else
78440+ return 0;
78441+#endif
78442+ return 0;
78443+}
78444+
78445+int
78446+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
78447+{
78448+#ifdef CONFIG_GRKERNSEC_ROFS
78449+ struct inode *inode = dentry->d_inode;
78450+
78451+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
78452+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
78453+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
78454+ return -EPERM;
78455+ } else
78456+ return 0;
78457+#endif
78458+ return 0;
78459+}
78460diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
78461new file mode 100644
78462index 0000000..6ee9d50
78463--- /dev/null
78464+++ b/grsecurity/grsec_pax.c
78465@@ -0,0 +1,45 @@
78466+#include <linux/kernel.h>
78467+#include <linux/sched.h>
78468+#include <linux/mm.h>
78469+#include <linux/file.h>
78470+#include <linux/grinternal.h>
78471+#include <linux/grsecurity.h>
78472+
78473+void
78474+gr_log_textrel(struct vm_area_struct * vma)
78475+{
78476+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78477+ if (grsec_enable_log_rwxmaps)
78478+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
78479+#endif
78480+ return;
78481+}
78482+
78483+void gr_log_ptgnustack(struct file *file)
78484+{
78485+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78486+ if (grsec_enable_log_rwxmaps)
78487+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
78488+#endif
78489+ return;
78490+}
78491+
78492+void
78493+gr_log_rwxmmap(struct file *file)
78494+{
78495+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78496+ if (grsec_enable_log_rwxmaps)
78497+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
78498+#endif
78499+ return;
78500+}
78501+
78502+void
78503+gr_log_rwxmprotect(struct vm_area_struct *vma)
78504+{
78505+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78506+ if (grsec_enable_log_rwxmaps)
78507+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
78508+#endif
78509+ return;
78510+}
78511diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
78512new file mode 100644
78513index 0000000..2005a3a
78514--- /dev/null
78515+++ b/grsecurity/grsec_proc.c
78516@@ -0,0 +1,20 @@
78517+#include <linux/kernel.h>
78518+#include <linux/sched.h>
78519+#include <linux/grsecurity.h>
78520+#include <linux/grinternal.h>
78521+
78522+int gr_proc_is_restricted(void)
78523+{
78524+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78525+ const struct cred *cred = current_cred();
78526+#endif
78527+
78528+#ifdef CONFIG_GRKERNSEC_PROC_USER
78529+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
78530+ return -EACCES;
78531+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78532+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
78533+ return -EACCES;
78534+#endif
78535+ return 0;
78536+}
78537diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
78538new file mode 100644
78539index 0000000..f7f29aa
78540--- /dev/null
78541+++ b/grsecurity/grsec_ptrace.c
78542@@ -0,0 +1,30 @@
78543+#include <linux/kernel.h>
78544+#include <linux/sched.h>
78545+#include <linux/grinternal.h>
78546+#include <linux/security.h>
78547+
78548+void
78549+gr_audit_ptrace(struct task_struct *task)
78550+{
78551+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78552+ if (grsec_enable_audit_ptrace)
78553+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
78554+#endif
78555+ return;
78556+}
78557+
78558+int
78559+gr_ptrace_readexec(struct file *file, int unsafe_flags)
78560+{
78561+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78562+ const struct dentry *dentry = file->f_path.dentry;
78563+ const struct vfsmount *mnt = file->f_path.mnt;
78564+
78565+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
78566+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
78567+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
78568+ return -EACCES;
78569+ }
78570+#endif
78571+ return 0;
78572+}
78573diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
78574new file mode 100644
78575index 0000000..3860c7e
78576--- /dev/null
78577+++ b/grsecurity/grsec_sig.c
78578@@ -0,0 +1,236 @@
78579+#include <linux/kernel.h>
78580+#include <linux/sched.h>
78581+#include <linux/fs.h>
78582+#include <linux/delay.h>
78583+#include <linux/grsecurity.h>
78584+#include <linux/grinternal.h>
78585+#include <linux/hardirq.h>
78586+
78587+char *signames[] = {
78588+ [SIGSEGV] = "Segmentation fault",
78589+ [SIGILL] = "Illegal instruction",
78590+ [SIGABRT] = "Abort",
78591+ [SIGBUS] = "Invalid alignment/Bus error"
78592+};
78593+
78594+void
78595+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
78596+{
78597+#ifdef CONFIG_GRKERNSEC_SIGNAL
78598+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
78599+ (sig == SIGABRT) || (sig == SIGBUS))) {
78600+ if (task_pid_nr(t) == task_pid_nr(current)) {
78601+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
78602+ } else {
78603+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
78604+ }
78605+ }
78606+#endif
78607+ return;
78608+}
78609+
78610+int
78611+gr_handle_signal(const struct task_struct *p, const int sig)
78612+{
78613+#ifdef CONFIG_GRKERNSEC
78614+ /* ignore the 0 signal for protected task checks */
78615+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
78616+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
78617+ return -EPERM;
78618+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
78619+ return -EPERM;
78620+ }
78621+#endif
78622+ return 0;
78623+}
78624+
78625+#ifdef CONFIG_GRKERNSEC
78626+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
78627+
78628+int gr_fake_force_sig(int sig, struct task_struct *t)
78629+{
78630+ unsigned long int flags;
78631+ int ret, blocked, ignored;
78632+ struct k_sigaction *action;
78633+
78634+ spin_lock_irqsave(&t->sighand->siglock, flags);
78635+ action = &t->sighand->action[sig-1];
78636+ ignored = action->sa.sa_handler == SIG_IGN;
78637+ blocked = sigismember(&t->blocked, sig);
78638+ if (blocked || ignored) {
78639+ action->sa.sa_handler = SIG_DFL;
78640+ if (blocked) {
78641+ sigdelset(&t->blocked, sig);
78642+ recalc_sigpending_and_wake(t);
78643+ }
78644+ }
78645+ if (action->sa.sa_handler == SIG_DFL)
78646+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
78647+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
78648+
78649+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
78650+
78651+ return ret;
78652+}
78653+#endif
78654+
78655+#define GR_USER_BAN_TIME (15 * 60)
78656+#define GR_DAEMON_BRUTE_TIME (30 * 60)
78657+
78658+void gr_handle_brute_attach(int dumpable)
78659+{
78660+#ifdef CONFIG_GRKERNSEC_BRUTE
78661+ struct task_struct *p = current;
78662+ kuid_t uid = GLOBAL_ROOT_UID;
78663+ int daemon = 0;
78664+
78665+ if (!grsec_enable_brute)
78666+ return;
78667+
78668+ rcu_read_lock();
78669+ read_lock(&tasklist_lock);
78670+ read_lock(&grsec_exec_file_lock);
78671+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
78672+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
78673+ p->real_parent->brute = 1;
78674+ daemon = 1;
78675+ } else {
78676+ const struct cred *cred = __task_cred(p), *cred2;
78677+ struct task_struct *tsk, *tsk2;
78678+
78679+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
78680+ struct user_struct *user;
78681+
78682+ uid = cred->uid;
78683+
78684+ /* this is put upon execution past expiration */
78685+ user = find_user(uid);
78686+ if (user == NULL)
78687+ goto unlock;
78688+ user->suid_banned = 1;
78689+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
78690+ if (user->suid_ban_expires == ~0UL)
78691+ user->suid_ban_expires--;
78692+
78693+ /* only kill other threads of the same binary, from the same user */
78694+ do_each_thread(tsk2, tsk) {
78695+ cred2 = __task_cred(tsk);
78696+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
78697+ gr_fake_force_sig(SIGKILL, tsk);
78698+ } while_each_thread(tsk2, tsk);
78699+ }
78700+ }
78701+unlock:
78702+ read_unlock(&grsec_exec_file_lock);
78703+ read_unlock(&tasklist_lock);
78704+ rcu_read_unlock();
78705+
78706+ if (gr_is_global_nonroot(uid))
78707+ 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);
78708+ else if (daemon)
78709+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
78710+
78711+#endif
78712+ return;
78713+}
78714+
78715+void gr_handle_brute_check(void)
78716+{
78717+#ifdef CONFIG_GRKERNSEC_BRUTE
78718+ struct task_struct *p = current;
78719+
78720+ if (unlikely(p->brute)) {
78721+ if (!grsec_enable_brute)
78722+ p->brute = 0;
78723+ else if (time_before(get_seconds(), p->brute_expires))
78724+ msleep(30 * 1000);
78725+ }
78726+#endif
78727+ return;
78728+}
78729+
78730+void gr_handle_kernel_exploit(void)
78731+{
78732+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78733+ const struct cred *cred;
78734+ struct task_struct *tsk, *tsk2;
78735+ struct user_struct *user;
78736+ kuid_t uid;
78737+
78738+ if (in_irq() || in_serving_softirq() || in_nmi())
78739+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
78740+
78741+ uid = current_uid();
78742+
78743+ if (gr_is_global_root(uid))
78744+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
78745+ else {
78746+ /* kill all the processes of this user, hold a reference
78747+ to their creds struct, and prevent them from creating
78748+ another process until system reset
78749+ */
78750+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
78751+ GR_GLOBAL_UID(uid));
78752+ /* we intentionally leak this ref */
78753+ user = get_uid(current->cred->user);
78754+ if (user)
78755+ user->kernel_banned = 1;
78756+
78757+ /* kill all processes of this user */
78758+ read_lock(&tasklist_lock);
78759+ do_each_thread(tsk2, tsk) {
78760+ cred = __task_cred(tsk);
78761+ if (uid_eq(cred->uid, uid))
78762+ gr_fake_force_sig(SIGKILL, tsk);
78763+ } while_each_thread(tsk2, tsk);
78764+ read_unlock(&tasklist_lock);
78765+ }
78766+#endif
78767+}
78768+
78769+#ifdef CONFIG_GRKERNSEC_BRUTE
78770+static bool suid_ban_expired(struct user_struct *user)
78771+{
78772+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
78773+ user->suid_banned = 0;
78774+ user->suid_ban_expires = 0;
78775+ free_uid(user);
78776+ return true;
78777+ }
78778+
78779+ return false;
78780+}
78781+#endif
78782+
78783+int gr_process_kernel_exec_ban(void)
78784+{
78785+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78786+ if (unlikely(current->cred->user->kernel_banned))
78787+ return -EPERM;
78788+#endif
78789+ return 0;
78790+}
78791+
78792+int gr_process_kernel_setuid_ban(struct user_struct *user)
78793+{
78794+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78795+ if (unlikely(user->kernel_banned))
78796+ gr_fake_force_sig(SIGKILL, current);
78797+#endif
78798+ return 0;
78799+}
78800+
78801+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78802+{
78803+#ifdef CONFIG_GRKERNSEC_BRUTE
78804+ struct user_struct *user = current->cred->user;
78805+ if (unlikely(user->suid_banned)) {
78806+ if (suid_ban_expired(user))
78807+ return 0;
78808+ /* disallow execution of suid binaries only */
78809+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78810+ return -EPERM;
78811+ }
78812+#endif
78813+ return 0;
78814+}
78815diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78816new file mode 100644
78817index 0000000..e3650b6
78818--- /dev/null
78819+++ b/grsecurity/grsec_sock.c
78820@@ -0,0 +1,244 @@
78821+#include <linux/kernel.h>
78822+#include <linux/module.h>
78823+#include <linux/sched.h>
78824+#include <linux/file.h>
78825+#include <linux/net.h>
78826+#include <linux/in.h>
78827+#include <linux/ip.h>
78828+#include <net/sock.h>
78829+#include <net/inet_sock.h>
78830+#include <linux/grsecurity.h>
78831+#include <linux/grinternal.h>
78832+#include <linux/gracl.h>
78833+
78834+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78835+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78836+
78837+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78838+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78839+
78840+#ifdef CONFIG_UNIX_MODULE
78841+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78842+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78843+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78844+EXPORT_SYMBOL_GPL(gr_handle_create);
78845+#endif
78846+
78847+#ifdef CONFIG_GRKERNSEC
78848+#define gr_conn_table_size 32749
78849+struct conn_table_entry {
78850+ struct conn_table_entry *next;
78851+ struct signal_struct *sig;
78852+};
78853+
78854+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78855+DEFINE_SPINLOCK(gr_conn_table_lock);
78856+
78857+extern const char * gr_socktype_to_name(unsigned char type);
78858+extern const char * gr_proto_to_name(unsigned char proto);
78859+extern const char * gr_sockfamily_to_name(unsigned char family);
78860+
78861+static __inline__ int
78862+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78863+{
78864+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78865+}
78866+
78867+static __inline__ int
78868+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78869+ __u16 sport, __u16 dport)
78870+{
78871+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78872+ sig->gr_sport == sport && sig->gr_dport == dport))
78873+ return 1;
78874+ else
78875+ return 0;
78876+}
78877+
78878+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78879+{
78880+ struct conn_table_entry **match;
78881+ unsigned int index;
78882+
78883+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78884+ sig->gr_sport, sig->gr_dport,
78885+ gr_conn_table_size);
78886+
78887+ newent->sig = sig;
78888+
78889+ match = &gr_conn_table[index];
78890+ newent->next = *match;
78891+ *match = newent;
78892+
78893+ return;
78894+}
78895+
78896+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78897+{
78898+ struct conn_table_entry *match, *last = NULL;
78899+ unsigned int index;
78900+
78901+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78902+ sig->gr_sport, sig->gr_dport,
78903+ gr_conn_table_size);
78904+
78905+ match = gr_conn_table[index];
78906+ while (match && !conn_match(match->sig,
78907+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78908+ sig->gr_dport)) {
78909+ last = match;
78910+ match = match->next;
78911+ }
78912+
78913+ if (match) {
78914+ if (last)
78915+ last->next = match->next;
78916+ else
78917+ gr_conn_table[index] = NULL;
78918+ kfree(match);
78919+ }
78920+
78921+ return;
78922+}
78923+
78924+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78925+ __u16 sport, __u16 dport)
78926+{
78927+ struct conn_table_entry *match;
78928+ unsigned int index;
78929+
78930+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78931+
78932+ match = gr_conn_table[index];
78933+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78934+ match = match->next;
78935+
78936+ if (match)
78937+ return match->sig;
78938+ else
78939+ return NULL;
78940+}
78941+
78942+#endif
78943+
78944+void gr_update_task_in_ip_table(const struct inet_sock *inet)
78945+{
78946+#ifdef CONFIG_GRKERNSEC
78947+ struct signal_struct *sig = current->signal;
78948+ struct conn_table_entry *newent;
78949+
78950+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78951+ if (newent == NULL)
78952+ return;
78953+ /* no bh lock needed since we are called with bh disabled */
78954+ spin_lock(&gr_conn_table_lock);
78955+ gr_del_task_from_ip_table_nolock(sig);
78956+ sig->gr_saddr = inet->inet_rcv_saddr;
78957+ sig->gr_daddr = inet->inet_daddr;
78958+ sig->gr_sport = inet->inet_sport;
78959+ sig->gr_dport = inet->inet_dport;
78960+ gr_add_to_task_ip_table_nolock(sig, newent);
78961+ spin_unlock(&gr_conn_table_lock);
78962+#endif
78963+ return;
78964+}
78965+
78966+void gr_del_task_from_ip_table(struct task_struct *task)
78967+{
78968+#ifdef CONFIG_GRKERNSEC
78969+ spin_lock_bh(&gr_conn_table_lock);
78970+ gr_del_task_from_ip_table_nolock(task->signal);
78971+ spin_unlock_bh(&gr_conn_table_lock);
78972+#endif
78973+ return;
78974+}
78975+
78976+void
78977+gr_attach_curr_ip(const struct sock *sk)
78978+{
78979+#ifdef CONFIG_GRKERNSEC
78980+ struct signal_struct *p, *set;
78981+ const struct inet_sock *inet = inet_sk(sk);
78982+
78983+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78984+ return;
78985+
78986+ set = current->signal;
78987+
78988+ spin_lock_bh(&gr_conn_table_lock);
78989+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78990+ inet->inet_dport, inet->inet_sport);
78991+ if (unlikely(p != NULL)) {
78992+ set->curr_ip = p->curr_ip;
78993+ set->used_accept = 1;
78994+ gr_del_task_from_ip_table_nolock(p);
78995+ spin_unlock_bh(&gr_conn_table_lock);
78996+ return;
78997+ }
78998+ spin_unlock_bh(&gr_conn_table_lock);
78999+
79000+ set->curr_ip = inet->inet_daddr;
79001+ set->used_accept = 1;
79002+#endif
79003+ return;
79004+}
79005+
79006+int
79007+gr_handle_sock_all(const int family, const int type, const int protocol)
79008+{
79009+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79010+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
79011+ (family != AF_UNIX)) {
79012+ if (family == AF_INET)
79013+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
79014+ else
79015+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
79016+ return -EACCES;
79017+ }
79018+#endif
79019+ return 0;
79020+}
79021+
79022+int
79023+gr_handle_sock_server(const struct sockaddr *sck)
79024+{
79025+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79026+ if (grsec_enable_socket_server &&
79027+ in_group_p(grsec_socket_server_gid) &&
79028+ sck && (sck->sa_family != AF_UNIX) &&
79029+ (sck->sa_family != AF_LOCAL)) {
79030+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79031+ return -EACCES;
79032+ }
79033+#endif
79034+ return 0;
79035+}
79036+
79037+int
79038+gr_handle_sock_server_other(const struct sock *sck)
79039+{
79040+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79041+ if (grsec_enable_socket_server &&
79042+ in_group_p(grsec_socket_server_gid) &&
79043+ sck && (sck->sk_family != AF_UNIX) &&
79044+ (sck->sk_family != AF_LOCAL)) {
79045+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79046+ return -EACCES;
79047+ }
79048+#endif
79049+ return 0;
79050+}
79051+
79052+int
79053+gr_handle_sock_client(const struct sockaddr *sck)
79054+{
79055+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
79056+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
79057+ sck && (sck->sa_family != AF_UNIX) &&
79058+ (sck->sa_family != AF_LOCAL)) {
79059+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
79060+ return -EACCES;
79061+ }
79062+#endif
79063+ return 0;
79064+}
79065diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
79066new file mode 100644
79067index 0000000..cce889e
79068--- /dev/null
79069+++ b/grsecurity/grsec_sysctl.c
79070@@ -0,0 +1,488 @@
79071+#include <linux/kernel.h>
79072+#include <linux/sched.h>
79073+#include <linux/sysctl.h>
79074+#include <linux/grsecurity.h>
79075+#include <linux/grinternal.h>
79076+
79077+int
79078+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
79079+{
79080+#ifdef CONFIG_GRKERNSEC_SYSCTL
79081+ if (dirname == NULL || name == NULL)
79082+ return 0;
79083+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
79084+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
79085+ return -EACCES;
79086+ }
79087+#endif
79088+ return 0;
79089+}
79090+
79091+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
79092+static int __maybe_unused __read_only one = 1;
79093+#endif
79094+
79095+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
79096+ defined(CONFIG_GRKERNSEC_DENYUSB)
79097+struct ctl_table grsecurity_table[] = {
79098+#ifdef CONFIG_GRKERNSEC_SYSCTL
79099+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
79100+#ifdef CONFIG_GRKERNSEC_IO
79101+ {
79102+ .procname = "disable_priv_io",
79103+ .data = &grsec_disable_privio,
79104+ .maxlen = sizeof(int),
79105+ .mode = 0600,
79106+ .proc_handler = &proc_dointvec,
79107+ },
79108+#endif
79109+#endif
79110+#ifdef CONFIG_GRKERNSEC_LINK
79111+ {
79112+ .procname = "linking_restrictions",
79113+ .data = &grsec_enable_link,
79114+ .maxlen = sizeof(int),
79115+ .mode = 0600,
79116+ .proc_handler = &proc_dointvec,
79117+ },
79118+#endif
79119+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
79120+ {
79121+ .procname = "enforce_symlinksifowner",
79122+ .data = &grsec_enable_symlinkown,
79123+ .maxlen = sizeof(int),
79124+ .mode = 0600,
79125+ .proc_handler = &proc_dointvec,
79126+ },
79127+ {
79128+ .procname = "symlinkown_gid",
79129+ .data = &grsec_symlinkown_gid,
79130+ .maxlen = sizeof(int),
79131+ .mode = 0600,
79132+ .proc_handler = &proc_dointvec,
79133+ },
79134+#endif
79135+#ifdef CONFIG_GRKERNSEC_BRUTE
79136+ {
79137+ .procname = "deter_bruteforce",
79138+ .data = &grsec_enable_brute,
79139+ .maxlen = sizeof(int),
79140+ .mode = 0600,
79141+ .proc_handler = &proc_dointvec,
79142+ },
79143+#endif
79144+#ifdef CONFIG_GRKERNSEC_FIFO
79145+ {
79146+ .procname = "fifo_restrictions",
79147+ .data = &grsec_enable_fifo,
79148+ .maxlen = sizeof(int),
79149+ .mode = 0600,
79150+ .proc_handler = &proc_dointvec,
79151+ },
79152+#endif
79153+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
79154+ {
79155+ .procname = "ptrace_readexec",
79156+ .data = &grsec_enable_ptrace_readexec,
79157+ .maxlen = sizeof(int),
79158+ .mode = 0600,
79159+ .proc_handler = &proc_dointvec,
79160+ },
79161+#endif
79162+#ifdef CONFIG_GRKERNSEC_SETXID
79163+ {
79164+ .procname = "consistent_setxid",
79165+ .data = &grsec_enable_setxid,
79166+ .maxlen = sizeof(int),
79167+ .mode = 0600,
79168+ .proc_handler = &proc_dointvec,
79169+ },
79170+#endif
79171+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
79172+ {
79173+ .procname = "ip_blackhole",
79174+ .data = &grsec_enable_blackhole,
79175+ .maxlen = sizeof(int),
79176+ .mode = 0600,
79177+ .proc_handler = &proc_dointvec,
79178+ },
79179+ {
79180+ .procname = "lastack_retries",
79181+ .data = &grsec_lastack_retries,
79182+ .maxlen = sizeof(int),
79183+ .mode = 0600,
79184+ .proc_handler = &proc_dointvec,
79185+ },
79186+#endif
79187+#ifdef CONFIG_GRKERNSEC_EXECLOG
79188+ {
79189+ .procname = "exec_logging",
79190+ .data = &grsec_enable_execlog,
79191+ .maxlen = sizeof(int),
79192+ .mode = 0600,
79193+ .proc_handler = &proc_dointvec,
79194+ },
79195+#endif
79196+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79197+ {
79198+ .procname = "rwxmap_logging",
79199+ .data = &grsec_enable_log_rwxmaps,
79200+ .maxlen = sizeof(int),
79201+ .mode = 0600,
79202+ .proc_handler = &proc_dointvec,
79203+ },
79204+#endif
79205+#ifdef CONFIG_GRKERNSEC_SIGNAL
79206+ {
79207+ .procname = "signal_logging",
79208+ .data = &grsec_enable_signal,
79209+ .maxlen = sizeof(int),
79210+ .mode = 0600,
79211+ .proc_handler = &proc_dointvec,
79212+ },
79213+#endif
79214+#ifdef CONFIG_GRKERNSEC_FORKFAIL
79215+ {
79216+ .procname = "forkfail_logging",
79217+ .data = &grsec_enable_forkfail,
79218+ .maxlen = sizeof(int),
79219+ .mode = 0600,
79220+ .proc_handler = &proc_dointvec,
79221+ },
79222+#endif
79223+#ifdef CONFIG_GRKERNSEC_TIME
79224+ {
79225+ .procname = "timechange_logging",
79226+ .data = &grsec_enable_time,
79227+ .maxlen = sizeof(int),
79228+ .mode = 0600,
79229+ .proc_handler = &proc_dointvec,
79230+ },
79231+#endif
79232+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
79233+ {
79234+ .procname = "chroot_deny_shmat",
79235+ .data = &grsec_enable_chroot_shmat,
79236+ .maxlen = sizeof(int),
79237+ .mode = 0600,
79238+ .proc_handler = &proc_dointvec,
79239+ },
79240+#endif
79241+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
79242+ {
79243+ .procname = "chroot_deny_unix",
79244+ .data = &grsec_enable_chroot_unix,
79245+ .maxlen = sizeof(int),
79246+ .mode = 0600,
79247+ .proc_handler = &proc_dointvec,
79248+ },
79249+#endif
79250+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
79251+ {
79252+ .procname = "chroot_deny_mount",
79253+ .data = &grsec_enable_chroot_mount,
79254+ .maxlen = sizeof(int),
79255+ .mode = 0600,
79256+ .proc_handler = &proc_dointvec,
79257+ },
79258+#endif
79259+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
79260+ {
79261+ .procname = "chroot_deny_fchdir",
79262+ .data = &grsec_enable_chroot_fchdir,
79263+ .maxlen = sizeof(int),
79264+ .mode = 0600,
79265+ .proc_handler = &proc_dointvec,
79266+ },
79267+#endif
79268+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
79269+ {
79270+ .procname = "chroot_deny_chroot",
79271+ .data = &grsec_enable_chroot_double,
79272+ .maxlen = sizeof(int),
79273+ .mode = 0600,
79274+ .proc_handler = &proc_dointvec,
79275+ },
79276+#endif
79277+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
79278+ {
79279+ .procname = "chroot_deny_pivot",
79280+ .data = &grsec_enable_chroot_pivot,
79281+ .maxlen = sizeof(int),
79282+ .mode = 0600,
79283+ .proc_handler = &proc_dointvec,
79284+ },
79285+#endif
79286+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
79287+ {
79288+ .procname = "chroot_enforce_chdir",
79289+ .data = &grsec_enable_chroot_chdir,
79290+ .maxlen = sizeof(int),
79291+ .mode = 0600,
79292+ .proc_handler = &proc_dointvec,
79293+ },
79294+#endif
79295+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
79296+ {
79297+ .procname = "chroot_deny_chmod",
79298+ .data = &grsec_enable_chroot_chmod,
79299+ .maxlen = sizeof(int),
79300+ .mode = 0600,
79301+ .proc_handler = &proc_dointvec,
79302+ },
79303+#endif
79304+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
79305+ {
79306+ .procname = "chroot_deny_mknod",
79307+ .data = &grsec_enable_chroot_mknod,
79308+ .maxlen = sizeof(int),
79309+ .mode = 0600,
79310+ .proc_handler = &proc_dointvec,
79311+ },
79312+#endif
79313+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
79314+ {
79315+ .procname = "chroot_restrict_nice",
79316+ .data = &grsec_enable_chroot_nice,
79317+ .maxlen = sizeof(int),
79318+ .mode = 0600,
79319+ .proc_handler = &proc_dointvec,
79320+ },
79321+#endif
79322+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
79323+ {
79324+ .procname = "chroot_execlog",
79325+ .data = &grsec_enable_chroot_execlog,
79326+ .maxlen = sizeof(int),
79327+ .mode = 0600,
79328+ .proc_handler = &proc_dointvec,
79329+ },
79330+#endif
79331+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
79332+ {
79333+ .procname = "chroot_caps",
79334+ .data = &grsec_enable_chroot_caps,
79335+ .maxlen = sizeof(int),
79336+ .mode = 0600,
79337+ .proc_handler = &proc_dointvec,
79338+ },
79339+#endif
79340+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
79341+ {
79342+ .procname = "chroot_deny_bad_rename",
79343+ .data = &grsec_enable_chroot_rename,
79344+ .maxlen = sizeof(int),
79345+ .mode = 0600,
79346+ .proc_handler = &proc_dointvec,
79347+ },
79348+#endif
79349+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
79350+ {
79351+ .procname = "chroot_deny_sysctl",
79352+ .data = &grsec_enable_chroot_sysctl,
79353+ .maxlen = sizeof(int),
79354+ .mode = 0600,
79355+ .proc_handler = &proc_dointvec,
79356+ },
79357+#endif
79358+#ifdef CONFIG_GRKERNSEC_TPE
79359+ {
79360+ .procname = "tpe",
79361+ .data = &grsec_enable_tpe,
79362+ .maxlen = sizeof(int),
79363+ .mode = 0600,
79364+ .proc_handler = &proc_dointvec,
79365+ },
79366+ {
79367+ .procname = "tpe_gid",
79368+ .data = &grsec_tpe_gid,
79369+ .maxlen = sizeof(int),
79370+ .mode = 0600,
79371+ .proc_handler = &proc_dointvec,
79372+ },
79373+#endif
79374+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79375+ {
79376+ .procname = "tpe_invert",
79377+ .data = &grsec_enable_tpe_invert,
79378+ .maxlen = sizeof(int),
79379+ .mode = 0600,
79380+ .proc_handler = &proc_dointvec,
79381+ },
79382+#endif
79383+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79384+ {
79385+ .procname = "tpe_restrict_all",
79386+ .data = &grsec_enable_tpe_all,
79387+ .maxlen = sizeof(int),
79388+ .mode = 0600,
79389+ .proc_handler = &proc_dointvec,
79390+ },
79391+#endif
79392+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79393+ {
79394+ .procname = "socket_all",
79395+ .data = &grsec_enable_socket_all,
79396+ .maxlen = sizeof(int),
79397+ .mode = 0600,
79398+ .proc_handler = &proc_dointvec,
79399+ },
79400+ {
79401+ .procname = "socket_all_gid",
79402+ .data = &grsec_socket_all_gid,
79403+ .maxlen = sizeof(int),
79404+ .mode = 0600,
79405+ .proc_handler = &proc_dointvec,
79406+ },
79407+#endif
79408+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
79409+ {
79410+ .procname = "socket_client",
79411+ .data = &grsec_enable_socket_client,
79412+ .maxlen = sizeof(int),
79413+ .mode = 0600,
79414+ .proc_handler = &proc_dointvec,
79415+ },
79416+ {
79417+ .procname = "socket_client_gid",
79418+ .data = &grsec_socket_client_gid,
79419+ .maxlen = sizeof(int),
79420+ .mode = 0600,
79421+ .proc_handler = &proc_dointvec,
79422+ },
79423+#endif
79424+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79425+ {
79426+ .procname = "socket_server",
79427+ .data = &grsec_enable_socket_server,
79428+ .maxlen = sizeof(int),
79429+ .mode = 0600,
79430+ .proc_handler = &proc_dointvec,
79431+ },
79432+ {
79433+ .procname = "socket_server_gid",
79434+ .data = &grsec_socket_server_gid,
79435+ .maxlen = sizeof(int),
79436+ .mode = 0600,
79437+ .proc_handler = &proc_dointvec,
79438+ },
79439+#endif
79440+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
79441+ {
79442+ .procname = "audit_group",
79443+ .data = &grsec_enable_group,
79444+ .maxlen = sizeof(int),
79445+ .mode = 0600,
79446+ .proc_handler = &proc_dointvec,
79447+ },
79448+ {
79449+ .procname = "audit_gid",
79450+ .data = &grsec_audit_gid,
79451+ .maxlen = sizeof(int),
79452+ .mode = 0600,
79453+ .proc_handler = &proc_dointvec,
79454+ },
79455+#endif
79456+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
79457+ {
79458+ .procname = "audit_chdir",
79459+ .data = &grsec_enable_chdir,
79460+ .maxlen = sizeof(int),
79461+ .mode = 0600,
79462+ .proc_handler = &proc_dointvec,
79463+ },
79464+#endif
79465+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
79466+ {
79467+ .procname = "audit_mount",
79468+ .data = &grsec_enable_mount,
79469+ .maxlen = sizeof(int),
79470+ .mode = 0600,
79471+ .proc_handler = &proc_dointvec,
79472+ },
79473+#endif
79474+#ifdef CONFIG_GRKERNSEC_DMESG
79475+ {
79476+ .procname = "dmesg",
79477+ .data = &grsec_enable_dmesg,
79478+ .maxlen = sizeof(int),
79479+ .mode = 0600,
79480+ .proc_handler = &proc_dointvec,
79481+ },
79482+#endif
79483+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
79484+ {
79485+ .procname = "chroot_findtask",
79486+ .data = &grsec_enable_chroot_findtask,
79487+ .maxlen = sizeof(int),
79488+ .mode = 0600,
79489+ .proc_handler = &proc_dointvec,
79490+ },
79491+#endif
79492+#ifdef CONFIG_GRKERNSEC_RESLOG
79493+ {
79494+ .procname = "resource_logging",
79495+ .data = &grsec_resource_logging,
79496+ .maxlen = sizeof(int),
79497+ .mode = 0600,
79498+ .proc_handler = &proc_dointvec,
79499+ },
79500+#endif
79501+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
79502+ {
79503+ .procname = "audit_ptrace",
79504+ .data = &grsec_enable_audit_ptrace,
79505+ .maxlen = sizeof(int),
79506+ .mode = 0600,
79507+ .proc_handler = &proc_dointvec,
79508+ },
79509+#endif
79510+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79511+ {
79512+ .procname = "harden_ptrace",
79513+ .data = &grsec_enable_harden_ptrace,
79514+ .maxlen = sizeof(int),
79515+ .mode = 0600,
79516+ .proc_handler = &proc_dointvec,
79517+ },
79518+#endif
79519+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
79520+ {
79521+ .procname = "harden_ipc",
79522+ .data = &grsec_enable_harden_ipc,
79523+ .maxlen = sizeof(int),
79524+ .mode = 0600,
79525+ .proc_handler = &proc_dointvec,
79526+ },
79527+#endif
79528+ {
79529+ .procname = "grsec_lock",
79530+ .data = &grsec_lock,
79531+ .maxlen = sizeof(int),
79532+ .mode = 0600,
79533+ .proc_handler = &proc_dointvec,
79534+ },
79535+#endif
79536+#ifdef CONFIG_GRKERNSEC_ROFS
79537+ {
79538+ .procname = "romount_protect",
79539+ .data = &grsec_enable_rofs,
79540+ .maxlen = sizeof(int),
79541+ .mode = 0600,
79542+ .proc_handler = &proc_dointvec_minmax,
79543+ .extra1 = &one,
79544+ .extra2 = &one,
79545+ },
79546+#endif
79547+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
79548+ {
79549+ .procname = "deny_new_usb",
79550+ .data = &grsec_deny_new_usb,
79551+ .maxlen = sizeof(int),
79552+ .mode = 0600,
79553+ .proc_handler = &proc_dointvec,
79554+ },
79555+#endif
79556+ { }
79557+};
79558+#endif
79559diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
79560new file mode 100644
79561index 0000000..61b514e
79562--- /dev/null
79563+++ b/grsecurity/grsec_time.c
79564@@ -0,0 +1,16 @@
79565+#include <linux/kernel.h>
79566+#include <linux/sched.h>
79567+#include <linux/grinternal.h>
79568+#include <linux/module.h>
79569+
79570+void
79571+gr_log_timechange(void)
79572+{
79573+#ifdef CONFIG_GRKERNSEC_TIME
79574+ if (grsec_enable_time)
79575+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
79576+#endif
79577+ return;
79578+}
79579+
79580+EXPORT_SYMBOL_GPL(gr_log_timechange);
79581diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
79582new file mode 100644
79583index 0000000..d1953de
79584--- /dev/null
79585+++ b/grsecurity/grsec_tpe.c
79586@@ -0,0 +1,78 @@
79587+#include <linux/kernel.h>
79588+#include <linux/sched.h>
79589+#include <linux/file.h>
79590+#include <linux/fs.h>
79591+#include <linux/grinternal.h>
79592+
79593+extern int gr_acl_tpe_check(void);
79594+
79595+int
79596+gr_tpe_allow(const struct file *file)
79597+{
79598+#ifdef CONFIG_GRKERNSEC
79599+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
79600+ struct inode *file_inode = file->f_path.dentry->d_inode;
79601+ const struct cred *cred = current_cred();
79602+ char *msg = NULL;
79603+ char *msg2 = NULL;
79604+
79605+ // never restrict root
79606+ if (gr_is_global_root(cred->uid))
79607+ return 1;
79608+
79609+ if (grsec_enable_tpe) {
79610+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79611+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
79612+ msg = "not being in trusted group";
79613+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
79614+ msg = "being in untrusted group";
79615+#else
79616+ if (in_group_p(grsec_tpe_gid))
79617+ msg = "being in untrusted group";
79618+#endif
79619+ }
79620+ if (!msg && gr_acl_tpe_check())
79621+ msg = "being in untrusted role";
79622+
79623+ // not in any affected group/role
79624+ if (!msg)
79625+ goto next_check;
79626+
79627+ if (gr_is_global_nonroot(inode->i_uid))
79628+ msg2 = "file in non-root-owned directory";
79629+ else if (inode->i_mode & S_IWOTH)
79630+ msg2 = "file in world-writable directory";
79631+ else if (inode->i_mode & S_IWGRP)
79632+ msg2 = "file in group-writable directory";
79633+ else if (file_inode->i_mode & S_IWOTH)
79634+ msg2 = "file is world-writable";
79635+
79636+ if (msg && msg2) {
79637+ char fullmsg[70] = {0};
79638+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
79639+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
79640+ return 0;
79641+ }
79642+ msg = NULL;
79643+next_check:
79644+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79645+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
79646+ return 1;
79647+
79648+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
79649+ msg = "directory not owned by user";
79650+ else if (inode->i_mode & S_IWOTH)
79651+ msg = "file in world-writable directory";
79652+ else if (inode->i_mode & S_IWGRP)
79653+ msg = "file in group-writable directory";
79654+ else if (file_inode->i_mode & S_IWOTH)
79655+ msg = "file is world-writable";
79656+
79657+ if (msg) {
79658+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
79659+ return 0;
79660+ }
79661+#endif
79662+#endif
79663+ return 1;
79664+}
79665diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
79666new file mode 100644
79667index 0000000..ae02d8e
79668--- /dev/null
79669+++ b/grsecurity/grsec_usb.c
79670@@ -0,0 +1,15 @@
79671+#include <linux/kernel.h>
79672+#include <linux/grinternal.h>
79673+#include <linux/module.h>
79674+
79675+int gr_handle_new_usb(void)
79676+{
79677+#ifdef CONFIG_GRKERNSEC_DENYUSB
79678+ if (grsec_deny_new_usb) {
79679+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
79680+ return 1;
79681+ }
79682+#endif
79683+ return 0;
79684+}
79685+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
79686diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
79687new file mode 100644
79688index 0000000..158b330
79689--- /dev/null
79690+++ b/grsecurity/grsum.c
79691@@ -0,0 +1,64 @@
79692+#include <linux/err.h>
79693+#include <linux/kernel.h>
79694+#include <linux/sched.h>
79695+#include <linux/mm.h>
79696+#include <linux/scatterlist.h>
79697+#include <linux/crypto.h>
79698+#include <linux/gracl.h>
79699+
79700+
79701+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
79702+#error "crypto and sha256 must be built into the kernel"
79703+#endif
79704+
79705+int
79706+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
79707+{
79708+ struct crypto_hash *tfm;
79709+ struct hash_desc desc;
79710+ struct scatterlist sg[2];
79711+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
79712+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
79713+ unsigned long *sumptr = (unsigned long *)sum;
79714+ int cryptres;
79715+ int retval = 1;
79716+ volatile int mismatched = 0;
79717+ volatile int dummy = 0;
79718+ unsigned int i;
79719+
79720+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
79721+ if (IS_ERR(tfm)) {
79722+ /* should never happen, since sha256 should be built in */
79723+ memset(entry->pw, 0, GR_PW_LEN);
79724+ return 1;
79725+ }
79726+
79727+ sg_init_table(sg, 2);
79728+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
79729+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
79730+
79731+ desc.tfm = tfm;
79732+ desc.flags = 0;
79733+
79734+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
79735+ temp_sum);
79736+
79737+ memset(entry->pw, 0, GR_PW_LEN);
79738+
79739+ if (cryptres)
79740+ goto out;
79741+
79742+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
79743+ if (sumptr[i] != tmpsumptr[i])
79744+ mismatched = 1;
79745+ else
79746+ dummy = 1; // waste a cycle
79747+
79748+ if (!mismatched)
79749+ retval = dummy - 1;
79750+
79751+out:
79752+ crypto_free_hash(tfm);
79753+
79754+ return retval;
79755+}
79756diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
79757index 77ff547..181834f 100644
79758--- a/include/asm-generic/4level-fixup.h
79759+++ b/include/asm-generic/4level-fixup.h
79760@@ -13,8 +13,10 @@
79761 #define pmd_alloc(mm, pud, address) \
79762 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
79763 NULL: pmd_offset(pud, address))
79764+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
79765
79766 #define pud_alloc(mm, pgd, address) (pgd)
79767+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
79768 #define pud_offset(pgd, start) (pgd)
79769 #define pud_none(pud) 0
79770 #define pud_bad(pud) 0
79771diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
79772index b7babf0..1e4b4f1 100644
79773--- a/include/asm-generic/atomic-long.h
79774+++ b/include/asm-generic/atomic-long.h
79775@@ -22,6 +22,12 @@
79776
79777 typedef atomic64_t atomic_long_t;
79778
79779+#ifdef CONFIG_PAX_REFCOUNT
79780+typedef atomic64_unchecked_t atomic_long_unchecked_t;
79781+#else
79782+typedef atomic64_t atomic_long_unchecked_t;
79783+#endif
79784+
79785 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
79786
79787 static inline long atomic_long_read(atomic_long_t *l)
79788@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79789 return (long)atomic64_read(v);
79790 }
79791
79792+#ifdef CONFIG_PAX_REFCOUNT
79793+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79794+{
79795+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79796+
79797+ return (long)atomic64_read_unchecked(v);
79798+}
79799+#endif
79800+
79801 static inline void atomic_long_set(atomic_long_t *l, long i)
79802 {
79803 atomic64_t *v = (atomic64_t *)l;
79804@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79805 atomic64_set(v, i);
79806 }
79807
79808+#ifdef CONFIG_PAX_REFCOUNT
79809+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79810+{
79811+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79812+
79813+ atomic64_set_unchecked(v, i);
79814+}
79815+#endif
79816+
79817 static inline void atomic_long_inc(atomic_long_t *l)
79818 {
79819 atomic64_t *v = (atomic64_t *)l;
79820@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79821 atomic64_inc(v);
79822 }
79823
79824+#ifdef CONFIG_PAX_REFCOUNT
79825+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79826+{
79827+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79828+
79829+ atomic64_inc_unchecked(v);
79830+}
79831+#endif
79832+
79833 static inline void atomic_long_dec(atomic_long_t *l)
79834 {
79835 atomic64_t *v = (atomic64_t *)l;
79836@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79837 atomic64_dec(v);
79838 }
79839
79840+#ifdef CONFIG_PAX_REFCOUNT
79841+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79842+{
79843+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79844+
79845+ atomic64_dec_unchecked(v);
79846+}
79847+#endif
79848+
79849 static inline void atomic_long_add(long i, atomic_long_t *l)
79850 {
79851 atomic64_t *v = (atomic64_t *)l;
79852@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79853 atomic64_add(i, v);
79854 }
79855
79856+#ifdef CONFIG_PAX_REFCOUNT
79857+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79858+{
79859+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79860+
79861+ atomic64_add_unchecked(i, v);
79862+}
79863+#endif
79864+
79865 static inline void atomic_long_sub(long i, atomic_long_t *l)
79866 {
79867 atomic64_t *v = (atomic64_t *)l;
79868@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79869 atomic64_sub(i, v);
79870 }
79871
79872+#ifdef CONFIG_PAX_REFCOUNT
79873+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79874+{
79875+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79876+
79877+ atomic64_sub_unchecked(i, v);
79878+}
79879+#endif
79880+
79881 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79882 {
79883 atomic64_t *v = (atomic64_t *)l;
79884@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79885 return atomic64_add_negative(i, v);
79886 }
79887
79888-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79889+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79890 {
79891 atomic64_t *v = (atomic64_t *)l;
79892
79893 return (long)atomic64_add_return(i, v);
79894 }
79895
79896+#ifdef CONFIG_PAX_REFCOUNT
79897+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79898+{
79899+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79900+
79901+ return (long)atomic64_add_return_unchecked(i, v);
79902+}
79903+#endif
79904+
79905 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79906 {
79907 atomic64_t *v = (atomic64_t *)l;
79908@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79909 return (long)atomic64_inc_return(v);
79910 }
79911
79912+#ifdef CONFIG_PAX_REFCOUNT
79913+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79914+{
79915+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79916+
79917+ return (long)atomic64_inc_return_unchecked(v);
79918+}
79919+#endif
79920+
79921 static inline long atomic_long_dec_return(atomic_long_t *l)
79922 {
79923 atomic64_t *v = (atomic64_t *)l;
79924@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79925
79926 typedef atomic_t atomic_long_t;
79927
79928+#ifdef CONFIG_PAX_REFCOUNT
79929+typedef atomic_unchecked_t atomic_long_unchecked_t;
79930+#else
79931+typedef atomic_t atomic_long_unchecked_t;
79932+#endif
79933+
79934 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79935 static inline long atomic_long_read(atomic_long_t *l)
79936 {
79937@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79938 return (long)atomic_read(v);
79939 }
79940
79941+#ifdef CONFIG_PAX_REFCOUNT
79942+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79943+{
79944+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79945+
79946+ return (long)atomic_read_unchecked(v);
79947+}
79948+#endif
79949+
79950 static inline void atomic_long_set(atomic_long_t *l, long i)
79951 {
79952 atomic_t *v = (atomic_t *)l;
79953@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79954 atomic_set(v, i);
79955 }
79956
79957+#ifdef CONFIG_PAX_REFCOUNT
79958+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79959+{
79960+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79961+
79962+ atomic_set_unchecked(v, i);
79963+}
79964+#endif
79965+
79966 static inline void atomic_long_inc(atomic_long_t *l)
79967 {
79968 atomic_t *v = (atomic_t *)l;
79969@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79970 atomic_inc(v);
79971 }
79972
79973+#ifdef CONFIG_PAX_REFCOUNT
79974+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79975+{
79976+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79977+
79978+ atomic_inc_unchecked(v);
79979+}
79980+#endif
79981+
79982 static inline void atomic_long_dec(atomic_long_t *l)
79983 {
79984 atomic_t *v = (atomic_t *)l;
79985@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79986 atomic_dec(v);
79987 }
79988
79989+#ifdef CONFIG_PAX_REFCOUNT
79990+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79991+{
79992+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79993+
79994+ atomic_dec_unchecked(v);
79995+}
79996+#endif
79997+
79998 static inline void atomic_long_add(long i, atomic_long_t *l)
79999 {
80000 atomic_t *v = (atomic_t *)l;
80001@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
80002 atomic_add(i, v);
80003 }
80004
80005+#ifdef CONFIG_PAX_REFCOUNT
80006+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
80007+{
80008+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80009+
80010+ atomic_add_unchecked(i, v);
80011+}
80012+#endif
80013+
80014 static inline void atomic_long_sub(long i, atomic_long_t *l)
80015 {
80016 atomic_t *v = (atomic_t *)l;
80017@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
80018 atomic_sub(i, v);
80019 }
80020
80021+#ifdef CONFIG_PAX_REFCOUNT
80022+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
80023+{
80024+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80025+
80026+ atomic_sub_unchecked(i, v);
80027+}
80028+#endif
80029+
80030 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
80031 {
80032 atomic_t *v = (atomic_t *)l;
80033@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
80034 return atomic_add_negative(i, v);
80035 }
80036
80037-static inline long atomic_long_add_return(long i, atomic_long_t *l)
80038+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
80039 {
80040 atomic_t *v = (atomic_t *)l;
80041
80042 return (long)atomic_add_return(i, v);
80043 }
80044
80045+#ifdef CONFIG_PAX_REFCOUNT
80046+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
80047+{
80048+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80049+
80050+ return (long)atomic_add_return_unchecked(i, v);
80051+}
80052+
80053+#endif
80054+
80055 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
80056 {
80057 atomic_t *v = (atomic_t *)l;
80058@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
80059 return (long)atomic_inc_return(v);
80060 }
80061
80062+#ifdef CONFIG_PAX_REFCOUNT
80063+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
80064+{
80065+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80066+
80067+ return (long)atomic_inc_return_unchecked(v);
80068+}
80069+#endif
80070+
80071 static inline long atomic_long_dec_return(atomic_long_t *l)
80072 {
80073 atomic_t *v = (atomic_t *)l;
80074@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
80075
80076 #endif /* BITS_PER_LONG == 64 */
80077
80078+#ifdef CONFIG_PAX_REFCOUNT
80079+static inline void pax_refcount_needs_these_functions(void)
80080+{
80081+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
80082+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
80083+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
80084+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
80085+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
80086+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
80087+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
80088+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
80089+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
80090+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
80091+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
80092+#ifdef CONFIG_X86
80093+ atomic_clear_mask_unchecked(0, NULL);
80094+ atomic_set_mask_unchecked(0, NULL);
80095+#endif
80096+
80097+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
80098+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
80099+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
80100+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
80101+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
80102+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
80103+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
80104+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
80105+}
80106+#else
80107+#define atomic_read_unchecked(v) atomic_read(v)
80108+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
80109+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
80110+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
80111+#define atomic_inc_unchecked(v) atomic_inc(v)
80112+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
80113+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
80114+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
80115+#define atomic_dec_unchecked(v) atomic_dec(v)
80116+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
80117+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
80118+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
80119+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
80120+
80121+#define atomic_long_read_unchecked(v) atomic_long_read(v)
80122+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
80123+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
80124+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
80125+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
80126+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
80127+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
80128+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
80129+#endif
80130+
80131 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
80132diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
80133index 30ad9c8..c70c170 100644
80134--- a/include/asm-generic/atomic64.h
80135+++ b/include/asm-generic/atomic64.h
80136@@ -16,6 +16,8 @@ typedef struct {
80137 long long counter;
80138 } atomic64_t;
80139
80140+typedef atomic64_t atomic64_unchecked_t;
80141+
80142 #define ATOMIC64_INIT(i) { (i) }
80143
80144 extern long long atomic64_read(const atomic64_t *v);
80145@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
80146 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
80147 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
80148
80149+#define atomic64_read_unchecked(v) atomic64_read(v)
80150+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
80151+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
80152+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
80153+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
80154+#define atomic64_inc_unchecked(v) atomic64_inc(v)
80155+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
80156+#define atomic64_dec_unchecked(v) atomic64_dec(v)
80157+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
80158+
80159 #endif /* _ASM_GENERIC_ATOMIC64_H */
80160diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
80161index f5c40b0..e902f9d 100644
80162--- a/include/asm-generic/barrier.h
80163+++ b/include/asm-generic/barrier.h
80164@@ -82,7 +82,7 @@
80165 do { \
80166 compiletime_assert_atomic_type(*p); \
80167 smp_mb(); \
80168- ACCESS_ONCE(*p) = (v); \
80169+ ACCESS_ONCE_RW(*p) = (v); \
80170 } while (0)
80171
80172 #define smp_load_acquire(p) \
80173diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
80174index a60a7cc..0fe12f2 100644
80175--- a/include/asm-generic/bitops/__fls.h
80176+++ b/include/asm-generic/bitops/__fls.h
80177@@ -9,7 +9,7 @@
80178 *
80179 * Undefined if no set bit exists, so code should check against 0 first.
80180 */
80181-static __always_inline unsigned long __fls(unsigned long word)
80182+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
80183 {
80184 int num = BITS_PER_LONG - 1;
80185
80186diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
80187index 0576d1f..dad6c71 100644
80188--- a/include/asm-generic/bitops/fls.h
80189+++ b/include/asm-generic/bitops/fls.h
80190@@ -9,7 +9,7 @@
80191 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
80192 */
80193
80194-static __always_inline int fls(int x)
80195+static __always_inline int __intentional_overflow(-1) fls(int x)
80196 {
80197 int r = 32;
80198
80199diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
80200index b097cf8..3d40e14 100644
80201--- a/include/asm-generic/bitops/fls64.h
80202+++ b/include/asm-generic/bitops/fls64.h
80203@@ -15,7 +15,7 @@
80204 * at position 64.
80205 */
80206 #if BITS_PER_LONG == 32
80207-static __always_inline int fls64(__u64 x)
80208+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80209 {
80210 __u32 h = x >> 32;
80211 if (h)
80212@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
80213 return fls(x);
80214 }
80215 #elif BITS_PER_LONG == 64
80216-static __always_inline int fls64(__u64 x)
80217+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80218 {
80219 if (x == 0)
80220 return 0;
80221diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
80222index 1bfcfe5..e04c5c9 100644
80223--- a/include/asm-generic/cache.h
80224+++ b/include/asm-generic/cache.h
80225@@ -6,7 +6,7 @@
80226 * cache lines need to provide their own cache.h.
80227 */
80228
80229-#define L1_CACHE_SHIFT 5
80230-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
80231+#define L1_CACHE_SHIFT 5UL
80232+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
80233
80234 #endif /* __ASM_GENERIC_CACHE_H */
80235diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
80236index 0d68a1e..b74a761 100644
80237--- a/include/asm-generic/emergency-restart.h
80238+++ b/include/asm-generic/emergency-restart.h
80239@@ -1,7 +1,7 @@
80240 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
80241 #define _ASM_GENERIC_EMERGENCY_RESTART_H
80242
80243-static inline void machine_emergency_restart(void)
80244+static inline __noreturn void machine_emergency_restart(void)
80245 {
80246 machine_restart(NULL);
80247 }
80248diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
80249index 90f99c7..00ce236 100644
80250--- a/include/asm-generic/kmap_types.h
80251+++ b/include/asm-generic/kmap_types.h
80252@@ -2,9 +2,9 @@
80253 #define _ASM_GENERIC_KMAP_TYPES_H
80254
80255 #ifdef __WITH_KM_FENCE
80256-# define KM_TYPE_NR 41
80257+# define KM_TYPE_NR 42
80258 #else
80259-# define KM_TYPE_NR 20
80260+# define KM_TYPE_NR 21
80261 #endif
80262
80263 #endif
80264diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
80265index 9ceb03b..62b0b8f 100644
80266--- a/include/asm-generic/local.h
80267+++ b/include/asm-generic/local.h
80268@@ -23,24 +23,37 @@ typedef struct
80269 atomic_long_t a;
80270 } local_t;
80271
80272+typedef struct {
80273+ atomic_long_unchecked_t a;
80274+} local_unchecked_t;
80275+
80276 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
80277
80278 #define local_read(l) atomic_long_read(&(l)->a)
80279+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
80280 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
80281+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
80282 #define local_inc(l) atomic_long_inc(&(l)->a)
80283+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
80284 #define local_dec(l) atomic_long_dec(&(l)->a)
80285+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
80286 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
80287+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
80288 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
80289+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
80290
80291 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
80292 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
80293 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
80294 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
80295 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
80296+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
80297 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
80298 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
80299+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
80300
80301 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80302+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80303 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
80304 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
80305 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
80306diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
80307index 725612b..9cc513a 100644
80308--- a/include/asm-generic/pgtable-nopmd.h
80309+++ b/include/asm-generic/pgtable-nopmd.h
80310@@ -1,14 +1,19 @@
80311 #ifndef _PGTABLE_NOPMD_H
80312 #define _PGTABLE_NOPMD_H
80313
80314-#ifndef __ASSEMBLY__
80315-
80316 #include <asm-generic/pgtable-nopud.h>
80317
80318-struct mm_struct;
80319-
80320 #define __PAGETABLE_PMD_FOLDED
80321
80322+#define PMD_SHIFT PUD_SHIFT
80323+#define PTRS_PER_PMD 1
80324+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
80325+#define PMD_MASK (~(PMD_SIZE-1))
80326+
80327+#ifndef __ASSEMBLY__
80328+
80329+struct mm_struct;
80330+
80331 /*
80332 * Having the pmd type consist of a pud gets the size right, and allows
80333 * us to conceptually access the pud entry that this pmd is folded into
80334@@ -16,11 +21,6 @@ struct mm_struct;
80335 */
80336 typedef struct { pud_t pud; } pmd_t;
80337
80338-#define PMD_SHIFT PUD_SHIFT
80339-#define PTRS_PER_PMD 1
80340-#define PMD_SIZE (1UL << PMD_SHIFT)
80341-#define PMD_MASK (~(PMD_SIZE-1))
80342-
80343 /*
80344 * The "pud_xxx()" functions here are trivial for a folded two-level
80345 * setup: the pmd is never bad, and a pmd always exists (as it's folded
80346diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
80347index 810431d..0ec4804f 100644
80348--- a/include/asm-generic/pgtable-nopud.h
80349+++ b/include/asm-generic/pgtable-nopud.h
80350@@ -1,10 +1,15 @@
80351 #ifndef _PGTABLE_NOPUD_H
80352 #define _PGTABLE_NOPUD_H
80353
80354-#ifndef __ASSEMBLY__
80355-
80356 #define __PAGETABLE_PUD_FOLDED
80357
80358+#define PUD_SHIFT PGDIR_SHIFT
80359+#define PTRS_PER_PUD 1
80360+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
80361+#define PUD_MASK (~(PUD_SIZE-1))
80362+
80363+#ifndef __ASSEMBLY__
80364+
80365 /*
80366 * Having the pud type consist of a pgd gets the size right, and allows
80367 * us to conceptually access the pgd entry that this pud is folded into
80368@@ -12,11 +17,6 @@
80369 */
80370 typedef struct { pgd_t pgd; } pud_t;
80371
80372-#define PUD_SHIFT PGDIR_SHIFT
80373-#define PTRS_PER_PUD 1
80374-#define PUD_SIZE (1UL << PUD_SHIFT)
80375-#define PUD_MASK (~(PUD_SIZE-1))
80376-
80377 /*
80378 * The "pgd_xxx()" functions here are trivial for a folded two-level
80379 * setup: the pud is never bad, and a pud always exists (as it's folded
80380@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
80381 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
80382
80383 #define pgd_populate(mm, pgd, pud) do { } while (0)
80384+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
80385 /*
80386 * (puds are folded into pgds so this doesn't get actually called,
80387 * but the define is needed for a generic inline function.)
80388diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
80389index 177d597..2826237 100644
80390--- a/include/asm-generic/pgtable.h
80391+++ b/include/asm-generic/pgtable.h
80392@@ -839,6 +839,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
80393 }
80394 #endif /* CONFIG_NUMA_BALANCING */
80395
80396+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
80397+#ifdef CONFIG_PAX_KERNEXEC
80398+#error KERNEXEC requires pax_open_kernel
80399+#else
80400+static inline unsigned long pax_open_kernel(void) { return 0; }
80401+#endif
80402+#endif
80403+
80404+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
80405+#ifdef CONFIG_PAX_KERNEXEC
80406+#error KERNEXEC requires pax_close_kernel
80407+#else
80408+static inline unsigned long pax_close_kernel(void) { return 0; }
80409+#endif
80410+#endif
80411+
80412 #endif /* CONFIG_MMU */
80413
80414 #endif /* !__ASSEMBLY__ */
80415diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
80416index 72d8803..cb9749c 100644
80417--- a/include/asm-generic/uaccess.h
80418+++ b/include/asm-generic/uaccess.h
80419@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
80420 return __clear_user(to, n);
80421 }
80422
80423+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
80424+#ifdef CONFIG_PAX_MEMORY_UDEREF
80425+#error UDEREF requires pax_open_userland
80426+#else
80427+static inline unsigned long pax_open_userland(void) { return 0; }
80428+#endif
80429+#endif
80430+
80431+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
80432+#ifdef CONFIG_PAX_MEMORY_UDEREF
80433+#error UDEREF requires pax_close_userland
80434+#else
80435+static inline unsigned long pax_close_userland(void) { return 0; }
80436+#endif
80437+#endif
80438+
80439 #endif /* __ASM_GENERIC_UACCESS_H */
80440diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
80441index bee5d68..8d362d1 100644
80442--- a/include/asm-generic/vmlinux.lds.h
80443+++ b/include/asm-generic/vmlinux.lds.h
80444@@ -234,6 +234,7 @@
80445 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
80446 VMLINUX_SYMBOL(__start_rodata) = .; \
80447 *(.rodata) *(.rodata.*) \
80448+ *(.data..read_only) \
80449 *(__vermagic) /* Kernel version magic */ \
80450 . = ALIGN(8); \
80451 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
80452@@ -726,17 +727,18 @@
80453 * section in the linker script will go there too. @phdr should have
80454 * a leading colon.
80455 *
80456- * Note that this macros defines __per_cpu_load as an absolute symbol.
80457+ * Note that this macros defines per_cpu_load as an absolute symbol.
80458 * If there is no need to put the percpu section at a predetermined
80459 * address, use PERCPU_SECTION.
80460 */
80461 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
80462- VMLINUX_SYMBOL(__per_cpu_load) = .; \
80463- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
80464+ per_cpu_load = .; \
80465+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
80466 - LOAD_OFFSET) { \
80467+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
80468 PERCPU_INPUT(cacheline) \
80469 } phdr \
80470- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
80471+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
80472
80473 /**
80474 * PERCPU_SECTION - define output section for percpu area, simple version
80475diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
80476index 623a59c..1e79ab9 100644
80477--- a/include/crypto/algapi.h
80478+++ b/include/crypto/algapi.h
80479@@ -34,7 +34,7 @@ struct crypto_type {
80480 unsigned int maskclear;
80481 unsigned int maskset;
80482 unsigned int tfmsize;
80483-};
80484+} __do_const;
80485
80486 struct crypto_instance {
80487 struct crypto_alg alg;
80488diff --git a/include/drm/drmP.h b/include/drm/drmP.h
80489index e1b2e8b..2697bd2 100644
80490--- a/include/drm/drmP.h
80491+++ b/include/drm/drmP.h
80492@@ -59,6 +59,7 @@
80493
80494 #include <asm/mman.h>
80495 #include <asm/pgalloc.h>
80496+#include <asm/local.h>
80497 #include <asm/uaccess.h>
80498
80499 #include <uapi/drm/drm.h>
80500@@ -223,10 +224,12 @@ void drm_err(const char *format, ...);
80501 * \param cmd command.
80502 * \param arg argument.
80503 */
80504-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
80505+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
80506+ struct drm_file *file_priv);
80507+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
80508 struct drm_file *file_priv);
80509
80510-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80511+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
80512 unsigned long arg);
80513
80514 #define DRM_IOCTL_NR(n) _IOC_NR(n)
80515@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80516 struct drm_ioctl_desc {
80517 unsigned int cmd;
80518 int flags;
80519- drm_ioctl_t *func;
80520+ drm_ioctl_t func;
80521 unsigned int cmd_drv;
80522 const char *name;
80523-};
80524+} __do_const;
80525
80526 /**
80527 * Creates a driver or general drm_ioctl_desc array entry for the given
80528@@ -629,7 +632,8 @@ struct drm_info_list {
80529 int (*show)(struct seq_file*, void*); /** show callback */
80530 u32 driver_features; /**< Required driver features for this entry */
80531 void *data;
80532-};
80533+} __do_const;
80534+typedef struct drm_info_list __no_const drm_info_list_no_const;
80535
80536 /**
80537 * debugfs node structure. This structure represents a debugfs file.
80538@@ -713,7 +717,7 @@ struct drm_device {
80539
80540 /** \name Usage Counters */
80541 /*@{ */
80542- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80543+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80544 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
80545 int buf_use; /**< Buffers in use -- cannot alloc */
80546 atomic_t buf_alloc; /**< Buffer allocation in progress */
80547diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
80548index 7adbb65..2a1eb1f 100644
80549--- a/include/drm/drm_crtc_helper.h
80550+++ b/include/drm/drm_crtc_helper.h
80551@@ -116,7 +116,7 @@ struct drm_encoder_helper_funcs {
80552 struct drm_connector *connector);
80553 /* disable encoder when not in use - more explicit than dpms off */
80554 void (*disable)(struct drm_encoder *encoder);
80555-};
80556+} __no_const;
80557
80558 /**
80559 * drm_connector_helper_funcs - helper operations for connectors
80560diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
80561index d016dc5..3951fe0 100644
80562--- a/include/drm/i915_pciids.h
80563+++ b/include/drm/i915_pciids.h
80564@@ -37,7 +37,7 @@
80565 */
80566 #define INTEL_VGA_DEVICE(id, info) { \
80567 0x8086, id, \
80568- ~0, ~0, \
80569+ PCI_ANY_ID, PCI_ANY_ID, \
80570 0x030000, 0xff0000, \
80571 (unsigned long) info }
80572
80573diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
80574index 72dcbe8..8db58d7 100644
80575--- a/include/drm/ttm/ttm_memory.h
80576+++ b/include/drm/ttm/ttm_memory.h
80577@@ -48,7 +48,7 @@
80578
80579 struct ttm_mem_shrink {
80580 int (*do_shrink) (struct ttm_mem_shrink *);
80581-};
80582+} __no_const;
80583
80584 /**
80585 * struct ttm_mem_global - Global memory accounting structure.
80586diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
80587index 49a8284..9643967 100644
80588--- a/include/drm/ttm/ttm_page_alloc.h
80589+++ b/include/drm/ttm/ttm_page_alloc.h
80590@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
80591 */
80592 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
80593
80594+struct device;
80595 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80596 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80597
80598diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
80599index 4b840e8..155d235 100644
80600--- a/include/keys/asymmetric-subtype.h
80601+++ b/include/keys/asymmetric-subtype.h
80602@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
80603 /* Verify the signature on a key of this subtype (optional) */
80604 int (*verify_signature)(const struct key *key,
80605 const struct public_key_signature *sig);
80606-};
80607+} __do_const;
80608
80609 /**
80610 * asymmetric_key_subtype - Get the subtype from an asymmetric key
80611diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
80612index c1da539..1dcec55 100644
80613--- a/include/linux/atmdev.h
80614+++ b/include/linux/atmdev.h
80615@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
80616 #endif
80617
80618 struct k_atm_aal_stats {
80619-#define __HANDLE_ITEM(i) atomic_t i
80620+#define __HANDLE_ITEM(i) atomic_unchecked_t i
80621 __AAL_STAT_ITEMS
80622 #undef __HANDLE_ITEM
80623 };
80624@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
80625 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
80626 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
80627 struct module *owner;
80628-};
80629+} __do_const ;
80630
80631 struct atmphy_ops {
80632 int (*start)(struct atm_dev *dev);
80633diff --git a/include/linux/atomic.h b/include/linux/atomic.h
80634index 5b08a85..60922fb 100644
80635--- a/include/linux/atomic.h
80636+++ b/include/linux/atomic.h
80637@@ -12,7 +12,7 @@
80638 * Atomically adds @a to @v, so long as @v was not already @u.
80639 * Returns non-zero if @v was not @u, and zero otherwise.
80640 */
80641-static inline int atomic_add_unless(atomic_t *v, int a, int u)
80642+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
80643 {
80644 return __atomic_add_unless(v, a, u) != u;
80645 }
80646diff --git a/include/linux/audit.h b/include/linux/audit.h
80647index af84234..4177a40 100644
80648--- a/include/linux/audit.h
80649+++ b/include/linux/audit.h
80650@@ -225,7 +225,7 @@ static inline void audit_ptrace(struct task_struct *t)
80651 extern unsigned int audit_serial(void);
80652 extern int auditsc_get_stamp(struct audit_context *ctx,
80653 struct timespec *t, unsigned int *serial);
80654-extern int audit_set_loginuid(kuid_t loginuid);
80655+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
80656
80657 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
80658 {
80659diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
80660index 576e463..28fd926 100644
80661--- a/include/linux/binfmts.h
80662+++ b/include/linux/binfmts.h
80663@@ -44,7 +44,7 @@ struct linux_binprm {
80664 unsigned interp_flags;
80665 unsigned interp_data;
80666 unsigned long loader, exec;
80667-};
80668+} __randomize_layout;
80669
80670 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
80671 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
80672@@ -77,8 +77,10 @@ struct linux_binfmt {
80673 int (*load_binary)(struct linux_binprm *);
80674 int (*load_shlib)(struct file *);
80675 int (*core_dump)(struct coredump_params *cprm);
80676+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
80677+ void (*handle_mmap)(struct file *);
80678 unsigned long min_coredump; /* minimal dump size */
80679-};
80680+} __do_const __randomize_layout;
80681
80682 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
80683
80684diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
80685index 202e403..16e6617 100644
80686--- a/include/linux/bitmap.h
80687+++ b/include/linux/bitmap.h
80688@@ -302,7 +302,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
80689 return __bitmap_full(src, nbits);
80690 }
80691
80692-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
80693+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
80694 {
80695 if (small_const_nbits(nbits))
80696 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
80697diff --git a/include/linux/bitops.h b/include/linux/bitops.h
80698index 5d858e0..336c1d9 100644
80699--- a/include/linux/bitops.h
80700+++ b/include/linux/bitops.h
80701@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
80702 * @word: value to rotate
80703 * @shift: bits to roll
80704 */
80705-static inline __u32 rol32(__u32 word, unsigned int shift)
80706+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
80707 {
80708 return (word << shift) | (word >> (32 - shift));
80709 }
80710@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
80711 * @word: value to rotate
80712 * @shift: bits to roll
80713 */
80714-static inline __u32 ror32(__u32 word, unsigned int shift)
80715+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
80716 {
80717 return (word >> shift) | (word << (32 - shift));
80718 }
80719@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
80720 return (__s32)(value << shift) >> shift;
80721 }
80722
80723-static inline unsigned fls_long(unsigned long l)
80724+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
80725 {
80726 if (sizeof(l) == 4)
80727 return fls(l);
80728diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
80729index 92f4b4b..483d537 100644
80730--- a/include/linux/blkdev.h
80731+++ b/include/linux/blkdev.h
80732@@ -1613,7 +1613,7 @@ struct block_device_operations {
80733 /* this callback is with swap_lock and sometimes page table lock held */
80734 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
80735 struct module *owner;
80736-};
80737+} __do_const;
80738
80739 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
80740 unsigned long);
80741diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
80742index afc1343..9735539 100644
80743--- a/include/linux/blktrace_api.h
80744+++ b/include/linux/blktrace_api.h
80745@@ -25,7 +25,7 @@ struct blk_trace {
80746 struct dentry *dropped_file;
80747 struct dentry *msg_file;
80748 struct list_head running_list;
80749- atomic_t dropped;
80750+ atomic_unchecked_t dropped;
80751 };
80752
80753 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
80754diff --git a/include/linux/cache.h b/include/linux/cache.h
80755index 17e7e82..1d7da26 100644
80756--- a/include/linux/cache.h
80757+++ b/include/linux/cache.h
80758@@ -16,6 +16,14 @@
80759 #define __read_mostly
80760 #endif
80761
80762+#ifndef __read_only
80763+#ifdef CONFIG_PAX_KERNEXEC
80764+#error KERNEXEC requires __read_only
80765+#else
80766+#define __read_only __read_mostly
80767+#endif
80768+#endif
80769+
80770 #ifndef ____cacheline_aligned
80771 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
80772 #endif
80773diff --git a/include/linux/capability.h b/include/linux/capability.h
80774index aa93e5e..985a1b0 100644
80775--- a/include/linux/capability.h
80776+++ b/include/linux/capability.h
80777@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
80778 extern bool capable(int cap);
80779 extern bool ns_capable(struct user_namespace *ns, int cap);
80780 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
80781+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
80782 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
80783+extern bool capable_nolog(int cap);
80784+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
80785
80786 /* audit system wants to get cap info from files as well */
80787 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
80788
80789+extern int is_privileged_binary(const struct dentry *dentry);
80790+
80791 #endif /* !_LINUX_CAPABILITY_H */
80792diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
80793index 8609d57..86e4d79 100644
80794--- a/include/linux/cdrom.h
80795+++ b/include/linux/cdrom.h
80796@@ -87,7 +87,6 @@ struct cdrom_device_ops {
80797
80798 /* driver specifications */
80799 const int capability; /* capability flags */
80800- int n_minors; /* number of active minor devices */
80801 /* handle uniform packets for scsi type devices (scsi,atapi) */
80802 int (*generic_packet) (struct cdrom_device_info *,
80803 struct packet_command *);
80804diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
80805index 4ce9056..86caac6 100644
80806--- a/include/linux/cleancache.h
80807+++ b/include/linux/cleancache.h
80808@@ -31,7 +31,7 @@ struct cleancache_ops {
80809 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
80810 void (*invalidate_inode)(int, struct cleancache_filekey);
80811 void (*invalidate_fs)(int);
80812-};
80813+} __no_const;
80814
80815 extern struct cleancache_ops *
80816 cleancache_register_ops(struct cleancache_ops *ops);
80817diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80818index d936409..ce9f842 100644
80819--- a/include/linux/clk-provider.h
80820+++ b/include/linux/clk-provider.h
80821@@ -191,6 +191,7 @@ struct clk_ops {
80822 void (*init)(struct clk_hw *hw);
80823 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80824 };
80825+typedef struct clk_ops __no_const clk_ops_no_const;
80826
80827 /**
80828 * struct clk_init_data - holds init data that's common to all clocks and is
80829diff --git a/include/linux/compat.h b/include/linux/compat.h
80830index 7450ca2..a824b81 100644
80831--- a/include/linux/compat.h
80832+++ b/include/linux/compat.h
80833@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80834 compat_size_t __user *len_ptr);
80835
80836 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80837-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80838+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80839 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80840 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80841 compat_ssize_t msgsz, int msgflg);
80842@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80843 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80844 compat_ulong_t addr, compat_ulong_t data);
80845 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80846- compat_long_t addr, compat_long_t data);
80847+ compat_ulong_t addr, compat_ulong_t data);
80848
80849 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80850 /*
80851diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80852index d1a5582..4424efa 100644
80853--- a/include/linux/compiler-gcc4.h
80854+++ b/include/linux/compiler-gcc4.h
80855@@ -39,9 +39,34 @@
80856 # define __compiletime_warning(message) __attribute__((warning(message)))
80857 # define __compiletime_error(message) __attribute__((error(message)))
80858 #endif /* __CHECKER__ */
80859+
80860+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80861+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80862+#define __bos0(ptr) __bos((ptr), 0)
80863+#define __bos1(ptr) __bos((ptr), 1)
80864 #endif /* GCC_VERSION >= 40300 */
80865
80866 #if GCC_VERSION >= 40500
80867+
80868+#ifdef RANDSTRUCT_PLUGIN
80869+#define __randomize_layout __attribute__((randomize_layout))
80870+#define __no_randomize_layout __attribute__((no_randomize_layout))
80871+#endif
80872+
80873+#ifdef CONSTIFY_PLUGIN
80874+#define __no_const __attribute__((no_const))
80875+#define __do_const __attribute__((do_const))
80876+#endif
80877+
80878+#ifdef SIZE_OVERFLOW_PLUGIN
80879+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80880+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80881+#endif
80882+
80883+#ifdef LATENT_ENTROPY_PLUGIN
80884+#define __latent_entropy __attribute__((latent_entropy))
80885+#endif
80886+
80887 /*
80888 * Mark a position in code as unreachable. This can be used to
80889 * suppress control flow warnings after asm blocks that transfer
80890diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
80891index c8c5659..9b20f4e 100644
80892--- a/include/linux/compiler-gcc5.h
80893+++ b/include/linux/compiler-gcc5.h
80894@@ -28,6 +28,25 @@
80895 # define __compiletime_error(message) __attribute__((error(message)))
80896 #endif /* __CHECKER__ */
80897
80898+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80899+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80900+#define __bos0(ptr) __bos((ptr), 0)
80901+#define __bos1(ptr) __bos((ptr), 1)
80902+
80903+#ifdef CONSTIFY_PLUGIN
80904+#define __no_const __attribute__((no_const))
80905+#define __do_const __attribute__((do_const))
80906+#endif
80907+
80908+#ifdef SIZE_OVERFLOW_PLUGIN
80909+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80910+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80911+#endif
80912+
80913+#ifdef LATENT_ENTROPY_PLUGIN
80914+#define __latent_entropy __attribute__((latent_entropy))
80915+#endif
80916+
80917 /*
80918 * Mark a position in code as unreachable. This can be used to
80919 * suppress control flow warnings after asm blocks that transfer
80920diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80921index fa6a314..a1b01ad 100644
80922--- a/include/linux/compiler.h
80923+++ b/include/linux/compiler.h
80924@@ -5,11 +5,14 @@
80925
80926 #ifdef __CHECKER__
80927 # define __user __attribute__((noderef, address_space(1)))
80928+# define __force_user __force __user
80929 # define __kernel __attribute__((address_space(0)))
80930+# define __force_kernel __force __kernel
80931 # define __safe __attribute__((safe))
80932 # define __force __attribute__((force))
80933 # define __nocast __attribute__((nocast))
80934 # define __iomem __attribute__((noderef, address_space(2)))
80935+# define __force_iomem __force __iomem
80936 # define __must_hold(x) __attribute__((context(x,1,1)))
80937 # define __acquires(x) __attribute__((context(x,0,1)))
80938 # define __releases(x) __attribute__((context(x,1,0)))
80939@@ -17,20 +20,37 @@
80940 # define __release(x) __context__(x,-1)
80941 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80942 # define __percpu __attribute__((noderef, address_space(3)))
80943+# define __force_percpu __force __percpu
80944 #ifdef CONFIG_SPARSE_RCU_POINTER
80945 # define __rcu __attribute__((noderef, address_space(4)))
80946+# define __force_rcu __force __rcu
80947 #else
80948 # define __rcu
80949+# define __force_rcu
80950 #endif
80951 extern void __chk_user_ptr(const volatile void __user *);
80952 extern void __chk_io_ptr(const volatile void __iomem *);
80953 #else
80954-# define __user
80955-# define __kernel
80956+# ifdef CHECKER_PLUGIN
80957+//# define __user
80958+//# define __force_user
80959+//# define __kernel
80960+//# define __force_kernel
80961+# else
80962+# ifdef STRUCTLEAK_PLUGIN
80963+# define __user __attribute__((user))
80964+# else
80965+# define __user
80966+# endif
80967+# define __force_user
80968+# define __kernel
80969+# define __force_kernel
80970+# endif
80971 # define __safe
80972 # define __force
80973 # define __nocast
80974 # define __iomem
80975+# define __force_iomem
80976 # define __chk_user_ptr(x) (void)0
80977 # define __chk_io_ptr(x) (void)0
80978 # define __builtin_warning(x, y...) (1)
80979@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80980 # define __release(x) (void)0
80981 # define __cond_lock(x,c) (c)
80982 # define __percpu
80983+# define __force_percpu
80984 # define __rcu
80985+# define __force_rcu
80986 #endif
80987
80988 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80989@@ -201,32 +223,32 @@ static __always_inline void data_access_exceeds_word_size(void)
80990 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
80991 {
80992 switch (size) {
80993- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
80994- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
80995- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
80996+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
80997+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
80998+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
80999 #ifdef CONFIG_64BIT
81000- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
81001+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
81002 #endif
81003 default:
81004 barrier();
81005- __builtin_memcpy((void *)res, (const void *)p, size);
81006+ __builtin_memcpy(res, (const void *)p, size);
81007 data_access_exceeds_word_size();
81008 barrier();
81009 }
81010 }
81011
81012-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
81013+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
81014 {
81015 switch (size) {
81016- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
81017- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
81018- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
81019+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
81020+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
81021+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
81022 #ifdef CONFIG_64BIT
81023- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
81024+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
81025 #endif
81026 default:
81027 barrier();
81028- __builtin_memcpy((void *)p, (const void *)res, size);
81029+ __builtin_memcpy((void *)p, res, size);
81030 data_access_exceeds_word_size();
81031 barrier();
81032 }
81033@@ -360,6 +382,34 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81034 # define __attribute_const__ /* unimplemented */
81035 #endif
81036
81037+#ifndef __randomize_layout
81038+# define __randomize_layout
81039+#endif
81040+
81041+#ifndef __no_randomize_layout
81042+# define __no_randomize_layout
81043+#endif
81044+
81045+#ifndef __no_const
81046+# define __no_const
81047+#endif
81048+
81049+#ifndef __do_const
81050+# define __do_const
81051+#endif
81052+
81053+#ifndef __size_overflow
81054+# define __size_overflow(...)
81055+#endif
81056+
81057+#ifndef __intentional_overflow
81058+# define __intentional_overflow(...)
81059+#endif
81060+
81061+#ifndef __latent_entropy
81062+# define __latent_entropy
81063+#endif
81064+
81065 /*
81066 * Tell gcc if a function is cold. The compiler will assume any path
81067 * directly leading to the call is unlikely.
81068@@ -369,6 +419,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81069 #define __cold
81070 #endif
81071
81072+#ifndef __alloc_size
81073+#define __alloc_size(...)
81074+#endif
81075+
81076+#ifndef __bos
81077+#define __bos(ptr, arg)
81078+#endif
81079+
81080+#ifndef __bos0
81081+#define __bos0(ptr)
81082+#endif
81083+
81084+#ifndef __bos1
81085+#define __bos1(ptr)
81086+#endif
81087+
81088 /* Simple shorthand for a section definition */
81089 #ifndef __section
81090 # define __section(S) __attribute__ ((__section__(#S)))
81091@@ -383,6 +449,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81092 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
81093 #endif
81094
81095+#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))
81096+
81097 /* Is this type a native word size -- useful for atomic operations */
81098 #ifndef __native_word
81099 # define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
81100@@ -462,8 +530,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81101 */
81102 #define __ACCESS_ONCE(x) ({ \
81103 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
81104- (volatile typeof(x) *)&(x); })
81105+ (volatile const typeof(x) *)&(x); })
81106 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
81107+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
81108
81109 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
81110 #ifdef CONFIG_KPROBES
81111diff --git a/include/linux/completion.h b/include/linux/completion.h
81112index 5d5aaae..0ea9b84 100644
81113--- a/include/linux/completion.h
81114+++ b/include/linux/completion.h
81115@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
81116
81117 extern void wait_for_completion(struct completion *);
81118 extern void wait_for_completion_io(struct completion *);
81119-extern int wait_for_completion_interruptible(struct completion *x);
81120-extern int wait_for_completion_killable(struct completion *x);
81121+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
81122+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
81123 extern unsigned long wait_for_completion_timeout(struct completion *x,
81124- unsigned long timeout);
81125+ unsigned long timeout) __intentional_overflow(-1);
81126 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
81127- unsigned long timeout);
81128+ unsigned long timeout) __intentional_overflow(-1);
81129 extern long wait_for_completion_interruptible_timeout(
81130- struct completion *x, unsigned long timeout);
81131+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81132 extern long wait_for_completion_killable_timeout(
81133- struct completion *x, unsigned long timeout);
81134+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81135 extern bool try_wait_for_completion(struct completion *x);
81136 extern bool completion_done(struct completion *x);
81137
81138diff --git a/include/linux/configfs.h b/include/linux/configfs.h
81139index 34025df..d94bbbc 100644
81140--- a/include/linux/configfs.h
81141+++ b/include/linux/configfs.h
81142@@ -125,7 +125,7 @@ struct configfs_attribute {
81143 const char *ca_name;
81144 struct module *ca_owner;
81145 umode_t ca_mode;
81146-};
81147+} __do_const;
81148
81149 /*
81150 * Users often need to create attribute structures for their configurable
81151diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
81152index 4d078ce..c970f4d 100644
81153--- a/include/linux/cpufreq.h
81154+++ b/include/linux/cpufreq.h
81155@@ -206,6 +206,7 @@ struct global_attr {
81156 ssize_t (*store)(struct kobject *a, struct attribute *b,
81157 const char *c, size_t count);
81158 };
81159+typedef struct global_attr __no_const global_attr_no_const;
81160
81161 #define define_one_global_ro(_name) \
81162 static struct global_attr _name = \
81163@@ -277,7 +278,7 @@ struct cpufreq_driver {
81164 bool boost_supported;
81165 bool boost_enabled;
81166 int (*set_boost)(int state);
81167-};
81168+} __do_const;
81169
81170 /* flags */
81171 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
81172diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
81173index 948df62..4602717 100644
81174--- a/include/linux/cpuidle.h
81175+++ b/include/linux/cpuidle.h
81176@@ -50,7 +50,8 @@ struct cpuidle_state {
81177 int index);
81178
81179 int (*enter_dead) (struct cpuidle_device *dev, int index);
81180-};
81181+} __do_const;
81182+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
81183
81184 /* Idle State Flags */
81185 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
81186@@ -205,7 +206,7 @@ struct cpuidle_governor {
81187 void (*reflect) (struct cpuidle_device *dev, int index);
81188
81189 struct module *owner;
81190-};
81191+} __do_const;
81192
81193 #ifdef CONFIG_CPU_IDLE
81194 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
81195diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
81196index b950e9d..63810aa 100644
81197--- a/include/linux/cpumask.h
81198+++ b/include/linux/cpumask.h
81199@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81200 }
81201
81202 /* Valid inputs for n are -1 and 0. */
81203-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81204+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81205 {
81206 return n+1;
81207 }
81208
81209-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81210+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81211 {
81212 return n+1;
81213 }
81214
81215-static inline unsigned int cpumask_next_and(int n,
81216+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
81217 const struct cpumask *srcp,
81218 const struct cpumask *andp)
81219 {
81220@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81221 *
81222 * Returns >= nr_cpu_ids if no further cpus set.
81223 */
81224-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81225+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81226 {
81227 /* -1 is a legal arg here. */
81228 if (n != -1)
81229@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81230 *
81231 * Returns >= nr_cpu_ids if no further cpus unset.
81232 */
81233-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81234+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81235 {
81236 /* -1 is a legal arg here. */
81237 if (n != -1)
81238@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81239 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
81240 }
81241
81242-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
81243+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
81244 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
81245 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
81246
81247@@ -464,7 +464,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
81248 * cpumask_weight - Count of bits in *srcp
81249 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
81250 */
81251-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
81252+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
81253 {
81254 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
81255 }
81256diff --git a/include/linux/cred.h b/include/linux/cred.h
81257index 2fb2ca2..d6a3340 100644
81258--- a/include/linux/cred.h
81259+++ b/include/linux/cred.h
81260@@ -35,7 +35,7 @@ struct group_info {
81261 int nblocks;
81262 kgid_t small_block[NGROUPS_SMALL];
81263 kgid_t *blocks[0];
81264-};
81265+} __randomize_layout;
81266
81267 /**
81268 * get_group_info - Get a reference to a group info structure
81269@@ -137,7 +137,7 @@ struct cred {
81270 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
81271 struct group_info *group_info; /* supplementary groups for euid/fsgid */
81272 struct rcu_head rcu; /* RCU deletion hook */
81273-};
81274+} __randomize_layout;
81275
81276 extern void __put_cred(struct cred *);
81277 extern void exit_creds(struct task_struct *);
81278@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
81279 static inline void validate_process_creds(void)
81280 {
81281 }
81282+static inline void validate_task_creds(struct task_struct *task)
81283+{
81284+}
81285 #endif
81286
81287 /**
81288@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
81289
81290 #define task_uid(task) (task_cred_xxx((task), uid))
81291 #define task_euid(task) (task_cred_xxx((task), euid))
81292+#define task_securebits(task) (task_cred_xxx((task), securebits))
81293
81294 #define current_cred_xxx(xxx) \
81295 ({ \
81296diff --git a/include/linux/crypto.h b/include/linux/crypto.h
81297index 9c8776d..8c526c2 100644
81298--- a/include/linux/crypto.h
81299+++ b/include/linux/crypto.h
81300@@ -626,7 +626,7 @@ struct cipher_tfm {
81301 const u8 *key, unsigned int keylen);
81302 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81303 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81304-};
81305+} __no_const;
81306
81307 struct hash_tfm {
81308 int (*init)(struct hash_desc *desc);
81309@@ -647,13 +647,13 @@ struct compress_tfm {
81310 int (*cot_decompress)(struct crypto_tfm *tfm,
81311 const u8 *src, unsigned int slen,
81312 u8 *dst, unsigned int *dlen);
81313-};
81314+} __no_const;
81315
81316 struct rng_tfm {
81317 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
81318 unsigned int dlen);
81319 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
81320-};
81321+} __no_const;
81322
81323 #define crt_ablkcipher crt_u.ablkcipher
81324 #define crt_aead crt_u.aead
81325diff --git a/include/linux/ctype.h b/include/linux/ctype.h
81326index 653589e..4ef254a 100644
81327--- a/include/linux/ctype.h
81328+++ b/include/linux/ctype.h
81329@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
81330 * Fast implementation of tolower() for internal usage. Do not use in your
81331 * code.
81332 */
81333-static inline char _tolower(const char c)
81334+static inline unsigned char _tolower(const unsigned char c)
81335 {
81336 return c | 0x20;
81337 }
81338diff --git a/include/linux/dcache.h b/include/linux/dcache.h
81339index 5a81398..6bbee30 100644
81340--- a/include/linux/dcache.h
81341+++ b/include/linux/dcache.h
81342@@ -123,6 +123,9 @@ struct dentry {
81343 unsigned long d_time; /* used by d_revalidate */
81344 void *d_fsdata; /* fs-specific data */
81345
81346+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
81347+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
81348+#endif
81349 struct list_head d_lru; /* LRU list */
81350 struct list_head d_child; /* child of parent list */
81351 struct list_head d_subdirs; /* our children */
81352@@ -133,7 +136,7 @@ struct dentry {
81353 struct hlist_node d_alias; /* inode alias list */
81354 struct rcu_head d_rcu;
81355 } d_u;
81356-};
81357+} __randomize_layout;
81358
81359 /*
81360 * dentry->d_lock spinlock nesting subclasses:
81361diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
81362index 7925bf0..d5143d2 100644
81363--- a/include/linux/decompress/mm.h
81364+++ b/include/linux/decompress/mm.h
81365@@ -77,7 +77,7 @@ static void free(void *where)
81366 * warnings when not needed (indeed large_malloc / large_free are not
81367 * needed by inflate */
81368
81369-#define malloc(a) kmalloc(a, GFP_KERNEL)
81370+#define malloc(a) kmalloc((a), GFP_KERNEL)
81371 #define free(a) kfree(a)
81372
81373 #define large_malloc(a) vmalloc(a)
81374diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
81375index ce447f0..83c66bd 100644
81376--- a/include/linux/devfreq.h
81377+++ b/include/linux/devfreq.h
81378@@ -114,7 +114,7 @@ struct devfreq_governor {
81379 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
81380 int (*event_handler)(struct devfreq *devfreq,
81381 unsigned int event, void *data);
81382-};
81383+} __do_const;
81384
81385 /**
81386 * struct devfreq - Device devfreq structure
81387diff --git a/include/linux/device.h b/include/linux/device.h
81388index fb50673..ec0b35b 100644
81389--- a/include/linux/device.h
81390+++ b/include/linux/device.h
81391@@ -311,7 +311,7 @@ struct subsys_interface {
81392 struct list_head node;
81393 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
81394 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
81395-};
81396+} __do_const;
81397
81398 int subsys_interface_register(struct subsys_interface *sif);
81399 void subsys_interface_unregister(struct subsys_interface *sif);
81400@@ -507,7 +507,7 @@ struct device_type {
81401 void (*release)(struct device *dev);
81402
81403 const struct dev_pm_ops *pm;
81404-};
81405+} __do_const;
81406
81407 /* interface for exporting device attributes */
81408 struct device_attribute {
81409@@ -517,11 +517,12 @@ struct device_attribute {
81410 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
81411 const char *buf, size_t count);
81412 };
81413+typedef struct device_attribute __no_const device_attribute_no_const;
81414
81415 struct dev_ext_attribute {
81416 struct device_attribute attr;
81417 void *var;
81418-};
81419+} __do_const;
81420
81421 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
81422 char *buf);
81423diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
81424index c3007cb..43efc8c 100644
81425--- a/include/linux/dma-mapping.h
81426+++ b/include/linux/dma-mapping.h
81427@@ -60,7 +60,7 @@ struct dma_map_ops {
81428 u64 (*get_required_mask)(struct device *dev);
81429 #endif
81430 int is_phys;
81431-};
81432+} __do_const;
81433
81434 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
81435
81436diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
81437index 40cd75e..38572a9 100644
81438--- a/include/linux/dmaengine.h
81439+++ b/include/linux/dmaengine.h
81440@@ -1137,9 +1137,9 @@ struct dma_pinned_list {
81441 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
81442 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
81443
81444-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
81445+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
81446 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
81447-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
81448+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
81449 struct dma_pinned_list *pinned_list, struct page *page,
81450 unsigned int offset, size_t len);
81451
81452diff --git a/include/linux/efi.h b/include/linux/efi.h
81453index 0238d61..34a758f 100644
81454--- a/include/linux/efi.h
81455+++ b/include/linux/efi.h
81456@@ -1054,6 +1054,7 @@ struct efivar_operations {
81457 efi_set_variable_nonblocking_t *set_variable_nonblocking;
81458 efi_query_variable_store_t *query_variable_store;
81459 };
81460+typedef struct efivar_operations __no_const efivar_operations_no_const;
81461
81462 struct efivars {
81463 /*
81464diff --git a/include/linux/elf.h b/include/linux/elf.h
81465index 20fa8d8..3d0dd18 100644
81466--- a/include/linux/elf.h
81467+++ b/include/linux/elf.h
81468@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
81469 #define elf_note elf32_note
81470 #define elf_addr_t Elf32_Off
81471 #define Elf_Half Elf32_Half
81472+#define elf_dyn Elf32_Dyn
81473
81474 #else
81475
81476@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
81477 #define elf_note elf64_note
81478 #define elf_addr_t Elf64_Off
81479 #define Elf_Half Elf64_Half
81480+#define elf_dyn Elf64_Dyn
81481
81482 #endif
81483
81484diff --git a/include/linux/err.h b/include/linux/err.h
81485index a729120..6ede2c9 100644
81486--- a/include/linux/err.h
81487+++ b/include/linux/err.h
81488@@ -20,12 +20,12 @@
81489
81490 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
81491
81492-static inline void * __must_check ERR_PTR(long error)
81493+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
81494 {
81495 return (void *) error;
81496 }
81497
81498-static inline long __must_check PTR_ERR(__force const void *ptr)
81499+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
81500 {
81501 return (long) ptr;
81502 }
81503diff --git a/include/linux/extcon.h b/include/linux/extcon.h
81504index 36f49c4..a2a1f4c 100644
81505--- a/include/linux/extcon.h
81506+++ b/include/linux/extcon.h
81507@@ -135,7 +135,7 @@ struct extcon_dev {
81508 /* /sys/class/extcon/.../mutually_exclusive/... */
81509 struct attribute_group attr_g_muex;
81510 struct attribute **attrs_muex;
81511- struct device_attribute *d_attrs_muex;
81512+ device_attribute_no_const *d_attrs_muex;
81513 };
81514
81515 /**
81516diff --git a/include/linux/fb.h b/include/linux/fb.h
81517index 09bb7a1..d98870a 100644
81518--- a/include/linux/fb.h
81519+++ b/include/linux/fb.h
81520@@ -305,7 +305,7 @@ struct fb_ops {
81521 /* called at KDB enter and leave time to prepare the console */
81522 int (*fb_debug_enter)(struct fb_info *info);
81523 int (*fb_debug_leave)(struct fb_info *info);
81524-};
81525+} __do_const;
81526
81527 #ifdef CONFIG_FB_TILEBLITTING
81528 #define FB_TILE_CURSOR_NONE 0
81529diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
81530index 230f87b..1fd0485 100644
81531--- a/include/linux/fdtable.h
81532+++ b/include/linux/fdtable.h
81533@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
81534 void put_files_struct(struct files_struct *fs);
81535 void reset_files_struct(struct files_struct *);
81536 int unshare_files(struct files_struct **);
81537-struct files_struct *dup_fd(struct files_struct *, int *);
81538+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
81539 void do_close_on_exec(struct files_struct *);
81540 int iterate_fd(struct files_struct *, unsigned,
81541 int (*)(const void *, struct file *, unsigned),
81542diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
81543index 8293262..2b3b8bd 100644
81544--- a/include/linux/frontswap.h
81545+++ b/include/linux/frontswap.h
81546@@ -11,7 +11,7 @@ struct frontswap_ops {
81547 int (*load)(unsigned, pgoff_t, struct page *);
81548 void (*invalidate_page)(unsigned, pgoff_t);
81549 void (*invalidate_area)(unsigned);
81550-};
81551+} __no_const;
81552
81553 extern bool frontswap_enabled;
81554 extern struct frontswap_ops *
81555diff --git a/include/linux/fs.h b/include/linux/fs.h
81556index 42efe13..72d42ee 100644
81557--- a/include/linux/fs.h
81558+++ b/include/linux/fs.h
81559@@ -413,7 +413,7 @@ struct address_space {
81560 spinlock_t private_lock; /* for use by the address_space */
81561 struct list_head private_list; /* ditto */
81562 void *private_data; /* ditto */
81563-} __attribute__((aligned(sizeof(long))));
81564+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
81565 /*
81566 * On most architectures that alignment is already the case; but
81567 * must be enforced here for CRIS, to let the least significant bit
81568@@ -456,7 +456,7 @@ struct block_device {
81569 int bd_fsfreeze_count;
81570 /* Mutex for freeze */
81571 struct mutex bd_fsfreeze_mutex;
81572-};
81573+} __randomize_layout;
81574
81575 /*
81576 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
81577@@ -642,7 +642,7 @@ struct inode {
81578 #endif
81579
81580 void *i_private; /* fs or device private pointer */
81581-};
81582+} __randomize_layout;
81583
81584 static inline int inode_unhashed(struct inode *inode)
81585 {
81586@@ -837,7 +837,7 @@ struct file {
81587 struct list_head f_tfile_llink;
81588 #endif /* #ifdef CONFIG_EPOLL */
81589 struct address_space *f_mapping;
81590-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
81591+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
81592
81593 struct file_handle {
81594 __u32 handle_bytes;
81595@@ -962,7 +962,7 @@ struct file_lock {
81596 int state; /* state of grant or error if -ve */
81597 } afs;
81598 } fl_u;
81599-};
81600+} __randomize_layout;
81601
81602 /* The following constant reflects the upper bound of the file/locking space */
81603 #ifndef OFFSET_MAX
81604@@ -1305,7 +1305,7 @@ struct super_block {
81605 * Indicates how deep in a filesystem stack this SB is
81606 */
81607 int s_stack_depth;
81608-};
81609+} __randomize_layout;
81610
81611 extern struct timespec current_fs_time(struct super_block *sb);
81612
81613@@ -1536,7 +1536,8 @@ struct file_operations {
81614 long (*fallocate)(struct file *file, int mode, loff_t offset,
81615 loff_t len);
81616 void (*show_fdinfo)(struct seq_file *m, struct file *f);
81617-};
81618+} __do_const __randomize_layout;
81619+typedef struct file_operations __no_const file_operations_no_const;
81620
81621 struct inode_operations {
81622 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
81623@@ -2854,4 +2855,14 @@ static inline bool dir_relax(struct inode *inode)
81624 return !IS_DEADDIR(inode);
81625 }
81626
81627+static inline bool is_sidechannel_device(const struct inode *inode)
81628+{
81629+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
81630+ umode_t mode = inode->i_mode;
81631+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
81632+#else
81633+ return false;
81634+#endif
81635+}
81636+
81637 #endif /* _LINUX_FS_H */
81638diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
81639index 0efc3e6..fd23610 100644
81640--- a/include/linux/fs_struct.h
81641+++ b/include/linux/fs_struct.h
81642@@ -6,13 +6,13 @@
81643 #include <linux/seqlock.h>
81644
81645 struct fs_struct {
81646- int users;
81647+ atomic_t users;
81648 spinlock_t lock;
81649 seqcount_t seq;
81650 int umask;
81651 int in_exec;
81652 struct path root, pwd;
81653-};
81654+} __randomize_layout;
81655
81656 extern struct kmem_cache *fs_cachep;
81657
81658diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
81659index 7714849..a4a5c7a 100644
81660--- a/include/linux/fscache-cache.h
81661+++ b/include/linux/fscache-cache.h
81662@@ -113,7 +113,7 @@ struct fscache_operation {
81663 fscache_operation_release_t release;
81664 };
81665
81666-extern atomic_t fscache_op_debug_id;
81667+extern atomic_unchecked_t fscache_op_debug_id;
81668 extern void fscache_op_work_func(struct work_struct *work);
81669
81670 extern void fscache_enqueue_operation(struct fscache_operation *);
81671@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
81672 INIT_WORK(&op->work, fscache_op_work_func);
81673 atomic_set(&op->usage, 1);
81674 op->state = FSCACHE_OP_ST_INITIALISED;
81675- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
81676+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
81677 op->processor = processor;
81678 op->release = release;
81679 INIT_LIST_HEAD(&op->pend_link);
81680diff --git a/include/linux/fscache.h b/include/linux/fscache.h
81681index 115bb81..e7b812b 100644
81682--- a/include/linux/fscache.h
81683+++ b/include/linux/fscache.h
81684@@ -152,7 +152,7 @@ struct fscache_cookie_def {
81685 * - this is mandatory for any object that may have data
81686 */
81687 void (*now_uncached)(void *cookie_netfs_data);
81688-};
81689+} __do_const;
81690
81691 /*
81692 * fscache cached network filesystem type
81693diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
81694index 7ee1774..72505b8 100644
81695--- a/include/linux/fsnotify.h
81696+++ b/include/linux/fsnotify.h
81697@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
81698 struct inode *inode = file_inode(file);
81699 __u32 mask = FS_ACCESS;
81700
81701+ if (is_sidechannel_device(inode))
81702+ return;
81703+
81704 if (S_ISDIR(inode->i_mode))
81705 mask |= FS_ISDIR;
81706
81707@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
81708 struct inode *inode = file_inode(file);
81709 __u32 mask = FS_MODIFY;
81710
81711+ if (is_sidechannel_device(inode))
81712+ return;
81713+
81714 if (S_ISDIR(inode->i_mode))
81715 mask |= FS_ISDIR;
81716
81717@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
81718 */
81719 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
81720 {
81721- return kstrdup(name, GFP_KERNEL);
81722+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
81723 }
81724
81725 /*
81726diff --git a/include/linux/genhd.h b/include/linux/genhd.h
81727index ec274e0..e678159 100644
81728--- a/include/linux/genhd.h
81729+++ b/include/linux/genhd.h
81730@@ -194,7 +194,7 @@ struct gendisk {
81731 struct kobject *slave_dir;
81732
81733 struct timer_rand_state *random;
81734- atomic_t sync_io; /* RAID */
81735+ atomic_unchecked_t sync_io; /* RAID */
81736 struct disk_events *ev;
81737 #ifdef CONFIG_BLK_DEV_INTEGRITY
81738 struct blk_integrity *integrity;
81739@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
81740 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
81741
81742 /* drivers/char/random.c */
81743-extern void add_disk_randomness(struct gendisk *disk);
81744+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
81745 extern void rand_initialize_disk(struct gendisk *disk);
81746
81747 static inline sector_t get_start_sect(struct block_device *bdev)
81748diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
81749index 667c311..abac2a7 100644
81750--- a/include/linux/genl_magic_func.h
81751+++ b/include/linux/genl_magic_func.h
81752@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
81753 },
81754
81755 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
81756-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
81757+static struct genl_ops ZZZ_genl_ops[] = {
81758 #include GENL_MAGIC_INCLUDE_FILE
81759 };
81760
81761diff --git a/include/linux/gfp.h b/include/linux/gfp.h
81762index b840e3b..aeaeef9 100644
81763--- a/include/linux/gfp.h
81764+++ b/include/linux/gfp.h
81765@@ -34,6 +34,13 @@ struct vm_area_struct;
81766 #define ___GFP_NO_KSWAPD 0x400000u
81767 #define ___GFP_OTHER_NODE 0x800000u
81768 #define ___GFP_WRITE 0x1000000u
81769+
81770+#ifdef CONFIG_PAX_USERCOPY_SLABS
81771+#define ___GFP_USERCOPY 0x2000000u
81772+#else
81773+#define ___GFP_USERCOPY 0
81774+#endif
81775+
81776 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
81777
81778 /*
81779@@ -90,6 +97,7 @@ struct vm_area_struct;
81780 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
81781 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
81782 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
81783+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
81784
81785 /*
81786 * This may seem redundant, but it's a way of annotating false positives vs.
81787@@ -97,7 +105,7 @@ struct vm_area_struct;
81788 */
81789 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
81790
81791-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
81792+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
81793 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
81794
81795 /* This equals 0, but use constants in case they ever change */
81796@@ -152,6 +160,8 @@ struct vm_area_struct;
81797 /* 4GB DMA on some platforms */
81798 #define GFP_DMA32 __GFP_DMA32
81799
81800+#define GFP_USERCOPY __GFP_USERCOPY
81801+
81802 /* Convert GFP flags to their corresponding migrate type */
81803 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
81804 {
81805diff --git a/include/linux/gracl.h b/include/linux/gracl.h
81806new file mode 100644
81807index 0000000..91858e4
81808--- /dev/null
81809+++ b/include/linux/gracl.h
81810@@ -0,0 +1,342 @@
81811+#ifndef GR_ACL_H
81812+#define GR_ACL_H
81813+
81814+#include <linux/grdefs.h>
81815+#include <linux/resource.h>
81816+#include <linux/capability.h>
81817+#include <linux/dcache.h>
81818+#include <asm/resource.h>
81819+
81820+/* Major status information */
81821+
81822+#define GR_VERSION "grsecurity 3.1"
81823+#define GRSECURITY_VERSION 0x3100
81824+
81825+enum {
81826+ GR_SHUTDOWN = 0,
81827+ GR_ENABLE = 1,
81828+ GR_SPROLE = 2,
81829+ GR_OLDRELOAD = 3,
81830+ GR_SEGVMOD = 4,
81831+ GR_STATUS = 5,
81832+ GR_UNSPROLE = 6,
81833+ GR_PASSSET = 7,
81834+ GR_SPROLEPAM = 8,
81835+ GR_RELOAD = 9,
81836+};
81837+
81838+/* Password setup definitions
81839+ * kernel/grhash.c */
81840+enum {
81841+ GR_PW_LEN = 128,
81842+ GR_SALT_LEN = 16,
81843+ GR_SHA_LEN = 32,
81844+};
81845+
81846+enum {
81847+ GR_SPROLE_LEN = 64,
81848+};
81849+
81850+enum {
81851+ GR_NO_GLOB = 0,
81852+ GR_REG_GLOB,
81853+ GR_CREATE_GLOB
81854+};
81855+
81856+#define GR_NLIMITS 32
81857+
81858+/* Begin Data Structures */
81859+
81860+struct sprole_pw {
81861+ unsigned char *rolename;
81862+ unsigned char salt[GR_SALT_LEN];
81863+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
81864+};
81865+
81866+struct name_entry {
81867+ __u32 key;
81868+ u64 inode;
81869+ dev_t device;
81870+ char *name;
81871+ __u16 len;
81872+ __u8 deleted;
81873+ struct name_entry *prev;
81874+ struct name_entry *next;
81875+};
81876+
81877+struct inodev_entry {
81878+ struct name_entry *nentry;
81879+ struct inodev_entry *prev;
81880+ struct inodev_entry *next;
81881+};
81882+
81883+struct acl_role_db {
81884+ struct acl_role_label **r_hash;
81885+ __u32 r_size;
81886+};
81887+
81888+struct inodev_db {
81889+ struct inodev_entry **i_hash;
81890+ __u32 i_size;
81891+};
81892+
81893+struct name_db {
81894+ struct name_entry **n_hash;
81895+ __u32 n_size;
81896+};
81897+
81898+struct crash_uid {
81899+ uid_t uid;
81900+ unsigned long expires;
81901+};
81902+
81903+struct gr_hash_struct {
81904+ void **table;
81905+ void **nametable;
81906+ void *first;
81907+ __u32 table_size;
81908+ __u32 used_size;
81909+ int type;
81910+};
81911+
81912+/* Userspace Grsecurity ACL data structures */
81913+
81914+struct acl_subject_label {
81915+ char *filename;
81916+ u64 inode;
81917+ dev_t device;
81918+ __u32 mode;
81919+ kernel_cap_t cap_mask;
81920+ kernel_cap_t cap_lower;
81921+ kernel_cap_t cap_invert_audit;
81922+
81923+ struct rlimit res[GR_NLIMITS];
81924+ __u32 resmask;
81925+
81926+ __u8 user_trans_type;
81927+ __u8 group_trans_type;
81928+ uid_t *user_transitions;
81929+ gid_t *group_transitions;
81930+ __u16 user_trans_num;
81931+ __u16 group_trans_num;
81932+
81933+ __u32 sock_families[2];
81934+ __u32 ip_proto[8];
81935+ __u32 ip_type;
81936+ struct acl_ip_label **ips;
81937+ __u32 ip_num;
81938+ __u32 inaddr_any_override;
81939+
81940+ __u32 crashes;
81941+ unsigned long expires;
81942+
81943+ struct acl_subject_label *parent_subject;
81944+ struct gr_hash_struct *hash;
81945+ struct acl_subject_label *prev;
81946+ struct acl_subject_label *next;
81947+
81948+ struct acl_object_label **obj_hash;
81949+ __u32 obj_hash_size;
81950+ __u16 pax_flags;
81951+};
81952+
81953+struct role_allowed_ip {
81954+ __u32 addr;
81955+ __u32 netmask;
81956+
81957+ struct role_allowed_ip *prev;
81958+ struct role_allowed_ip *next;
81959+};
81960+
81961+struct role_transition {
81962+ char *rolename;
81963+
81964+ struct role_transition *prev;
81965+ struct role_transition *next;
81966+};
81967+
81968+struct acl_role_label {
81969+ char *rolename;
81970+ uid_t uidgid;
81971+ __u16 roletype;
81972+
81973+ __u16 auth_attempts;
81974+ unsigned long expires;
81975+
81976+ struct acl_subject_label *root_label;
81977+ struct gr_hash_struct *hash;
81978+
81979+ struct acl_role_label *prev;
81980+ struct acl_role_label *next;
81981+
81982+ struct role_transition *transitions;
81983+ struct role_allowed_ip *allowed_ips;
81984+ uid_t *domain_children;
81985+ __u16 domain_child_num;
81986+
81987+ umode_t umask;
81988+
81989+ struct acl_subject_label **subj_hash;
81990+ __u32 subj_hash_size;
81991+};
81992+
81993+struct user_acl_role_db {
81994+ struct acl_role_label **r_table;
81995+ __u32 num_pointers; /* Number of allocations to track */
81996+ __u32 num_roles; /* Number of roles */
81997+ __u32 num_domain_children; /* Number of domain children */
81998+ __u32 num_subjects; /* Number of subjects */
81999+ __u32 num_objects; /* Number of objects */
82000+};
82001+
82002+struct acl_object_label {
82003+ char *filename;
82004+ u64 inode;
82005+ dev_t device;
82006+ __u32 mode;
82007+
82008+ struct acl_subject_label *nested;
82009+ struct acl_object_label *globbed;
82010+
82011+ /* next two structures not used */
82012+
82013+ struct acl_object_label *prev;
82014+ struct acl_object_label *next;
82015+};
82016+
82017+struct acl_ip_label {
82018+ char *iface;
82019+ __u32 addr;
82020+ __u32 netmask;
82021+ __u16 low, high;
82022+ __u8 mode;
82023+ __u32 type;
82024+ __u32 proto[8];
82025+
82026+ /* next two structures not used */
82027+
82028+ struct acl_ip_label *prev;
82029+ struct acl_ip_label *next;
82030+};
82031+
82032+struct gr_arg {
82033+ struct user_acl_role_db role_db;
82034+ unsigned char pw[GR_PW_LEN];
82035+ unsigned char salt[GR_SALT_LEN];
82036+ unsigned char sum[GR_SHA_LEN];
82037+ unsigned char sp_role[GR_SPROLE_LEN];
82038+ struct sprole_pw *sprole_pws;
82039+ dev_t segv_device;
82040+ u64 segv_inode;
82041+ uid_t segv_uid;
82042+ __u16 num_sprole_pws;
82043+ __u16 mode;
82044+};
82045+
82046+struct gr_arg_wrapper {
82047+ struct gr_arg *arg;
82048+ __u32 version;
82049+ __u32 size;
82050+};
82051+
82052+struct subject_map {
82053+ struct acl_subject_label *user;
82054+ struct acl_subject_label *kernel;
82055+ struct subject_map *prev;
82056+ struct subject_map *next;
82057+};
82058+
82059+struct acl_subj_map_db {
82060+ struct subject_map **s_hash;
82061+ __u32 s_size;
82062+};
82063+
82064+struct gr_policy_state {
82065+ struct sprole_pw **acl_special_roles;
82066+ __u16 num_sprole_pws;
82067+ struct acl_role_label *kernel_role;
82068+ struct acl_role_label *role_list;
82069+ struct acl_role_label *default_role;
82070+ struct acl_role_db acl_role_set;
82071+ struct acl_subj_map_db subj_map_set;
82072+ struct name_db name_set;
82073+ struct inodev_db inodev_set;
82074+};
82075+
82076+struct gr_alloc_state {
82077+ unsigned long alloc_stack_next;
82078+ unsigned long alloc_stack_size;
82079+ void **alloc_stack;
82080+};
82081+
82082+struct gr_reload_state {
82083+ struct gr_policy_state oldpolicy;
82084+ struct gr_alloc_state oldalloc;
82085+ struct gr_policy_state newpolicy;
82086+ struct gr_alloc_state newalloc;
82087+ struct gr_policy_state *oldpolicy_ptr;
82088+ struct gr_alloc_state *oldalloc_ptr;
82089+ unsigned char oldmode;
82090+};
82091+
82092+/* End Data Structures Section */
82093+
82094+/* Hash functions generated by empirical testing by Brad Spengler
82095+ Makes good use of the low bits of the inode. Generally 0-1 times
82096+ in loop for successful match. 0-3 for unsuccessful match.
82097+ Shift/add algorithm with modulus of table size and an XOR*/
82098+
82099+static __inline__ unsigned int
82100+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
82101+{
82102+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
82103+}
82104+
82105+ static __inline__ unsigned int
82106+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
82107+{
82108+ return ((const unsigned long)userp % sz);
82109+}
82110+
82111+static __inline__ unsigned int
82112+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
82113+{
82114+ unsigned int rem;
82115+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
82116+ return rem;
82117+}
82118+
82119+static __inline__ unsigned int
82120+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
82121+{
82122+ return full_name_hash((const unsigned char *)name, len) % sz;
82123+}
82124+
82125+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
82126+ subj = NULL; \
82127+ iter = 0; \
82128+ while (iter < role->subj_hash_size) { \
82129+ if (subj == NULL) \
82130+ subj = role->subj_hash[iter]; \
82131+ if (subj == NULL) { \
82132+ iter++; \
82133+ continue; \
82134+ }
82135+
82136+#define FOR_EACH_SUBJECT_END(subj,iter) \
82137+ subj = subj->next; \
82138+ if (subj == NULL) \
82139+ iter++; \
82140+ }
82141+
82142+
82143+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
82144+ subj = role->hash->first; \
82145+ while (subj != NULL) {
82146+
82147+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
82148+ subj = subj->next; \
82149+ }
82150+
82151+#endif
82152+
82153diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
82154new file mode 100644
82155index 0000000..af64092
82156--- /dev/null
82157+++ b/include/linux/gracl_compat.h
82158@@ -0,0 +1,156 @@
82159+#ifndef GR_ACL_COMPAT_H
82160+#define GR_ACL_COMPAT_H
82161+
82162+#include <linux/resource.h>
82163+#include <asm/resource.h>
82164+
82165+struct sprole_pw_compat {
82166+ compat_uptr_t rolename;
82167+ unsigned char salt[GR_SALT_LEN];
82168+ unsigned char sum[GR_SHA_LEN];
82169+};
82170+
82171+struct gr_hash_struct_compat {
82172+ compat_uptr_t table;
82173+ compat_uptr_t nametable;
82174+ compat_uptr_t first;
82175+ __u32 table_size;
82176+ __u32 used_size;
82177+ int type;
82178+};
82179+
82180+struct acl_subject_label_compat {
82181+ compat_uptr_t filename;
82182+ compat_u64 inode;
82183+ __u32 device;
82184+ __u32 mode;
82185+ kernel_cap_t cap_mask;
82186+ kernel_cap_t cap_lower;
82187+ kernel_cap_t cap_invert_audit;
82188+
82189+ struct compat_rlimit res[GR_NLIMITS];
82190+ __u32 resmask;
82191+
82192+ __u8 user_trans_type;
82193+ __u8 group_trans_type;
82194+ compat_uptr_t user_transitions;
82195+ compat_uptr_t group_transitions;
82196+ __u16 user_trans_num;
82197+ __u16 group_trans_num;
82198+
82199+ __u32 sock_families[2];
82200+ __u32 ip_proto[8];
82201+ __u32 ip_type;
82202+ compat_uptr_t ips;
82203+ __u32 ip_num;
82204+ __u32 inaddr_any_override;
82205+
82206+ __u32 crashes;
82207+ compat_ulong_t expires;
82208+
82209+ compat_uptr_t parent_subject;
82210+ compat_uptr_t hash;
82211+ compat_uptr_t prev;
82212+ compat_uptr_t next;
82213+
82214+ compat_uptr_t obj_hash;
82215+ __u32 obj_hash_size;
82216+ __u16 pax_flags;
82217+};
82218+
82219+struct role_allowed_ip_compat {
82220+ __u32 addr;
82221+ __u32 netmask;
82222+
82223+ compat_uptr_t prev;
82224+ compat_uptr_t next;
82225+};
82226+
82227+struct role_transition_compat {
82228+ compat_uptr_t rolename;
82229+
82230+ compat_uptr_t prev;
82231+ compat_uptr_t next;
82232+};
82233+
82234+struct acl_role_label_compat {
82235+ compat_uptr_t rolename;
82236+ uid_t uidgid;
82237+ __u16 roletype;
82238+
82239+ __u16 auth_attempts;
82240+ compat_ulong_t expires;
82241+
82242+ compat_uptr_t root_label;
82243+ compat_uptr_t hash;
82244+
82245+ compat_uptr_t prev;
82246+ compat_uptr_t next;
82247+
82248+ compat_uptr_t transitions;
82249+ compat_uptr_t allowed_ips;
82250+ compat_uptr_t domain_children;
82251+ __u16 domain_child_num;
82252+
82253+ umode_t umask;
82254+
82255+ compat_uptr_t subj_hash;
82256+ __u32 subj_hash_size;
82257+};
82258+
82259+struct user_acl_role_db_compat {
82260+ compat_uptr_t r_table;
82261+ __u32 num_pointers;
82262+ __u32 num_roles;
82263+ __u32 num_domain_children;
82264+ __u32 num_subjects;
82265+ __u32 num_objects;
82266+};
82267+
82268+struct acl_object_label_compat {
82269+ compat_uptr_t filename;
82270+ compat_u64 inode;
82271+ __u32 device;
82272+ __u32 mode;
82273+
82274+ compat_uptr_t nested;
82275+ compat_uptr_t globbed;
82276+
82277+ compat_uptr_t prev;
82278+ compat_uptr_t next;
82279+};
82280+
82281+struct acl_ip_label_compat {
82282+ compat_uptr_t iface;
82283+ __u32 addr;
82284+ __u32 netmask;
82285+ __u16 low, high;
82286+ __u8 mode;
82287+ __u32 type;
82288+ __u32 proto[8];
82289+
82290+ compat_uptr_t prev;
82291+ compat_uptr_t next;
82292+};
82293+
82294+struct gr_arg_compat {
82295+ struct user_acl_role_db_compat role_db;
82296+ unsigned char pw[GR_PW_LEN];
82297+ unsigned char salt[GR_SALT_LEN];
82298+ unsigned char sum[GR_SHA_LEN];
82299+ unsigned char sp_role[GR_SPROLE_LEN];
82300+ compat_uptr_t sprole_pws;
82301+ __u32 segv_device;
82302+ compat_u64 segv_inode;
82303+ uid_t segv_uid;
82304+ __u16 num_sprole_pws;
82305+ __u16 mode;
82306+};
82307+
82308+struct gr_arg_wrapper_compat {
82309+ compat_uptr_t arg;
82310+ __u32 version;
82311+ __u32 size;
82312+};
82313+
82314+#endif
82315diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
82316new file mode 100644
82317index 0000000..323ecf2
82318--- /dev/null
82319+++ b/include/linux/gralloc.h
82320@@ -0,0 +1,9 @@
82321+#ifndef __GRALLOC_H
82322+#define __GRALLOC_H
82323+
82324+void acl_free_all(void);
82325+int acl_alloc_stack_init(unsigned long size);
82326+void *acl_alloc(unsigned long len);
82327+void *acl_alloc_num(unsigned long num, unsigned long len);
82328+
82329+#endif
82330diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
82331new file mode 100644
82332index 0000000..be66033
82333--- /dev/null
82334+++ b/include/linux/grdefs.h
82335@@ -0,0 +1,140 @@
82336+#ifndef GRDEFS_H
82337+#define GRDEFS_H
82338+
82339+/* Begin grsecurity status declarations */
82340+
82341+enum {
82342+ GR_READY = 0x01,
82343+ GR_STATUS_INIT = 0x00 // disabled state
82344+};
82345+
82346+/* Begin ACL declarations */
82347+
82348+/* Role flags */
82349+
82350+enum {
82351+ GR_ROLE_USER = 0x0001,
82352+ GR_ROLE_GROUP = 0x0002,
82353+ GR_ROLE_DEFAULT = 0x0004,
82354+ GR_ROLE_SPECIAL = 0x0008,
82355+ GR_ROLE_AUTH = 0x0010,
82356+ GR_ROLE_NOPW = 0x0020,
82357+ GR_ROLE_GOD = 0x0040,
82358+ GR_ROLE_LEARN = 0x0080,
82359+ GR_ROLE_TPE = 0x0100,
82360+ GR_ROLE_DOMAIN = 0x0200,
82361+ GR_ROLE_PAM = 0x0400,
82362+ GR_ROLE_PERSIST = 0x0800
82363+};
82364+
82365+/* ACL Subject and Object mode flags */
82366+enum {
82367+ GR_DELETED = 0x80000000
82368+};
82369+
82370+/* ACL Object-only mode flags */
82371+enum {
82372+ GR_READ = 0x00000001,
82373+ GR_APPEND = 0x00000002,
82374+ GR_WRITE = 0x00000004,
82375+ GR_EXEC = 0x00000008,
82376+ GR_FIND = 0x00000010,
82377+ GR_INHERIT = 0x00000020,
82378+ GR_SETID = 0x00000040,
82379+ GR_CREATE = 0x00000080,
82380+ GR_DELETE = 0x00000100,
82381+ GR_LINK = 0x00000200,
82382+ GR_AUDIT_READ = 0x00000400,
82383+ GR_AUDIT_APPEND = 0x00000800,
82384+ GR_AUDIT_WRITE = 0x00001000,
82385+ GR_AUDIT_EXEC = 0x00002000,
82386+ GR_AUDIT_FIND = 0x00004000,
82387+ GR_AUDIT_INHERIT= 0x00008000,
82388+ GR_AUDIT_SETID = 0x00010000,
82389+ GR_AUDIT_CREATE = 0x00020000,
82390+ GR_AUDIT_DELETE = 0x00040000,
82391+ GR_AUDIT_LINK = 0x00080000,
82392+ GR_PTRACERD = 0x00100000,
82393+ GR_NOPTRACE = 0x00200000,
82394+ GR_SUPPRESS = 0x00400000,
82395+ GR_NOLEARN = 0x00800000,
82396+ GR_INIT_TRANSFER= 0x01000000
82397+};
82398+
82399+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
82400+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
82401+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
82402+
82403+/* ACL subject-only mode flags */
82404+enum {
82405+ GR_KILL = 0x00000001,
82406+ GR_VIEW = 0x00000002,
82407+ GR_PROTECTED = 0x00000004,
82408+ GR_LEARN = 0x00000008,
82409+ GR_OVERRIDE = 0x00000010,
82410+ /* just a placeholder, this mode is only used in userspace */
82411+ GR_DUMMY = 0x00000020,
82412+ GR_PROTSHM = 0x00000040,
82413+ GR_KILLPROC = 0x00000080,
82414+ GR_KILLIPPROC = 0x00000100,
82415+ /* just a placeholder, this mode is only used in userspace */
82416+ GR_NOTROJAN = 0x00000200,
82417+ GR_PROTPROCFD = 0x00000400,
82418+ GR_PROCACCT = 0x00000800,
82419+ GR_RELAXPTRACE = 0x00001000,
82420+ //GR_NESTED = 0x00002000,
82421+ GR_INHERITLEARN = 0x00004000,
82422+ GR_PROCFIND = 0x00008000,
82423+ GR_POVERRIDE = 0x00010000,
82424+ GR_KERNELAUTH = 0x00020000,
82425+ GR_ATSECURE = 0x00040000,
82426+ GR_SHMEXEC = 0x00080000
82427+};
82428+
82429+enum {
82430+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
82431+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
82432+ GR_PAX_ENABLE_MPROTECT = 0x0004,
82433+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
82434+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
82435+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
82436+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
82437+ GR_PAX_DISABLE_MPROTECT = 0x0400,
82438+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
82439+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
82440+};
82441+
82442+enum {
82443+ GR_ID_USER = 0x01,
82444+ GR_ID_GROUP = 0x02,
82445+};
82446+
82447+enum {
82448+ GR_ID_ALLOW = 0x01,
82449+ GR_ID_DENY = 0x02,
82450+};
82451+
82452+#define GR_CRASH_RES 31
82453+#define GR_UIDTABLE_MAX 500
82454+
82455+/* begin resource learning section */
82456+enum {
82457+ GR_RLIM_CPU_BUMP = 60,
82458+ GR_RLIM_FSIZE_BUMP = 50000,
82459+ GR_RLIM_DATA_BUMP = 10000,
82460+ GR_RLIM_STACK_BUMP = 1000,
82461+ GR_RLIM_CORE_BUMP = 10000,
82462+ GR_RLIM_RSS_BUMP = 500000,
82463+ GR_RLIM_NPROC_BUMP = 1,
82464+ GR_RLIM_NOFILE_BUMP = 5,
82465+ GR_RLIM_MEMLOCK_BUMP = 50000,
82466+ GR_RLIM_AS_BUMP = 500000,
82467+ GR_RLIM_LOCKS_BUMP = 2,
82468+ GR_RLIM_SIGPENDING_BUMP = 5,
82469+ GR_RLIM_MSGQUEUE_BUMP = 10000,
82470+ GR_RLIM_NICE_BUMP = 1,
82471+ GR_RLIM_RTPRIO_BUMP = 1,
82472+ GR_RLIM_RTTIME_BUMP = 1000000
82473+};
82474+
82475+#endif
82476diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
82477new file mode 100644
82478index 0000000..fb1de5d
82479--- /dev/null
82480+++ b/include/linux/grinternal.h
82481@@ -0,0 +1,230 @@
82482+#ifndef __GRINTERNAL_H
82483+#define __GRINTERNAL_H
82484+
82485+#ifdef CONFIG_GRKERNSEC
82486+
82487+#include <linux/fs.h>
82488+#include <linux/mnt_namespace.h>
82489+#include <linux/nsproxy.h>
82490+#include <linux/gracl.h>
82491+#include <linux/grdefs.h>
82492+#include <linux/grmsg.h>
82493+
82494+void gr_add_learn_entry(const char *fmt, ...)
82495+ __attribute__ ((format (printf, 1, 2)));
82496+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
82497+ const struct vfsmount *mnt);
82498+__u32 gr_check_create(const struct dentry *new_dentry,
82499+ const struct dentry *parent,
82500+ const struct vfsmount *mnt, const __u32 mode);
82501+int gr_check_protected_task(const struct task_struct *task);
82502+__u32 to_gr_audit(const __u32 reqmode);
82503+int gr_set_acls(const int type);
82504+int gr_acl_is_enabled(void);
82505+char gr_roletype_to_char(void);
82506+
82507+void gr_handle_alertkill(struct task_struct *task);
82508+char *gr_to_filename(const struct dentry *dentry,
82509+ const struct vfsmount *mnt);
82510+char *gr_to_filename1(const struct dentry *dentry,
82511+ const struct vfsmount *mnt);
82512+char *gr_to_filename2(const struct dentry *dentry,
82513+ const struct vfsmount *mnt);
82514+char *gr_to_filename3(const struct dentry *dentry,
82515+ const struct vfsmount *mnt);
82516+
82517+extern int grsec_enable_ptrace_readexec;
82518+extern int grsec_enable_harden_ptrace;
82519+extern int grsec_enable_link;
82520+extern int grsec_enable_fifo;
82521+extern int grsec_enable_execve;
82522+extern int grsec_enable_shm;
82523+extern int grsec_enable_execlog;
82524+extern int grsec_enable_signal;
82525+extern int grsec_enable_audit_ptrace;
82526+extern int grsec_enable_forkfail;
82527+extern int grsec_enable_time;
82528+extern int grsec_enable_rofs;
82529+extern int grsec_deny_new_usb;
82530+extern int grsec_enable_chroot_shmat;
82531+extern int grsec_enable_chroot_mount;
82532+extern int grsec_enable_chroot_double;
82533+extern int grsec_enable_chroot_pivot;
82534+extern int grsec_enable_chroot_chdir;
82535+extern int grsec_enable_chroot_chmod;
82536+extern int grsec_enable_chroot_mknod;
82537+extern int grsec_enable_chroot_fchdir;
82538+extern int grsec_enable_chroot_nice;
82539+extern int grsec_enable_chroot_execlog;
82540+extern int grsec_enable_chroot_caps;
82541+extern int grsec_enable_chroot_rename;
82542+extern int grsec_enable_chroot_sysctl;
82543+extern int grsec_enable_chroot_unix;
82544+extern int grsec_enable_symlinkown;
82545+extern kgid_t grsec_symlinkown_gid;
82546+extern int grsec_enable_tpe;
82547+extern kgid_t grsec_tpe_gid;
82548+extern int grsec_enable_tpe_all;
82549+extern int grsec_enable_tpe_invert;
82550+extern int grsec_enable_socket_all;
82551+extern kgid_t grsec_socket_all_gid;
82552+extern int grsec_enable_socket_client;
82553+extern kgid_t grsec_socket_client_gid;
82554+extern int grsec_enable_socket_server;
82555+extern kgid_t grsec_socket_server_gid;
82556+extern kgid_t grsec_audit_gid;
82557+extern int grsec_enable_group;
82558+extern int grsec_enable_log_rwxmaps;
82559+extern int grsec_enable_mount;
82560+extern int grsec_enable_chdir;
82561+extern int grsec_resource_logging;
82562+extern int grsec_enable_blackhole;
82563+extern int grsec_lastack_retries;
82564+extern int grsec_enable_brute;
82565+extern int grsec_enable_harden_ipc;
82566+extern int grsec_lock;
82567+
82568+extern spinlock_t grsec_alert_lock;
82569+extern unsigned long grsec_alert_wtime;
82570+extern unsigned long grsec_alert_fyet;
82571+
82572+extern spinlock_t grsec_audit_lock;
82573+
82574+extern rwlock_t grsec_exec_file_lock;
82575+
82576+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
82577+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
82578+ (tsk)->exec_file->f_path.mnt) : "/")
82579+
82580+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
82581+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
82582+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
82583+
82584+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
82585+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
82586+ (tsk)->exec_file->f_path.mnt) : "/")
82587+
82588+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
82589+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
82590+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
82591+
82592+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
82593+
82594+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
82595+
82596+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
82597+{
82598+ if (file1 && file2) {
82599+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
82600+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
82601+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
82602+ return true;
82603+ }
82604+
82605+ return false;
82606+}
82607+
82608+#define GR_CHROOT_CAPS {{ \
82609+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
82610+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
82611+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
82612+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
82613+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
82614+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
82615+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
82616+
82617+#define security_learn(normal_msg,args...) \
82618+({ \
82619+ read_lock(&grsec_exec_file_lock); \
82620+ gr_add_learn_entry(normal_msg "\n", ## args); \
82621+ read_unlock(&grsec_exec_file_lock); \
82622+})
82623+
82624+enum {
82625+ GR_DO_AUDIT,
82626+ GR_DONT_AUDIT,
82627+ /* used for non-audit messages that we shouldn't kill the task on */
82628+ GR_DONT_AUDIT_GOOD
82629+};
82630+
82631+enum {
82632+ GR_TTYSNIFF,
82633+ GR_RBAC,
82634+ GR_RBAC_STR,
82635+ GR_STR_RBAC,
82636+ GR_RBAC_MODE2,
82637+ GR_RBAC_MODE3,
82638+ GR_FILENAME,
82639+ GR_SYSCTL_HIDDEN,
82640+ GR_NOARGS,
82641+ GR_ONE_INT,
82642+ GR_ONE_INT_TWO_STR,
82643+ GR_ONE_STR,
82644+ GR_STR_INT,
82645+ GR_TWO_STR_INT,
82646+ GR_TWO_INT,
82647+ GR_TWO_U64,
82648+ GR_THREE_INT,
82649+ GR_FIVE_INT_TWO_STR,
82650+ GR_TWO_STR,
82651+ GR_THREE_STR,
82652+ GR_FOUR_STR,
82653+ GR_STR_FILENAME,
82654+ GR_FILENAME_STR,
82655+ GR_FILENAME_TWO_INT,
82656+ GR_FILENAME_TWO_INT_STR,
82657+ GR_TEXTREL,
82658+ GR_PTRACE,
82659+ GR_RESOURCE,
82660+ GR_CAP,
82661+ GR_SIG,
82662+ GR_SIG2,
82663+ GR_CRASH1,
82664+ GR_CRASH2,
82665+ GR_PSACCT,
82666+ GR_RWXMAP,
82667+ GR_RWXMAPVMA
82668+};
82669+
82670+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
82671+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
82672+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
82673+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
82674+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
82675+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
82676+#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)
82677+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
82678+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
82679+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
82680+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
82681+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
82682+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
82683+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
82684+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
82685+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
82686+#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)
82687+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
82688+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
82689+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
82690+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
82691+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
82692+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
82693+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
82694+#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)
82695+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
82696+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
82697+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
82698+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
82699+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
82700+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
82701+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
82702+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
82703+#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)
82704+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
82705+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
82706+
82707+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
82708+
82709+#endif
82710+
82711+#endif
82712diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
82713new file mode 100644
82714index 0000000..26ef560
82715--- /dev/null
82716+++ b/include/linux/grmsg.h
82717@@ -0,0 +1,118 @@
82718+#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"
82719+#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"
82720+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
82721+#define GR_STOPMOD_MSG "denied modification of module state by "
82722+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
82723+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
82724+#define GR_IOPERM_MSG "denied use of ioperm() by "
82725+#define GR_IOPL_MSG "denied use of iopl() by "
82726+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
82727+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
82728+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
82729+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
82730+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
82731+#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"
82732+#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"
82733+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
82734+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
82735+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
82736+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
82737+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
82738+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
82739+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
82740+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
82741+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
82742+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
82743+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
82744+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
82745+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
82746+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
82747+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
82748+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
82749+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
82750+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
82751+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
82752+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
82753+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
82754+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
82755+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
82756+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
82757+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
82758+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
82759+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
82760+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
82761+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
82762+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
82763+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
82764+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
82765+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
82766+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
82767+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
82768+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
82769+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
82770+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
82771+#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"
82772+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
82773+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
82774+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
82775+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
82776+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
82777+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
82778+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
82779+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
82780+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
82781+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
82782+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
82783+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
82784+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
82785+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
82786+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
82787+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
82788+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
82789+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
82790+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
82791+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
82792+#define GR_FAILFORK_MSG "failed fork with errno %s by "
82793+#define GR_NICE_CHROOT_MSG "denied priority change by "
82794+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
82795+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
82796+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
82797+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
82798+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
82799+#define GR_TIME_MSG "time set by "
82800+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
82801+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
82802+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
82803+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
82804+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
82805+#define GR_BIND_MSG "denied bind() by "
82806+#define GR_CONNECT_MSG "denied connect() by "
82807+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
82808+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
82809+#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"
82810+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
82811+#define GR_CAP_ACL_MSG "use of %s denied for "
82812+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
82813+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
82814+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
82815+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
82816+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
82817+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
82818+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
82819+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
82820+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
82821+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
82822+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
82823+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
82824+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
82825+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
82826+#define GR_VM86_MSG "denied use of vm86 by "
82827+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
82828+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
82829+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
82830+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
82831+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
82832+#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 "
82833+#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 "
82834+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
82835+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
82836diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
82837new file mode 100644
82838index 0000000..63c1850
82839--- /dev/null
82840+++ b/include/linux/grsecurity.h
82841@@ -0,0 +1,250 @@
82842+#ifndef GR_SECURITY_H
82843+#define GR_SECURITY_H
82844+#include <linux/fs.h>
82845+#include <linux/fs_struct.h>
82846+#include <linux/binfmts.h>
82847+#include <linux/gracl.h>
82848+
82849+/* notify of brain-dead configs */
82850+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82851+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
82852+#endif
82853+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82854+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
82855+#endif
82856+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
82857+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
82858+#endif
82859+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
82860+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
82861+#endif
82862+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
82863+#error "CONFIG_PAX enabled, but no PaX options are enabled."
82864+#endif
82865+
82866+int gr_handle_new_usb(void);
82867+
82868+void gr_handle_brute_attach(int dumpable);
82869+void gr_handle_brute_check(void);
82870+void gr_handle_kernel_exploit(void);
82871+
82872+char gr_roletype_to_char(void);
82873+
82874+int gr_proc_is_restricted(void);
82875+
82876+int gr_acl_enable_at_secure(void);
82877+
82878+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
82879+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
82880+
82881+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
82882+
82883+void gr_del_task_from_ip_table(struct task_struct *p);
82884+
82885+int gr_pid_is_chrooted(struct task_struct *p);
82886+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
82887+int gr_handle_chroot_nice(void);
82888+int gr_handle_chroot_sysctl(const int op);
82889+int gr_handle_chroot_setpriority(struct task_struct *p,
82890+ const int niceval);
82891+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
82892+int gr_chroot_fhandle(void);
82893+int gr_handle_chroot_chroot(const struct dentry *dentry,
82894+ const struct vfsmount *mnt);
82895+void gr_handle_chroot_chdir(const struct path *path);
82896+int gr_handle_chroot_chmod(const struct dentry *dentry,
82897+ const struct vfsmount *mnt, const int mode);
82898+int gr_handle_chroot_mknod(const struct dentry *dentry,
82899+ const struct vfsmount *mnt, const int mode);
82900+int gr_handle_chroot_mount(const struct dentry *dentry,
82901+ const struct vfsmount *mnt,
82902+ const char *dev_name);
82903+int gr_handle_chroot_pivot(void);
82904+int gr_handle_chroot_unix(const pid_t pid);
82905+
82906+int gr_handle_rawio(const struct inode *inode);
82907+
82908+void gr_handle_ioperm(void);
82909+void gr_handle_iopl(void);
82910+void gr_handle_msr_write(void);
82911+
82912+umode_t gr_acl_umask(void);
82913+
82914+int gr_tpe_allow(const struct file *file);
82915+
82916+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
82917+void gr_clear_chroot_entries(struct task_struct *task);
82918+
82919+void gr_log_forkfail(const int retval);
82920+void gr_log_timechange(void);
82921+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
82922+void gr_log_chdir(const struct dentry *dentry,
82923+ const struct vfsmount *mnt);
82924+void gr_log_chroot_exec(const struct dentry *dentry,
82925+ const struct vfsmount *mnt);
82926+void gr_log_remount(const char *devname, const int retval);
82927+void gr_log_unmount(const char *devname, const int retval);
82928+void gr_log_mount(const char *from, struct path *to, const int retval);
82929+void gr_log_textrel(struct vm_area_struct *vma);
82930+void gr_log_ptgnustack(struct file *file);
82931+void gr_log_rwxmmap(struct file *file);
82932+void gr_log_rwxmprotect(struct vm_area_struct *vma);
82933+
82934+int gr_handle_follow_link(const struct inode *parent,
82935+ const struct inode *inode,
82936+ const struct dentry *dentry,
82937+ const struct vfsmount *mnt);
82938+int gr_handle_fifo(const struct dentry *dentry,
82939+ const struct vfsmount *mnt,
82940+ const struct dentry *dir, const int flag,
82941+ const int acc_mode);
82942+int gr_handle_hardlink(const struct dentry *dentry,
82943+ const struct vfsmount *mnt,
82944+ struct inode *inode,
82945+ const int mode, const struct filename *to);
82946+
82947+int gr_is_capable(const int cap);
82948+int gr_is_capable_nolog(const int cap);
82949+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82950+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82951+
82952+void gr_copy_label(struct task_struct *tsk);
82953+void gr_handle_crash(struct task_struct *task, const int sig);
82954+int gr_handle_signal(const struct task_struct *p, const int sig);
82955+int gr_check_crash_uid(const kuid_t uid);
82956+int gr_check_protected_task(const struct task_struct *task);
82957+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82958+int gr_acl_handle_mmap(const struct file *file,
82959+ const unsigned long prot);
82960+int gr_acl_handle_mprotect(const struct file *file,
82961+ const unsigned long prot);
82962+int gr_check_hidden_task(const struct task_struct *tsk);
82963+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82964+ const struct vfsmount *mnt);
82965+__u32 gr_acl_handle_utime(const struct dentry *dentry,
82966+ const struct vfsmount *mnt);
82967+__u32 gr_acl_handle_access(const struct dentry *dentry,
82968+ const struct vfsmount *mnt, const int fmode);
82969+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82970+ const struct vfsmount *mnt, umode_t *mode);
82971+__u32 gr_acl_handle_chown(const struct dentry *dentry,
82972+ const struct vfsmount *mnt);
82973+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82974+ const struct vfsmount *mnt);
82975+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82976+ const struct vfsmount *mnt);
82977+int gr_handle_ptrace(struct task_struct *task, const long request);
82978+int gr_handle_proc_ptrace(struct task_struct *task);
82979+__u32 gr_acl_handle_execve(const struct dentry *dentry,
82980+ const struct vfsmount *mnt);
82981+int gr_check_crash_exec(const struct file *filp);
82982+int gr_acl_is_enabled(void);
82983+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82984+ const kgid_t gid);
82985+int gr_set_proc_label(const struct dentry *dentry,
82986+ const struct vfsmount *mnt,
82987+ const int unsafe_flags);
82988+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82989+ const struct vfsmount *mnt);
82990+__u32 gr_acl_handle_open(const struct dentry *dentry,
82991+ const struct vfsmount *mnt, int acc_mode);
82992+__u32 gr_acl_handle_creat(const struct dentry *dentry,
82993+ const struct dentry *p_dentry,
82994+ const struct vfsmount *p_mnt,
82995+ int open_flags, int acc_mode, const int imode);
82996+void gr_handle_create(const struct dentry *dentry,
82997+ const struct vfsmount *mnt);
82998+void gr_handle_proc_create(const struct dentry *dentry,
82999+ const struct inode *inode);
83000+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
83001+ const struct dentry *parent_dentry,
83002+ const struct vfsmount *parent_mnt,
83003+ const int mode);
83004+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
83005+ const struct dentry *parent_dentry,
83006+ const struct vfsmount *parent_mnt);
83007+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
83008+ const struct vfsmount *mnt);
83009+void gr_handle_delete(const u64 ino, const dev_t dev);
83010+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
83011+ const struct vfsmount *mnt);
83012+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
83013+ const struct dentry *parent_dentry,
83014+ const struct vfsmount *parent_mnt,
83015+ const struct filename *from);
83016+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
83017+ const struct dentry *parent_dentry,
83018+ const struct vfsmount *parent_mnt,
83019+ const struct dentry *old_dentry,
83020+ const struct vfsmount *old_mnt, const struct filename *to);
83021+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
83022+int gr_acl_handle_rename(struct dentry *new_dentry,
83023+ struct dentry *parent_dentry,
83024+ const struct vfsmount *parent_mnt,
83025+ struct dentry *old_dentry,
83026+ struct inode *old_parent_inode,
83027+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
83028+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
83029+ struct dentry *old_dentry,
83030+ struct dentry *new_dentry,
83031+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
83032+__u32 gr_check_link(const struct dentry *new_dentry,
83033+ const struct dentry *parent_dentry,
83034+ const struct vfsmount *parent_mnt,
83035+ const struct dentry *old_dentry,
83036+ const struct vfsmount *old_mnt);
83037+int gr_acl_handle_filldir(const struct file *file, const char *name,
83038+ const unsigned int namelen, const u64 ino);
83039+
83040+__u32 gr_acl_handle_unix(const struct dentry *dentry,
83041+ const struct vfsmount *mnt);
83042+void gr_acl_handle_exit(void);
83043+void gr_acl_handle_psacct(struct task_struct *task, const long code);
83044+int gr_acl_handle_procpidmem(const struct task_struct *task);
83045+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
83046+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
83047+void gr_audit_ptrace(struct task_struct *task);
83048+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
83049+u64 gr_get_ino_from_dentry(struct dentry *dentry);
83050+void gr_put_exec_file(struct task_struct *task);
83051+
83052+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
83053+
83054+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83055+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83056+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
83057+ struct dentry *newdentry, struct vfsmount *newmnt);
83058+
83059+#ifdef CONFIG_GRKERNSEC_RESLOG
83060+extern void gr_log_resource(const struct task_struct *task, const int res,
83061+ const unsigned long wanted, const int gt);
83062+#else
83063+static inline void gr_log_resource(const struct task_struct *task, const int res,
83064+ const unsigned long wanted, const int gt)
83065+{
83066+}
83067+#endif
83068+
83069+#ifdef CONFIG_GRKERNSEC
83070+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
83071+void gr_handle_vm86(void);
83072+void gr_handle_mem_readwrite(u64 from, u64 to);
83073+
83074+void gr_log_badprocpid(const char *entry);
83075+
83076+extern int grsec_enable_dmesg;
83077+extern int grsec_disable_privio;
83078+
83079+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
83080+extern kgid_t grsec_proc_gid;
83081+#endif
83082+
83083+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
83084+extern int grsec_enable_chroot_findtask;
83085+#endif
83086+#ifdef CONFIG_GRKERNSEC_SETXID
83087+extern int grsec_enable_setxid;
83088+#endif
83089+#endif
83090+
83091+#endif
83092diff --git a/include/linux/grsock.h b/include/linux/grsock.h
83093new file mode 100644
83094index 0000000..e7ffaaf
83095--- /dev/null
83096+++ b/include/linux/grsock.h
83097@@ -0,0 +1,19 @@
83098+#ifndef __GRSOCK_H
83099+#define __GRSOCK_H
83100+
83101+extern void gr_attach_curr_ip(const struct sock *sk);
83102+extern int gr_handle_sock_all(const int family, const int type,
83103+ const int protocol);
83104+extern int gr_handle_sock_server(const struct sockaddr *sck);
83105+extern int gr_handle_sock_server_other(const struct sock *sck);
83106+extern int gr_handle_sock_client(const struct sockaddr *sck);
83107+extern int gr_search_connect(struct socket * sock,
83108+ struct sockaddr_in * addr);
83109+extern int gr_search_bind(struct socket * sock,
83110+ struct sockaddr_in * addr);
83111+extern int gr_search_listen(struct socket * sock);
83112+extern int gr_search_accept(struct socket * sock);
83113+extern int gr_search_socket(const int domain, const int type,
83114+ const int protocol);
83115+
83116+#endif
83117diff --git a/include/linux/highmem.h b/include/linux/highmem.h
83118index 9286a46..373f27f 100644
83119--- a/include/linux/highmem.h
83120+++ b/include/linux/highmem.h
83121@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
83122 kunmap_atomic(kaddr);
83123 }
83124
83125+static inline void sanitize_highpage(struct page *page)
83126+{
83127+ void *kaddr;
83128+ unsigned long flags;
83129+
83130+ local_irq_save(flags);
83131+ kaddr = kmap_atomic(page);
83132+ clear_page(kaddr);
83133+ kunmap_atomic(kaddr);
83134+ local_irq_restore(flags);
83135+}
83136+
83137 static inline void zero_user_segments(struct page *page,
83138 unsigned start1, unsigned end1,
83139 unsigned start2, unsigned end2)
83140diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
83141index 1c7b89a..7dda400 100644
83142--- a/include/linux/hwmon-sysfs.h
83143+++ b/include/linux/hwmon-sysfs.h
83144@@ -25,7 +25,8 @@
83145 struct sensor_device_attribute{
83146 struct device_attribute dev_attr;
83147 int index;
83148-};
83149+} __do_const;
83150+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
83151 #define to_sensor_dev_attr(_dev_attr) \
83152 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
83153
83154@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
83155 struct device_attribute dev_attr;
83156 u8 index;
83157 u8 nr;
83158-};
83159+} __do_const;
83160+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
83161 #define to_sensor_dev_attr_2(_dev_attr) \
83162 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
83163
83164diff --git a/include/linux/i2c.h b/include/linux/i2c.h
83165index 7c76959..153e597 100644
83166--- a/include/linux/i2c.h
83167+++ b/include/linux/i2c.h
83168@@ -413,6 +413,7 @@ struct i2c_algorithm {
83169 int (*unreg_slave)(struct i2c_client *client);
83170 #endif
83171 };
83172+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
83173
83174 /**
83175 * struct i2c_bus_recovery_info - I2C bus recovery information
83176diff --git a/include/linux/i2o.h b/include/linux/i2o.h
83177index d23c3c2..eb63c81 100644
83178--- a/include/linux/i2o.h
83179+++ b/include/linux/i2o.h
83180@@ -565,7 +565,7 @@ struct i2o_controller {
83181 struct i2o_device *exec; /* Executive */
83182 #if BITS_PER_LONG == 64
83183 spinlock_t context_list_lock; /* lock for context_list */
83184- atomic_t context_list_counter; /* needed for unique contexts */
83185+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
83186 struct list_head context_list; /* list of context id's
83187 and pointers */
83188 #endif
83189diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
83190index aff7ad8..3942bbd 100644
83191--- a/include/linux/if_pppox.h
83192+++ b/include/linux/if_pppox.h
83193@@ -76,7 +76,7 @@ struct pppox_proto {
83194 int (*ioctl)(struct socket *sock, unsigned int cmd,
83195 unsigned long arg);
83196 struct module *owner;
83197-};
83198+} __do_const;
83199
83200 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
83201 extern void unregister_pppox_proto(int proto_num);
83202diff --git a/include/linux/init.h b/include/linux/init.h
83203index 2df8e8d..3e1280d 100644
83204--- a/include/linux/init.h
83205+++ b/include/linux/init.h
83206@@ -37,9 +37,17 @@
83207 * section.
83208 */
83209
83210+#define add_init_latent_entropy __latent_entropy
83211+
83212+#ifdef CONFIG_MEMORY_HOTPLUG
83213+#define add_meminit_latent_entropy
83214+#else
83215+#define add_meminit_latent_entropy __latent_entropy
83216+#endif
83217+
83218 /* These are for everybody (although not all archs will actually
83219 discard it in modules) */
83220-#define __init __section(.init.text) __cold notrace
83221+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
83222 #define __initdata __section(.init.data)
83223 #define __initconst __constsection(.init.rodata)
83224 #define __exitdata __section(.exit.data)
83225@@ -100,7 +108,7 @@
83226 #define __cpuexitconst
83227
83228 /* Used for MEMORY_HOTPLUG */
83229-#define __meminit __section(.meminit.text) __cold notrace
83230+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
83231 #define __meminitdata __section(.meminit.data)
83232 #define __meminitconst __constsection(.meminit.rodata)
83233 #define __memexit __section(.memexit.text) __exitused __cold notrace
83234diff --git a/include/linux/init_task.h b/include/linux/init_task.h
83235index 3037fc0..c6527ce 100644
83236--- a/include/linux/init_task.h
83237+++ b/include/linux/init_task.h
83238@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
83239
83240 #define INIT_TASK_COMM "swapper"
83241
83242+#ifdef CONFIG_X86
83243+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
83244+#else
83245+#define INIT_TASK_THREAD_INFO
83246+#endif
83247+
83248 #ifdef CONFIG_RT_MUTEXES
83249 # define INIT_RT_MUTEXES(tsk) \
83250 .pi_waiters = RB_ROOT, \
83251@@ -214,6 +220,7 @@ extern struct task_group root_task_group;
83252 RCU_POINTER_INITIALIZER(cred, &init_cred), \
83253 .comm = INIT_TASK_COMM, \
83254 .thread = INIT_THREAD, \
83255+ INIT_TASK_THREAD_INFO \
83256 .fs = &init_fs, \
83257 .files = &init_files, \
83258 .signal = &init_signals, \
83259diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
83260index d9b05b5..e5f5b7b 100644
83261--- a/include/linux/interrupt.h
83262+++ b/include/linux/interrupt.h
83263@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
83264
83265 struct softirq_action
83266 {
83267- void (*action)(struct softirq_action *);
83268-};
83269+ void (*action)(void);
83270+} __no_const;
83271
83272 asmlinkage void do_softirq(void);
83273 asmlinkage void __do_softirq(void);
83274@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
83275 }
83276 #endif
83277
83278-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
83279+extern void open_softirq(int nr, void (*action)(void));
83280 extern void softirq_init(void);
83281 extern void __raise_softirq_irqoff(unsigned int nr);
83282
83283diff --git a/include/linux/iommu.h b/include/linux/iommu.h
83284index 38daa45..4de4317 100644
83285--- a/include/linux/iommu.h
83286+++ b/include/linux/iommu.h
83287@@ -147,7 +147,7 @@ struct iommu_ops {
83288
83289 unsigned long pgsize_bitmap;
83290 void *priv;
83291-};
83292+} __do_const;
83293
83294 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
83295 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
83296diff --git a/include/linux/ioport.h b/include/linux/ioport.h
83297index 2c525022..345b106 100644
83298--- a/include/linux/ioport.h
83299+++ b/include/linux/ioport.h
83300@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
83301 int adjust_resource(struct resource *res, resource_size_t start,
83302 resource_size_t size);
83303 resource_size_t resource_alignment(struct resource *res);
83304-static inline resource_size_t resource_size(const struct resource *res)
83305+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
83306 {
83307 return res->end - res->start + 1;
83308 }
83309diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
83310index 1eee6bc..9cf4912 100644
83311--- a/include/linux/ipc_namespace.h
83312+++ b/include/linux/ipc_namespace.h
83313@@ -60,7 +60,7 @@ struct ipc_namespace {
83314 struct user_namespace *user_ns;
83315
83316 struct ns_common ns;
83317-};
83318+} __randomize_layout;
83319
83320 extern struct ipc_namespace init_ipc_ns;
83321 extern atomic_t nr_ipc_ns;
83322diff --git a/include/linux/irq.h b/include/linux/irq.h
83323index d09ec7a..f373eb5 100644
83324--- a/include/linux/irq.h
83325+++ b/include/linux/irq.h
83326@@ -364,7 +364,8 @@ struct irq_chip {
83327 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
83328
83329 unsigned long flags;
83330-};
83331+} __do_const;
83332+typedef struct irq_chip __no_const irq_chip_no_const;
83333
83334 /*
83335 * irq_chip specific flags
83336diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
83337index 71d706d..817cdec 100644
83338--- a/include/linux/irqchip/arm-gic.h
83339+++ b/include/linux/irqchip/arm-gic.h
83340@@ -95,7 +95,7 @@
83341
83342 struct device_node;
83343
83344-extern struct irq_chip gic_arch_extn;
83345+extern irq_chip_no_const gic_arch_extn;
83346
83347 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
83348 u32 offset, struct device_node *);
83349diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
83350index faf433a..7dcb186 100644
83351--- a/include/linux/irqdesc.h
83352+++ b/include/linux/irqdesc.h
83353@@ -61,7 +61,7 @@ struct irq_desc {
83354 unsigned int irq_count; /* For detecting broken IRQs */
83355 unsigned long last_unhandled; /* Aging timer for unhandled count */
83356 unsigned int irqs_unhandled;
83357- atomic_t threads_handled;
83358+ atomic_unchecked_t threads_handled;
83359 int threads_handled_last;
83360 raw_spinlock_t lock;
83361 struct cpumask *percpu_enabled;
83362diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
83363index c367cbd..c9b79e6 100644
83364--- a/include/linux/jiffies.h
83365+++ b/include/linux/jiffies.h
83366@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
83367 /*
83368 * Convert various time units to each other:
83369 */
83370-extern unsigned int jiffies_to_msecs(const unsigned long j);
83371-extern unsigned int jiffies_to_usecs(const unsigned long j);
83372+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
83373+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
83374
83375-static inline u64 jiffies_to_nsecs(const unsigned long j)
83376+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
83377 {
83378 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
83379 }
83380
83381-extern unsigned long msecs_to_jiffies(const unsigned int m);
83382-extern unsigned long usecs_to_jiffies(const unsigned int u);
83383+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
83384+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
83385 extern unsigned long timespec_to_jiffies(const struct timespec *value);
83386 extern void jiffies_to_timespec(const unsigned long jiffies,
83387- struct timespec *value);
83388-extern unsigned long timeval_to_jiffies(const struct timeval *value);
83389+ struct timespec *value) __intentional_overflow(-1);
83390+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
83391 extern void jiffies_to_timeval(const unsigned long jiffies,
83392 struct timeval *value);
83393
83394diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
83395index 6883e19..e854fcb 100644
83396--- a/include/linux/kallsyms.h
83397+++ b/include/linux/kallsyms.h
83398@@ -15,7 +15,8 @@
83399
83400 struct module;
83401
83402-#ifdef CONFIG_KALLSYMS
83403+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
83404+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
83405 /* Lookup the address for a symbol. Returns 0 if not found. */
83406 unsigned long kallsyms_lookup_name(const char *name);
83407
83408@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
83409 /* Stupid that this does nothing, but I didn't create this mess. */
83410 #define __print_symbol(fmt, addr)
83411 #endif /*CONFIG_KALLSYMS*/
83412+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
83413+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
83414+extern unsigned long kallsyms_lookup_name(const char *name);
83415+extern void __print_symbol(const char *fmt, unsigned long address);
83416+extern int sprint_backtrace(char *buffer, unsigned long address);
83417+extern int sprint_symbol(char *buffer, unsigned long address);
83418+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
83419+const char *kallsyms_lookup(unsigned long addr,
83420+ unsigned long *symbolsize,
83421+ unsigned long *offset,
83422+ char **modname, char *namebuf);
83423+extern int kallsyms_lookup_size_offset(unsigned long addr,
83424+ unsigned long *symbolsize,
83425+ unsigned long *offset);
83426+#endif
83427
83428 /* This macro allows us to keep printk typechecking */
83429 static __printf(1, 2)
83430diff --git a/include/linux/kernel.h b/include/linux/kernel.h
83431index 64ce58b..6bcdbfa 100644
83432--- a/include/linux/kernel.h
83433+++ b/include/linux/kernel.h
83434@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
83435 /* Obsolete, do not use. Use kstrto<foo> instead */
83436
83437 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
83438-extern long simple_strtol(const char *,char **,unsigned int);
83439+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
83440 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
83441 extern long long simple_strtoll(const char *,char **,unsigned int);
83442
83443diff --git a/include/linux/key-type.h b/include/linux/key-type.h
83444index ff9f1d3..6712be5 100644
83445--- a/include/linux/key-type.h
83446+++ b/include/linux/key-type.h
83447@@ -152,7 +152,7 @@ struct key_type {
83448 /* internal fields */
83449 struct list_head link; /* link in types list */
83450 struct lock_class_key lock_class; /* key->sem lock class */
83451-};
83452+} __do_const;
83453
83454 extern struct key_type key_type_keyring;
83455
83456diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
83457index e465bb1..19f605fd 100644
83458--- a/include/linux/kgdb.h
83459+++ b/include/linux/kgdb.h
83460@@ -52,7 +52,7 @@ extern int kgdb_connected;
83461 extern int kgdb_io_module_registered;
83462
83463 extern atomic_t kgdb_setting_breakpoint;
83464-extern atomic_t kgdb_cpu_doing_single_step;
83465+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
83466
83467 extern struct task_struct *kgdb_usethread;
83468 extern struct task_struct *kgdb_contthread;
83469@@ -254,7 +254,7 @@ struct kgdb_arch {
83470 void (*correct_hw_break)(void);
83471
83472 void (*enable_nmi)(bool on);
83473-};
83474+} __do_const;
83475
83476 /**
83477 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
83478@@ -279,7 +279,7 @@ struct kgdb_io {
83479 void (*pre_exception) (void);
83480 void (*post_exception) (void);
83481 int is_console;
83482-};
83483+} __do_const;
83484
83485 extern struct kgdb_arch arch_kgdb_ops;
83486
83487diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
83488index e705467..a92471d 100644
83489--- a/include/linux/kmemleak.h
83490+++ b/include/linux/kmemleak.h
83491@@ -27,7 +27,7 @@
83492
83493 extern void kmemleak_init(void) __ref;
83494 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
83495- gfp_t gfp) __ref;
83496+ gfp_t gfp) __ref __size_overflow(2);
83497 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
83498 extern void kmemleak_free(const void *ptr) __ref;
83499 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
83500@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
83501 static inline void kmemleak_init(void)
83502 {
83503 }
83504-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
83505+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
83506 gfp_t gfp)
83507 {
83508 }
83509diff --git a/include/linux/kmod.h b/include/linux/kmod.h
83510index 0555cc6..40116ce 100644
83511--- a/include/linux/kmod.h
83512+++ b/include/linux/kmod.h
83513@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
83514 * usually useless though. */
83515 extern __printf(2, 3)
83516 int __request_module(bool wait, const char *name, ...);
83517+extern __printf(3, 4)
83518+int ___request_module(bool wait, char *param_name, const char *name, ...);
83519 #define request_module(mod...) __request_module(true, mod)
83520 #define request_module_nowait(mod...) __request_module(false, mod)
83521 #define try_then_request_module(x, mod...) \
83522@@ -57,6 +59,9 @@ struct subprocess_info {
83523 struct work_struct work;
83524 struct completion *complete;
83525 char *path;
83526+#ifdef CONFIG_GRKERNSEC
83527+ char *origpath;
83528+#endif
83529 char **argv;
83530 char **envp;
83531 int wait;
83532diff --git a/include/linux/kobject.h b/include/linux/kobject.h
83533index 2d61b90..a1d0a13 100644
83534--- a/include/linux/kobject.h
83535+++ b/include/linux/kobject.h
83536@@ -118,7 +118,7 @@ struct kobj_type {
83537 struct attribute **default_attrs;
83538 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
83539 const void *(*namespace)(struct kobject *kobj);
83540-};
83541+} __do_const;
83542
83543 struct kobj_uevent_env {
83544 char *argv[3];
83545@@ -142,6 +142,7 @@ struct kobj_attribute {
83546 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
83547 const char *buf, size_t count);
83548 };
83549+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
83550
83551 extern const struct sysfs_ops kobj_sysfs_ops;
83552
83553@@ -169,7 +170,7 @@ struct kset {
83554 spinlock_t list_lock;
83555 struct kobject kobj;
83556 const struct kset_uevent_ops *uevent_ops;
83557-};
83558+} __randomize_layout;
83559
83560 extern void kset_init(struct kset *kset);
83561 extern int __must_check kset_register(struct kset *kset);
83562diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
83563index df32d25..fb52e27 100644
83564--- a/include/linux/kobject_ns.h
83565+++ b/include/linux/kobject_ns.h
83566@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
83567 const void *(*netlink_ns)(struct sock *sk);
83568 const void *(*initial_ns)(void);
83569 void (*drop_ns)(void *);
83570-};
83571+} __do_const;
83572
83573 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
83574 int kobj_ns_type_registered(enum kobj_ns_type type);
83575diff --git a/include/linux/kref.h b/include/linux/kref.h
83576index 484604d..0f6c5b6 100644
83577--- a/include/linux/kref.h
83578+++ b/include/linux/kref.h
83579@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
83580 static inline int kref_sub(struct kref *kref, unsigned int count,
83581 void (*release)(struct kref *kref))
83582 {
83583- WARN_ON(release == NULL);
83584+ BUG_ON(release == NULL);
83585
83586 if (atomic_sub_and_test((int) count, &kref->refcount)) {
83587 release(kref);
83588diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
83589index 26f1060..bafc04a 100644
83590--- a/include/linux/kvm_host.h
83591+++ b/include/linux/kvm_host.h
83592@@ -470,7 +470,7 @@ static inline void kvm_irqfd_exit(void)
83593 {
83594 }
83595 #endif
83596-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
83597+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
83598 struct module *module);
83599 void kvm_exit(void);
83600
83601@@ -639,7 +639,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
83602 struct kvm_guest_debug *dbg);
83603 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
83604
83605-int kvm_arch_init(void *opaque);
83606+int kvm_arch_init(const void *opaque);
83607 void kvm_arch_exit(void);
83608
83609 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
83610diff --git a/include/linux/libata.h b/include/linux/libata.h
83611index 91f705d..24be831 100644
83612--- a/include/linux/libata.h
83613+++ b/include/linux/libata.h
83614@@ -979,7 +979,7 @@ struct ata_port_operations {
83615 * fields must be pointers.
83616 */
83617 const struct ata_port_operations *inherits;
83618-};
83619+} __do_const;
83620
83621 struct ata_port_info {
83622 unsigned long flags;
83623diff --git a/include/linux/linkage.h b/include/linux/linkage.h
83624index a6a42dd..6c5ebce 100644
83625--- a/include/linux/linkage.h
83626+++ b/include/linux/linkage.h
83627@@ -36,6 +36,7 @@
83628 #endif
83629
83630 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
83631+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
83632 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
83633
83634 /*
83635diff --git a/include/linux/list.h b/include/linux/list.h
83636index feb773c..98f3075 100644
83637--- a/include/linux/list.h
83638+++ b/include/linux/list.h
83639@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
83640 extern void list_del(struct list_head *entry);
83641 #endif
83642
83643+extern void __pax_list_add(struct list_head *new,
83644+ struct list_head *prev,
83645+ struct list_head *next);
83646+static inline void pax_list_add(struct list_head *new, struct list_head *head)
83647+{
83648+ __pax_list_add(new, head, head->next);
83649+}
83650+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
83651+{
83652+ __pax_list_add(new, head->prev, head);
83653+}
83654+extern void pax_list_del(struct list_head *entry);
83655+
83656 /**
83657 * list_replace - replace old entry by new one
83658 * @old : the element to be replaced
83659@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
83660 INIT_LIST_HEAD(entry);
83661 }
83662
83663+extern void pax_list_del_init(struct list_head *entry);
83664+
83665 /**
83666 * list_move - delete from one list and add as another's head
83667 * @list: the entry to move
83668diff --git a/include/linux/lockref.h b/include/linux/lockref.h
83669index 4bfde0e..d6e2e09 100644
83670--- a/include/linux/lockref.h
83671+++ b/include/linux/lockref.h
83672@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
83673 return ((int)l->count < 0);
83674 }
83675
83676+static inline unsigned int __lockref_read(struct lockref *lockref)
83677+{
83678+ return lockref->count;
83679+}
83680+
83681+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
83682+{
83683+ lockref->count = count;
83684+}
83685+
83686+static inline void __lockref_inc(struct lockref *lockref)
83687+{
83688+
83689+#ifdef CONFIG_PAX_REFCOUNT
83690+ atomic_inc((atomic_t *)&lockref->count);
83691+#else
83692+ lockref->count++;
83693+#endif
83694+
83695+}
83696+
83697+static inline void __lockref_dec(struct lockref *lockref)
83698+{
83699+
83700+#ifdef CONFIG_PAX_REFCOUNT
83701+ atomic_dec((atomic_t *)&lockref->count);
83702+#else
83703+ lockref->count--;
83704+#endif
83705+
83706+}
83707+
83708 #endif /* __LINUX_LOCKREF_H */
83709diff --git a/include/linux/math64.h b/include/linux/math64.h
83710index c45c089..298841c 100644
83711--- a/include/linux/math64.h
83712+++ b/include/linux/math64.h
83713@@ -15,7 +15,7 @@
83714 * This is commonly provided by 32bit archs to provide an optimized 64bit
83715 * divide.
83716 */
83717-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83718+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83719 {
83720 *remainder = dividend % divisor;
83721 return dividend / divisor;
83722@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
83723 /**
83724 * div64_u64 - unsigned 64bit divide with 64bit divisor
83725 */
83726-static inline u64 div64_u64(u64 dividend, u64 divisor)
83727+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
83728 {
83729 return dividend / divisor;
83730 }
83731@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
83732 #define div64_ul(x, y) div_u64((x), (y))
83733
83734 #ifndef div_u64_rem
83735-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83736+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83737 {
83738 *remainder = do_div(dividend, divisor);
83739 return dividend;
83740@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
83741 #endif
83742
83743 #ifndef div64_u64
83744-extern u64 div64_u64(u64 dividend, u64 divisor);
83745+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
83746 #endif
83747
83748 #ifndef div64_s64
83749@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
83750 * divide.
83751 */
83752 #ifndef div_u64
83753-static inline u64 div_u64(u64 dividend, u32 divisor)
83754+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
83755 {
83756 u32 remainder;
83757 return div_u64_rem(dividend, divisor, &remainder);
83758diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
83759index 3d385c8..deacb6a 100644
83760--- a/include/linux/mempolicy.h
83761+++ b/include/linux/mempolicy.h
83762@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
83763 }
83764
83765 #define vma_policy(vma) ((vma)->vm_policy)
83766+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83767+{
83768+ vma->vm_policy = pol;
83769+}
83770
83771 static inline void mpol_get(struct mempolicy *pol)
83772 {
83773@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
83774 }
83775
83776 #define vma_policy(vma) NULL
83777+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83778+{
83779+}
83780
83781 static inline int
83782 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
83783diff --git a/include/linux/mm.h b/include/linux/mm.h
83784index dd5ea30..cf81cd1 100644
83785--- a/include/linux/mm.h
83786+++ b/include/linux/mm.h
83787@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
83788
83789 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
83790 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
83791+
83792+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
83793+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
83794+#endif
83795+
83796 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
83797 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
83798 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
83799@@ -256,8 +261,8 @@ struct vm_operations_struct {
83800 /* called by access_process_vm when get_user_pages() fails, typically
83801 * for use by special VMAs that can switch between memory and hardware
83802 */
83803- int (*access)(struct vm_area_struct *vma, unsigned long addr,
83804- void *buf, int len, int write);
83805+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
83806+ void *buf, size_t len, int write);
83807
83808 /* Called by the /proc/PID/maps code to ask the vma whether it
83809 * has a special name. Returning non-NULL will also cause this
83810@@ -291,6 +296,7 @@ struct vm_operations_struct {
83811 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
83812 unsigned long size, pgoff_t pgoff);
83813 };
83814+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
83815
83816 struct mmu_gather;
83817 struct inode;
83818@@ -1183,8 +1189,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
83819 unsigned long *pfn);
83820 int follow_phys(struct vm_area_struct *vma, unsigned long address,
83821 unsigned int flags, unsigned long *prot, resource_size_t *phys);
83822-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83823- void *buf, int len, int write);
83824+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83825+ void *buf, size_t len, int write);
83826
83827 static inline void unmap_shared_mapping_range(struct address_space *mapping,
83828 loff_t const holebegin, loff_t const holelen)
83829@@ -1224,9 +1230,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
83830 }
83831 #endif
83832
83833-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
83834-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
83835- void *buf, int len, int write);
83836+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
83837+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
83838+ void *buf, size_t len, int write);
83839
83840 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
83841 unsigned long start, unsigned long nr_pages,
83842@@ -1258,34 +1264,6 @@ int set_page_dirty_lock(struct page *page);
83843 int clear_page_dirty_for_io(struct page *page);
83844 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
83845
83846-/* Is the vma a continuation of the stack vma above it? */
83847-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
83848-{
83849- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
83850-}
83851-
83852-static inline int stack_guard_page_start(struct vm_area_struct *vma,
83853- unsigned long addr)
83854-{
83855- return (vma->vm_flags & VM_GROWSDOWN) &&
83856- (vma->vm_start == addr) &&
83857- !vma_growsdown(vma->vm_prev, addr);
83858-}
83859-
83860-/* Is the vma a continuation of the stack vma below it? */
83861-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
83862-{
83863- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
83864-}
83865-
83866-static inline int stack_guard_page_end(struct vm_area_struct *vma,
83867- unsigned long addr)
83868-{
83869- return (vma->vm_flags & VM_GROWSUP) &&
83870- (vma->vm_end == addr) &&
83871- !vma_growsup(vma->vm_next, addr);
83872-}
83873-
83874 extern struct task_struct *task_of_stack(struct task_struct *task,
83875 struct vm_area_struct *vma, bool in_group);
83876
83877@@ -1403,8 +1381,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
83878 {
83879 return 0;
83880 }
83881+
83882+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
83883+ unsigned long address)
83884+{
83885+ return 0;
83886+}
83887 #else
83888 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83889+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83890 #endif
83891
83892 #ifdef __PAGETABLE_PMD_FOLDED
83893@@ -1413,8 +1398,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
83894 {
83895 return 0;
83896 }
83897+
83898+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
83899+ unsigned long address)
83900+{
83901+ return 0;
83902+}
83903 #else
83904 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
83905+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
83906 #endif
83907
83908 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
83909@@ -1432,11 +1424,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
83910 NULL: pud_offset(pgd, address);
83911 }
83912
83913+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
83914+{
83915+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
83916+ NULL: pud_offset(pgd, address);
83917+}
83918+
83919 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
83920 {
83921 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
83922 NULL: pmd_offset(pud, address);
83923 }
83924+
83925+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
83926+{
83927+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
83928+ NULL: pmd_offset(pud, address);
83929+}
83930 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
83931
83932 #if USE_SPLIT_PTE_PTLOCKS
83933@@ -1819,12 +1823,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
83934 bool *need_rmap_locks);
83935 extern void exit_mmap(struct mm_struct *);
83936
83937+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
83938+extern void gr_learn_resource(const struct task_struct *task, const int res,
83939+ const unsigned long wanted, const int gt);
83940+#else
83941+static inline void gr_learn_resource(const struct task_struct *task, const int res,
83942+ const unsigned long wanted, const int gt)
83943+{
83944+}
83945+#endif
83946+
83947 static inline int check_data_rlimit(unsigned long rlim,
83948 unsigned long new,
83949 unsigned long start,
83950 unsigned long end_data,
83951 unsigned long start_data)
83952 {
83953+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
83954 if (rlim < RLIM_INFINITY) {
83955 if (((new - start) + (end_data - start_data)) > rlim)
83956 return -ENOSPC;
83957@@ -1849,7 +1864,7 @@ extern int install_special_mapping(struct mm_struct *mm,
83958 unsigned long addr, unsigned long len,
83959 unsigned long flags, struct page **pages);
83960
83961-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83962+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83963
83964 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83965 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83966@@ -1857,6 +1872,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83967 unsigned long len, unsigned long prot, unsigned long flags,
83968 unsigned long pgoff, unsigned long *populate);
83969 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83970+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83971
83972 #ifdef CONFIG_MMU
83973 extern int __mm_populate(unsigned long addr, unsigned long len,
83974@@ -1885,10 +1901,11 @@ struct vm_unmapped_area_info {
83975 unsigned long high_limit;
83976 unsigned long align_mask;
83977 unsigned long align_offset;
83978+ unsigned long threadstack_offset;
83979 };
83980
83981-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83982-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83983+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
83984+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
83985
83986 /*
83987 * Search for an unmapped address range.
83988@@ -1900,7 +1917,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83989 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
83990 */
83991 static inline unsigned long
83992-vm_unmapped_area(struct vm_unmapped_area_info *info)
83993+vm_unmapped_area(const struct vm_unmapped_area_info *info)
83994 {
83995 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
83996 return unmapped_area(info);
83997@@ -1962,6 +1979,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
83998 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
83999 struct vm_area_struct **pprev);
84000
84001+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
84002+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
84003+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
84004+
84005 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
84006 NULL if none. Assume start_addr < end_addr. */
84007 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
84008@@ -1991,10 +2012,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
84009 }
84010
84011 #ifdef CONFIG_MMU
84012-pgprot_t vm_get_page_prot(unsigned long vm_flags);
84013+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
84014 void vma_set_page_prot(struct vm_area_struct *vma);
84015 #else
84016-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
84017+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
84018 {
84019 return __pgprot(0);
84020 }
84021@@ -2056,6 +2077,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
84022 static inline void vm_stat_account(struct mm_struct *mm,
84023 unsigned long flags, struct file *file, long pages)
84024 {
84025+
84026+#ifdef CONFIG_PAX_RANDMMAP
84027+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
84028+#endif
84029+
84030 mm->total_vm += pages;
84031 }
84032 #endif /* CONFIG_PROC_FS */
84033@@ -2159,7 +2185,7 @@ extern int unpoison_memory(unsigned long pfn);
84034 extern int sysctl_memory_failure_early_kill;
84035 extern int sysctl_memory_failure_recovery;
84036 extern void shake_page(struct page *p, int access);
84037-extern atomic_long_t num_poisoned_pages;
84038+extern atomic_long_unchecked_t num_poisoned_pages;
84039 extern int soft_offline_page(struct page *page, int flags);
84040
84041 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
84042@@ -2210,5 +2236,11 @@ void __init setup_nr_node_ids(void);
84043 static inline void setup_nr_node_ids(void) {}
84044 #endif
84045
84046+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
84047+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
84048+#else
84049+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
84050+#endif
84051+
84052 #endif /* __KERNEL__ */
84053 #endif /* _LINUX_MM_H */
84054diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
84055index 6d34aa2..d73d848 100644
84056--- a/include/linux/mm_types.h
84057+++ b/include/linux/mm_types.h
84058@@ -309,7 +309,9 @@ struct vm_area_struct {
84059 #ifdef CONFIG_NUMA
84060 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
84061 #endif
84062-};
84063+
84064+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
84065+} __randomize_layout;
84066
84067 struct core_thread {
84068 struct task_struct *task;
84069@@ -459,7 +461,25 @@ struct mm_struct {
84070 /* address of the bounds directory */
84071 void __user *bd_addr;
84072 #endif
84073-};
84074+
84075+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84076+ unsigned long pax_flags;
84077+#endif
84078+
84079+#ifdef CONFIG_PAX_DLRESOLVE
84080+ unsigned long call_dl_resolve;
84081+#endif
84082+
84083+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
84084+ unsigned long call_syscall;
84085+#endif
84086+
84087+#ifdef CONFIG_PAX_ASLR
84088+ unsigned long delta_mmap; /* randomized offset */
84089+ unsigned long delta_stack; /* randomized offset */
84090+#endif
84091+
84092+} __randomize_layout;
84093
84094 static inline void mm_init_cpumask(struct mm_struct *mm)
84095 {
84096diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
84097index cb2b040..f3c9f5c 100644
84098--- a/include/linux/mmc/core.h
84099+++ b/include/linux/mmc/core.h
84100@@ -79,7 +79,7 @@ struct mmc_command {
84101 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
84102
84103 unsigned int retries; /* max number of retries */
84104- unsigned int error; /* command error */
84105+ int error; /* command error */
84106
84107 /*
84108 * Standard errno values are used for errors, but some have specific
84109diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
84110index c5d5278..f0b68c8 100644
84111--- a/include/linux/mmiotrace.h
84112+++ b/include/linux/mmiotrace.h
84113@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
84114 /* Called from ioremap.c */
84115 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
84116 void __iomem *addr);
84117-extern void mmiotrace_iounmap(volatile void __iomem *addr);
84118+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
84119
84120 /* For anyone to insert markers. Remember trailing newline. */
84121 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
84122@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
84123 {
84124 }
84125
84126-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
84127+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
84128 {
84129 }
84130
84131diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
84132index 2f0856d..5a4bc1e 100644
84133--- a/include/linux/mmzone.h
84134+++ b/include/linux/mmzone.h
84135@@ -527,7 +527,7 @@ struct zone {
84136
84137 ZONE_PADDING(_pad3_)
84138 /* Zone statistics */
84139- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84140+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84141 } ____cacheline_internodealigned_in_smp;
84142
84143 enum zone_flags {
84144diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
84145index 745def8..08a820b 100644
84146--- a/include/linux/mod_devicetable.h
84147+++ b/include/linux/mod_devicetable.h
84148@@ -139,7 +139,7 @@ struct usb_device_id {
84149 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
84150 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
84151
84152-#define HID_ANY_ID (~0)
84153+#define HID_ANY_ID (~0U)
84154 #define HID_BUS_ANY 0xffff
84155 #define HID_GROUP_ANY 0x0000
84156
84157@@ -475,7 +475,7 @@ struct dmi_system_id {
84158 const char *ident;
84159 struct dmi_strmatch matches[4];
84160 void *driver_data;
84161-};
84162+} __do_const;
84163 /*
84164 * struct dmi_device_id appears during expansion of
84165 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
84166diff --git a/include/linux/module.h b/include/linux/module.h
84167index b653d7c..22a238f 100644
84168--- a/include/linux/module.h
84169+++ b/include/linux/module.h
84170@@ -17,9 +17,11 @@
84171 #include <linux/moduleparam.h>
84172 #include <linux/jump_label.h>
84173 #include <linux/export.h>
84174+#include <linux/fs.h>
84175
84176 #include <linux/percpu.h>
84177 #include <asm/module.h>
84178+#include <asm/pgtable.h>
84179
84180 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
84181 #define MODULE_SIG_STRING "~Module signature appended~\n"
84182@@ -42,7 +44,7 @@ struct module_kobject {
84183 struct kobject *drivers_dir;
84184 struct module_param_attrs *mp;
84185 struct completion *kobj_completion;
84186-};
84187+} __randomize_layout;
84188
84189 struct module_attribute {
84190 struct attribute attr;
84191@@ -54,12 +56,13 @@ struct module_attribute {
84192 int (*test)(struct module *);
84193 void (*free)(struct module *);
84194 };
84195+typedef struct module_attribute __no_const module_attribute_no_const;
84196
84197 struct module_version_attribute {
84198 struct module_attribute mattr;
84199 const char *module_name;
84200 const char *version;
84201-} __attribute__ ((__aligned__(sizeof(void *))));
84202+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
84203
84204 extern ssize_t __modver_version_show(struct module_attribute *,
84205 struct module_kobject *, char *);
84206@@ -221,7 +224,7 @@ struct module {
84207
84208 /* Sysfs stuff. */
84209 struct module_kobject mkobj;
84210- struct module_attribute *modinfo_attrs;
84211+ module_attribute_no_const *modinfo_attrs;
84212 const char *version;
84213 const char *srcversion;
84214 struct kobject *holders_dir;
84215@@ -270,19 +273,16 @@ struct module {
84216 int (*init)(void);
84217
84218 /* If this is non-NULL, vfree after init() returns */
84219- void *module_init;
84220+ void *module_init_rx, *module_init_rw;
84221
84222 /* Here is the actual code + data, vfree'd on unload. */
84223- void *module_core;
84224+ void *module_core_rx, *module_core_rw;
84225
84226 /* Here are the sizes of the init and core sections */
84227- unsigned int init_size, core_size;
84228+ unsigned int init_size_rw, core_size_rw;
84229
84230 /* The size of the executable code in each section. */
84231- unsigned int init_text_size, core_text_size;
84232-
84233- /* Size of RO sections of the module (text+rodata) */
84234- unsigned int init_ro_size, core_ro_size;
84235+ unsigned int init_size_rx, core_size_rx;
84236
84237 /* Arch-specific module values */
84238 struct mod_arch_specific arch;
84239@@ -338,6 +338,10 @@ struct module {
84240 #ifdef CONFIG_EVENT_TRACING
84241 struct ftrace_event_call **trace_events;
84242 unsigned int num_trace_events;
84243+ struct file_operations trace_id;
84244+ struct file_operations trace_enable;
84245+ struct file_operations trace_format;
84246+ struct file_operations trace_filter;
84247 #endif
84248 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
84249 unsigned int num_ftrace_callsites;
84250@@ -361,7 +365,7 @@ struct module {
84251 ctor_fn_t *ctors;
84252 unsigned int num_ctors;
84253 #endif
84254-};
84255+} __randomize_layout;
84256 #ifndef MODULE_ARCH_INIT
84257 #define MODULE_ARCH_INIT {}
84258 #endif
84259@@ -382,18 +386,48 @@ bool is_module_address(unsigned long addr);
84260 bool is_module_percpu_address(unsigned long addr);
84261 bool is_module_text_address(unsigned long addr);
84262
84263+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
84264+{
84265+
84266+#ifdef CONFIG_PAX_KERNEXEC
84267+ if (ktla_ktva(addr) >= (unsigned long)start &&
84268+ ktla_ktva(addr) < (unsigned long)start + size)
84269+ return 1;
84270+#endif
84271+
84272+ return ((void *)addr >= start && (void *)addr < start + size);
84273+}
84274+
84275+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
84276+{
84277+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
84278+}
84279+
84280+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
84281+{
84282+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
84283+}
84284+
84285+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
84286+{
84287+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
84288+}
84289+
84290+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
84291+{
84292+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
84293+}
84294+
84295 static inline bool within_module_core(unsigned long addr,
84296 const struct module *mod)
84297 {
84298- return (unsigned long)mod->module_core <= addr &&
84299- addr < (unsigned long)mod->module_core + mod->core_size;
84300+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
84301 }
84302
84303 static inline bool within_module_init(unsigned long addr,
84304 const struct module *mod)
84305 {
84306- return (unsigned long)mod->module_init <= addr &&
84307- addr < (unsigned long)mod->module_init + mod->init_size;
84308+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
84309 }
84310
84311 static inline bool within_module(unsigned long addr, const struct module *mod)
84312diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
84313index f755626..641f822 100644
84314--- a/include/linux/moduleloader.h
84315+++ b/include/linux/moduleloader.h
84316@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
84317 sections. Returns NULL on failure. */
84318 void *module_alloc(unsigned long size);
84319
84320+#ifdef CONFIG_PAX_KERNEXEC
84321+void *module_alloc_exec(unsigned long size);
84322+#else
84323+#define module_alloc_exec(x) module_alloc(x)
84324+#endif
84325+
84326 /* Free memory returned from module_alloc. */
84327 void module_memfree(void *module_region);
84328
84329+#ifdef CONFIG_PAX_KERNEXEC
84330+void module_memfree_exec(void *module_region);
84331+#else
84332+#define module_memfree_exec(x) module_memfree((x))
84333+#endif
84334+
84335 /*
84336 * Apply the given relocation to the (simplified) ELF. Return -error
84337 * or 0.
84338@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
84339 unsigned int relsec,
84340 struct module *me)
84341 {
84342+#ifdef CONFIG_MODULES
84343 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84344 module_name(me));
84345+#endif
84346 return -ENOEXEC;
84347 }
84348 #endif
84349@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
84350 unsigned int relsec,
84351 struct module *me)
84352 {
84353+#ifdef CONFIG_MODULES
84354 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84355 module_name(me));
84356+#endif
84357 return -ENOEXEC;
84358 }
84359 #endif
84360diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
84361index 1c9effa..1160bdd 100644
84362--- a/include/linux/moduleparam.h
84363+++ b/include/linux/moduleparam.h
84364@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
84365 * @len is usually just sizeof(string).
84366 */
84367 #define module_param_string(name, string, len, perm) \
84368- static const struct kparam_string __param_string_##name \
84369+ static const struct kparam_string __param_string_##name __used \
84370 = { len, string }; \
84371 __module_param_call(MODULE_PARAM_PREFIX, name, \
84372 &param_ops_string, \
84373@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
84374 */
84375 #define module_param_array_named(name, array, type, nump, perm) \
84376 param_check_##type(name, &(array)[0]); \
84377- static const struct kparam_array __param_arr_##name \
84378+ static const struct kparam_array __param_arr_##name __used \
84379 = { .max = ARRAY_SIZE(array), .num = nump, \
84380 .ops = &param_ops_##type, \
84381 .elemsize = sizeof(array[0]), .elem = array }; \
84382diff --git a/include/linux/mount.h b/include/linux/mount.h
84383index c2c561d..a5f2a8c 100644
84384--- a/include/linux/mount.h
84385+++ b/include/linux/mount.h
84386@@ -66,7 +66,7 @@ struct vfsmount {
84387 struct dentry *mnt_root; /* root of the mounted tree */
84388 struct super_block *mnt_sb; /* pointer to superblock */
84389 int mnt_flags;
84390-};
84391+} __randomize_layout;
84392
84393 struct file; /* forward dec */
84394 struct path;
84395diff --git a/include/linux/namei.h b/include/linux/namei.h
84396index c899077..b9a2010 100644
84397--- a/include/linux/namei.h
84398+++ b/include/linux/namei.h
84399@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
84400 extern void unlock_rename(struct dentry *, struct dentry *);
84401
84402 extern void nd_jump_link(struct nameidata *nd, struct path *path);
84403-extern void nd_set_link(struct nameidata *nd, char *path);
84404-extern char *nd_get_link(struct nameidata *nd);
84405+extern void nd_set_link(struct nameidata *nd, const char *path);
84406+extern const char *nd_get_link(const struct nameidata *nd);
84407
84408 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
84409 {
84410diff --git a/include/linux/net.h b/include/linux/net.h
84411index 17d8339..81656c0 100644
84412--- a/include/linux/net.h
84413+++ b/include/linux/net.h
84414@@ -192,7 +192,7 @@ struct net_proto_family {
84415 int (*create)(struct net *net, struct socket *sock,
84416 int protocol, int kern);
84417 struct module *owner;
84418-};
84419+} __do_const;
84420
84421 struct iovec;
84422 struct kvec;
84423diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
84424index 840fb7f..547ad02 100644
84425--- a/include/linux/netdevice.h
84426+++ b/include/linux/netdevice.h
84427@@ -1191,6 +1191,7 @@ struct net_device_ops {
84428 u8 state);
84429 #endif
84430 };
84431+typedef struct net_device_ops __no_const net_device_ops_no_const;
84432
84433 /**
84434 * enum net_device_priv_flags - &struct net_device priv_flags
84435@@ -1537,10 +1538,10 @@ struct net_device {
84436
84437 struct net_device_stats stats;
84438
84439- atomic_long_t rx_dropped;
84440- atomic_long_t tx_dropped;
84441+ atomic_long_unchecked_t rx_dropped;
84442+ atomic_long_unchecked_t tx_dropped;
84443
84444- atomic_t carrier_changes;
84445+ atomic_unchecked_t carrier_changes;
84446
84447 #ifdef CONFIG_WIRELESS_EXT
84448 const struct iw_handler_def * wireless_handlers;
84449diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
84450index 2517ece..0bbfcfb 100644
84451--- a/include/linux/netfilter.h
84452+++ b/include/linux/netfilter.h
84453@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
84454 #endif
84455 /* Use the module struct to lock set/get code in place */
84456 struct module *owner;
84457-};
84458+} __do_const;
84459
84460 /* Function to register/unregister hook points. */
84461 int nf_register_hook(struct nf_hook_ops *reg);
84462diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
84463index e955d47..04a5338 100644
84464--- a/include/linux/netfilter/nfnetlink.h
84465+++ b/include/linux/netfilter/nfnetlink.h
84466@@ -19,7 +19,7 @@ struct nfnl_callback {
84467 const struct nlattr * const cda[]);
84468 const struct nla_policy *policy; /* netlink attribute policy */
84469 const u_int16_t attr_count; /* number of nlattr's */
84470-};
84471+} __do_const;
84472
84473 struct nfnetlink_subsystem {
84474 const char *name;
84475diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
84476new file mode 100644
84477index 0000000..33f4af8
84478--- /dev/null
84479+++ b/include/linux/netfilter/xt_gradm.h
84480@@ -0,0 +1,9 @@
84481+#ifndef _LINUX_NETFILTER_XT_GRADM_H
84482+#define _LINUX_NETFILTER_XT_GRADM_H 1
84483+
84484+struct xt_gradm_mtinfo {
84485+ __u16 flags;
84486+ __u16 invflags;
84487+};
84488+
84489+#endif
84490diff --git a/include/linux/nls.h b/include/linux/nls.h
84491index 520681b..2b7fabb 100644
84492--- a/include/linux/nls.h
84493+++ b/include/linux/nls.h
84494@@ -31,7 +31,7 @@ struct nls_table {
84495 const unsigned char *charset2upper;
84496 struct module *owner;
84497 struct nls_table *next;
84498-};
84499+} __do_const;
84500
84501 /* this value hold the maximum octet of charset */
84502 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
84503@@ -46,7 +46,7 @@ enum utf16_endian {
84504 /* nls_base.c */
84505 extern int __register_nls(struct nls_table *, struct module *);
84506 extern int unregister_nls(struct nls_table *);
84507-extern struct nls_table *load_nls(char *);
84508+extern struct nls_table *load_nls(const char *);
84509 extern void unload_nls(struct nls_table *);
84510 extern struct nls_table *load_nls_default(void);
84511 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
84512diff --git a/include/linux/notifier.h b/include/linux/notifier.h
84513index d14a4c3..a078786 100644
84514--- a/include/linux/notifier.h
84515+++ b/include/linux/notifier.h
84516@@ -54,7 +54,8 @@ struct notifier_block {
84517 notifier_fn_t notifier_call;
84518 struct notifier_block __rcu *next;
84519 int priority;
84520-};
84521+} __do_const;
84522+typedef struct notifier_block __no_const notifier_block_no_const;
84523
84524 struct atomic_notifier_head {
84525 spinlock_t lock;
84526diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
84527index b2a0f15..4d7da32 100644
84528--- a/include/linux/oprofile.h
84529+++ b/include/linux/oprofile.h
84530@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
84531 int oprofilefs_create_ro_ulong(struct dentry * root,
84532 char const * name, ulong * val);
84533
84534-/** Create a file for read-only access to an atomic_t. */
84535+/** Create a file for read-only access to an atomic_unchecked_t. */
84536 int oprofilefs_create_ro_atomic(struct dentry * root,
84537- char const * name, atomic_t * val);
84538+ char const * name, atomic_unchecked_t * val);
84539
84540 /** create a directory */
84541 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
84542diff --git a/include/linux/padata.h b/include/linux/padata.h
84543index 4386946..f50c615 100644
84544--- a/include/linux/padata.h
84545+++ b/include/linux/padata.h
84546@@ -129,7 +129,7 @@ struct parallel_data {
84547 struct padata_serial_queue __percpu *squeue;
84548 atomic_t reorder_objects;
84549 atomic_t refcnt;
84550- atomic_t seq_nr;
84551+ atomic_unchecked_t seq_nr;
84552 struct padata_cpumask cpumask;
84553 spinlock_t lock ____cacheline_aligned;
84554 unsigned int processed;
84555diff --git a/include/linux/path.h b/include/linux/path.h
84556index d137218..be0c176 100644
84557--- a/include/linux/path.h
84558+++ b/include/linux/path.h
84559@@ -1,13 +1,15 @@
84560 #ifndef _LINUX_PATH_H
84561 #define _LINUX_PATH_H
84562
84563+#include <linux/compiler.h>
84564+
84565 struct dentry;
84566 struct vfsmount;
84567
84568 struct path {
84569 struct vfsmount *mnt;
84570 struct dentry *dentry;
84571-};
84572+} __randomize_layout;
84573
84574 extern void path_get(const struct path *);
84575 extern void path_put(const struct path *);
84576diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
84577index 8c78950..0d74ed9 100644
84578--- a/include/linux/pci_hotplug.h
84579+++ b/include/linux/pci_hotplug.h
84580@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
84581 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
84582 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
84583 int (*reset_slot) (struct hotplug_slot *slot, int probe);
84584-};
84585+} __do_const;
84586+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
84587
84588 /**
84589 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
84590diff --git a/include/linux/percpu.h b/include/linux/percpu.h
84591index caebf2a..4c3ae9d 100644
84592--- a/include/linux/percpu.h
84593+++ b/include/linux/percpu.h
84594@@ -34,7 +34,7 @@
84595 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
84596 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
84597 */
84598-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
84599+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
84600 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
84601
84602 /*
84603diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
84604index 664de5a..b3e1bf4 100644
84605--- a/include/linux/perf_event.h
84606+++ b/include/linux/perf_event.h
84607@@ -336,8 +336,8 @@ struct perf_event {
84608
84609 enum perf_event_active_state state;
84610 unsigned int attach_state;
84611- local64_t count;
84612- atomic64_t child_count;
84613+ local64_t count; /* PaX: fix it one day */
84614+ atomic64_unchecked_t child_count;
84615
84616 /*
84617 * These are the total time in nanoseconds that the event
84618@@ -388,8 +388,8 @@ struct perf_event {
84619 * These accumulate total time (in nanoseconds) that children
84620 * events have been enabled and running, respectively.
84621 */
84622- atomic64_t child_total_time_enabled;
84623- atomic64_t child_total_time_running;
84624+ atomic64_unchecked_t child_total_time_enabled;
84625+ atomic64_unchecked_t child_total_time_running;
84626
84627 /*
84628 * Protect attach/detach and child_list:
84629@@ -733,7 +733,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
84630 entry->ip[entry->nr++] = ip;
84631 }
84632
84633-extern int sysctl_perf_event_paranoid;
84634+extern int sysctl_perf_event_legitimately_concerned;
84635 extern int sysctl_perf_event_mlock;
84636 extern int sysctl_perf_event_sample_rate;
84637 extern int sysctl_perf_cpu_time_max_percent;
84638@@ -748,19 +748,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
84639 loff_t *ppos);
84640
84641
84642+static inline bool perf_paranoid_any(void)
84643+{
84644+ return sysctl_perf_event_legitimately_concerned > 2;
84645+}
84646+
84647 static inline bool perf_paranoid_tracepoint_raw(void)
84648 {
84649- return sysctl_perf_event_paranoid > -1;
84650+ return sysctl_perf_event_legitimately_concerned > -1;
84651 }
84652
84653 static inline bool perf_paranoid_cpu(void)
84654 {
84655- return sysctl_perf_event_paranoid > 0;
84656+ return sysctl_perf_event_legitimately_concerned > 0;
84657 }
84658
84659 static inline bool perf_paranoid_kernel(void)
84660 {
84661- return sysctl_perf_event_paranoid > 1;
84662+ return sysctl_perf_event_legitimately_concerned > 1;
84663 }
84664
84665 extern void perf_event_init(void);
84666@@ -891,7 +896,7 @@ struct perf_pmu_events_attr {
84667 struct device_attribute attr;
84668 u64 id;
84669 const char *event_str;
84670-};
84671+} __do_const;
84672
84673 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
84674 static struct perf_pmu_events_attr _var = { \
84675diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
84676index b9cf6c5..5462472 100644
84677--- a/include/linux/pid_namespace.h
84678+++ b/include/linux/pid_namespace.h
84679@@ -45,7 +45,7 @@ struct pid_namespace {
84680 int hide_pid;
84681 int reboot; /* group exit code if this pidns was rebooted */
84682 struct ns_common ns;
84683-};
84684+} __randomize_layout;
84685
84686 extern struct pid_namespace init_pid_ns;
84687
84688diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
84689index eb8b8ac..62649e1 100644
84690--- a/include/linux/pipe_fs_i.h
84691+++ b/include/linux/pipe_fs_i.h
84692@@ -47,10 +47,10 @@ struct pipe_inode_info {
84693 struct mutex mutex;
84694 wait_queue_head_t wait;
84695 unsigned int nrbufs, curbuf, buffers;
84696- unsigned int readers;
84697- unsigned int writers;
84698- unsigned int files;
84699- unsigned int waiting_writers;
84700+ atomic_t readers;
84701+ atomic_t writers;
84702+ atomic_t files;
84703+ atomic_t waiting_writers;
84704 unsigned int r_counter;
84705 unsigned int w_counter;
84706 struct page *tmp_page;
84707diff --git a/include/linux/pm.h b/include/linux/pm.h
84708index 8b59763..8a05939 100644
84709--- a/include/linux/pm.h
84710+++ b/include/linux/pm.h
84711@@ -608,6 +608,7 @@ struct dev_pm_domain {
84712 struct dev_pm_ops ops;
84713 void (*detach)(struct device *dev, bool power_off);
84714 };
84715+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
84716
84717 /*
84718 * The PM_EVENT_ messages are also used by drivers implementing the legacy
84719diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
84720index a9edab2..8bada56 100644
84721--- a/include/linux/pm_domain.h
84722+++ b/include/linux/pm_domain.h
84723@@ -39,11 +39,11 @@ struct gpd_dev_ops {
84724 int (*save_state)(struct device *dev);
84725 int (*restore_state)(struct device *dev);
84726 bool (*active_wakeup)(struct device *dev);
84727-};
84728+} __no_const;
84729
84730 struct gpd_cpuidle_data {
84731 unsigned int saved_exit_latency;
84732- struct cpuidle_state *idle_state;
84733+ cpuidle_state_no_const *idle_state;
84734 };
84735
84736 struct generic_pm_domain {
84737diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
84738index 30e84d4..22278b4 100644
84739--- a/include/linux/pm_runtime.h
84740+++ b/include/linux/pm_runtime.h
84741@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
84742
84743 static inline void pm_runtime_mark_last_busy(struct device *dev)
84744 {
84745- ACCESS_ONCE(dev->power.last_busy) = jiffies;
84746+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
84747 }
84748
84749 static inline bool pm_runtime_is_irq_safe(struct device *dev)
84750diff --git a/include/linux/pnp.h b/include/linux/pnp.h
84751index 195aafc..49a7bc2 100644
84752--- a/include/linux/pnp.h
84753+++ b/include/linux/pnp.h
84754@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
84755 struct pnp_fixup {
84756 char id[7];
84757 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
84758-};
84759+} __do_const;
84760
84761 /* config parameters */
84762 #define PNP_CONFIG_NORMAL 0x0001
84763diff --git a/include/linux/poison.h b/include/linux/poison.h
84764index 2110a81..13a11bb 100644
84765--- a/include/linux/poison.h
84766+++ b/include/linux/poison.h
84767@@ -19,8 +19,8 @@
84768 * under normal circumstances, used to verify that nobody uses
84769 * non-initialized list entries.
84770 */
84771-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
84772-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
84773+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
84774+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
84775
84776 /********** include/linux/timer.h **********/
84777 /*
84778diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
84779index d8b187c3..9a9257a 100644
84780--- a/include/linux/power/smartreflex.h
84781+++ b/include/linux/power/smartreflex.h
84782@@ -238,7 +238,7 @@ struct omap_sr_class_data {
84783 int (*notify)(struct omap_sr *sr, u32 status);
84784 u8 notify_flags;
84785 u8 class_type;
84786-};
84787+} __do_const;
84788
84789 /**
84790 * struct omap_sr_nvalue_table - Smartreflex n-target value info
84791diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
84792index 4ea1d37..80f4b33 100644
84793--- a/include/linux/ppp-comp.h
84794+++ b/include/linux/ppp-comp.h
84795@@ -84,7 +84,7 @@ struct compressor {
84796 struct module *owner;
84797 /* Extra skb space needed by the compressor algorithm */
84798 unsigned int comp_extra;
84799-};
84800+} __do_const;
84801
84802 /*
84803 * The return value from decompress routine is the length of the
84804diff --git a/include/linux/preempt.h b/include/linux/preempt.h
84805index de83b4e..c4b997d 100644
84806--- a/include/linux/preempt.h
84807+++ b/include/linux/preempt.h
84808@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
84809 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
84810 #endif
84811
84812+#define raw_preempt_count_add(val) __preempt_count_add(val)
84813+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
84814+
84815 #define __preempt_count_inc() __preempt_count_add(1)
84816 #define __preempt_count_dec() __preempt_count_sub(1)
84817
84818 #define preempt_count_inc() preempt_count_add(1)
84819+#define raw_preempt_count_inc() raw_preempt_count_add(1)
84820 #define preempt_count_dec() preempt_count_sub(1)
84821+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
84822
84823 #ifdef CONFIG_PREEMPT_COUNT
84824
84825@@ -41,6 +46,12 @@ do { \
84826 barrier(); \
84827 } while (0)
84828
84829+#define raw_preempt_disable() \
84830+do { \
84831+ raw_preempt_count_inc(); \
84832+ barrier(); \
84833+} while (0)
84834+
84835 #define sched_preempt_enable_no_resched() \
84836 do { \
84837 barrier(); \
84838@@ -49,6 +60,12 @@ do { \
84839
84840 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
84841
84842+#define raw_preempt_enable_no_resched() \
84843+do { \
84844+ barrier(); \
84845+ raw_preempt_count_dec(); \
84846+} while (0)
84847+
84848 #ifdef CONFIG_PREEMPT
84849 #define preempt_enable() \
84850 do { \
84851@@ -113,8 +130,10 @@ do { \
84852 * region.
84853 */
84854 #define preempt_disable() barrier()
84855+#define raw_preempt_disable() barrier()
84856 #define sched_preempt_enable_no_resched() barrier()
84857 #define preempt_enable_no_resched() barrier()
84858+#define raw_preempt_enable_no_resched() barrier()
84859 #define preempt_enable() barrier()
84860 #define preempt_check_resched() do { } while (0)
84861
84862@@ -128,11 +147,13 @@ do { \
84863 /*
84864 * Modules have no business playing preemption tricks.
84865 */
84866+#ifndef CONFIG_PAX_KERNEXEC
84867 #undef sched_preempt_enable_no_resched
84868 #undef preempt_enable_no_resched
84869 #undef preempt_enable_no_resched_notrace
84870 #undef preempt_check_resched
84871 #endif
84872+#endif
84873
84874 #define preempt_set_need_resched() \
84875 do { \
84876diff --git a/include/linux/printk.h b/include/linux/printk.h
84877index 4d5bf57..d94eccf 100644
84878--- a/include/linux/printk.h
84879+++ b/include/linux/printk.h
84880@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
84881 #endif
84882
84883 typedef int(*printk_func_t)(const char *fmt, va_list args);
84884+extern int kptr_restrict;
84885
84886 #ifdef CONFIG_PRINTK
84887 asmlinkage __printf(5, 0)
84888@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
84889
84890 extern int printk_delay_msec;
84891 extern int dmesg_restrict;
84892-extern int kptr_restrict;
84893
84894 extern void wake_up_klogd(void);
84895
84896diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
84897index b97bf2e..f14c92d4 100644
84898--- a/include/linux/proc_fs.h
84899+++ b/include/linux/proc_fs.h
84900@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
84901 extern struct proc_dir_entry *proc_symlink(const char *,
84902 struct proc_dir_entry *, const char *);
84903 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
84904+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
84905 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
84906 struct proc_dir_entry *, void *);
84907+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
84908+ struct proc_dir_entry *, void *);
84909 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
84910 struct proc_dir_entry *);
84911
84912@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
84913 return proc_create_data(name, mode, parent, proc_fops, NULL);
84914 }
84915
84916+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
84917+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
84918+{
84919+#ifdef CONFIG_GRKERNSEC_PROC_USER
84920+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
84921+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84922+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
84923+#else
84924+ return proc_create_data(name, mode, parent, proc_fops, NULL);
84925+#endif
84926+}
84927+
84928+
84929 extern void proc_set_size(struct proc_dir_entry *, loff_t);
84930 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
84931 extern void *PDE_DATA(const struct inode *);
84932@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
84933 struct proc_dir_entry *parent,const char *dest) { return NULL;}
84934 static inline struct proc_dir_entry *proc_mkdir(const char *name,
84935 struct proc_dir_entry *parent) {return NULL;}
84936+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
84937+ struct proc_dir_entry *parent) { return NULL; }
84938 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
84939 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84940+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
84941+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84942 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
84943 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
84944 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
84945@@ -79,7 +99,7 @@ struct net;
84946 static inline struct proc_dir_entry *proc_net_mkdir(
84947 struct net *net, const char *name, struct proc_dir_entry *parent)
84948 {
84949- return proc_mkdir_data(name, 0, parent, net);
84950+ return proc_mkdir_data_restrict(name, 0, parent, net);
84951 }
84952
84953 #endif /* _LINUX_PROC_FS_H */
84954diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
84955index 42dfc61..8113a99 100644
84956--- a/include/linux/proc_ns.h
84957+++ b/include/linux/proc_ns.h
84958@@ -16,7 +16,7 @@ struct proc_ns_operations {
84959 struct ns_common *(*get)(struct task_struct *task);
84960 void (*put)(struct ns_common *ns);
84961 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
84962-};
84963+} __do_const __randomize_layout;
84964
84965 extern const struct proc_ns_operations netns_operations;
84966 extern const struct proc_ns_operations utsns_operations;
84967diff --git a/include/linux/quota.h b/include/linux/quota.h
84968index b86df49..8002997 100644
84969--- a/include/linux/quota.h
84970+++ b/include/linux/quota.h
84971@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
84972
84973 extern bool qid_eq(struct kqid left, struct kqid right);
84974 extern bool qid_lt(struct kqid left, struct kqid right);
84975-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84976+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84977 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84978 extern bool qid_valid(struct kqid qid);
84979
84980diff --git a/include/linux/random.h b/include/linux/random.h
84981index b05856e..0a9f14e 100644
84982--- a/include/linux/random.h
84983+++ b/include/linux/random.h
84984@@ -9,9 +9,19 @@
84985 #include <uapi/linux/random.h>
84986
84987 extern void add_device_randomness(const void *, unsigned int);
84988+
84989+static inline void add_latent_entropy(void)
84990+{
84991+
84992+#ifdef LATENT_ENTROPY_PLUGIN
84993+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
84994+#endif
84995+
84996+}
84997+
84998 extern void add_input_randomness(unsigned int type, unsigned int code,
84999- unsigned int value);
85000-extern void add_interrupt_randomness(int irq, int irq_flags);
85001+ unsigned int value) __latent_entropy;
85002+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
85003
85004 extern void get_random_bytes(void *buf, int nbytes);
85005 extern void get_random_bytes_arch(void *buf, int nbytes);
85006@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
85007 extern const struct file_operations random_fops, urandom_fops;
85008 #endif
85009
85010-unsigned int get_random_int(void);
85011+unsigned int __intentional_overflow(-1) get_random_int(void);
85012 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
85013
85014-u32 prandom_u32(void);
85015+u32 prandom_u32(void) __intentional_overflow(-1);
85016 void prandom_bytes(void *buf, size_t nbytes);
85017 void prandom_seed(u32 seed);
85018 void prandom_reseed_late(void);
85019@@ -37,6 +47,11 @@ struct rnd_state {
85020 u32 prandom_u32_state(struct rnd_state *state);
85021 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85022
85023+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
85024+{
85025+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
85026+}
85027+
85028 /**
85029 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
85030 * @ep_ro: right open interval endpoint
85031@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85032 *
85033 * Returns: pseudo-random number in interval [0, ep_ro)
85034 */
85035-static inline u32 prandom_u32_max(u32 ep_ro)
85036+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
85037 {
85038 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
85039 }
85040diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
85041index 378c5ee..aa84a47 100644
85042--- a/include/linux/rbtree_augmented.h
85043+++ b/include/linux/rbtree_augmented.h
85044@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
85045 old->rbaugmented = rbcompute(old); \
85046 } \
85047 rbstatic const struct rb_augment_callbacks rbname = { \
85048- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
85049+ .propagate = rbname ## _propagate, \
85050+ .copy = rbname ## _copy, \
85051+ .rotate = rbname ## _rotate \
85052 };
85053
85054
85055diff --git a/include/linux/rculist.h b/include/linux/rculist.h
85056index 529bc94..82ce778 100644
85057--- a/include/linux/rculist.h
85058+++ b/include/linux/rculist.h
85059@@ -29,8 +29,8 @@
85060 */
85061 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
85062 {
85063- ACCESS_ONCE(list->next) = list;
85064- ACCESS_ONCE(list->prev) = list;
85065+ ACCESS_ONCE_RW(list->next) = list;
85066+ ACCESS_ONCE_RW(list->prev) = list;
85067 }
85068
85069 /*
85070@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
85071 struct list_head *prev, struct list_head *next);
85072 #endif
85073
85074+void __pax_list_add_rcu(struct list_head *new,
85075+ struct list_head *prev, struct list_head *next);
85076+
85077 /**
85078 * list_add_rcu - add a new entry to rcu-protected list
85079 * @new: new entry to be added
85080@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
85081 __list_add_rcu(new, head, head->next);
85082 }
85083
85084+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
85085+{
85086+ __pax_list_add_rcu(new, head, head->next);
85087+}
85088+
85089 /**
85090 * list_add_tail_rcu - add a new entry to rcu-protected list
85091 * @new: new entry to be added
85092@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
85093 __list_add_rcu(new, head->prev, head);
85094 }
85095
85096+static inline void pax_list_add_tail_rcu(struct list_head *new,
85097+ struct list_head *head)
85098+{
85099+ __pax_list_add_rcu(new, head->prev, head);
85100+}
85101+
85102 /**
85103 * list_del_rcu - deletes entry from list without re-initialization
85104 * @entry: the element to delete from the list.
85105@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
85106 entry->prev = LIST_POISON2;
85107 }
85108
85109+extern void pax_list_del_rcu(struct list_head *entry);
85110+
85111 /**
85112 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
85113 * @n: the element to delete from the hash list.
85114diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
85115index ed4f593..8a51501 100644
85116--- a/include/linux/rcupdate.h
85117+++ b/include/linux/rcupdate.h
85118@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
85119 #define rcu_note_voluntary_context_switch(t) \
85120 do { \
85121 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
85122- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
85123+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
85124 } while (0)
85125 #else /* #ifdef CONFIG_TASKS_RCU */
85126 #define TASKS_RCU(x) do { } while (0)
85127diff --git a/include/linux/reboot.h b/include/linux/reboot.h
85128index 67fc8fc..a90f7d8 100644
85129--- a/include/linux/reboot.h
85130+++ b/include/linux/reboot.h
85131@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
85132 */
85133
85134 extern void migrate_to_reboot_cpu(void);
85135-extern void machine_restart(char *cmd);
85136-extern void machine_halt(void);
85137-extern void machine_power_off(void);
85138+extern void machine_restart(char *cmd) __noreturn;
85139+extern void machine_halt(void) __noreturn;
85140+extern void machine_power_off(void) __noreturn;
85141
85142 extern void machine_shutdown(void);
85143 struct pt_regs;
85144@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
85145 */
85146
85147 extern void kernel_restart_prepare(char *cmd);
85148-extern void kernel_restart(char *cmd);
85149-extern void kernel_halt(void);
85150-extern void kernel_power_off(void);
85151+extern void kernel_restart(char *cmd) __noreturn;
85152+extern void kernel_halt(void) __noreturn;
85153+extern void kernel_power_off(void) __noreturn;
85154
85155 extern int C_A_D; /* for sysctl */
85156 void ctrl_alt_del(void);
85157@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
85158 * Emergency restart, callable from an interrupt handler.
85159 */
85160
85161-extern void emergency_restart(void);
85162+extern void emergency_restart(void) __noreturn;
85163 #include <asm/emergency-restart.h>
85164
85165 #endif /* _LINUX_REBOOT_H */
85166diff --git a/include/linux/regset.h b/include/linux/regset.h
85167index 8e0c9fe..ac4d221 100644
85168--- a/include/linux/regset.h
85169+++ b/include/linux/regset.h
85170@@ -161,7 +161,8 @@ struct user_regset {
85171 unsigned int align;
85172 unsigned int bias;
85173 unsigned int core_note_type;
85174-};
85175+} __do_const;
85176+typedef struct user_regset __no_const user_regset_no_const;
85177
85178 /**
85179 * struct user_regset_view - available regsets
85180diff --git a/include/linux/relay.h b/include/linux/relay.h
85181index d7c8359..818daf5 100644
85182--- a/include/linux/relay.h
85183+++ b/include/linux/relay.h
85184@@ -157,7 +157,7 @@ struct rchan_callbacks
85185 * The callback should return 0 if successful, negative if not.
85186 */
85187 int (*remove_buf_file)(struct dentry *dentry);
85188-};
85189+} __no_const;
85190
85191 /*
85192 * CONFIG_RELAY kernel API, kernel/relay.c
85193diff --git a/include/linux/rio.h b/include/linux/rio.h
85194index 6bda06f..bf39a9b 100644
85195--- a/include/linux/rio.h
85196+++ b/include/linux/rio.h
85197@@ -358,7 +358,7 @@ struct rio_ops {
85198 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
85199 u64 rstart, u32 size, u32 flags);
85200 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
85201-};
85202+} __no_const;
85203
85204 #define RIO_RESOURCE_MEM 0x00000100
85205 #define RIO_RESOURCE_DOORBELL 0x00000200
85206diff --git a/include/linux/rmap.h b/include/linux/rmap.h
85207index d9d7e7e..86f47ac 100644
85208--- a/include/linux/rmap.h
85209+++ b/include/linux/rmap.h
85210@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
85211 void anon_vma_init(void); /* create anon_vma_cachep */
85212 int anon_vma_prepare(struct vm_area_struct *);
85213 void unlink_anon_vmas(struct vm_area_struct *);
85214-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
85215-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
85216+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
85217+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
85218
85219 static inline void anon_vma_merge(struct vm_area_struct *vma,
85220 struct vm_area_struct *next)
85221diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
85222index ed8f9e70..999bc96 100644
85223--- a/include/linux/scatterlist.h
85224+++ b/include/linux/scatterlist.h
85225@@ -1,6 +1,7 @@
85226 #ifndef _LINUX_SCATTERLIST_H
85227 #define _LINUX_SCATTERLIST_H
85228
85229+#include <linux/sched.h>
85230 #include <linux/string.h>
85231 #include <linux/bug.h>
85232 #include <linux/mm.h>
85233@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
85234 #ifdef CONFIG_DEBUG_SG
85235 BUG_ON(!virt_addr_valid(buf));
85236 #endif
85237+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85238+ if (object_starts_on_stack(buf)) {
85239+ void *adjbuf = buf - current->stack + current->lowmem_stack;
85240+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
85241+ } else
85242+#endif
85243 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
85244 }
85245
85246diff --git a/include/linux/sched.h b/include/linux/sched.h
85247index 8db31ef..0af1f81 100644
85248--- a/include/linux/sched.h
85249+++ b/include/linux/sched.h
85250@@ -133,6 +133,7 @@ struct fs_struct;
85251 struct perf_event_context;
85252 struct blk_plug;
85253 struct filename;
85254+struct linux_binprm;
85255
85256 #define VMACACHE_BITS 2
85257 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
85258@@ -415,7 +416,7 @@ extern char __sched_text_start[], __sched_text_end[];
85259 extern int in_sched_functions(unsigned long addr);
85260
85261 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
85262-extern signed long schedule_timeout(signed long timeout);
85263+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
85264 extern signed long schedule_timeout_interruptible(signed long timeout);
85265 extern signed long schedule_timeout_killable(signed long timeout);
85266 extern signed long schedule_timeout_uninterruptible(signed long timeout);
85267@@ -426,6 +427,19 @@ struct nsproxy;
85268 struct user_namespace;
85269
85270 #ifdef CONFIG_MMU
85271+
85272+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
85273+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
85274+#else
85275+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
85276+{
85277+ return 0;
85278+}
85279+#endif
85280+
85281+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
85282+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
85283+
85284 extern void arch_pick_mmap_layout(struct mm_struct *mm);
85285 extern unsigned long
85286 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
85287@@ -724,6 +738,17 @@ struct signal_struct {
85288 #ifdef CONFIG_TASKSTATS
85289 struct taskstats *stats;
85290 #endif
85291+
85292+#ifdef CONFIG_GRKERNSEC
85293+ u32 curr_ip;
85294+ u32 saved_ip;
85295+ u32 gr_saddr;
85296+ u32 gr_daddr;
85297+ u16 gr_sport;
85298+ u16 gr_dport;
85299+ u8 used_accept:1;
85300+#endif
85301+
85302 #ifdef CONFIG_AUDIT
85303 unsigned audit_tty;
85304 unsigned audit_tty_log_passwd;
85305@@ -750,7 +775,7 @@ struct signal_struct {
85306 struct mutex cred_guard_mutex; /* guard against foreign influences on
85307 * credential calculations
85308 * (notably. ptrace) */
85309-};
85310+} __randomize_layout;
85311
85312 /*
85313 * Bits in flags field of signal_struct.
85314@@ -803,6 +828,14 @@ struct user_struct {
85315 struct key *session_keyring; /* UID's default session keyring */
85316 #endif
85317
85318+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
85319+ unsigned char kernel_banned;
85320+#endif
85321+#ifdef CONFIG_GRKERNSEC_BRUTE
85322+ unsigned char suid_banned;
85323+ unsigned long suid_ban_expires;
85324+#endif
85325+
85326 /* Hash table maintenance information */
85327 struct hlist_node uidhash_node;
85328 kuid_t uid;
85329@@ -810,7 +843,7 @@ struct user_struct {
85330 #ifdef CONFIG_PERF_EVENTS
85331 atomic_long_t locked_vm;
85332 #endif
85333-};
85334+} __randomize_layout;
85335
85336 extern int uids_sysfs_init(void);
85337
85338@@ -1274,6 +1307,9 @@ enum perf_event_task_context {
85339 struct task_struct {
85340 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
85341 void *stack;
85342+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85343+ void *lowmem_stack;
85344+#endif
85345 atomic_t usage;
85346 unsigned int flags; /* per process flags, defined below */
85347 unsigned int ptrace;
85348@@ -1405,8 +1441,8 @@ struct task_struct {
85349 struct list_head thread_node;
85350
85351 struct completion *vfork_done; /* for vfork() */
85352- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
85353- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85354+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
85355+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85356
85357 cputime_t utime, stime, utimescaled, stimescaled;
85358 cputime_t gtime;
85359@@ -1431,11 +1467,6 @@ struct task_struct {
85360 struct task_cputime cputime_expires;
85361 struct list_head cpu_timers[3];
85362
85363-/* process credentials */
85364- const struct cred __rcu *real_cred; /* objective and real subjective task
85365- * credentials (COW) */
85366- const struct cred __rcu *cred; /* effective (overridable) subjective task
85367- * credentials (COW) */
85368 char comm[TASK_COMM_LEN]; /* executable name excluding path
85369 - access with [gs]et_task_comm (which lock
85370 it with task_lock())
85371@@ -1453,6 +1484,10 @@ struct task_struct {
85372 #endif
85373 /* CPU-specific state of this task */
85374 struct thread_struct thread;
85375+/* thread_info moved to task_struct */
85376+#ifdef CONFIG_X86
85377+ struct thread_info tinfo;
85378+#endif
85379 /* filesystem information */
85380 struct fs_struct *fs;
85381 /* open file information */
85382@@ -1527,6 +1562,10 @@ struct task_struct {
85383 gfp_t lockdep_reclaim_gfp;
85384 #endif
85385
85386+/* process credentials */
85387+ const struct cred __rcu *real_cred; /* objective and real subjective task
85388+ * credentials (COW) */
85389+
85390 /* journalling filesystem info */
85391 void *journal_info;
85392
85393@@ -1565,6 +1604,10 @@ struct task_struct {
85394 /* cg_list protected by css_set_lock and tsk->alloc_lock */
85395 struct list_head cg_list;
85396 #endif
85397+
85398+ const struct cred __rcu *cred; /* effective (overridable) subjective task
85399+ * credentials (COW) */
85400+
85401 #ifdef CONFIG_FUTEX
85402 struct robust_list_head __user *robust_list;
85403 #ifdef CONFIG_COMPAT
85404@@ -1673,7 +1716,7 @@ struct task_struct {
85405 * Number of functions that haven't been traced
85406 * because of depth overrun.
85407 */
85408- atomic_t trace_overrun;
85409+ atomic_unchecked_t trace_overrun;
85410 /* Pause for the tracing */
85411 atomic_t tracing_graph_pause;
85412 #endif
85413@@ -1701,7 +1744,78 @@ struct task_struct {
85414 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
85415 unsigned long task_state_change;
85416 #endif
85417-};
85418+
85419+#ifdef CONFIG_GRKERNSEC
85420+ /* grsecurity */
85421+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
85422+ u64 exec_id;
85423+#endif
85424+#ifdef CONFIG_GRKERNSEC_SETXID
85425+ const struct cred *delayed_cred;
85426+#endif
85427+ struct dentry *gr_chroot_dentry;
85428+ struct acl_subject_label *acl;
85429+ struct acl_subject_label *tmpacl;
85430+ struct acl_role_label *role;
85431+ struct file *exec_file;
85432+ unsigned long brute_expires;
85433+ u16 acl_role_id;
85434+ u8 inherited;
85435+ /* is this the task that authenticated to the special role */
85436+ u8 acl_sp_role;
85437+ u8 is_writable;
85438+ u8 brute;
85439+ u8 gr_is_chrooted;
85440+#endif
85441+
85442+} __randomize_layout;
85443+
85444+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
85445+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
85446+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
85447+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
85448+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
85449+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
85450+
85451+#ifdef CONFIG_PAX_SOFTMODE
85452+extern int pax_softmode;
85453+#endif
85454+
85455+extern int pax_check_flags(unsigned long *);
85456+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
85457+
85458+/* if tsk != current then task_lock must be held on it */
85459+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
85460+static inline unsigned long pax_get_flags(struct task_struct *tsk)
85461+{
85462+ if (likely(tsk->mm))
85463+ return tsk->mm->pax_flags;
85464+ else
85465+ return 0UL;
85466+}
85467+
85468+/* if tsk != current then task_lock must be held on it */
85469+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
85470+{
85471+ if (likely(tsk->mm)) {
85472+ tsk->mm->pax_flags = flags;
85473+ return 0;
85474+ }
85475+ return -EINVAL;
85476+}
85477+#endif
85478+
85479+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
85480+extern void pax_set_initial_flags(struct linux_binprm *bprm);
85481+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
85482+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
85483+#endif
85484+
85485+struct path;
85486+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
85487+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
85488+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
85489+extern void pax_report_refcount_overflow(struct pt_regs *regs);
85490
85491 /* Future-safe accessor for struct task_struct's cpus_allowed. */
85492 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
85493@@ -1783,7 +1897,7 @@ struct pid_namespace;
85494 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
85495 struct pid_namespace *ns);
85496
85497-static inline pid_t task_pid_nr(struct task_struct *tsk)
85498+static inline pid_t task_pid_nr(const struct task_struct *tsk)
85499 {
85500 return tsk->pid;
85501 }
85502@@ -2150,6 +2264,25 @@ extern u64 sched_clock_cpu(int cpu);
85503
85504 extern void sched_clock_init(void);
85505
85506+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85507+static inline void populate_stack(void)
85508+{
85509+ struct task_struct *curtask = current;
85510+ int c;
85511+ int *ptr = curtask->stack;
85512+ int *end = curtask->stack + THREAD_SIZE;
85513+
85514+ while (ptr < end) {
85515+ c = *(volatile int *)ptr;
85516+ ptr += PAGE_SIZE/sizeof(int);
85517+ }
85518+}
85519+#else
85520+static inline void populate_stack(void)
85521+{
85522+}
85523+#endif
85524+
85525 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
85526 static inline void sched_clock_tick(void)
85527 {
85528@@ -2283,7 +2416,9 @@ void yield(void);
85529 extern struct exec_domain default_exec_domain;
85530
85531 union thread_union {
85532+#ifndef CONFIG_X86
85533 struct thread_info thread_info;
85534+#endif
85535 unsigned long stack[THREAD_SIZE/sizeof(long)];
85536 };
85537
85538@@ -2316,6 +2451,7 @@ extern struct pid_namespace init_pid_ns;
85539 */
85540
85541 extern struct task_struct *find_task_by_vpid(pid_t nr);
85542+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
85543 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
85544 struct pid_namespace *ns);
85545
85546@@ -2480,7 +2616,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
85547 extern void exit_itimers(struct signal_struct *);
85548 extern void flush_itimer_signals(void);
85549
85550-extern void do_group_exit(int);
85551+extern __noreturn void do_group_exit(int);
85552
85553 extern int do_execve(struct filename *,
85554 const char __user * const __user *,
85555@@ -2701,9 +2837,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
85556 #define task_stack_end_corrupted(task) \
85557 (*(end_of_stack(task)) != STACK_END_MAGIC)
85558
85559-static inline int object_is_on_stack(void *obj)
85560+static inline int object_starts_on_stack(const void *obj)
85561 {
85562- void *stack = task_stack_page(current);
85563+ const void *stack = task_stack_page(current);
85564
85565 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
85566 }
85567diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
85568index 596a0e0..bea77ec 100644
85569--- a/include/linux/sched/sysctl.h
85570+++ b/include/linux/sched/sysctl.h
85571@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
85572 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
85573
85574 extern int sysctl_max_map_count;
85575+extern unsigned long sysctl_heap_stack_gap;
85576
85577 extern unsigned int sysctl_sched_latency;
85578 extern unsigned int sysctl_sched_min_granularity;
85579diff --git a/include/linux/security.h b/include/linux/security.h
85580index ba96471..74fb3f6 100644
85581--- a/include/linux/security.h
85582+++ b/include/linux/security.h
85583@@ -27,6 +27,7 @@
85584 #include <linux/slab.h>
85585 #include <linux/err.h>
85586 #include <linux/string.h>
85587+#include <linux/grsecurity.h>
85588
85589 struct linux_binprm;
85590 struct cred;
85591@@ -116,8 +117,6 @@ struct seq_file;
85592
85593 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
85594
85595-void reset_security_ops(void);
85596-
85597 #ifdef CONFIG_MMU
85598 extern unsigned long mmap_min_addr;
85599 extern unsigned long dac_mmap_min_addr;
85600@@ -1729,7 +1728,7 @@ struct security_operations {
85601 struct audit_context *actx);
85602 void (*audit_rule_free) (void *lsmrule);
85603 #endif /* CONFIG_AUDIT */
85604-};
85605+} __randomize_layout;
85606
85607 /* prototypes */
85608 extern int security_init(void);
85609diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
85610index dc368b8..e895209 100644
85611--- a/include/linux/semaphore.h
85612+++ b/include/linux/semaphore.h
85613@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
85614 }
85615
85616 extern void down(struct semaphore *sem);
85617-extern int __must_check down_interruptible(struct semaphore *sem);
85618+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
85619 extern int __must_check down_killable(struct semaphore *sem);
85620 extern int __must_check down_trylock(struct semaphore *sem);
85621 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
85622diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
85623index cf6a9da..bd86b1f 100644
85624--- a/include/linux/seq_file.h
85625+++ b/include/linux/seq_file.h
85626@@ -27,6 +27,9 @@ struct seq_file {
85627 struct mutex lock;
85628 const struct seq_operations *op;
85629 int poll_event;
85630+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
85631+ u64 exec_id;
85632+#endif
85633 #ifdef CONFIG_USER_NS
85634 struct user_namespace *user_ns;
85635 #endif
85636@@ -39,6 +42,7 @@ struct seq_operations {
85637 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
85638 int (*show) (struct seq_file *m, void *v);
85639 };
85640+typedef struct seq_operations __no_const seq_operations_no_const;
85641
85642 #define SEQ_SKIP 1
85643
85644@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
85645
85646 char *mangle_path(char *s, const char *p, const char *esc);
85647 int seq_open(struct file *, const struct seq_operations *);
85648+int seq_open_restrict(struct file *, const struct seq_operations *);
85649 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
85650 loff_t seq_lseek(struct file *, loff_t, int);
85651 int seq_release(struct inode *, struct file *);
85652@@ -153,6 +158,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
85653 }
85654
85655 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
85656+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
85657 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
85658 int single_release(struct inode *, struct file *);
85659 void *__seq_open_private(struct file *, const struct seq_operations *, int);
85660diff --git a/include/linux/shm.h b/include/linux/shm.h
85661index 6fb8016..ab4465e 100644
85662--- a/include/linux/shm.h
85663+++ b/include/linux/shm.h
85664@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
85665 /* The task created the shm object. NULL if the task is dead. */
85666 struct task_struct *shm_creator;
85667 struct list_head shm_clist; /* list by creator */
85668+#ifdef CONFIG_GRKERNSEC
85669+ u64 shm_createtime;
85670+ pid_t shm_lapid;
85671+#endif
85672 };
85673
85674 /* shm_mode upper byte flags */
85675diff --git a/include/linux/signal.h b/include/linux/signal.h
85676index ab1e039..ad4229e 100644
85677--- a/include/linux/signal.h
85678+++ b/include/linux/signal.h
85679@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
85680 * know it'll be handled, so that they don't get converted to
85681 * SIGKILL or just silently dropped.
85682 */
85683- kernel_sigaction(sig, (__force __sighandler_t)2);
85684+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
85685 }
85686
85687 static inline void disallow_signal(int sig)
85688diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
85689index 85ab7d7..eb1585a 100644
85690--- a/include/linux/skbuff.h
85691+++ b/include/linux/skbuff.h
85692@@ -763,7 +763,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
85693 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
85694 int node);
85695 struct sk_buff *build_skb(void *data, unsigned int frag_size);
85696-static inline struct sk_buff *alloc_skb(unsigned int size,
85697+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
85698 gfp_t priority)
85699 {
85700 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
85701@@ -1952,7 +1952,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
85702 return skb->inner_transport_header - skb->inner_network_header;
85703 }
85704
85705-static inline int skb_network_offset(const struct sk_buff *skb)
85706+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
85707 {
85708 return skb_network_header(skb) - skb->data;
85709 }
85710@@ -2012,7 +2012,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
85711 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
85712 */
85713 #ifndef NET_SKB_PAD
85714-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
85715+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
85716 #endif
85717
85718 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
85719@@ -2655,9 +2655,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
85720 int *err);
85721 unsigned int datagram_poll(struct file *file, struct socket *sock,
85722 struct poll_table_struct *wait);
85723-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
85724+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
85725 struct iov_iter *to, int size);
85726-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
85727+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
85728 struct msghdr *msg, int size)
85729 {
85730 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
85731@@ -3131,6 +3131,9 @@ static inline void nf_reset(struct sk_buff *skb)
85732 nf_bridge_put(skb->nf_bridge);
85733 skb->nf_bridge = NULL;
85734 #endif
85735+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
85736+ skb->nf_trace = 0;
85737+#endif
85738 }
85739
85740 static inline void nf_reset_trace(struct sk_buff *skb)
85741diff --git a/include/linux/slab.h b/include/linux/slab.h
85742index 9a139b6..aab37b4 100644
85743--- a/include/linux/slab.h
85744+++ b/include/linux/slab.h
85745@@ -14,15 +14,29 @@
85746 #include <linux/gfp.h>
85747 #include <linux/types.h>
85748 #include <linux/workqueue.h>
85749-
85750+#include <linux/err.h>
85751
85752 /*
85753 * Flags to pass to kmem_cache_create().
85754 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
85755 */
85756 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
85757+
85758+#ifdef CONFIG_PAX_USERCOPY_SLABS
85759+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
85760+#else
85761+#define SLAB_USERCOPY 0x00000000UL
85762+#endif
85763+
85764 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
85765 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
85766+
85767+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85768+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
85769+#else
85770+#define SLAB_NO_SANITIZE 0x00000000UL
85771+#endif
85772+
85773 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
85774 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
85775 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
85776@@ -98,10 +112,13 @@
85777 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
85778 * Both make kfree a no-op.
85779 */
85780-#define ZERO_SIZE_PTR ((void *)16)
85781+#define ZERO_SIZE_PTR \
85782+({ \
85783+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
85784+ (void *)(-MAX_ERRNO-1L); \
85785+})
85786
85787-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
85788- (unsigned long)ZERO_SIZE_PTR)
85789+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
85790
85791 #include <linux/kmemleak.h>
85792
85793@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
85794 void kfree(const void *);
85795 void kzfree(const void *);
85796 size_t ksize(const void *);
85797+const char *check_heap_object(const void *ptr, unsigned long n);
85798+bool is_usercopy_object(const void *ptr);
85799
85800 /*
85801 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
85802@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
85803 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85804 #endif
85805
85806+#ifdef CONFIG_PAX_USERCOPY_SLABS
85807+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
85808+#endif
85809+
85810 /*
85811 * Figure out which kmalloc slab an allocation of a certain size
85812 * belongs to.
85813@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85814 * 2 = 120 .. 192 bytes
85815 * n = 2^(n-1) .. 2^n -1
85816 */
85817-static __always_inline int kmalloc_index(size_t size)
85818+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
85819 {
85820 if (!size)
85821 return 0;
85822@@ -287,14 +310,14 @@ static __always_inline int kmalloc_index(size_t size)
85823 }
85824 #endif /* !CONFIG_SLOB */
85825
85826-void *__kmalloc(size_t size, gfp_t flags);
85827+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
85828 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
85829
85830 #ifdef CONFIG_NUMA
85831-void *__kmalloc_node(size_t size, gfp_t flags, int node);
85832+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
85833 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
85834 #else
85835-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
85836+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
85837 {
85838 return __kmalloc(size, flags);
85839 }
85840diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
85841index b869d16..1453c73 100644
85842--- a/include/linux/slab_def.h
85843+++ b/include/linux/slab_def.h
85844@@ -40,7 +40,7 @@ struct kmem_cache {
85845 /* 4) cache creation/removal */
85846 const char *name;
85847 struct list_head list;
85848- int refcount;
85849+ atomic_t refcount;
85850 int object_size;
85851 int align;
85852
85853@@ -56,10 +56,14 @@ struct kmem_cache {
85854 unsigned long node_allocs;
85855 unsigned long node_frees;
85856 unsigned long node_overflow;
85857- atomic_t allochit;
85858- atomic_t allocmiss;
85859- atomic_t freehit;
85860- atomic_t freemiss;
85861+ atomic_unchecked_t allochit;
85862+ atomic_unchecked_t allocmiss;
85863+ atomic_unchecked_t freehit;
85864+ atomic_unchecked_t freemiss;
85865+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85866+ atomic_unchecked_t sanitized;
85867+ atomic_unchecked_t not_sanitized;
85868+#endif
85869
85870 /*
85871 * If debugging is enabled, then the allocator can add additional
85872diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
85873index d82abd4..408c3a0 100644
85874--- a/include/linux/slub_def.h
85875+++ b/include/linux/slub_def.h
85876@@ -74,7 +74,7 @@ struct kmem_cache {
85877 struct kmem_cache_order_objects max;
85878 struct kmem_cache_order_objects min;
85879 gfp_t allocflags; /* gfp flags to use on each alloc */
85880- int refcount; /* Refcount for slab cache destroy */
85881+ atomic_t refcount; /* Refcount for slab cache destroy */
85882 void (*ctor)(void *);
85883 int inuse; /* Offset to metadata */
85884 int align; /* Alignment */
85885diff --git a/include/linux/smp.h b/include/linux/smp.h
85886index 93dff5f..933c561 100644
85887--- a/include/linux/smp.h
85888+++ b/include/linux/smp.h
85889@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
85890 #endif
85891
85892 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
85893+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
85894 #define put_cpu() preempt_enable()
85895+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
85896
85897 /*
85898 * Callback to arch code if there's nosmp or maxcpus=0 on the
85899diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
85900index 46cca4c..3323536 100644
85901--- a/include/linux/sock_diag.h
85902+++ b/include/linux/sock_diag.h
85903@@ -11,7 +11,7 @@ struct sock;
85904 struct sock_diag_handler {
85905 __u8 family;
85906 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
85907-};
85908+} __do_const;
85909
85910 int sock_diag_register(const struct sock_diag_handler *h);
85911 void sock_diag_unregister(const struct sock_diag_handler *h);
85912diff --git a/include/linux/sonet.h b/include/linux/sonet.h
85913index 680f9a3..f13aeb0 100644
85914--- a/include/linux/sonet.h
85915+++ b/include/linux/sonet.h
85916@@ -7,7 +7,7 @@
85917 #include <uapi/linux/sonet.h>
85918
85919 struct k_sonet_stats {
85920-#define __HANDLE_ITEM(i) atomic_t i
85921+#define __HANDLE_ITEM(i) atomic_unchecked_t i
85922 __SONET_ITEMS
85923 #undef __HANDLE_ITEM
85924 };
85925diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
85926index 07d8e53..dc934c9 100644
85927--- a/include/linux/sunrpc/addr.h
85928+++ b/include/linux/sunrpc/addr.h
85929@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
85930 {
85931 switch (sap->sa_family) {
85932 case AF_INET:
85933- return ntohs(((struct sockaddr_in *)sap)->sin_port);
85934+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
85935 case AF_INET6:
85936- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
85937+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
85938 }
85939 return 0;
85940 }
85941@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
85942 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
85943 const struct sockaddr *src)
85944 {
85945- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
85946+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
85947 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
85948
85949 dsin->sin_family = ssin->sin_family;
85950@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
85951 if (sa->sa_family != AF_INET6)
85952 return 0;
85953
85954- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
85955+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
85956 }
85957
85958 #endif /* _LINUX_SUNRPC_ADDR_H */
85959diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
85960index 598ba80..d90cba6 100644
85961--- a/include/linux/sunrpc/clnt.h
85962+++ b/include/linux/sunrpc/clnt.h
85963@@ -100,7 +100,7 @@ struct rpc_procinfo {
85964 unsigned int p_timer; /* Which RTT timer to use */
85965 u32 p_statidx; /* Which procedure to account */
85966 const char * p_name; /* name of procedure */
85967-};
85968+} __do_const;
85969
85970 #ifdef __KERNEL__
85971
85972diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
85973index 6f22cfe..9fd0909 100644
85974--- a/include/linux/sunrpc/svc.h
85975+++ b/include/linux/sunrpc/svc.h
85976@@ -420,7 +420,7 @@ struct svc_procedure {
85977 unsigned int pc_count; /* call count */
85978 unsigned int pc_cachetype; /* cache info (NFS) */
85979 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85980-};
85981+} __do_const;
85982
85983 /*
85984 * Function prototypes.
85985diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
85986index 975da75..318c083 100644
85987--- a/include/linux/sunrpc/svc_rdma.h
85988+++ b/include/linux/sunrpc/svc_rdma.h
85989@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
85990 extern unsigned int svcrdma_max_requests;
85991 extern unsigned int svcrdma_max_req_size;
85992
85993-extern atomic_t rdma_stat_recv;
85994-extern atomic_t rdma_stat_read;
85995-extern atomic_t rdma_stat_write;
85996-extern atomic_t rdma_stat_sq_starve;
85997-extern atomic_t rdma_stat_rq_starve;
85998-extern atomic_t rdma_stat_rq_poll;
85999-extern atomic_t rdma_stat_rq_prod;
86000-extern atomic_t rdma_stat_sq_poll;
86001-extern atomic_t rdma_stat_sq_prod;
86002+extern atomic_unchecked_t rdma_stat_recv;
86003+extern atomic_unchecked_t rdma_stat_read;
86004+extern atomic_unchecked_t rdma_stat_write;
86005+extern atomic_unchecked_t rdma_stat_sq_starve;
86006+extern atomic_unchecked_t rdma_stat_rq_starve;
86007+extern atomic_unchecked_t rdma_stat_rq_poll;
86008+extern atomic_unchecked_t rdma_stat_rq_prod;
86009+extern atomic_unchecked_t rdma_stat_sq_poll;
86010+extern atomic_unchecked_t rdma_stat_sq_prod;
86011
86012 #define RPCRDMA_VERSION 1
86013
86014diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
86015index 8d71d65..f79586e 100644
86016--- a/include/linux/sunrpc/svcauth.h
86017+++ b/include/linux/sunrpc/svcauth.h
86018@@ -120,7 +120,7 @@ struct auth_ops {
86019 int (*release)(struct svc_rqst *rq);
86020 void (*domain_release)(struct auth_domain *);
86021 int (*set_client)(struct svc_rqst *rq);
86022-};
86023+} __do_const;
86024
86025 #define SVC_GARBAGE 1
86026 #define SVC_SYSERR 2
86027diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
86028index e7a018e..49f8b17 100644
86029--- a/include/linux/swiotlb.h
86030+++ b/include/linux/swiotlb.h
86031@@ -60,7 +60,8 @@ extern void
86032
86033 extern void
86034 swiotlb_free_coherent(struct device *hwdev, size_t size,
86035- void *vaddr, dma_addr_t dma_handle);
86036+ void *vaddr, dma_addr_t dma_handle,
86037+ struct dma_attrs *attrs);
86038
86039 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
86040 unsigned long offset, size_t size,
86041diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
86042index 85893d7..e78c660 100644
86043--- a/include/linux/syscalls.h
86044+++ b/include/linux/syscalls.h
86045@@ -102,7 +102,12 @@ union bpf_attr;
86046 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
86047 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
86048 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
86049-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
86050+#define __SC_LONG(t, a) __typeof__( \
86051+ __builtin_choose_expr( \
86052+ sizeof(t) > sizeof(int), \
86053+ (t) 0, \
86054+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
86055+ )) a
86056 #define __SC_CAST(t, a) (t) a
86057 #define __SC_ARGS(t, a) a
86058 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
86059@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
86060 asmlinkage long sys_fsync(unsigned int fd);
86061 asmlinkage long sys_fdatasync(unsigned int fd);
86062 asmlinkage long sys_bdflush(int func, long data);
86063-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
86064- char __user *type, unsigned long flags,
86065+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
86066+ const char __user *type, unsigned long flags,
86067 void __user *data);
86068-asmlinkage long sys_umount(char __user *name, int flags);
86069-asmlinkage long sys_oldumount(char __user *name);
86070+asmlinkage long sys_umount(const char __user *name, int flags);
86071+asmlinkage long sys_oldumount(const char __user *name);
86072 asmlinkage long sys_truncate(const char __user *path, long length);
86073 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
86074 asmlinkage long sys_stat(const char __user *filename,
86075@@ -600,7 +605,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
86076 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
86077 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
86078 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
86079- struct sockaddr __user *, int);
86080+ struct sockaddr __user *, int) __intentional_overflow(0);
86081 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
86082 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
86083 unsigned int vlen, unsigned flags);
86084diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
86085index 27b3b0b..e093dd9 100644
86086--- a/include/linux/syscore_ops.h
86087+++ b/include/linux/syscore_ops.h
86088@@ -16,7 +16,7 @@ struct syscore_ops {
86089 int (*suspend)(void);
86090 void (*resume)(void);
86091 void (*shutdown)(void);
86092-};
86093+} __do_const;
86094
86095 extern void register_syscore_ops(struct syscore_ops *ops);
86096 extern void unregister_syscore_ops(struct syscore_ops *ops);
86097diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
86098index b7361f8..341a15a 100644
86099--- a/include/linux/sysctl.h
86100+++ b/include/linux/sysctl.h
86101@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
86102
86103 extern int proc_dostring(struct ctl_table *, int,
86104 void __user *, size_t *, loff_t *);
86105+extern int proc_dostring_modpriv(struct ctl_table *, int,
86106+ void __user *, size_t *, loff_t *);
86107 extern int proc_dointvec(struct ctl_table *, int,
86108 void __user *, size_t *, loff_t *);
86109 extern int proc_dointvec_minmax(struct ctl_table *, int,
86110@@ -113,7 +115,8 @@ struct ctl_table
86111 struct ctl_table_poll *poll;
86112 void *extra1;
86113 void *extra2;
86114-};
86115+} __do_const __randomize_layout;
86116+typedef struct ctl_table __no_const ctl_table_no_const;
86117
86118 struct ctl_node {
86119 struct rb_node node;
86120diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
86121index ddad161..a3efd26 100644
86122--- a/include/linux/sysfs.h
86123+++ b/include/linux/sysfs.h
86124@@ -34,7 +34,8 @@ struct attribute {
86125 struct lock_class_key *key;
86126 struct lock_class_key skey;
86127 #endif
86128-};
86129+} __do_const;
86130+typedef struct attribute __no_const attribute_no_const;
86131
86132 /**
86133 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
86134@@ -63,7 +64,8 @@ struct attribute_group {
86135 struct attribute *, int);
86136 struct attribute **attrs;
86137 struct bin_attribute **bin_attrs;
86138-};
86139+} __do_const;
86140+typedef struct attribute_group __no_const attribute_group_no_const;
86141
86142 /**
86143 * Use these macros to make defining attributes easier. See include/linux/device.h
86144@@ -137,7 +139,8 @@ struct bin_attribute {
86145 char *, loff_t, size_t);
86146 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
86147 struct vm_area_struct *vma);
86148-};
86149+} __do_const;
86150+typedef struct bin_attribute __no_const bin_attribute_no_const;
86151
86152 /**
86153 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
86154diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
86155index 387fa7d..3fcde6b 100644
86156--- a/include/linux/sysrq.h
86157+++ b/include/linux/sysrq.h
86158@@ -16,6 +16,7 @@
86159
86160 #include <linux/errno.h>
86161 #include <linux/types.h>
86162+#include <linux/compiler.h>
86163
86164 /* Possible values of bitmask for enabling sysrq functions */
86165 /* 0x0001 is reserved for enable everything */
86166@@ -33,7 +34,7 @@ struct sysrq_key_op {
86167 char *help_msg;
86168 char *action_msg;
86169 int enable_mask;
86170-};
86171+} __do_const;
86172
86173 #ifdef CONFIG_MAGIC_SYSRQ
86174
86175diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
86176index ff307b5..f1a4468 100644
86177--- a/include/linux/thread_info.h
86178+++ b/include/linux/thread_info.h
86179@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
86180 #error "no set_restore_sigmask() provided and default one won't work"
86181 #endif
86182
86183+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
86184+
86185+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
86186+{
86187+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
86188+}
86189+
86190 #endif /* __KERNEL__ */
86191
86192 #endif /* _LINUX_THREAD_INFO_H */
86193diff --git a/include/linux/tty.h b/include/linux/tty.h
86194index 7d66ae5..0327149 100644
86195--- a/include/linux/tty.h
86196+++ b/include/linux/tty.h
86197@@ -202,7 +202,7 @@ struct tty_port {
86198 const struct tty_port_operations *ops; /* Port operations */
86199 spinlock_t lock; /* Lock protecting tty field */
86200 int blocked_open; /* Waiting to open */
86201- int count; /* Usage count */
86202+ atomic_t count; /* Usage count */
86203 wait_queue_head_t open_wait; /* Open waiters */
86204 wait_queue_head_t close_wait; /* Close waiters */
86205 wait_queue_head_t delta_msr_wait; /* Modem status change */
86206@@ -290,7 +290,7 @@ struct tty_struct {
86207 /* If the tty has a pending do_SAK, queue it here - akpm */
86208 struct work_struct SAK_work;
86209 struct tty_port *port;
86210-};
86211+} __randomize_layout;
86212
86213 /* Each of a tty's open files has private_data pointing to tty_file_private */
86214 struct tty_file_private {
86215@@ -549,7 +549,7 @@ extern int tty_port_open(struct tty_port *port,
86216 struct tty_struct *tty, struct file *filp);
86217 static inline int tty_port_users(struct tty_port *port)
86218 {
86219- return port->count + port->blocked_open;
86220+ return atomic_read(&port->count) + port->blocked_open;
86221 }
86222
86223 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
86224diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
86225index 92e337c..f46757b 100644
86226--- a/include/linux/tty_driver.h
86227+++ b/include/linux/tty_driver.h
86228@@ -291,7 +291,7 @@ struct tty_operations {
86229 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
86230 #endif
86231 const struct file_operations *proc_fops;
86232-};
86233+} __do_const __randomize_layout;
86234
86235 struct tty_driver {
86236 int magic; /* magic number for this structure */
86237@@ -325,7 +325,7 @@ struct tty_driver {
86238
86239 const struct tty_operations *ops;
86240 struct list_head tty_drivers;
86241-};
86242+} __randomize_layout;
86243
86244 extern struct list_head tty_drivers;
86245
86246diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
86247index 00c9d68..bc0188b 100644
86248--- a/include/linux/tty_ldisc.h
86249+++ b/include/linux/tty_ldisc.h
86250@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
86251
86252 struct module *owner;
86253
86254- int refcount;
86255+ atomic_t refcount;
86256 };
86257
86258 struct tty_ldisc {
86259diff --git a/include/linux/types.h b/include/linux/types.h
86260index a0bb704..f511c77 100644
86261--- a/include/linux/types.h
86262+++ b/include/linux/types.h
86263@@ -177,10 +177,26 @@ typedef struct {
86264 int counter;
86265 } atomic_t;
86266
86267+#ifdef CONFIG_PAX_REFCOUNT
86268+typedef struct {
86269+ int counter;
86270+} atomic_unchecked_t;
86271+#else
86272+typedef atomic_t atomic_unchecked_t;
86273+#endif
86274+
86275 #ifdef CONFIG_64BIT
86276 typedef struct {
86277 long counter;
86278 } atomic64_t;
86279+
86280+#ifdef CONFIG_PAX_REFCOUNT
86281+typedef struct {
86282+ long counter;
86283+} atomic64_unchecked_t;
86284+#else
86285+typedef atomic64_t atomic64_unchecked_t;
86286+#endif
86287 #endif
86288
86289 struct list_head {
86290diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
86291index ecd3319..8a36ded 100644
86292--- a/include/linux/uaccess.h
86293+++ b/include/linux/uaccess.h
86294@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
86295 long ret; \
86296 mm_segment_t old_fs = get_fs(); \
86297 \
86298- set_fs(KERNEL_DS); \
86299 pagefault_disable(); \
86300- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
86301- pagefault_enable(); \
86302+ set_fs(KERNEL_DS); \
86303+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
86304 set_fs(old_fs); \
86305+ pagefault_enable(); \
86306 ret; \
86307 })
86308
86309diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
86310index 2d1f9b6..d7a9fce 100644
86311--- a/include/linux/uidgid.h
86312+++ b/include/linux/uidgid.h
86313@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
86314
86315 #endif /* CONFIG_USER_NS */
86316
86317+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
86318+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
86319+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
86320+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
86321+
86322 #endif /* _LINUX_UIDGID_H */
86323diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
86324index 32c0e83..671eb35 100644
86325--- a/include/linux/uio_driver.h
86326+++ b/include/linux/uio_driver.h
86327@@ -67,7 +67,7 @@ struct uio_device {
86328 struct module *owner;
86329 struct device *dev;
86330 int minor;
86331- atomic_t event;
86332+ atomic_unchecked_t event;
86333 struct fasync_struct *async_queue;
86334 wait_queue_head_t wait;
86335 struct uio_info *info;
86336diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
86337index 99c1b4d..562e6f3 100644
86338--- a/include/linux/unaligned/access_ok.h
86339+++ b/include/linux/unaligned/access_ok.h
86340@@ -4,34 +4,34 @@
86341 #include <linux/kernel.h>
86342 #include <asm/byteorder.h>
86343
86344-static inline u16 get_unaligned_le16(const void *p)
86345+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
86346 {
86347- return le16_to_cpup((__le16 *)p);
86348+ return le16_to_cpup((const __le16 *)p);
86349 }
86350
86351-static inline u32 get_unaligned_le32(const void *p)
86352+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
86353 {
86354- return le32_to_cpup((__le32 *)p);
86355+ return le32_to_cpup((const __le32 *)p);
86356 }
86357
86358-static inline u64 get_unaligned_le64(const void *p)
86359+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
86360 {
86361- return le64_to_cpup((__le64 *)p);
86362+ return le64_to_cpup((const __le64 *)p);
86363 }
86364
86365-static inline u16 get_unaligned_be16(const void *p)
86366+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
86367 {
86368- return be16_to_cpup((__be16 *)p);
86369+ return be16_to_cpup((const __be16 *)p);
86370 }
86371
86372-static inline u32 get_unaligned_be32(const void *p)
86373+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
86374 {
86375- return be32_to_cpup((__be32 *)p);
86376+ return be32_to_cpup((const __be32 *)p);
86377 }
86378
86379-static inline u64 get_unaligned_be64(const void *p)
86380+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
86381 {
86382- return be64_to_cpup((__be64 *)p);
86383+ return be64_to_cpup((const __be64 *)p);
86384 }
86385
86386 static inline void put_unaligned_le16(u16 val, void *p)
86387diff --git a/include/linux/usb.h b/include/linux/usb.h
86388index 058a769..c17a1c2c 100644
86389--- a/include/linux/usb.h
86390+++ b/include/linux/usb.h
86391@@ -566,7 +566,7 @@ struct usb_device {
86392 int maxchild;
86393
86394 u32 quirks;
86395- atomic_t urbnum;
86396+ atomic_unchecked_t urbnum;
86397
86398 unsigned long active_duration;
86399
86400@@ -1650,7 +1650,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
86401
86402 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
86403 __u8 request, __u8 requesttype, __u16 value, __u16 index,
86404- void *data, __u16 size, int timeout);
86405+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
86406 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
86407 void *data, int len, int *actual_length, int timeout);
86408 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
86409diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
86410index 9fd9e48..e2c5f35 100644
86411--- a/include/linux/usb/renesas_usbhs.h
86412+++ b/include/linux/usb/renesas_usbhs.h
86413@@ -39,7 +39,7 @@ enum {
86414 */
86415 struct renesas_usbhs_driver_callback {
86416 int (*notify_hotplug)(struct platform_device *pdev);
86417-};
86418+} __no_const;
86419
86420 /*
86421 * callback functions for platform
86422diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
86423index 8297e5b..0dfae27 100644
86424--- a/include/linux/user_namespace.h
86425+++ b/include/linux/user_namespace.h
86426@@ -39,7 +39,7 @@ struct user_namespace {
86427 struct key *persistent_keyring_register;
86428 struct rw_semaphore persistent_keyring_register_sem;
86429 #endif
86430-};
86431+} __randomize_layout;
86432
86433 extern struct user_namespace init_user_ns;
86434
86435diff --git a/include/linux/utsname.h b/include/linux/utsname.h
86436index 5093f58..c103e58 100644
86437--- a/include/linux/utsname.h
86438+++ b/include/linux/utsname.h
86439@@ -25,7 +25,7 @@ struct uts_namespace {
86440 struct new_utsname name;
86441 struct user_namespace *user_ns;
86442 struct ns_common ns;
86443-};
86444+} __randomize_layout;
86445 extern struct uts_namespace init_uts_ns;
86446
86447 #ifdef CONFIG_UTS_NS
86448diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
86449index 6f8fbcf..4efc177 100644
86450--- a/include/linux/vermagic.h
86451+++ b/include/linux/vermagic.h
86452@@ -25,9 +25,42 @@
86453 #define MODULE_ARCH_VERMAGIC ""
86454 #endif
86455
86456+#ifdef CONFIG_PAX_REFCOUNT
86457+#define MODULE_PAX_REFCOUNT "REFCOUNT "
86458+#else
86459+#define MODULE_PAX_REFCOUNT ""
86460+#endif
86461+
86462+#ifdef CONSTIFY_PLUGIN
86463+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
86464+#else
86465+#define MODULE_CONSTIFY_PLUGIN ""
86466+#endif
86467+
86468+#ifdef STACKLEAK_PLUGIN
86469+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
86470+#else
86471+#define MODULE_STACKLEAK_PLUGIN ""
86472+#endif
86473+
86474+#ifdef RANDSTRUCT_PLUGIN
86475+#include <generated/randomize_layout_hash.h>
86476+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
86477+#else
86478+#define MODULE_RANDSTRUCT_PLUGIN
86479+#endif
86480+
86481+#ifdef CONFIG_GRKERNSEC
86482+#define MODULE_GRSEC "GRSEC "
86483+#else
86484+#define MODULE_GRSEC ""
86485+#endif
86486+
86487 #define VERMAGIC_STRING \
86488 UTS_RELEASE " " \
86489 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
86490 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
86491- MODULE_ARCH_VERMAGIC
86492+ MODULE_ARCH_VERMAGIC \
86493+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
86494+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
86495
86496diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
86497index b483abd..af305ad 100644
86498--- a/include/linux/vga_switcheroo.h
86499+++ b/include/linux/vga_switcheroo.h
86500@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
86501
86502 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
86503
86504-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
86505+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
86506 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
86507-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
86508+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
86509 #else
86510
86511 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
86512@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
86513
86514 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
86515
86516-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86517+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
86518 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
86519-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86520+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
86521
86522 #endif
86523 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
86524diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
86525index b87696f..1d11de7 100644
86526--- a/include/linux/vmalloc.h
86527+++ b/include/linux/vmalloc.h
86528@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
86529 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
86530 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
86531 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
86532+
86533+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
86534+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
86535+#endif
86536+
86537 /* bits [20..32] reserved for arch specific ioremap internals */
86538
86539 /*
86540@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
86541 unsigned long flags, pgprot_t prot);
86542 extern void vunmap(const void *addr);
86543
86544+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86545+extern void unmap_process_stacks(struct task_struct *task);
86546+#endif
86547+
86548 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
86549 unsigned long uaddr, void *kaddr,
86550 unsigned long size);
86551@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
86552
86553 /* for /dev/kmem */
86554 extern long vread(char *buf, char *addr, unsigned long count);
86555-extern long vwrite(char *buf, char *addr, unsigned long count);
86556+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
86557
86558 /*
86559 * Internals. Dont't use..
86560diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
86561index 82e7db7..f8ce3d0 100644
86562--- a/include/linux/vmstat.h
86563+++ b/include/linux/vmstat.h
86564@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
86565 /*
86566 * Zone based page accounting with per cpu differentials.
86567 */
86568-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
86569+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
86570
86571 static inline void zone_page_state_add(long x, struct zone *zone,
86572 enum zone_stat_item item)
86573 {
86574- atomic_long_add(x, &zone->vm_stat[item]);
86575- atomic_long_add(x, &vm_stat[item]);
86576+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
86577+ atomic_long_add_unchecked(x, &vm_stat[item]);
86578 }
86579
86580-static inline unsigned long global_page_state(enum zone_stat_item item)
86581+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
86582 {
86583- long x = atomic_long_read(&vm_stat[item]);
86584+ long x = atomic_long_read_unchecked(&vm_stat[item]);
86585 #ifdef CONFIG_SMP
86586 if (x < 0)
86587 x = 0;
86588@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
86589 return x;
86590 }
86591
86592-static inline unsigned long zone_page_state(struct zone *zone,
86593+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
86594 enum zone_stat_item item)
86595 {
86596- long x = atomic_long_read(&zone->vm_stat[item]);
86597+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
86598 #ifdef CONFIG_SMP
86599 if (x < 0)
86600 x = 0;
86601@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
86602 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
86603 enum zone_stat_item item)
86604 {
86605- long x = atomic_long_read(&zone->vm_stat[item]);
86606+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
86607
86608 #ifdef CONFIG_SMP
86609 int cpu;
86610@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
86611
86612 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
86613 {
86614- atomic_long_inc(&zone->vm_stat[item]);
86615- atomic_long_inc(&vm_stat[item]);
86616+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
86617+ atomic_long_inc_unchecked(&vm_stat[item]);
86618 }
86619
86620 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
86621 {
86622- atomic_long_dec(&zone->vm_stat[item]);
86623- atomic_long_dec(&vm_stat[item]);
86624+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
86625+ atomic_long_dec_unchecked(&vm_stat[item]);
86626 }
86627
86628 static inline void __inc_zone_page_state(struct page *page,
86629diff --git a/include/linux/xattr.h b/include/linux/xattr.h
86630index 91b0a68..0e9adf6 100644
86631--- a/include/linux/xattr.h
86632+++ b/include/linux/xattr.h
86633@@ -28,7 +28,7 @@ struct xattr_handler {
86634 size_t size, int handler_flags);
86635 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
86636 size_t size, int flags, int handler_flags);
86637-};
86638+} __do_const;
86639
86640 struct xattr {
86641 const char *name;
86642@@ -37,6 +37,9 @@ struct xattr {
86643 };
86644
86645 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
86646+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
86647+ssize_t pax_getxattr(struct dentry *, void *, size_t);
86648+#endif
86649 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
86650 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
86651 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
86652diff --git a/include/linux/zlib.h b/include/linux/zlib.h
86653index 92dbbd3..13ab0b3 100644
86654--- a/include/linux/zlib.h
86655+++ b/include/linux/zlib.h
86656@@ -31,6 +31,7 @@
86657 #define _ZLIB_H
86658
86659 #include <linux/zconf.h>
86660+#include <linux/compiler.h>
86661
86662 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
86663 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
86664@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
86665
86666 /* basic functions */
86667
86668-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
86669+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
86670 /*
86671 Returns the number of bytes that needs to be allocated for a per-
86672 stream workspace with the specified parameters. A pointer to this
86673diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
86674index eb76cfd..9fd0e7c 100644
86675--- a/include/media/v4l2-dev.h
86676+++ b/include/media/v4l2-dev.h
86677@@ -75,7 +75,7 @@ struct v4l2_file_operations {
86678 int (*mmap) (struct file *, struct vm_area_struct *);
86679 int (*open) (struct file *);
86680 int (*release) (struct file *);
86681-};
86682+} __do_const;
86683
86684 /*
86685 * Newer version of video_device, handled by videodev2.c
86686diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
86687index ffb69da..040393e 100644
86688--- a/include/media/v4l2-device.h
86689+++ b/include/media/v4l2-device.h
86690@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
86691 this function returns 0. If the name ends with a digit (e.g. cx18),
86692 then the name will be set to cx18-0 since cx180 looks really odd. */
86693 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
86694- atomic_t *instance);
86695+ atomic_unchecked_t *instance);
86696
86697 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
86698 Since the parent disappears this ensures that v4l2_dev doesn't have an
86699diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
86700index 2a25dec..bf6dd8a 100644
86701--- a/include/net/9p/transport.h
86702+++ b/include/net/9p/transport.h
86703@@ -62,7 +62,7 @@ struct p9_trans_module {
86704 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
86705 int (*zc_request)(struct p9_client *, struct p9_req_t *,
86706 char *, char *, int , int, int, int);
86707-};
86708+} __do_const;
86709
86710 void v9fs_register_trans(struct p9_trans_module *m);
86711 void v9fs_unregister_trans(struct p9_trans_module *m);
86712diff --git a/include/net/af_unix.h b/include/net/af_unix.h
86713index a175ba4..196eb8242 100644
86714--- a/include/net/af_unix.h
86715+++ b/include/net/af_unix.h
86716@@ -36,7 +36,7 @@ struct unix_skb_parms {
86717 u32 secid; /* Security ID */
86718 #endif
86719 u32 consumed;
86720-};
86721+} __randomize_layout;
86722
86723 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
86724 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
86725diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
86726index d1bb342..e12f7d2 100644
86727--- a/include/net/bluetooth/l2cap.h
86728+++ b/include/net/bluetooth/l2cap.h
86729@@ -608,7 +608,7 @@ struct l2cap_ops {
86730 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
86731 unsigned long hdr_len,
86732 unsigned long len, int nb);
86733-};
86734+} __do_const;
86735
86736 struct l2cap_conn {
86737 struct hci_conn *hcon;
86738diff --git a/include/net/bonding.h b/include/net/bonding.h
86739index 983a94b..7aa9b16 100644
86740--- a/include/net/bonding.h
86741+++ b/include/net/bonding.h
86742@@ -647,7 +647,7 @@ extern struct rtnl_link_ops bond_link_ops;
86743
86744 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
86745 {
86746- atomic_long_inc(&dev->tx_dropped);
86747+ atomic_long_inc_unchecked(&dev->tx_dropped);
86748 dev_kfree_skb_any(skb);
86749 }
86750
86751diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
86752index f2ae33d..c457cf0 100644
86753--- a/include/net/caif/cfctrl.h
86754+++ b/include/net/caif/cfctrl.h
86755@@ -52,7 +52,7 @@ struct cfctrl_rsp {
86756 void (*radioset_rsp)(void);
86757 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
86758 struct cflayer *client_layer);
86759-};
86760+} __no_const;
86761
86762 /* Link Setup Parameters for CAIF-Links. */
86763 struct cfctrl_link_param {
86764@@ -101,8 +101,8 @@ struct cfctrl_request_info {
86765 struct cfctrl {
86766 struct cfsrvl serv;
86767 struct cfctrl_rsp res;
86768- atomic_t req_seq_no;
86769- atomic_t rsp_seq_no;
86770+ atomic_unchecked_t req_seq_no;
86771+ atomic_unchecked_t rsp_seq_no;
86772 struct list_head list;
86773 /* Protects from simultaneous access to first_req list */
86774 spinlock_t info_list_lock;
86775diff --git a/include/net/flow.h b/include/net/flow.h
86776index 8109a15..504466d 100644
86777--- a/include/net/flow.h
86778+++ b/include/net/flow.h
86779@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
86780
86781 void flow_cache_flush(struct net *net);
86782 void flow_cache_flush_deferred(struct net *net);
86783-extern atomic_t flow_cache_genid;
86784+extern atomic_unchecked_t flow_cache_genid;
86785
86786 #endif
86787diff --git a/include/net/genetlink.h b/include/net/genetlink.h
86788index 6c92415..3a352d8 100644
86789--- a/include/net/genetlink.h
86790+++ b/include/net/genetlink.h
86791@@ -130,7 +130,7 @@ struct genl_ops {
86792 u8 cmd;
86793 u8 internal_flags;
86794 u8 flags;
86795-};
86796+} __do_const;
86797
86798 int __genl_register_family(struct genl_family *family);
86799
86800diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
86801index 734d9b5..48a9a4b 100644
86802--- a/include/net/gro_cells.h
86803+++ b/include/net/gro_cells.h
86804@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
86805 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
86806
86807 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
86808- atomic_long_inc(&dev->rx_dropped);
86809+ atomic_long_inc_unchecked(&dev->rx_dropped);
86810 kfree_skb(skb);
86811 return;
86812 }
86813diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
86814index 848e85c..051c7de 100644
86815--- a/include/net/inet_connection_sock.h
86816+++ b/include/net/inet_connection_sock.h
86817@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
86818 int (*bind_conflict)(const struct sock *sk,
86819 const struct inet_bind_bucket *tb, bool relax);
86820 void (*mtu_reduced)(struct sock *sk);
86821-};
86822+} __do_const;
86823
86824 /** inet_connection_sock - INET connection oriented sock
86825 *
86826diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
86827index 80479ab..0c3f647 100644
86828--- a/include/net/inetpeer.h
86829+++ b/include/net/inetpeer.h
86830@@ -47,7 +47,7 @@ struct inet_peer {
86831 */
86832 union {
86833 struct {
86834- atomic_t rid; /* Frag reception counter */
86835+ atomic_unchecked_t rid; /* Frag reception counter */
86836 };
86837 struct rcu_head rcu;
86838 struct inet_peer *gc_next;
86839diff --git a/include/net/ip.h b/include/net/ip.h
86840index c0c26c3..29f0420 100644
86841--- a/include/net/ip.h
86842+++ b/include/net/ip.h
86843@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
86844 }
86845 }
86846
86847-u32 ip_idents_reserve(u32 hash, int segs);
86848+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
86849 void __ip_select_ident(struct iphdr *iph, int segs);
86850
86851 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
86852diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
86853index 09a819e..3ab9e14 100644
86854--- a/include/net/ip_fib.h
86855+++ b/include/net/ip_fib.h
86856@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
86857
86858 #define FIB_RES_SADDR(net, res) \
86859 ((FIB_RES_NH(res).nh_saddr_genid == \
86860- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
86861+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
86862 FIB_RES_NH(res).nh_saddr : \
86863 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
86864 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
86865diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
86866index 615b20b..fd4cbd8 100644
86867--- a/include/net/ip_vs.h
86868+++ b/include/net/ip_vs.h
86869@@ -534,7 +534,7 @@ struct ip_vs_conn {
86870 struct ip_vs_conn *control; /* Master control connection */
86871 atomic_t n_control; /* Number of controlled ones */
86872 struct ip_vs_dest *dest; /* real server */
86873- atomic_t in_pkts; /* incoming packet counter */
86874+ atomic_unchecked_t in_pkts; /* incoming packet counter */
86875
86876 /* Packet transmitter for different forwarding methods. If it
86877 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
86878@@ -682,7 +682,7 @@ struct ip_vs_dest {
86879 __be16 port; /* port number of the server */
86880 union nf_inet_addr addr; /* IP address of the server */
86881 volatile unsigned int flags; /* dest status flags */
86882- atomic_t conn_flags; /* flags to copy to conn */
86883+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
86884 atomic_t weight; /* server weight */
86885
86886 atomic_t refcnt; /* reference counter */
86887@@ -928,11 +928,11 @@ struct netns_ipvs {
86888 /* ip_vs_lblc */
86889 int sysctl_lblc_expiration;
86890 struct ctl_table_header *lblc_ctl_header;
86891- struct ctl_table *lblc_ctl_table;
86892+ ctl_table_no_const *lblc_ctl_table;
86893 /* ip_vs_lblcr */
86894 int sysctl_lblcr_expiration;
86895 struct ctl_table_header *lblcr_ctl_header;
86896- struct ctl_table *lblcr_ctl_table;
86897+ ctl_table_no_const *lblcr_ctl_table;
86898 /* ip_vs_est */
86899 struct list_head est_list; /* estimator list */
86900 spinlock_t est_lock;
86901diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
86902index 8d4f588..2e37ad2 100644
86903--- a/include/net/irda/ircomm_tty.h
86904+++ b/include/net/irda/ircomm_tty.h
86905@@ -33,6 +33,7 @@
86906 #include <linux/termios.h>
86907 #include <linux/timer.h>
86908 #include <linux/tty.h> /* struct tty_struct */
86909+#include <asm/local.h>
86910
86911 #include <net/irda/irias_object.h>
86912 #include <net/irda/ircomm_core.h>
86913diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
86914index 714cc9a..ea05f3e 100644
86915--- a/include/net/iucv/af_iucv.h
86916+++ b/include/net/iucv/af_iucv.h
86917@@ -149,7 +149,7 @@ struct iucv_skb_cb {
86918 struct iucv_sock_list {
86919 struct hlist_head head;
86920 rwlock_t lock;
86921- atomic_t autobind_name;
86922+ atomic_unchecked_t autobind_name;
86923 };
86924
86925 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
86926diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
86927index f3be818..bf46196 100644
86928--- a/include/net/llc_c_ac.h
86929+++ b/include/net/llc_c_ac.h
86930@@ -87,7 +87,7 @@
86931 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
86932 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
86933
86934-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86935+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86936
86937 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
86938 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
86939diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
86940index 3948cf1..83b28c4 100644
86941--- a/include/net/llc_c_ev.h
86942+++ b/include/net/llc_c_ev.h
86943@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
86944 return (struct llc_conn_state_ev *)skb->cb;
86945 }
86946
86947-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86948-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86949+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86950+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86951
86952 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
86953 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
86954diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
86955index 48f3f89..0e92c50 100644
86956--- a/include/net/llc_c_st.h
86957+++ b/include/net/llc_c_st.h
86958@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
86959 u8 next_state;
86960 const llc_conn_ev_qfyr_t *ev_qualifiers;
86961 const llc_conn_action_t *ev_actions;
86962-};
86963+} __do_const;
86964
86965 struct llc_conn_state {
86966 u8 current_state;
86967diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
86968index a61b98c..aade1eb 100644
86969--- a/include/net/llc_s_ac.h
86970+++ b/include/net/llc_s_ac.h
86971@@ -23,7 +23,7 @@
86972 #define SAP_ACT_TEST_IND 9
86973
86974 /* All action functions must look like this */
86975-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86976+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86977
86978 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
86979 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
86980diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
86981index c4359e2..76dbc4a 100644
86982--- a/include/net/llc_s_st.h
86983+++ b/include/net/llc_s_st.h
86984@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
86985 llc_sap_ev_t ev;
86986 u8 next_state;
86987 const llc_sap_action_t *ev_actions;
86988-};
86989+} __do_const;
86990
86991 struct llc_sap_state {
86992 u8 curr_state;
86993diff --git a/include/net/mac80211.h b/include/net/mac80211.h
86994index 29c7be8..746bd73 100644
86995--- a/include/net/mac80211.h
86996+++ b/include/net/mac80211.h
86997@@ -4869,7 +4869,7 @@ struct rate_control_ops {
86998 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
86999
87000 u32 (*get_expected_throughput)(void *priv_sta);
87001-};
87002+} __do_const;
87003
87004 static inline int rate_supported(struct ieee80211_sta *sta,
87005 enum ieee80211_band band,
87006diff --git a/include/net/neighbour.h b/include/net/neighbour.h
87007index 76f7084..8f36e39 100644
87008--- a/include/net/neighbour.h
87009+++ b/include/net/neighbour.h
87010@@ -163,7 +163,7 @@ struct neigh_ops {
87011 void (*error_report)(struct neighbour *, struct sk_buff *);
87012 int (*output)(struct neighbour *, struct sk_buff *);
87013 int (*connected_output)(struct neighbour *, struct sk_buff *);
87014-};
87015+} __do_const;
87016
87017 struct pneigh_entry {
87018 struct pneigh_entry *next;
87019@@ -217,7 +217,7 @@ struct neigh_table {
87020 struct neigh_statistics __percpu *stats;
87021 struct neigh_hash_table __rcu *nht;
87022 struct pneigh_entry **phash_buckets;
87023-};
87024+} __randomize_layout;
87025
87026 enum {
87027 NEIGH_ARP_TABLE = 0,
87028diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
87029index 2e8756b8..0bd0083 100644
87030--- a/include/net/net_namespace.h
87031+++ b/include/net/net_namespace.h
87032@@ -130,8 +130,8 @@ struct net {
87033 struct netns_ipvs *ipvs;
87034 #endif
87035 struct sock *diag_nlsk;
87036- atomic_t fnhe_genid;
87037-};
87038+ atomic_unchecked_t fnhe_genid;
87039+} __randomize_layout;
87040
87041 #include <linux/seq_file_net.h>
87042
87043@@ -287,7 +287,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
87044 #define __net_init __init
87045 #define __net_exit __exit_refok
87046 #define __net_initdata __initdata
87047+#ifdef CONSTIFY_PLUGIN
87048 #define __net_initconst __initconst
87049+#else
87050+#define __net_initconst __initdata
87051+#endif
87052 #endif
87053
87054 struct pernet_operations {
87055@@ -297,7 +301,7 @@ struct pernet_operations {
87056 void (*exit_batch)(struct list_head *net_exit_list);
87057 int *id;
87058 size_t size;
87059-};
87060+} __do_const;
87061
87062 /*
87063 * Use these carefully. If you implement a network device and it
87064@@ -345,12 +349,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
87065
87066 static inline int rt_genid_ipv4(struct net *net)
87067 {
87068- return atomic_read(&net->ipv4.rt_genid);
87069+ return atomic_read_unchecked(&net->ipv4.rt_genid);
87070 }
87071
87072 static inline void rt_genid_bump_ipv4(struct net *net)
87073 {
87074- atomic_inc(&net->ipv4.rt_genid);
87075+ atomic_inc_unchecked(&net->ipv4.rt_genid);
87076 }
87077
87078 extern void (*__fib6_flush_trees)(struct net *net);
87079@@ -377,12 +381,12 @@ static inline void rt_genid_bump_all(struct net *net)
87080
87081 static inline int fnhe_genid(struct net *net)
87082 {
87083- return atomic_read(&net->fnhe_genid);
87084+ return atomic_read_unchecked(&net->fnhe_genid);
87085 }
87086
87087 static inline void fnhe_genid_bump(struct net *net)
87088 {
87089- atomic_inc(&net->fnhe_genid);
87090+ atomic_inc_unchecked(&net->fnhe_genid);
87091 }
87092
87093 #endif /* __NET_NET_NAMESPACE_H */
87094diff --git a/include/net/netlink.h b/include/net/netlink.h
87095index 6415835..ab96d87 100644
87096--- a/include/net/netlink.h
87097+++ b/include/net/netlink.h
87098@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
87099 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
87100 {
87101 if (mark)
87102- skb_trim(skb, (unsigned char *) mark - skb->data);
87103+ skb_trim(skb, (const unsigned char *) mark - skb->data);
87104 }
87105
87106 /**
87107diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
87108index 29d6a94..235d3d84 100644
87109--- a/include/net/netns/conntrack.h
87110+++ b/include/net/netns/conntrack.h
87111@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
87112 struct nf_proto_net {
87113 #ifdef CONFIG_SYSCTL
87114 struct ctl_table_header *ctl_table_header;
87115- struct ctl_table *ctl_table;
87116+ ctl_table_no_const *ctl_table;
87117 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
87118 struct ctl_table_header *ctl_compat_header;
87119- struct ctl_table *ctl_compat_table;
87120+ ctl_table_no_const *ctl_compat_table;
87121 #endif
87122 #endif
87123 unsigned int users;
87124@@ -60,7 +60,7 @@ struct nf_ip_net {
87125 struct nf_icmp_net icmpv6;
87126 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
87127 struct ctl_table_header *ctl_table_header;
87128- struct ctl_table *ctl_table;
87129+ ctl_table_no_const *ctl_table;
87130 #endif
87131 };
87132
87133diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
87134index 0ffef1a..2ce1ceb 100644
87135--- a/include/net/netns/ipv4.h
87136+++ b/include/net/netns/ipv4.h
87137@@ -84,7 +84,7 @@ struct netns_ipv4 {
87138
87139 struct ping_group_range ping_group_range;
87140
87141- atomic_t dev_addr_genid;
87142+ atomic_unchecked_t dev_addr_genid;
87143
87144 #ifdef CONFIG_SYSCTL
87145 unsigned long *sysctl_local_reserved_ports;
87146@@ -98,6 +98,6 @@ struct netns_ipv4 {
87147 struct fib_rules_ops *mr_rules_ops;
87148 #endif
87149 #endif
87150- atomic_t rt_genid;
87151+ atomic_unchecked_t rt_genid;
87152 };
87153 #endif
87154diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
87155index 69ae41f..4f94868 100644
87156--- a/include/net/netns/ipv6.h
87157+++ b/include/net/netns/ipv6.h
87158@@ -75,8 +75,8 @@ struct netns_ipv6 {
87159 struct fib_rules_ops *mr6_rules_ops;
87160 #endif
87161 #endif
87162- atomic_t dev_addr_genid;
87163- atomic_t fib6_sernum;
87164+ atomic_unchecked_t dev_addr_genid;
87165+ atomic_unchecked_t fib6_sernum;
87166 };
87167
87168 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
87169diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
87170index 730d82a..045f2c4 100644
87171--- a/include/net/netns/xfrm.h
87172+++ b/include/net/netns/xfrm.h
87173@@ -78,7 +78,7 @@ struct netns_xfrm {
87174
87175 /* flow cache part */
87176 struct flow_cache flow_cache_global;
87177- atomic_t flow_cache_genid;
87178+ atomic_unchecked_t flow_cache_genid;
87179 struct list_head flow_cache_gc_list;
87180 spinlock_t flow_cache_gc_lock;
87181 struct work_struct flow_cache_gc_work;
87182diff --git a/include/net/ping.h b/include/net/ping.h
87183index f074060..830fba0 100644
87184--- a/include/net/ping.h
87185+++ b/include/net/ping.h
87186@@ -54,7 +54,7 @@ struct ping_iter_state {
87187
87188 extern struct proto ping_prot;
87189 #if IS_ENABLED(CONFIG_IPV6)
87190-extern struct pingv6_ops pingv6_ops;
87191+extern struct pingv6_ops *pingv6_ops;
87192 #endif
87193
87194 struct pingfakehdr {
87195diff --git a/include/net/protocol.h b/include/net/protocol.h
87196index d6fcc1f..ca277058 100644
87197--- a/include/net/protocol.h
87198+++ b/include/net/protocol.h
87199@@ -49,7 +49,7 @@ struct net_protocol {
87200 * socket lookup?
87201 */
87202 icmp_strict_tag_validation:1;
87203-};
87204+} __do_const;
87205
87206 #if IS_ENABLED(CONFIG_IPV6)
87207 struct inet6_protocol {
87208@@ -62,7 +62,7 @@ struct inet6_protocol {
87209 u8 type, u8 code, int offset,
87210 __be32 info);
87211 unsigned int flags; /* INET6_PROTO_xxx */
87212-};
87213+} __do_const;
87214
87215 #define INET6_PROTO_NOPOLICY 0x1
87216 #define INET6_PROTO_FINAL 0x2
87217diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
87218index e21b9f9..0191ef0 100644
87219--- a/include/net/rtnetlink.h
87220+++ b/include/net/rtnetlink.h
87221@@ -93,7 +93,7 @@ struct rtnl_link_ops {
87222 int (*fill_slave_info)(struct sk_buff *skb,
87223 const struct net_device *dev,
87224 const struct net_device *slave_dev);
87225-};
87226+} __do_const;
87227
87228 int __rtnl_link_register(struct rtnl_link_ops *ops);
87229 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
87230diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
87231index 4a5b9a3..ca27d73 100644
87232--- a/include/net/sctp/checksum.h
87233+++ b/include/net/sctp/checksum.h
87234@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
87235 unsigned int offset)
87236 {
87237 struct sctphdr *sh = sctp_hdr(skb);
87238- __le32 ret, old = sh->checksum;
87239- const struct skb_checksum_ops ops = {
87240+ __le32 ret, old = sh->checksum;
87241+ static const struct skb_checksum_ops ops = {
87242 .update = sctp_csum_update,
87243 .combine = sctp_csum_combine,
87244 };
87245diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
87246index 487ef34..d457f98 100644
87247--- a/include/net/sctp/sm.h
87248+++ b/include/net/sctp/sm.h
87249@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
87250 typedef struct {
87251 sctp_state_fn_t *fn;
87252 const char *name;
87253-} sctp_sm_table_entry_t;
87254+} __do_const sctp_sm_table_entry_t;
87255
87256 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
87257 * currently in use.
87258@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
87259 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
87260
87261 /* Extern declarations for major data structures. */
87262-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87263+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87264
87265
87266 /* Get the size of a DATA chunk payload. */
87267diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
87268index 2bb2fcf..d17c291 100644
87269--- a/include/net/sctp/structs.h
87270+++ b/include/net/sctp/structs.h
87271@@ -509,7 +509,7 @@ struct sctp_pf {
87272 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
87273 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
87274 struct sctp_af *af;
87275-};
87276+} __do_const;
87277
87278
87279 /* Structure to track chunk fragments that have been acked, but peer
87280diff --git a/include/net/sock.h b/include/net/sock.h
87281index 45b54d3..10efeac 100644
87282--- a/include/net/sock.h
87283+++ b/include/net/sock.h
87284@@ -362,7 +362,7 @@ struct sock {
87285 unsigned int sk_napi_id;
87286 unsigned int sk_ll_usec;
87287 #endif
87288- atomic_t sk_drops;
87289+ atomic_unchecked_t sk_drops;
87290 int sk_rcvbuf;
87291
87292 struct sk_filter __rcu *sk_filter;
87293@@ -1061,7 +1061,7 @@ struct proto {
87294 void (*destroy_cgroup)(struct mem_cgroup *memcg);
87295 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
87296 #endif
87297-};
87298+} __randomize_layout;
87299
87300 /*
87301 * Bits in struct cg_proto.flags
87302@@ -1239,7 +1239,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
87303 page_counter_uncharge(&prot->memory_allocated, amt);
87304 }
87305
87306-static inline long
87307+static inline long __intentional_overflow(-1)
87308 sk_memory_allocated(const struct sock *sk)
87309 {
87310 struct proto *prot = sk->sk_prot;
87311@@ -1385,7 +1385,7 @@ struct sock_iocb {
87312 struct scm_cookie *scm;
87313 struct msghdr *msg, async_msg;
87314 struct kiocb *kiocb;
87315-};
87316+} __randomize_layout;
87317
87318 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
87319 {
87320@@ -1828,7 +1828,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
87321 }
87322
87323 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
87324- char __user *from, char *to,
87325+ char __user *from, unsigned char *to,
87326 int copy, int offset)
87327 {
87328 if (skb->ip_summed == CHECKSUM_NONE) {
87329@@ -2077,7 +2077,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
87330 }
87331 }
87332
87333-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87334+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87335
87336 /**
87337 * sk_page_frag - return an appropriate page_frag
87338diff --git a/include/net/tcp.h b/include/net/tcp.h
87339index 9d9111e..349c847 100644
87340--- a/include/net/tcp.h
87341+++ b/include/net/tcp.h
87342@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
87343 void tcp_xmit_retransmit_queue(struct sock *);
87344 void tcp_simple_retransmit(struct sock *);
87345 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
87346-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87347+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87348
87349 void tcp_send_probe0(struct sock *);
87350 void tcp_send_partial(struct sock *);
87351@@ -689,8 +689,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
87352 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
87353 */
87354 struct tcp_skb_cb {
87355- __u32 seq; /* Starting sequence number */
87356- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
87357+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
87358+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
87359 union {
87360 /* Note : tcp_tw_isn is used in input path only
87361 * (isn chosen by tcp_timewait_state_process())
87362@@ -715,7 +715,7 @@ struct tcp_skb_cb {
87363
87364 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
87365 /* 1 byte hole */
87366- __u32 ack_seq; /* Sequence number ACK'd */
87367+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
87368 union {
87369 struct inet_skb_parm h4;
87370 #if IS_ENABLED(CONFIG_IPV6)
87371diff --git a/include/net/xfrm.h b/include/net/xfrm.h
87372index dc4865e..152ee4c 100644
87373--- a/include/net/xfrm.h
87374+++ b/include/net/xfrm.h
87375@@ -285,7 +285,6 @@ struct xfrm_dst;
87376 struct xfrm_policy_afinfo {
87377 unsigned short family;
87378 struct dst_ops *dst_ops;
87379- void (*garbage_collect)(struct net *net);
87380 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
87381 const xfrm_address_t *saddr,
87382 const xfrm_address_t *daddr);
87383@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
87384 struct net_device *dev,
87385 const struct flowi *fl);
87386 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
87387-};
87388+} __do_const;
87389
87390 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
87391 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
87392@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
87393 int (*transport_finish)(struct sk_buff *skb,
87394 int async);
87395 void (*local_error)(struct sk_buff *skb, u32 mtu);
87396-};
87397+} __do_const;
87398
87399 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
87400 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
87401@@ -437,7 +436,7 @@ struct xfrm_mode {
87402 struct module *owner;
87403 unsigned int encap;
87404 int flags;
87405-};
87406+} __do_const;
87407
87408 /* Flags for xfrm_mode. */
87409 enum {
87410@@ -534,7 +533,7 @@ struct xfrm_policy {
87411 struct timer_list timer;
87412
87413 struct flow_cache_object flo;
87414- atomic_t genid;
87415+ atomic_unchecked_t genid;
87416 u32 priority;
87417 u32 index;
87418 struct xfrm_mark mark;
87419@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
87420 }
87421
87422 void xfrm_garbage_collect(struct net *net);
87423+void xfrm_garbage_collect_deferred(struct net *net);
87424
87425 #else
87426
87427@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
87428 static inline void xfrm_garbage_collect(struct net *net)
87429 {
87430 }
87431+static inline void xfrm_garbage_collect_deferred(struct net *net)
87432+{
87433+}
87434 #endif
87435
87436 static __inline__
87437diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
87438index 1017e0b..227aa4d 100644
87439--- a/include/rdma/iw_cm.h
87440+++ b/include/rdma/iw_cm.h
87441@@ -122,7 +122,7 @@ struct iw_cm_verbs {
87442 int backlog);
87443
87444 int (*destroy_listen)(struct iw_cm_id *cm_id);
87445-};
87446+} __no_const;
87447
87448 /**
87449 * iw_create_cm_id - Create an IW CM identifier.
87450diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
87451index 93d14da..734b3d8 100644
87452--- a/include/scsi/libfc.h
87453+++ b/include/scsi/libfc.h
87454@@ -771,6 +771,7 @@ struct libfc_function_template {
87455 */
87456 void (*disc_stop_final) (struct fc_lport *);
87457 };
87458+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
87459
87460 /**
87461 * struct fc_disc - Discovery context
87462@@ -875,7 +876,7 @@ struct fc_lport {
87463 struct fc_vport *vport;
87464
87465 /* Operational Information */
87466- struct libfc_function_template tt;
87467+ libfc_function_template_no_const tt;
87468 u8 link_up;
87469 u8 qfull;
87470 enum fc_lport_state state;
87471diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
87472index 3a4edd1..feb2e3e 100644
87473--- a/include/scsi/scsi_device.h
87474+++ b/include/scsi/scsi_device.h
87475@@ -185,9 +185,9 @@ struct scsi_device {
87476 unsigned int max_device_blocked; /* what device_blocked counts down from */
87477 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
87478
87479- atomic_t iorequest_cnt;
87480- atomic_t iodone_cnt;
87481- atomic_t ioerr_cnt;
87482+ atomic_unchecked_t iorequest_cnt;
87483+ atomic_unchecked_t iodone_cnt;
87484+ atomic_unchecked_t ioerr_cnt;
87485
87486 struct device sdev_gendev,
87487 sdev_dev;
87488diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
87489index 007a0bc..7188db8 100644
87490--- a/include/scsi/scsi_transport_fc.h
87491+++ b/include/scsi/scsi_transport_fc.h
87492@@ -756,7 +756,8 @@ struct fc_function_template {
87493 unsigned long show_host_system_hostname:1;
87494
87495 unsigned long disable_target_scan:1;
87496-};
87497+} __do_const;
87498+typedef struct fc_function_template __no_const fc_function_template_no_const;
87499
87500
87501 /**
87502diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
87503index 396e8f7..b037e89 100644
87504--- a/include/sound/compress_driver.h
87505+++ b/include/sound/compress_driver.h
87506@@ -129,7 +129,7 @@ struct snd_compr_ops {
87507 struct snd_compr_caps *caps);
87508 int (*get_codec_caps) (struct snd_compr_stream *stream,
87509 struct snd_compr_codec_caps *codec);
87510-};
87511+} __no_const;
87512
87513 /**
87514 * struct snd_compr: Compressed device
87515diff --git a/include/sound/soc.h b/include/sound/soc.h
87516index ac8b333..59c3692 100644
87517--- a/include/sound/soc.h
87518+++ b/include/sound/soc.h
87519@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
87520 enum snd_soc_dapm_type, int);
87521
87522 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
87523-};
87524+} __do_const;
87525
87526 /* SoC platform interface */
87527 struct snd_soc_platform_driver {
87528@@ -880,7 +880,7 @@ struct snd_soc_platform_driver {
87529 const struct snd_compr_ops *compr_ops;
87530
87531 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
87532-};
87533+} __do_const;
87534
87535 struct snd_soc_dai_link_component {
87536 const char *name;
87537diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
87538index 672150b..9d4bec4 100644
87539--- a/include/target/target_core_base.h
87540+++ b/include/target/target_core_base.h
87541@@ -767,7 +767,7 @@ struct se_device {
87542 atomic_long_t write_bytes;
87543 /* Active commands on this virtual SE device */
87544 atomic_t simple_cmds;
87545- atomic_t dev_ordered_id;
87546+ atomic_unchecked_t dev_ordered_id;
87547 atomic_t dev_ordered_sync;
87548 atomic_t dev_qf_count;
87549 int export_count;
87550diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
87551new file mode 100644
87552index 0000000..fb634b7
87553--- /dev/null
87554+++ b/include/trace/events/fs.h
87555@@ -0,0 +1,53 @@
87556+#undef TRACE_SYSTEM
87557+#define TRACE_SYSTEM fs
87558+
87559+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
87560+#define _TRACE_FS_H
87561+
87562+#include <linux/fs.h>
87563+#include <linux/tracepoint.h>
87564+
87565+TRACE_EVENT(do_sys_open,
87566+
87567+ TP_PROTO(const char *filename, int flags, int mode),
87568+
87569+ TP_ARGS(filename, flags, mode),
87570+
87571+ TP_STRUCT__entry(
87572+ __string( filename, filename )
87573+ __field( int, flags )
87574+ __field( int, mode )
87575+ ),
87576+
87577+ TP_fast_assign(
87578+ __assign_str(filename, filename);
87579+ __entry->flags = flags;
87580+ __entry->mode = mode;
87581+ ),
87582+
87583+ TP_printk("\"%s\" %x %o",
87584+ __get_str(filename), __entry->flags, __entry->mode)
87585+);
87586+
87587+TRACE_EVENT(open_exec,
87588+
87589+ TP_PROTO(const char *filename),
87590+
87591+ TP_ARGS(filename),
87592+
87593+ TP_STRUCT__entry(
87594+ __string( filename, filename )
87595+ ),
87596+
87597+ TP_fast_assign(
87598+ __assign_str(filename, filename);
87599+ ),
87600+
87601+ TP_printk("\"%s\"",
87602+ __get_str(filename))
87603+);
87604+
87605+#endif /* _TRACE_FS_H */
87606+
87607+/* This part must be outside protection */
87608+#include <trace/define_trace.h>
87609diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
87610index 3608beb..df39d8a 100644
87611--- a/include/trace/events/irq.h
87612+++ b/include/trace/events/irq.h
87613@@ -36,7 +36,7 @@ struct softirq_action;
87614 */
87615 TRACE_EVENT(irq_handler_entry,
87616
87617- TP_PROTO(int irq, struct irqaction *action),
87618+ TP_PROTO(int irq, const struct irqaction *action),
87619
87620 TP_ARGS(irq, action),
87621
87622@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
87623 */
87624 TRACE_EVENT(irq_handler_exit,
87625
87626- TP_PROTO(int irq, struct irqaction *action, int ret),
87627+ TP_PROTO(int irq, const struct irqaction *action, int ret),
87628
87629 TP_ARGS(irq, action, ret),
87630
87631diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
87632index 7caf44c..23c6f27 100644
87633--- a/include/uapi/linux/a.out.h
87634+++ b/include/uapi/linux/a.out.h
87635@@ -39,6 +39,14 @@ enum machine_type {
87636 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
87637 };
87638
87639+/* Constants for the N_FLAGS field */
87640+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87641+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
87642+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
87643+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
87644+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87645+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87646+
87647 #if !defined (N_MAGIC)
87648 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
87649 #endif
87650diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
87651index 22b6ad3..aeba37e 100644
87652--- a/include/uapi/linux/bcache.h
87653+++ b/include/uapi/linux/bcache.h
87654@@ -5,6 +5,7 @@
87655 * Bcache on disk data structures
87656 */
87657
87658+#include <linux/compiler.h>
87659 #include <asm/types.h>
87660
87661 #define BITMASK(name, type, field, offset, size) \
87662@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
87663 /* Btree keys - all units are in sectors */
87664
87665 struct bkey {
87666- __u64 high;
87667- __u64 low;
87668+ __u64 high __intentional_overflow(-1);
87669+ __u64 low __intentional_overflow(-1);
87670 __u64 ptr[];
87671 };
87672
87673diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
87674index d876736..ccce5c0 100644
87675--- a/include/uapi/linux/byteorder/little_endian.h
87676+++ b/include/uapi/linux/byteorder/little_endian.h
87677@@ -42,51 +42,51 @@
87678
87679 static inline __le64 __cpu_to_le64p(const __u64 *p)
87680 {
87681- return (__force __le64)*p;
87682+ return (__force const __le64)*p;
87683 }
87684-static inline __u64 __le64_to_cpup(const __le64 *p)
87685+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
87686 {
87687- return (__force __u64)*p;
87688+ return (__force const __u64)*p;
87689 }
87690 static inline __le32 __cpu_to_le32p(const __u32 *p)
87691 {
87692- return (__force __le32)*p;
87693+ return (__force const __le32)*p;
87694 }
87695 static inline __u32 __le32_to_cpup(const __le32 *p)
87696 {
87697- return (__force __u32)*p;
87698+ return (__force const __u32)*p;
87699 }
87700 static inline __le16 __cpu_to_le16p(const __u16 *p)
87701 {
87702- return (__force __le16)*p;
87703+ return (__force const __le16)*p;
87704 }
87705 static inline __u16 __le16_to_cpup(const __le16 *p)
87706 {
87707- return (__force __u16)*p;
87708+ return (__force const __u16)*p;
87709 }
87710 static inline __be64 __cpu_to_be64p(const __u64 *p)
87711 {
87712- return (__force __be64)__swab64p(p);
87713+ return (__force const __be64)__swab64p(p);
87714 }
87715 static inline __u64 __be64_to_cpup(const __be64 *p)
87716 {
87717- return __swab64p((__u64 *)p);
87718+ return __swab64p((const __u64 *)p);
87719 }
87720 static inline __be32 __cpu_to_be32p(const __u32 *p)
87721 {
87722- return (__force __be32)__swab32p(p);
87723+ return (__force const __be32)__swab32p(p);
87724 }
87725-static inline __u32 __be32_to_cpup(const __be32 *p)
87726+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
87727 {
87728- return __swab32p((__u32 *)p);
87729+ return __swab32p((const __u32 *)p);
87730 }
87731 static inline __be16 __cpu_to_be16p(const __u16 *p)
87732 {
87733- return (__force __be16)__swab16p(p);
87734+ return (__force const __be16)__swab16p(p);
87735 }
87736 static inline __u16 __be16_to_cpup(const __be16 *p)
87737 {
87738- return __swab16p((__u16 *)p);
87739+ return __swab16p((const __u16 *)p);
87740 }
87741 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
87742 #define __le64_to_cpus(x) do { (void)(x); } while (0)
87743diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
87744index 71e1d0e..6cc9caf 100644
87745--- a/include/uapi/linux/elf.h
87746+++ b/include/uapi/linux/elf.h
87747@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
87748 #define PT_GNU_EH_FRAME 0x6474e550
87749
87750 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
87751+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
87752+
87753+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
87754+
87755+/* Constants for the e_flags field */
87756+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87757+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
87758+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
87759+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
87760+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87761+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87762
87763 /*
87764 * Extended Numbering
87765@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
87766 #define DT_DEBUG 21
87767 #define DT_TEXTREL 22
87768 #define DT_JMPREL 23
87769+#define DT_FLAGS 30
87770+ #define DF_TEXTREL 0x00000004
87771 #define DT_ENCODING 32
87772 #define OLD_DT_LOOS 0x60000000
87773 #define DT_LOOS 0x6000000d
87774@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
87775 #define PF_W 0x2
87776 #define PF_X 0x1
87777
87778+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
87779+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
87780+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
87781+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
87782+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
87783+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
87784+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
87785+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
87786+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
87787+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
87788+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
87789+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
87790+
87791 typedef struct elf32_phdr{
87792 Elf32_Word p_type;
87793 Elf32_Off p_offset;
87794@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
87795 #define EI_OSABI 7
87796 #define EI_PAD 8
87797
87798+#define EI_PAX 14
87799+
87800 #define ELFMAG0 0x7f /* EI_MAG */
87801 #define ELFMAG1 'E'
87802 #define ELFMAG2 'L'
87803diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
87804index aa169c4..6a2771d 100644
87805--- a/include/uapi/linux/personality.h
87806+++ b/include/uapi/linux/personality.h
87807@@ -30,6 +30,7 @@ enum {
87808 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
87809 ADDR_NO_RANDOMIZE | \
87810 ADDR_COMPAT_LAYOUT | \
87811+ ADDR_LIMIT_3GB | \
87812 MMAP_PAGE_ZERO)
87813
87814 /*
87815diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
87816index 7530e74..e714828 100644
87817--- a/include/uapi/linux/screen_info.h
87818+++ b/include/uapi/linux/screen_info.h
87819@@ -43,7 +43,8 @@ struct screen_info {
87820 __u16 pages; /* 0x32 */
87821 __u16 vesa_attributes; /* 0x34 */
87822 __u32 capabilities; /* 0x36 */
87823- __u8 _reserved[6]; /* 0x3a */
87824+ __u16 vesapm_size; /* 0x3a */
87825+ __u8 _reserved[4]; /* 0x3c */
87826 } __attribute__((packed));
87827
87828 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
87829diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
87830index 0e011eb..82681b1 100644
87831--- a/include/uapi/linux/swab.h
87832+++ b/include/uapi/linux/swab.h
87833@@ -43,7 +43,7 @@
87834 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
87835 */
87836
87837-static inline __attribute_const__ __u16 __fswab16(__u16 val)
87838+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
87839 {
87840 #ifdef __HAVE_BUILTIN_BSWAP16__
87841 return __builtin_bswap16(val);
87842@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
87843 #endif
87844 }
87845
87846-static inline __attribute_const__ __u32 __fswab32(__u32 val)
87847+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
87848 {
87849 #ifdef __HAVE_BUILTIN_BSWAP32__
87850 return __builtin_bswap32(val);
87851@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
87852 #endif
87853 }
87854
87855-static inline __attribute_const__ __u64 __fswab64(__u64 val)
87856+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
87857 {
87858 #ifdef __HAVE_BUILTIN_BSWAP64__
87859 return __builtin_bswap64(val);
87860diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
87861index 1590c49..5eab462 100644
87862--- a/include/uapi/linux/xattr.h
87863+++ b/include/uapi/linux/xattr.h
87864@@ -73,5 +73,9 @@
87865 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
87866 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
87867
87868+/* User namespace */
87869+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
87870+#define XATTR_PAX_FLAGS_SUFFIX "flags"
87871+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
87872
87873 #endif /* _UAPI_LINUX_XATTR_H */
87874diff --git a/include/video/udlfb.h b/include/video/udlfb.h
87875index f9466fa..f4e2b81 100644
87876--- a/include/video/udlfb.h
87877+++ b/include/video/udlfb.h
87878@@ -53,10 +53,10 @@ struct dlfb_data {
87879 u32 pseudo_palette[256];
87880 int blank_mode; /*one of FB_BLANK_ */
87881 /* blit-only rendering path metrics, exposed through sysfs */
87882- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87883- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
87884- atomic_t bytes_sent; /* to usb, after compression including overhead */
87885- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
87886+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87887+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
87888+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
87889+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
87890 };
87891
87892 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
87893diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
87894index 30f5362..8ed8ac9 100644
87895--- a/include/video/uvesafb.h
87896+++ b/include/video/uvesafb.h
87897@@ -122,6 +122,7 @@ struct uvesafb_par {
87898 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
87899 u8 pmi_setpal; /* PMI for palette changes */
87900 u16 *pmi_base; /* protected mode interface location */
87901+ u8 *pmi_code; /* protected mode code location */
87902 void *pmi_start;
87903 void *pmi_pal;
87904 u8 *vbe_state_orig; /*
87905diff --git a/init/Kconfig b/init/Kconfig
87906index 9afb971..27d6fca 100644
87907--- a/init/Kconfig
87908+++ b/init/Kconfig
87909@@ -1129,6 +1129,7 @@ endif # CGROUPS
87910
87911 config CHECKPOINT_RESTORE
87912 bool "Checkpoint/restore support" if EXPERT
87913+ depends on !GRKERNSEC
87914 default n
87915 help
87916 Enables additional kernel features in a sake of checkpoint/restore.
87917@@ -1654,7 +1655,7 @@ config SLUB_DEBUG
87918
87919 config COMPAT_BRK
87920 bool "Disable heap randomization"
87921- default y
87922+ default n
87923 help
87924 Randomizing heap placement makes heap exploits harder, but it
87925 also breaks ancient binaries (including anything libc5 based).
87926@@ -1985,7 +1986,7 @@ config INIT_ALL_POSSIBLE
87927 config STOP_MACHINE
87928 bool
87929 default y
87930- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
87931+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
87932 help
87933 Need stop_machine() primitive.
87934
87935diff --git a/init/Makefile b/init/Makefile
87936index 7bc47ee..6da2dc7 100644
87937--- a/init/Makefile
87938+++ b/init/Makefile
87939@@ -2,6 +2,9 @@
87940 # Makefile for the linux kernel.
87941 #
87942
87943+ccflags-y := $(GCC_PLUGINS_CFLAGS)
87944+asflags-y := $(GCC_PLUGINS_AFLAGS)
87945+
87946 obj-y := main.o version.o mounts.o
87947 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
87948 obj-y += noinitramfs.o
87949diff --git a/init/do_mounts.c b/init/do_mounts.c
87950index eb41008..f5dbbf9 100644
87951--- a/init/do_mounts.c
87952+++ b/init/do_mounts.c
87953@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
87954 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
87955 {
87956 struct super_block *s;
87957- int err = sys_mount(name, "/root", fs, flags, data);
87958+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
87959 if (err)
87960 return err;
87961
87962- sys_chdir("/root");
87963+ sys_chdir((const char __force_user *)"/root");
87964 s = current->fs->pwd.dentry->d_sb;
87965 ROOT_DEV = s->s_dev;
87966 printk(KERN_INFO
87967@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
87968 va_start(args, fmt);
87969 vsprintf(buf, fmt, args);
87970 va_end(args);
87971- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
87972+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
87973 if (fd >= 0) {
87974 sys_ioctl(fd, FDEJECT, 0);
87975 sys_close(fd);
87976 }
87977 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87978- fd = sys_open("/dev/console", O_RDWR, 0);
87979+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87980 if (fd >= 0) {
87981 sys_ioctl(fd, TCGETS, (long)&termios);
87982 termios.c_lflag &= ~ICANON;
87983 sys_ioctl(fd, TCSETSF, (long)&termios);
87984- sys_read(fd, &c, 1);
87985+ sys_read(fd, (char __user *)&c, 1);
87986 termios.c_lflag |= ICANON;
87987 sys_ioctl(fd, TCSETSF, (long)&termios);
87988 sys_close(fd);
87989@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
87990 mount_root();
87991 out:
87992 devtmpfs_mount("dev");
87993- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87994- sys_chroot(".");
87995+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87996+ sys_chroot((const char __force_user *)".");
87997 }
87998
87999 static bool is_tmpfs;
88000diff --git a/init/do_mounts.h b/init/do_mounts.h
88001index f5b978a..69dbfe8 100644
88002--- a/init/do_mounts.h
88003+++ b/init/do_mounts.h
88004@@ -15,15 +15,15 @@ extern int root_mountflags;
88005
88006 static inline int create_dev(char *name, dev_t dev)
88007 {
88008- sys_unlink(name);
88009- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
88010+ sys_unlink((char __force_user *)name);
88011+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
88012 }
88013
88014 #if BITS_PER_LONG == 32
88015 static inline u32 bstat(char *name)
88016 {
88017 struct stat64 stat;
88018- if (sys_stat64(name, &stat) != 0)
88019+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
88020 return 0;
88021 if (!S_ISBLK(stat.st_mode))
88022 return 0;
88023@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
88024 static inline u32 bstat(char *name)
88025 {
88026 struct stat stat;
88027- if (sys_newstat(name, &stat) != 0)
88028+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
88029 return 0;
88030 if (!S_ISBLK(stat.st_mode))
88031 return 0;
88032diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
88033index 3e0878e..8a9d7a0 100644
88034--- a/init/do_mounts_initrd.c
88035+++ b/init/do_mounts_initrd.c
88036@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
88037 {
88038 sys_unshare(CLONE_FS | CLONE_FILES);
88039 /* stdin/stdout/stderr for /linuxrc */
88040- sys_open("/dev/console", O_RDWR, 0);
88041+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
88042 sys_dup(0);
88043 sys_dup(0);
88044 /* move initrd over / and chdir/chroot in initrd root */
88045- sys_chdir("/root");
88046- sys_mount(".", "/", NULL, MS_MOVE, NULL);
88047- sys_chroot(".");
88048+ sys_chdir((const char __force_user *)"/root");
88049+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
88050+ sys_chroot((const char __force_user *)".");
88051 sys_setsid();
88052 return 0;
88053 }
88054@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
88055 create_dev("/dev/root.old", Root_RAM0);
88056 /* mount initrd on rootfs' /root */
88057 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
88058- sys_mkdir("/old", 0700);
88059- sys_chdir("/old");
88060+ sys_mkdir((const char __force_user *)"/old", 0700);
88061+ sys_chdir((const char __force_user *)"/old");
88062
88063 /* try loading default modules from initrd */
88064 load_default_modules();
88065@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
88066 current->flags &= ~PF_FREEZER_SKIP;
88067
88068 /* move initrd to rootfs' /old */
88069- sys_mount("..", ".", NULL, MS_MOVE, NULL);
88070+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
88071 /* switch root and cwd back to / of rootfs */
88072- sys_chroot("..");
88073+ sys_chroot((const char __force_user *)"..");
88074
88075 if (new_decode_dev(real_root_dev) == Root_RAM0) {
88076- sys_chdir("/old");
88077+ sys_chdir((const char __force_user *)"/old");
88078 return;
88079 }
88080
88081- sys_chdir("/");
88082+ sys_chdir((const char __force_user *)"/");
88083 ROOT_DEV = new_decode_dev(real_root_dev);
88084 mount_root();
88085
88086 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
88087- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
88088+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
88089 if (!error)
88090 printk("okay\n");
88091 else {
88092- int fd = sys_open("/dev/root.old", O_RDWR, 0);
88093+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
88094 if (error == -ENOENT)
88095 printk("/initrd does not exist. Ignored.\n");
88096 else
88097 printk("failed\n");
88098 printk(KERN_NOTICE "Unmounting old root\n");
88099- sys_umount("/old", MNT_DETACH);
88100+ sys_umount((char __force_user *)"/old", MNT_DETACH);
88101 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
88102 if (fd < 0) {
88103 error = fd;
88104@@ -127,11 +127,11 @@ int __init initrd_load(void)
88105 * mounted in the normal path.
88106 */
88107 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
88108- sys_unlink("/initrd.image");
88109+ sys_unlink((const char __force_user *)"/initrd.image");
88110 handle_initrd();
88111 return 1;
88112 }
88113 }
88114- sys_unlink("/initrd.image");
88115+ sys_unlink((const char __force_user *)"/initrd.image");
88116 return 0;
88117 }
88118diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
88119index 8cb6db5..d729f50 100644
88120--- a/init/do_mounts_md.c
88121+++ b/init/do_mounts_md.c
88122@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
88123 partitioned ? "_d" : "", minor,
88124 md_setup_args[ent].device_names);
88125
88126- fd = sys_open(name, 0, 0);
88127+ fd = sys_open((char __force_user *)name, 0, 0);
88128 if (fd < 0) {
88129 printk(KERN_ERR "md: open failed - cannot start "
88130 "array %s\n", name);
88131@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
88132 * array without it
88133 */
88134 sys_close(fd);
88135- fd = sys_open(name, 0, 0);
88136+ fd = sys_open((char __force_user *)name, 0, 0);
88137 sys_ioctl(fd, BLKRRPART, 0);
88138 }
88139 sys_close(fd);
88140@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
88141
88142 wait_for_device_probe();
88143
88144- fd = sys_open("/dev/md0", 0, 0);
88145+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
88146 if (fd >= 0) {
88147 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
88148 sys_close(fd);
88149diff --git a/init/init_task.c b/init/init_task.c
88150index ba0a7f36..2bcf1d5 100644
88151--- a/init/init_task.c
88152+++ b/init/init_task.c
88153@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
88154 * Initial thread structure. Alignment of this is handled by a special
88155 * linker map entry.
88156 */
88157+#ifdef CONFIG_X86
88158+union thread_union init_thread_union __init_task_data;
88159+#else
88160 union thread_union init_thread_union __init_task_data =
88161 { INIT_THREAD_INFO(init_task) };
88162+#endif
88163diff --git a/init/initramfs.c b/init/initramfs.c
88164index ad1bd77..dca2c1b 100644
88165--- a/init/initramfs.c
88166+++ b/init/initramfs.c
88167@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
88168
88169 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
88170 while (count) {
88171- ssize_t rv = sys_write(fd, p, count);
88172+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
88173
88174 if (rv < 0) {
88175 if (rv == -EINTR || rv == -EAGAIN)
88176@@ -107,7 +107,7 @@ static void __init free_hash(void)
88177 }
88178 }
88179
88180-static long __init do_utime(char *filename, time_t mtime)
88181+static long __init do_utime(char __force_user *filename, time_t mtime)
88182 {
88183 struct timespec t[2];
88184
88185@@ -142,7 +142,7 @@ static void __init dir_utime(void)
88186 struct dir_entry *de, *tmp;
88187 list_for_each_entry_safe(de, tmp, &dir_list, list) {
88188 list_del(&de->list);
88189- do_utime(de->name, de->mtime);
88190+ do_utime((char __force_user *)de->name, de->mtime);
88191 kfree(de->name);
88192 kfree(de);
88193 }
88194@@ -304,7 +304,7 @@ static int __init maybe_link(void)
88195 if (nlink >= 2) {
88196 char *old = find_link(major, minor, ino, mode, collected);
88197 if (old)
88198- return (sys_link(old, collected) < 0) ? -1 : 1;
88199+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
88200 }
88201 return 0;
88202 }
88203@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
88204 {
88205 struct stat st;
88206
88207- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
88208+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
88209 if (S_ISDIR(st.st_mode))
88210- sys_rmdir(path);
88211+ sys_rmdir((char __force_user *)path);
88212 else
88213- sys_unlink(path);
88214+ sys_unlink((char __force_user *)path);
88215 }
88216 }
88217
88218@@ -338,7 +338,7 @@ static int __init do_name(void)
88219 int openflags = O_WRONLY|O_CREAT;
88220 if (ml != 1)
88221 openflags |= O_TRUNC;
88222- wfd = sys_open(collected, openflags, mode);
88223+ wfd = sys_open((char __force_user *)collected, openflags, mode);
88224
88225 if (wfd >= 0) {
88226 sys_fchown(wfd, uid, gid);
88227@@ -350,17 +350,17 @@ static int __init do_name(void)
88228 }
88229 }
88230 } else if (S_ISDIR(mode)) {
88231- sys_mkdir(collected, mode);
88232- sys_chown(collected, uid, gid);
88233- sys_chmod(collected, mode);
88234+ sys_mkdir((char __force_user *)collected, mode);
88235+ sys_chown((char __force_user *)collected, uid, gid);
88236+ sys_chmod((char __force_user *)collected, mode);
88237 dir_add(collected, mtime);
88238 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
88239 S_ISFIFO(mode) || S_ISSOCK(mode)) {
88240 if (maybe_link() == 0) {
88241- sys_mknod(collected, mode, rdev);
88242- sys_chown(collected, uid, gid);
88243- sys_chmod(collected, mode);
88244- do_utime(collected, mtime);
88245+ sys_mknod((char __force_user *)collected, mode, rdev);
88246+ sys_chown((char __force_user *)collected, uid, gid);
88247+ sys_chmod((char __force_user *)collected, mode);
88248+ do_utime((char __force_user *)collected, mtime);
88249 }
88250 }
88251 return 0;
88252@@ -372,7 +372,7 @@ static int __init do_copy(void)
88253 if (xwrite(wfd, victim, body_len) != body_len)
88254 error("write error");
88255 sys_close(wfd);
88256- do_utime(vcollected, mtime);
88257+ do_utime((char __force_user *)vcollected, mtime);
88258 kfree(vcollected);
88259 eat(body_len);
88260 state = SkipIt;
88261@@ -390,9 +390,9 @@ static int __init do_symlink(void)
88262 {
88263 collected[N_ALIGN(name_len) + body_len] = '\0';
88264 clean_path(collected, 0);
88265- sys_symlink(collected + N_ALIGN(name_len), collected);
88266- sys_lchown(collected, uid, gid);
88267- do_utime(collected, mtime);
88268+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
88269+ sys_lchown((char __force_user *)collected, uid, gid);
88270+ do_utime((char __force_user *)collected, mtime);
88271 state = SkipIt;
88272 next_state = Reset;
88273 return 0;
88274diff --git a/init/main.c b/init/main.c
88275index 61b99376..1e346cb 100644
88276--- a/init/main.c
88277+++ b/init/main.c
88278@@ -100,6 +100,8 @@ extern void radix_tree_init(void);
88279 static inline void mark_rodata_ro(void) { }
88280 #endif
88281
88282+extern void grsecurity_init(void);
88283+
88284 /*
88285 * Debug helper: via this flag we know that we are in 'early bootup code'
88286 * where only the boot processor is running with IRQ disabled. This means
88287@@ -161,6 +163,85 @@ static int __init set_reset_devices(char *str)
88288
88289 __setup("reset_devices", set_reset_devices);
88290
88291+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
88292+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
88293+static int __init setup_grsec_proc_gid(char *str)
88294+{
88295+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
88296+ return 1;
88297+}
88298+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
88299+#endif
88300+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
88301+int grsec_enable_sysfs_restrict = 1;
88302+static int __init setup_grsec_sysfs_restrict(char *str)
88303+{
88304+ if (!simple_strtol(str, NULL, 0))
88305+ grsec_enable_sysfs_restrict = 0;
88306+ return 1;
88307+}
88308+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
88309+#endif
88310+
88311+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
88312+unsigned long pax_user_shadow_base __read_only;
88313+EXPORT_SYMBOL(pax_user_shadow_base);
88314+extern char pax_enter_kernel_user[];
88315+extern char pax_exit_kernel_user[];
88316+#endif
88317+
88318+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
88319+static int __init setup_pax_nouderef(char *str)
88320+{
88321+#ifdef CONFIG_X86_32
88322+ unsigned int cpu;
88323+ struct desc_struct *gdt;
88324+
88325+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
88326+ gdt = get_cpu_gdt_table(cpu);
88327+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
88328+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
88329+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
88330+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
88331+ }
88332+ loadsegment(ds, __KERNEL_DS);
88333+ loadsegment(es, __KERNEL_DS);
88334+ loadsegment(ss, __KERNEL_DS);
88335+#else
88336+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
88337+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
88338+ clone_pgd_mask = ~(pgdval_t)0UL;
88339+ pax_user_shadow_base = 0UL;
88340+ setup_clear_cpu_cap(X86_FEATURE_PCID);
88341+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
88342+#endif
88343+
88344+ return 0;
88345+}
88346+early_param("pax_nouderef", setup_pax_nouderef);
88347+
88348+#ifdef CONFIG_X86_64
88349+static int __init setup_pax_weakuderef(char *str)
88350+{
88351+ if (clone_pgd_mask != ~(pgdval_t)0UL)
88352+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
88353+ return 1;
88354+}
88355+__setup("pax_weakuderef", setup_pax_weakuderef);
88356+#endif
88357+#endif
88358+
88359+#ifdef CONFIG_PAX_SOFTMODE
88360+int pax_softmode;
88361+
88362+static int __init setup_pax_softmode(char *str)
88363+{
88364+ get_option(&str, &pax_softmode);
88365+ return 1;
88366+}
88367+__setup("pax_softmode=", setup_pax_softmode);
88368+#endif
88369+
88370 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
88371 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
88372 static const char *panic_later, *panic_param;
88373@@ -735,7 +816,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
88374 struct blacklist_entry *entry;
88375 char *fn_name;
88376
88377- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
88378+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
88379 if (!fn_name)
88380 return false;
88381
88382@@ -787,7 +868,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
88383 {
88384 int count = preempt_count();
88385 int ret;
88386- char msgbuf[64];
88387+ const char *msg1 = "", *msg2 = "";
88388
88389 if (initcall_blacklisted(fn))
88390 return -EPERM;
88391@@ -797,18 +878,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
88392 else
88393 ret = fn();
88394
88395- msgbuf[0] = 0;
88396-
88397 if (preempt_count() != count) {
88398- sprintf(msgbuf, "preemption imbalance ");
88399+ msg1 = " preemption imbalance";
88400 preempt_count_set(count);
88401 }
88402 if (irqs_disabled()) {
88403- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
88404+ msg2 = " disabled interrupts";
88405 local_irq_enable();
88406 }
88407- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
88408+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
88409
88410+ add_latent_entropy();
88411 return ret;
88412 }
88413
88414@@ -914,8 +994,8 @@ static int run_init_process(const char *init_filename)
88415 {
88416 argv_init[0] = init_filename;
88417 return do_execve(getname_kernel(init_filename),
88418- (const char __user *const __user *)argv_init,
88419- (const char __user *const __user *)envp_init);
88420+ (const char __user *const __force_user *)argv_init,
88421+ (const char __user *const __force_user *)envp_init);
88422 }
88423
88424 static int try_to_run_init_process(const char *init_filename)
88425@@ -932,6 +1012,10 @@ static int try_to_run_init_process(const char *init_filename)
88426 return ret;
88427 }
88428
88429+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
88430+extern int gr_init_ran;
88431+#endif
88432+
88433 static noinline void __init kernel_init_freeable(void);
88434
88435 static int __ref kernel_init(void *unused)
88436@@ -956,6 +1040,11 @@ static int __ref kernel_init(void *unused)
88437 ramdisk_execute_command, ret);
88438 }
88439
88440+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
88441+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
88442+ gr_init_ran = 1;
88443+#endif
88444+
88445 /*
88446 * We try each of these until one succeeds.
88447 *
88448@@ -1016,7 +1105,7 @@ static noinline void __init kernel_init_freeable(void)
88449 do_basic_setup();
88450
88451 /* Open the /dev/console on the rootfs, this should never fail */
88452- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
88453+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
88454 pr_err("Warning: unable to open an initial console.\n");
88455
88456 (void) sys_dup(0);
88457@@ -1029,11 +1118,13 @@ static noinline void __init kernel_init_freeable(void)
88458 if (!ramdisk_execute_command)
88459 ramdisk_execute_command = "/init";
88460
88461- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
88462+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
88463 ramdisk_execute_command = NULL;
88464 prepare_namespace();
88465 }
88466
88467+ grsecurity_init();
88468+
88469 /*
88470 * Ok, we have completed the initial bootup, and
88471 * we're essentially up and running. Get rid of the
88472diff --git a/ipc/compat.c b/ipc/compat.c
88473index 9b3c85f..1c4d897 100644
88474--- a/ipc/compat.c
88475+++ b/ipc/compat.c
88476@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
88477 COMPAT_SHMLBA);
88478 if (err < 0)
88479 return err;
88480- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
88481+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
88482 }
88483 case SHMDT:
88484 return sys_shmdt(compat_ptr(ptr));
88485diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
88486index 8ad93c2..efd80f8 100644
88487--- a/ipc/ipc_sysctl.c
88488+++ b/ipc/ipc_sysctl.c
88489@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
88490 static int proc_ipc_dointvec(struct ctl_table *table, int write,
88491 void __user *buffer, size_t *lenp, loff_t *ppos)
88492 {
88493- struct ctl_table ipc_table;
88494+ ctl_table_no_const ipc_table;
88495
88496 memcpy(&ipc_table, table, sizeof(ipc_table));
88497 ipc_table.data = get_ipc(table);
88498@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
88499 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
88500 void __user *buffer, size_t *lenp, loff_t *ppos)
88501 {
88502- struct ctl_table ipc_table;
88503+ ctl_table_no_const ipc_table;
88504
88505 memcpy(&ipc_table, table, sizeof(ipc_table));
88506 ipc_table.data = get_ipc(table);
88507@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
88508 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
88509 void __user *buffer, size_t *lenp, loff_t *ppos)
88510 {
88511- struct ctl_table ipc_table;
88512+ ctl_table_no_const ipc_table;
88513 memcpy(&ipc_table, table, sizeof(ipc_table));
88514 ipc_table.data = get_ipc(table);
88515
88516@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
88517 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
88518 void __user *buffer, size_t *lenp, loff_t *ppos)
88519 {
88520- struct ctl_table ipc_table;
88521+ ctl_table_no_const ipc_table;
88522 int dummy = 0;
88523
88524 memcpy(&ipc_table, table, sizeof(ipc_table));
88525diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
88526index 68d4e95..1477ded 100644
88527--- a/ipc/mq_sysctl.c
88528+++ b/ipc/mq_sysctl.c
88529@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
88530 static int proc_mq_dointvec(struct ctl_table *table, int write,
88531 void __user *buffer, size_t *lenp, loff_t *ppos)
88532 {
88533- struct ctl_table mq_table;
88534+ ctl_table_no_const mq_table;
88535 memcpy(&mq_table, table, sizeof(mq_table));
88536 mq_table.data = get_mq(table);
88537
88538@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
88539 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
88540 void __user *buffer, size_t *lenp, loff_t *ppos)
88541 {
88542- struct ctl_table mq_table;
88543+ ctl_table_no_const mq_table;
88544 memcpy(&mq_table, table, sizeof(mq_table));
88545 mq_table.data = get_mq(table);
88546
88547diff --git a/ipc/mqueue.c b/ipc/mqueue.c
88548index 7635a1c..7432cb6 100644
88549--- a/ipc/mqueue.c
88550+++ b/ipc/mqueue.c
88551@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
88552 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
88553 info->attr.mq_msgsize);
88554
88555+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
88556 spin_lock(&mq_lock);
88557 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
88558 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
88559diff --git a/ipc/shm.c b/ipc/shm.c
88560index 19633b4..d454904 100644
88561--- a/ipc/shm.c
88562+++ b/ipc/shm.c
88563@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
88564 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
88565 #endif
88566
88567+#ifdef CONFIG_GRKERNSEC
88568+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
88569+ const u64 shm_createtime, const kuid_t cuid,
88570+ const int shmid);
88571+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
88572+ const u64 shm_createtime);
88573+#endif
88574+
88575 void shm_init_ns(struct ipc_namespace *ns)
88576 {
88577 ns->shm_ctlmax = SHMMAX;
88578@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
88579 shp->shm_lprid = 0;
88580 shp->shm_atim = shp->shm_dtim = 0;
88581 shp->shm_ctim = get_seconds();
88582+#ifdef CONFIG_GRKERNSEC
88583+ shp->shm_createtime = ktime_get_ns();
88584+#endif
88585 shp->shm_segsz = size;
88586 shp->shm_nattch = 0;
88587 shp->shm_file = file;
88588@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88589 f_mode = FMODE_READ | FMODE_WRITE;
88590 }
88591 if (shmflg & SHM_EXEC) {
88592+
88593+#ifdef CONFIG_PAX_MPROTECT
88594+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
88595+ goto out;
88596+#endif
88597+
88598 prot |= PROT_EXEC;
88599 acc_mode |= S_IXUGO;
88600 }
88601@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88602 if (err)
88603 goto out_unlock;
88604
88605+#ifdef CONFIG_GRKERNSEC
88606+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
88607+ shp->shm_perm.cuid, shmid) ||
88608+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
88609+ err = -EACCES;
88610+ goto out_unlock;
88611+ }
88612+#endif
88613+
88614 ipc_lock_object(&shp->shm_perm);
88615
88616 /* check if shm_destroy() is tearing down shp */
88617@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88618 path = shp->shm_file->f_path;
88619 path_get(&path);
88620 shp->shm_nattch++;
88621+#ifdef CONFIG_GRKERNSEC
88622+ shp->shm_lapid = current->pid;
88623+#endif
88624 size = i_size_read(path.dentry->d_inode);
88625 ipc_unlock_object(&shp->shm_perm);
88626 rcu_read_unlock();
88627diff --git a/ipc/util.c b/ipc/util.c
88628index 106bed0..f851429 100644
88629--- a/ipc/util.c
88630+++ b/ipc/util.c
88631@@ -71,6 +71,8 @@ struct ipc_proc_iface {
88632 int (*show)(struct seq_file *, void *);
88633 };
88634
88635+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
88636+
88637 /**
88638 * ipc_init - initialise ipc subsystem
88639 *
88640@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
88641 granted_mode >>= 6;
88642 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
88643 granted_mode >>= 3;
88644+
88645+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
88646+ return -1;
88647+
88648 /* is there some bit set in requested_mode but not in granted_mode? */
88649 if ((requested_mode & ~granted_mode & 0007) &&
88650 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
88651diff --git a/kernel/audit.c b/kernel/audit.c
88652index 72ab759..757deba 100644
88653--- a/kernel/audit.c
88654+++ b/kernel/audit.c
88655@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
88656 3) suppressed due to audit_rate_limit
88657 4) suppressed due to audit_backlog_limit
88658 */
88659-static atomic_t audit_lost = ATOMIC_INIT(0);
88660+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
88661
88662 /* The netlink socket. */
88663 static struct sock *audit_sock;
88664@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
88665 unsigned long now;
88666 int print;
88667
88668- atomic_inc(&audit_lost);
88669+ atomic_inc_unchecked(&audit_lost);
88670
88671 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
88672
88673@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
88674 if (print) {
88675 if (printk_ratelimit())
88676 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
88677- atomic_read(&audit_lost),
88678+ atomic_read_unchecked(&audit_lost),
88679 audit_rate_limit,
88680 audit_backlog_limit);
88681 audit_panic(message);
88682@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
88683 s.pid = audit_pid;
88684 s.rate_limit = audit_rate_limit;
88685 s.backlog_limit = audit_backlog_limit;
88686- s.lost = atomic_read(&audit_lost);
88687+ s.lost = atomic_read_unchecked(&audit_lost);
88688 s.backlog = skb_queue_len(&audit_skb_queue);
88689 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
88690 s.backlog_wait_time = audit_backlog_wait_time;
88691diff --git a/kernel/auditsc.c b/kernel/auditsc.c
88692index 072566d..1190489 100644
88693--- a/kernel/auditsc.c
88694+++ b/kernel/auditsc.c
88695@@ -2056,7 +2056,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
88696 }
88697
88698 /* global counter which is incremented every time something logs in */
88699-static atomic_t session_id = ATOMIC_INIT(0);
88700+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
88701
88702 static int audit_set_loginuid_perm(kuid_t loginuid)
88703 {
88704@@ -2123,7 +2123,7 @@ int audit_set_loginuid(kuid_t loginuid)
88705
88706 /* are we setting or clearing? */
88707 if (uid_valid(loginuid))
88708- sessionid = (unsigned int)atomic_inc_return(&session_id);
88709+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
88710
88711 task->sessionid = sessionid;
88712 task->loginuid = loginuid;
88713diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
88714index a64e7a2..2e69448 100644
88715--- a/kernel/bpf/core.c
88716+++ b/kernel/bpf/core.c
88717@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88718 * random section of illegal instructions.
88719 */
88720 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
88721- hdr = module_alloc(size);
88722+ hdr = module_alloc_exec(size);
88723 if (hdr == NULL)
88724 return NULL;
88725
88726 /* Fill space with illegal/arch-dep instructions. */
88727 bpf_fill_ill_insns(hdr, size);
88728
88729+ pax_open_kernel();
88730 hdr->pages = size / PAGE_SIZE;
88731+ pax_close_kernel();
88732+
88733 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
88734 PAGE_SIZE - sizeof(*hdr));
88735 start = (prandom_u32() % hole) & ~(alignment - 1);
88736@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88737
88738 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
88739 {
88740- module_memfree(hdr);
88741+ module_memfree_exec(hdr);
88742 }
88743 #endif /* CONFIG_BPF_JIT */
88744
88745diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
88746index 536edc2..d28c85d 100644
88747--- a/kernel/bpf/syscall.c
88748+++ b/kernel/bpf/syscall.c
88749@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
88750 int err;
88751
88752 /* the syscall is limited to root temporarily. This restriction will be
88753- * lifted when security audit is clean. Note that eBPF+tracing must have
88754- * this restriction, since it may pass kernel data to user space
88755+ * lifted by upstream when a half-assed security audit is clean. Note
88756+ * that eBPF+tracing must have this restriction, since it may pass
88757+ * kernel data to user space
88758 */
88759 if (!capable(CAP_SYS_ADMIN))
88760 return -EPERM;
88761+#ifdef CONFIG_GRKERNSEC
88762+ return -EPERM;
88763+#endif
88764
88765 if (!access_ok(VERIFY_READ, uattr, 1))
88766 return -EFAULT;
88767diff --git a/kernel/capability.c b/kernel/capability.c
88768index 989f5bf..d317ca0 100644
88769--- a/kernel/capability.c
88770+++ b/kernel/capability.c
88771@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
88772 * before modification is attempted and the application
88773 * fails.
88774 */
88775+ if (tocopy > ARRAY_SIZE(kdata))
88776+ return -EFAULT;
88777+
88778 if (copy_to_user(dataptr, kdata, tocopy
88779 * sizeof(struct __user_cap_data_struct))) {
88780 return -EFAULT;
88781@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
88782 int ret;
88783
88784 rcu_read_lock();
88785- ret = security_capable(__task_cred(t), ns, cap);
88786+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
88787+ gr_task_is_capable(t, __task_cred(t), cap);
88788 rcu_read_unlock();
88789
88790- return (ret == 0);
88791+ return ret;
88792 }
88793
88794 /**
88795@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
88796 int ret;
88797
88798 rcu_read_lock();
88799- ret = security_capable_noaudit(__task_cred(t), ns, cap);
88800+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
88801 rcu_read_unlock();
88802
88803- return (ret == 0);
88804+ return ret;
88805 }
88806
88807 /**
88808@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
88809 BUG();
88810 }
88811
88812- if (security_capable(current_cred(), ns, cap) == 0) {
88813+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
88814 current->flags |= PF_SUPERPRIV;
88815 return true;
88816 }
88817@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
88818 }
88819 EXPORT_SYMBOL(ns_capable);
88820
88821+bool ns_capable_nolog(struct user_namespace *ns, int cap)
88822+{
88823+ if (unlikely(!cap_valid(cap))) {
88824+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
88825+ BUG();
88826+ }
88827+
88828+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
88829+ current->flags |= PF_SUPERPRIV;
88830+ return true;
88831+ }
88832+ return false;
88833+}
88834+EXPORT_SYMBOL(ns_capable_nolog);
88835+
88836 /**
88837 * file_ns_capable - Determine if the file's opener had a capability in effect
88838 * @file: The file we want to check
88839@@ -427,6 +446,12 @@ bool capable(int cap)
88840 }
88841 EXPORT_SYMBOL(capable);
88842
88843+bool capable_nolog(int cap)
88844+{
88845+ return ns_capable_nolog(&init_user_ns, cap);
88846+}
88847+EXPORT_SYMBOL(capable_nolog);
88848+
88849 /**
88850 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
88851 * @inode: The inode in question
88852@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
88853 kgid_has_mapping(ns, inode->i_gid);
88854 }
88855 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
88856+
88857+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
88858+{
88859+ struct user_namespace *ns = current_user_ns();
88860+
88861+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
88862+ kgid_has_mapping(ns, inode->i_gid);
88863+}
88864+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
88865diff --git a/kernel/cgroup.c b/kernel/cgroup.c
88866index 04cfe8a..adadcc0 100644
88867--- a/kernel/cgroup.c
88868+++ b/kernel/cgroup.c
88869@@ -5343,6 +5343,9 @@ static void cgroup_release_agent(struct work_struct *work)
88870 if (!pathbuf || !agentbuf)
88871 goto out;
88872
88873+ if (agentbuf[0] == '\0')
88874+ goto out;
88875+
88876 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
88877 if (!path)
88878 goto out;
88879@@ -5528,7 +5531,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
88880 struct task_struct *task;
88881 int count = 0;
88882
88883- seq_printf(seq, "css_set %p\n", cset);
88884+ seq_printf(seq, "css_set %pK\n", cset);
88885
88886 list_for_each_entry(task, &cset->tasks, cg_list) {
88887 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
88888diff --git a/kernel/compat.c b/kernel/compat.c
88889index ebb3c36..1df606e 100644
88890--- a/kernel/compat.c
88891+++ b/kernel/compat.c
88892@@ -13,6 +13,7 @@
88893
88894 #include <linux/linkage.h>
88895 #include <linux/compat.h>
88896+#include <linux/module.h>
88897 #include <linux/errno.h>
88898 #include <linux/time.h>
88899 #include <linux/signal.h>
88900@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
88901 mm_segment_t oldfs;
88902 long ret;
88903
88904- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
88905+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
88906 oldfs = get_fs();
88907 set_fs(KERNEL_DS);
88908 ret = hrtimer_nanosleep_restart(restart);
88909@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
88910 oldfs = get_fs();
88911 set_fs(KERNEL_DS);
88912 ret = hrtimer_nanosleep(&tu,
88913- rmtp ? (struct timespec __user *)&rmt : NULL,
88914+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
88915 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
88916 set_fs(oldfs);
88917
88918@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
88919 mm_segment_t old_fs = get_fs();
88920
88921 set_fs(KERNEL_DS);
88922- ret = sys_sigpending((old_sigset_t __user *) &s);
88923+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
88924 set_fs(old_fs);
88925 if (ret == 0)
88926 ret = put_user(s, set);
88927@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
88928 mm_segment_t old_fs = get_fs();
88929
88930 set_fs(KERNEL_DS);
88931- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
88932+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
88933 set_fs(old_fs);
88934
88935 if (!ret) {
88936@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
88937 set_fs (KERNEL_DS);
88938 ret = sys_wait4(pid,
88939 (stat_addr ?
88940- (unsigned int __user *) &status : NULL),
88941- options, (struct rusage __user *) &r);
88942+ (unsigned int __force_user *) &status : NULL),
88943+ options, (struct rusage __force_user *) &r);
88944 set_fs (old_fs);
88945
88946 if (ret > 0) {
88947@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
88948 memset(&info, 0, sizeof(info));
88949
88950 set_fs(KERNEL_DS);
88951- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
88952- uru ? (struct rusage __user *)&ru : NULL);
88953+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
88954+ uru ? (struct rusage __force_user *)&ru : NULL);
88955 set_fs(old_fs);
88956
88957 if ((ret < 0) || (info.si_signo == 0))
88958@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
88959 oldfs = get_fs();
88960 set_fs(KERNEL_DS);
88961 err = sys_timer_settime(timer_id, flags,
88962- (struct itimerspec __user *) &newts,
88963- (struct itimerspec __user *) &oldts);
88964+ (struct itimerspec __force_user *) &newts,
88965+ (struct itimerspec __force_user *) &oldts);
88966 set_fs(oldfs);
88967 if (!err && old && put_compat_itimerspec(old, &oldts))
88968 return -EFAULT;
88969@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
88970 oldfs = get_fs();
88971 set_fs(KERNEL_DS);
88972 err = sys_timer_gettime(timer_id,
88973- (struct itimerspec __user *) &ts);
88974+ (struct itimerspec __force_user *) &ts);
88975 set_fs(oldfs);
88976 if (!err && put_compat_itimerspec(setting, &ts))
88977 return -EFAULT;
88978@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88979 oldfs = get_fs();
88980 set_fs(KERNEL_DS);
88981 err = sys_clock_settime(which_clock,
88982- (struct timespec __user *) &ts);
88983+ (struct timespec __force_user *) &ts);
88984 set_fs(oldfs);
88985 return err;
88986 }
88987@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
88988 oldfs = get_fs();
88989 set_fs(KERNEL_DS);
88990 err = sys_clock_gettime(which_clock,
88991- (struct timespec __user *) &ts);
88992+ (struct timespec __force_user *) &ts);
88993 set_fs(oldfs);
88994 if (!err && compat_put_timespec(&ts, tp))
88995 return -EFAULT;
88996@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
88997
88998 oldfs = get_fs();
88999 set_fs(KERNEL_DS);
89000- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
89001+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
89002 set_fs(oldfs);
89003
89004 err = compat_put_timex(utp, &txc);
89005@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
89006 oldfs = get_fs();
89007 set_fs(KERNEL_DS);
89008 err = sys_clock_getres(which_clock,
89009- (struct timespec __user *) &ts);
89010+ (struct timespec __force_user *) &ts);
89011 set_fs(oldfs);
89012 if (!err && tp && compat_put_timespec(&ts, tp))
89013 return -EFAULT;
89014@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
89015 struct timespec tu;
89016 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
89017
89018- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
89019+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
89020 oldfs = get_fs();
89021 set_fs(KERNEL_DS);
89022 err = clock_nanosleep_restart(restart);
89023@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
89024 oldfs = get_fs();
89025 set_fs(KERNEL_DS);
89026 err = sys_clock_nanosleep(which_clock, flags,
89027- (struct timespec __user *) &in,
89028- (struct timespec __user *) &out);
89029+ (struct timespec __force_user *) &in,
89030+ (struct timespec __force_user *) &out);
89031 set_fs(oldfs);
89032
89033 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
89034@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
89035 mm_segment_t old_fs = get_fs();
89036
89037 set_fs(KERNEL_DS);
89038- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
89039+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
89040 set_fs(old_fs);
89041 if (compat_put_timespec(&t, interval))
89042 return -EFAULT;
89043diff --git a/kernel/configs.c b/kernel/configs.c
89044index c18b1f1..b9a0132 100644
89045--- a/kernel/configs.c
89046+++ b/kernel/configs.c
89047@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
89048 struct proc_dir_entry *entry;
89049
89050 /* create the current config file */
89051+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
89052+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
89053+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
89054+ &ikconfig_file_ops);
89055+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89056+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
89057+ &ikconfig_file_ops);
89058+#endif
89059+#else
89060 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
89061 &ikconfig_file_ops);
89062+#endif
89063+
89064 if (!entry)
89065 return -ENOMEM;
89066
89067diff --git a/kernel/cred.c b/kernel/cred.c
89068index e0573a4..26c0fd3 100644
89069--- a/kernel/cred.c
89070+++ b/kernel/cred.c
89071@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
89072 validate_creds(cred);
89073 alter_cred_subscribers(cred, -1);
89074 put_cred(cred);
89075+
89076+#ifdef CONFIG_GRKERNSEC_SETXID
89077+ cred = (struct cred *) tsk->delayed_cred;
89078+ if (cred != NULL) {
89079+ tsk->delayed_cred = NULL;
89080+ validate_creds(cred);
89081+ alter_cred_subscribers(cred, -1);
89082+ put_cred(cred);
89083+ }
89084+#endif
89085 }
89086
89087 /**
89088@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
89089 * Always returns 0 thus allowing this function to be tail-called at the end
89090 * of, say, sys_setgid().
89091 */
89092-int commit_creds(struct cred *new)
89093+static int __commit_creds(struct cred *new)
89094 {
89095 struct task_struct *task = current;
89096 const struct cred *old = task->real_cred;
89097@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
89098
89099 get_cred(new); /* we will require a ref for the subj creds too */
89100
89101+ gr_set_role_label(task, new->uid, new->gid);
89102+
89103 /* dumpability changes */
89104 if (!uid_eq(old->euid, new->euid) ||
89105 !gid_eq(old->egid, new->egid) ||
89106@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
89107 put_cred(old);
89108 return 0;
89109 }
89110+#ifdef CONFIG_GRKERNSEC_SETXID
89111+extern int set_user(struct cred *new);
89112+
89113+void gr_delayed_cred_worker(void)
89114+{
89115+ const struct cred *new = current->delayed_cred;
89116+ struct cred *ncred;
89117+
89118+ current->delayed_cred = NULL;
89119+
89120+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
89121+ // from doing get_cred on it when queueing this
89122+ put_cred(new);
89123+ return;
89124+ } else if (new == NULL)
89125+ return;
89126+
89127+ ncred = prepare_creds();
89128+ if (!ncred)
89129+ goto die;
89130+ // uids
89131+ ncred->uid = new->uid;
89132+ ncred->euid = new->euid;
89133+ ncred->suid = new->suid;
89134+ ncred->fsuid = new->fsuid;
89135+ // gids
89136+ ncred->gid = new->gid;
89137+ ncred->egid = new->egid;
89138+ ncred->sgid = new->sgid;
89139+ ncred->fsgid = new->fsgid;
89140+ // groups
89141+ set_groups(ncred, new->group_info);
89142+ // caps
89143+ ncred->securebits = new->securebits;
89144+ ncred->cap_inheritable = new->cap_inheritable;
89145+ ncred->cap_permitted = new->cap_permitted;
89146+ ncred->cap_effective = new->cap_effective;
89147+ ncred->cap_bset = new->cap_bset;
89148+
89149+ if (set_user(ncred)) {
89150+ abort_creds(ncred);
89151+ goto die;
89152+ }
89153+
89154+ // from doing get_cred on it when queueing this
89155+ put_cred(new);
89156+
89157+ __commit_creds(ncred);
89158+ return;
89159+die:
89160+ // from doing get_cred on it when queueing this
89161+ put_cred(new);
89162+ do_group_exit(SIGKILL);
89163+}
89164+#endif
89165+
89166+int commit_creds(struct cred *new)
89167+{
89168+#ifdef CONFIG_GRKERNSEC_SETXID
89169+ int ret;
89170+ int schedule_it = 0;
89171+ struct task_struct *t;
89172+ unsigned oldsecurebits = current_cred()->securebits;
89173+
89174+ /* we won't get called with tasklist_lock held for writing
89175+ and interrupts disabled as the cred struct in that case is
89176+ init_cred
89177+ */
89178+ if (grsec_enable_setxid && !current_is_single_threaded() &&
89179+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
89180+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
89181+ schedule_it = 1;
89182+ }
89183+ ret = __commit_creds(new);
89184+ if (schedule_it) {
89185+ rcu_read_lock();
89186+ read_lock(&tasklist_lock);
89187+ for (t = next_thread(current); t != current;
89188+ t = next_thread(t)) {
89189+ /* we'll check if the thread has uid 0 in
89190+ * the delayed worker routine
89191+ */
89192+ if (task_securebits(t) == oldsecurebits &&
89193+ t->delayed_cred == NULL) {
89194+ t->delayed_cred = get_cred(new);
89195+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
89196+ set_tsk_need_resched(t);
89197+ }
89198+ }
89199+ read_unlock(&tasklist_lock);
89200+ rcu_read_unlock();
89201+ }
89202+
89203+ return ret;
89204+#else
89205+ return __commit_creds(new);
89206+#endif
89207+}
89208+
89209 EXPORT_SYMBOL(commit_creds);
89210
89211 /**
89212diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
89213index ac5c0f9..4b1c6c2 100644
89214--- a/kernel/debug/debug_core.c
89215+++ b/kernel/debug/debug_core.c
89216@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
89217 */
89218 static atomic_t masters_in_kgdb;
89219 static atomic_t slaves_in_kgdb;
89220-static atomic_t kgdb_break_tasklet_var;
89221+static atomic_unchecked_t kgdb_break_tasklet_var;
89222 atomic_t kgdb_setting_breakpoint;
89223
89224 struct task_struct *kgdb_usethread;
89225@@ -137,7 +137,7 @@ int kgdb_single_step;
89226 static pid_t kgdb_sstep_pid;
89227
89228 /* to keep track of the CPU which is doing the single stepping*/
89229-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89230+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89231
89232 /*
89233 * If you are debugging a problem where roundup (the collection of
89234@@ -552,7 +552,7 @@ return_normal:
89235 * kernel will only try for the value of sstep_tries before
89236 * giving up and continuing on.
89237 */
89238- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
89239+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
89240 (kgdb_info[cpu].task &&
89241 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
89242 atomic_set(&kgdb_active, -1);
89243@@ -654,8 +654,8 @@ cpu_master_loop:
89244 }
89245
89246 kgdb_restore:
89247- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
89248- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
89249+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
89250+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
89251 if (kgdb_info[sstep_cpu].task)
89252 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
89253 else
89254@@ -932,18 +932,18 @@ static void kgdb_unregister_callbacks(void)
89255 static void kgdb_tasklet_bpt(unsigned long ing)
89256 {
89257 kgdb_breakpoint();
89258- atomic_set(&kgdb_break_tasklet_var, 0);
89259+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
89260 }
89261
89262 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
89263
89264 void kgdb_schedule_breakpoint(void)
89265 {
89266- if (atomic_read(&kgdb_break_tasklet_var) ||
89267+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
89268 atomic_read(&kgdb_active) != -1 ||
89269 atomic_read(&kgdb_setting_breakpoint))
89270 return;
89271- atomic_inc(&kgdb_break_tasklet_var);
89272+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
89273 tasklet_schedule(&kgdb_tasklet_breakpoint);
89274 }
89275 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
89276diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
89277index 60f6bb8..104bb07 100644
89278--- a/kernel/debug/kdb/kdb_main.c
89279+++ b/kernel/debug/kdb/kdb_main.c
89280@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
89281 continue;
89282
89283 kdb_printf("%-20s%8u 0x%p ", mod->name,
89284- mod->core_size, (void *)mod);
89285+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
89286 #ifdef CONFIG_MODULE_UNLOAD
89287 kdb_printf("%4d ", module_refcount(mod));
89288 #endif
89289@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
89290 kdb_printf(" (Loading)");
89291 else
89292 kdb_printf(" (Live)");
89293- kdb_printf(" 0x%p", mod->module_core);
89294+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
89295
89296 #ifdef CONFIG_MODULE_UNLOAD
89297 {
89298diff --git a/kernel/events/core.c b/kernel/events/core.c
89299index 7959624..c01b886 100644
89300--- a/kernel/events/core.c
89301+++ b/kernel/events/core.c
89302@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
89303 * 0 - disallow raw tracepoint access for unpriv
89304 * 1 - disallow cpu events for unpriv
89305 * 2 - disallow kernel profiling for unpriv
89306+ * 3 - disallow all unpriv perf event use
89307 */
89308-int sysctl_perf_event_paranoid __read_mostly = 1;
89309+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89310+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
89311+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
89312+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
89313+#else
89314+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
89315+#endif
89316
89317 /* Minimum for 512 kiB + 1 user control page */
89318 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
89319@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
89320
89321 tmp *= sysctl_perf_cpu_time_max_percent;
89322 do_div(tmp, 100);
89323- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
89324+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
89325 }
89326
89327 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
89328@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
89329 }
89330 }
89331
89332-static atomic64_t perf_event_id;
89333+static atomic64_unchecked_t perf_event_id;
89334
89335 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
89336 enum event_type_t event_type);
89337@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
89338
89339 static inline u64 perf_event_count(struct perf_event *event)
89340 {
89341- return local64_read(&event->count) + atomic64_read(&event->child_count);
89342+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
89343 }
89344
89345 static u64 perf_event_read(struct perf_event *event)
89346@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
89347 mutex_lock(&event->child_mutex);
89348 total += perf_event_read(event);
89349 *enabled += event->total_time_enabled +
89350- atomic64_read(&event->child_total_time_enabled);
89351+ atomic64_read_unchecked(&event->child_total_time_enabled);
89352 *running += event->total_time_running +
89353- atomic64_read(&event->child_total_time_running);
89354+ atomic64_read_unchecked(&event->child_total_time_running);
89355
89356 list_for_each_entry(child, &event->child_list, child_list) {
89357 total += perf_event_read(child);
89358@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
89359 userpg->offset -= local64_read(&event->hw.prev_count);
89360
89361 userpg->time_enabled = enabled +
89362- atomic64_read(&event->child_total_time_enabled);
89363+ atomic64_read_unchecked(&event->child_total_time_enabled);
89364
89365 userpg->time_running = running +
89366- atomic64_read(&event->child_total_time_running);
89367+ atomic64_read_unchecked(&event->child_total_time_running);
89368
89369 arch_perf_update_userpage(userpg, now);
89370
89371@@ -4578,7 +4585,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
89372
89373 /* Data. */
89374 sp = perf_user_stack_pointer(regs);
89375- rem = __output_copy_user(handle, (void *) sp, dump_size);
89376+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
89377 dyn_size = dump_size - rem;
89378
89379 perf_output_skip(handle, rem);
89380@@ -4669,11 +4676,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
89381 values[n++] = perf_event_count(event);
89382 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
89383 values[n++] = enabled +
89384- atomic64_read(&event->child_total_time_enabled);
89385+ atomic64_read_unchecked(&event->child_total_time_enabled);
89386 }
89387 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
89388 values[n++] = running +
89389- atomic64_read(&event->child_total_time_running);
89390+ atomic64_read_unchecked(&event->child_total_time_running);
89391 }
89392 if (read_format & PERF_FORMAT_ID)
89393 values[n++] = primary_event_id(event);
89394@@ -7004,7 +7011,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
89395 event->parent = parent_event;
89396
89397 event->ns = get_pid_ns(task_active_pid_ns(current));
89398- event->id = atomic64_inc_return(&perf_event_id);
89399+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
89400
89401 event->state = PERF_EVENT_STATE_INACTIVE;
89402
89403@@ -7285,6 +7292,11 @@ SYSCALL_DEFINE5(perf_event_open,
89404 if (flags & ~PERF_FLAG_ALL)
89405 return -EINVAL;
89406
89407+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89408+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
89409+ return -EACCES;
89410+#endif
89411+
89412 err = perf_copy_attr(attr_uptr, &attr);
89413 if (err)
89414 return err;
89415@@ -7652,10 +7664,10 @@ static void sync_child_event(struct perf_event *child_event,
89416 /*
89417 * Add back the child's count to the parent's count:
89418 */
89419- atomic64_add(child_val, &parent_event->child_count);
89420- atomic64_add(child_event->total_time_enabled,
89421+ atomic64_add_unchecked(child_val, &parent_event->child_count);
89422+ atomic64_add_unchecked(child_event->total_time_enabled,
89423 &parent_event->child_total_time_enabled);
89424- atomic64_add(child_event->total_time_running,
89425+ atomic64_add_unchecked(child_event->total_time_running,
89426 &parent_event->child_total_time_running);
89427
89428 /*
89429diff --git a/kernel/events/internal.h b/kernel/events/internal.h
89430index 569b2187..19940d9 100644
89431--- a/kernel/events/internal.h
89432+++ b/kernel/events/internal.h
89433@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
89434 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
89435 }
89436
89437-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
89438+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
89439 static inline unsigned long \
89440 func_name(struct perf_output_handle *handle, \
89441- const void *buf, unsigned long len) \
89442+ const void user *buf, unsigned long len) \
89443 { \
89444 unsigned long size, written; \
89445 \
89446@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
89447 return 0;
89448 }
89449
89450-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
89451+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
89452
89453 static inline unsigned long
89454 memcpy_skip(void *dst, const void *src, unsigned long n)
89455@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
89456 return 0;
89457 }
89458
89459-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
89460+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
89461
89462 #ifndef arch_perf_out_copy_user
89463 #define arch_perf_out_copy_user arch_perf_out_copy_user
89464@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
89465 }
89466 #endif
89467
89468-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
89469+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
89470
89471 /* Callchain handling */
89472 extern struct perf_callchain_entry *
89473diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
89474index cb346f2..e4dc317 100644
89475--- a/kernel/events/uprobes.c
89476+++ b/kernel/events/uprobes.c
89477@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
89478 {
89479 struct page *page;
89480 uprobe_opcode_t opcode;
89481- int result;
89482+ long result;
89483
89484 pagefault_disable();
89485 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
89486diff --git a/kernel/exit.c b/kernel/exit.c
89487index 6806c55..a5fb128 100644
89488--- a/kernel/exit.c
89489+++ b/kernel/exit.c
89490@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
89491 struct task_struct *leader;
89492 int zap_leader;
89493 repeat:
89494+#ifdef CONFIG_NET
89495+ gr_del_task_from_ip_table(p);
89496+#endif
89497+
89498 /* don't need to get the RCU readlock here - the process is dead and
89499 * can't be modifying its own credentials. But shut RCU-lockdep up */
89500 rcu_read_lock();
89501@@ -655,6 +659,8 @@ void do_exit(long code)
89502 int group_dead;
89503 TASKS_RCU(int tasks_rcu_i);
89504
89505+ set_fs(USER_DS);
89506+
89507 profile_task_exit(tsk);
89508
89509 WARN_ON(blk_needs_flush_plug(tsk));
89510@@ -671,7 +677,6 @@ void do_exit(long code)
89511 * mm_release()->clear_child_tid() from writing to a user-controlled
89512 * kernel address.
89513 */
89514- set_fs(USER_DS);
89515
89516 ptrace_event(PTRACE_EVENT_EXIT, code);
89517
89518@@ -729,6 +734,9 @@ void do_exit(long code)
89519 tsk->exit_code = code;
89520 taskstats_exit(tsk, group_dead);
89521
89522+ gr_acl_handle_psacct(tsk, code);
89523+ gr_acl_handle_exit();
89524+
89525 exit_mm(tsk);
89526
89527 if (group_dead)
89528@@ -848,7 +856,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
89529 * Take down every thread in the group. This is called by fatal signals
89530 * as well as by sys_exit_group (below).
89531 */
89532-void
89533+__noreturn void
89534 do_group_exit(int exit_code)
89535 {
89536 struct signal_struct *sig = current->signal;
89537diff --git a/kernel/fork.c b/kernel/fork.c
89538index 4dc2dda..651add0 100644
89539--- a/kernel/fork.c
89540+++ b/kernel/fork.c
89541@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
89542 void thread_info_cache_init(void)
89543 {
89544 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
89545- THREAD_SIZE, 0, NULL);
89546+ THREAD_SIZE, SLAB_USERCOPY, NULL);
89547 BUG_ON(thread_info_cache == NULL);
89548 }
89549 # endif
89550 #endif
89551
89552+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89553+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
89554+ int node, void **lowmem_stack)
89555+{
89556+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
89557+ void *ret = NULL;
89558+ unsigned int i;
89559+
89560+ *lowmem_stack = alloc_thread_info_node(tsk, node);
89561+ if (*lowmem_stack == NULL)
89562+ goto out;
89563+
89564+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
89565+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
89566+
89567+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
89568+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
89569+ if (ret == NULL) {
89570+ free_thread_info(*lowmem_stack);
89571+ *lowmem_stack = NULL;
89572+ }
89573+
89574+out:
89575+ return ret;
89576+}
89577+
89578+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
89579+{
89580+ unmap_process_stacks(tsk);
89581+}
89582+#else
89583+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
89584+ int node, void **lowmem_stack)
89585+{
89586+ return alloc_thread_info_node(tsk, node);
89587+}
89588+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
89589+{
89590+ free_thread_info(ti);
89591+}
89592+#endif
89593+
89594 /* SLAB cache for signal_struct structures (tsk->signal) */
89595 static struct kmem_cache *signal_cachep;
89596
89597@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
89598 /* SLAB cache for mm_struct structures (tsk->mm) */
89599 static struct kmem_cache *mm_cachep;
89600
89601-static void account_kernel_stack(struct thread_info *ti, int account)
89602+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
89603 {
89604+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89605+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
89606+#else
89607 struct zone *zone = page_zone(virt_to_page(ti));
89608+#endif
89609
89610 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
89611 }
89612
89613 void free_task(struct task_struct *tsk)
89614 {
89615- account_kernel_stack(tsk->stack, -1);
89616+ account_kernel_stack(tsk, tsk->stack, -1);
89617 arch_release_thread_info(tsk->stack);
89618- free_thread_info(tsk->stack);
89619+ gr_free_thread_info(tsk, tsk->stack);
89620 rt_mutex_debug_task_free(tsk);
89621 ftrace_graph_exit_task(tsk);
89622 put_seccomp_filter(tsk);
89623@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89624 {
89625 struct task_struct *tsk;
89626 struct thread_info *ti;
89627+ void *lowmem_stack;
89628 int node = tsk_fork_get_node(orig);
89629 int err;
89630
89631@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89632 if (!tsk)
89633 return NULL;
89634
89635- ti = alloc_thread_info_node(tsk, node);
89636+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
89637 if (!ti)
89638 goto free_tsk;
89639
89640@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89641 goto free_ti;
89642
89643 tsk->stack = ti;
89644+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89645+ tsk->lowmem_stack = lowmem_stack;
89646+#endif
89647 #ifdef CONFIG_SECCOMP
89648 /*
89649 * We must handle setting up seccomp filters once we're under
89650@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89651 set_task_stack_end_magic(tsk);
89652
89653 #ifdef CONFIG_CC_STACKPROTECTOR
89654- tsk->stack_canary = get_random_int();
89655+ tsk->stack_canary = pax_get_random_long();
89656 #endif
89657
89658 /*
89659@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89660 tsk->splice_pipe = NULL;
89661 tsk->task_frag.page = NULL;
89662
89663- account_kernel_stack(ti, 1);
89664+ account_kernel_stack(tsk, ti, 1);
89665
89666 return tsk;
89667
89668 free_ti:
89669- free_thread_info(ti);
89670+ gr_free_thread_info(tsk, ti);
89671 free_tsk:
89672 free_task_struct(tsk);
89673 return NULL;
89674 }
89675
89676 #ifdef CONFIG_MMU
89677-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89678+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
89679+{
89680+ struct vm_area_struct *tmp;
89681+ unsigned long charge;
89682+ struct file *file;
89683+ int retval;
89684+
89685+ charge = 0;
89686+ if (mpnt->vm_flags & VM_ACCOUNT) {
89687+ unsigned long len = vma_pages(mpnt);
89688+
89689+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89690+ goto fail_nomem;
89691+ charge = len;
89692+ }
89693+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89694+ if (!tmp)
89695+ goto fail_nomem;
89696+ *tmp = *mpnt;
89697+ tmp->vm_mm = mm;
89698+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
89699+ retval = vma_dup_policy(mpnt, tmp);
89700+ if (retval)
89701+ goto fail_nomem_policy;
89702+ if (anon_vma_fork(tmp, mpnt))
89703+ goto fail_nomem_anon_vma_fork;
89704+ tmp->vm_flags &= ~VM_LOCKED;
89705+ tmp->vm_next = tmp->vm_prev = NULL;
89706+ tmp->vm_mirror = NULL;
89707+ file = tmp->vm_file;
89708+ if (file) {
89709+ struct inode *inode = file_inode(file);
89710+ struct address_space *mapping = file->f_mapping;
89711+
89712+ get_file(file);
89713+ if (tmp->vm_flags & VM_DENYWRITE)
89714+ atomic_dec(&inode->i_writecount);
89715+ i_mmap_lock_write(mapping);
89716+ if (tmp->vm_flags & VM_SHARED)
89717+ atomic_inc(&mapping->i_mmap_writable);
89718+ flush_dcache_mmap_lock(mapping);
89719+ /* insert tmp into the share list, just after mpnt */
89720+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89721+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
89722+ else
89723+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
89724+ flush_dcache_mmap_unlock(mapping);
89725+ i_mmap_unlock_write(mapping);
89726+ }
89727+
89728+ /*
89729+ * Clear hugetlb-related page reserves for children. This only
89730+ * affects MAP_PRIVATE mappings. Faults generated by the child
89731+ * are not guaranteed to succeed, even if read-only
89732+ */
89733+ if (is_vm_hugetlb_page(tmp))
89734+ reset_vma_resv_huge_pages(tmp);
89735+
89736+ return tmp;
89737+
89738+fail_nomem_anon_vma_fork:
89739+ mpol_put(vma_policy(tmp));
89740+fail_nomem_policy:
89741+ kmem_cache_free(vm_area_cachep, tmp);
89742+fail_nomem:
89743+ vm_unacct_memory(charge);
89744+ return NULL;
89745+}
89746+
89747+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89748 {
89749 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
89750 struct rb_node **rb_link, *rb_parent;
89751 int retval;
89752- unsigned long charge;
89753
89754 uprobe_start_dup_mmap();
89755 down_write(&oldmm->mmap_sem);
89756@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89757
89758 prev = NULL;
89759 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
89760- struct file *file;
89761-
89762 if (mpnt->vm_flags & VM_DONTCOPY) {
89763 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
89764 -vma_pages(mpnt));
89765 continue;
89766 }
89767- charge = 0;
89768- if (mpnt->vm_flags & VM_ACCOUNT) {
89769- unsigned long len = vma_pages(mpnt);
89770-
89771- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89772- goto fail_nomem;
89773- charge = len;
89774- }
89775- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89776- if (!tmp)
89777- goto fail_nomem;
89778- *tmp = *mpnt;
89779- INIT_LIST_HEAD(&tmp->anon_vma_chain);
89780- retval = vma_dup_policy(mpnt, tmp);
89781- if (retval)
89782- goto fail_nomem_policy;
89783- tmp->vm_mm = mm;
89784- if (anon_vma_fork(tmp, mpnt))
89785- goto fail_nomem_anon_vma_fork;
89786- tmp->vm_flags &= ~VM_LOCKED;
89787- tmp->vm_next = tmp->vm_prev = NULL;
89788- file = tmp->vm_file;
89789- if (file) {
89790- struct inode *inode = file_inode(file);
89791- struct address_space *mapping = file->f_mapping;
89792-
89793- get_file(file);
89794- if (tmp->vm_flags & VM_DENYWRITE)
89795- atomic_dec(&inode->i_writecount);
89796- i_mmap_lock_write(mapping);
89797- if (tmp->vm_flags & VM_SHARED)
89798- atomic_inc(&mapping->i_mmap_writable);
89799- flush_dcache_mmap_lock(mapping);
89800- /* insert tmp into the share list, just after mpnt */
89801- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89802- vma_nonlinear_insert(tmp,
89803- &mapping->i_mmap_nonlinear);
89804- else
89805- vma_interval_tree_insert_after(tmp, mpnt,
89806- &mapping->i_mmap);
89807- flush_dcache_mmap_unlock(mapping);
89808- i_mmap_unlock_write(mapping);
89809+ tmp = dup_vma(mm, oldmm, mpnt);
89810+ if (!tmp) {
89811+ retval = -ENOMEM;
89812+ goto out;
89813 }
89814
89815 /*
89816@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89817 if (retval)
89818 goto out;
89819 }
89820+
89821+#ifdef CONFIG_PAX_SEGMEXEC
89822+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
89823+ struct vm_area_struct *mpnt_m;
89824+
89825+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
89826+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
89827+
89828+ if (!mpnt->vm_mirror)
89829+ continue;
89830+
89831+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
89832+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
89833+ mpnt->vm_mirror = mpnt_m;
89834+ } else {
89835+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
89836+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
89837+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
89838+ mpnt->vm_mirror->vm_mirror = mpnt;
89839+ }
89840+ }
89841+ BUG_ON(mpnt_m);
89842+ }
89843+#endif
89844+
89845 /* a new mm has just been created */
89846 arch_dup_mmap(oldmm, mm);
89847 retval = 0;
89848@@ -486,14 +589,6 @@ out:
89849 up_write(&oldmm->mmap_sem);
89850 uprobe_end_dup_mmap();
89851 return retval;
89852-fail_nomem_anon_vma_fork:
89853- mpol_put(vma_policy(tmp));
89854-fail_nomem_policy:
89855- kmem_cache_free(vm_area_cachep, tmp);
89856-fail_nomem:
89857- retval = -ENOMEM;
89858- vm_unacct_memory(charge);
89859- goto out;
89860 }
89861
89862 static inline int mm_alloc_pgd(struct mm_struct *mm)
89863@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
89864 return ERR_PTR(err);
89865
89866 mm = get_task_mm(task);
89867- if (mm && mm != current->mm &&
89868- !ptrace_may_access(task, mode)) {
89869+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
89870+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
89871 mmput(mm);
89872 mm = ERR_PTR(-EACCES);
89873 }
89874@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
89875 spin_unlock(&fs->lock);
89876 return -EAGAIN;
89877 }
89878- fs->users++;
89879+ atomic_inc(&fs->users);
89880 spin_unlock(&fs->lock);
89881 return 0;
89882 }
89883 tsk->fs = copy_fs_struct(fs);
89884 if (!tsk->fs)
89885 return -ENOMEM;
89886+ /* Carry through gr_chroot_dentry and is_chrooted instead
89887+ of recomputing it here. Already copied when the task struct
89888+ is duplicated. This allows pivot_root to not be treated as
89889+ a chroot
89890+ */
89891+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
89892+
89893 return 0;
89894 }
89895
89896@@ -1182,7 +1284,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
89897 * parts of the process environment (as per the clone
89898 * flags). The actual kick-off is left to the caller.
89899 */
89900-static struct task_struct *copy_process(unsigned long clone_flags,
89901+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
89902 unsigned long stack_start,
89903 unsigned long stack_size,
89904 int __user *child_tidptr,
89905@@ -1253,6 +1355,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89906 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
89907 #endif
89908 retval = -EAGAIN;
89909+
89910+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
89911+
89912 if (atomic_read(&p->real_cred->user->processes) >=
89913 task_rlimit(p, RLIMIT_NPROC)) {
89914 if (p->real_cred->user != INIT_USER &&
89915@@ -1502,6 +1607,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89916 goto bad_fork_free_pid;
89917 }
89918
89919+ /* synchronizes with gr_set_acls()
89920+ we need to call this past the point of no return for fork()
89921+ */
89922+ gr_copy_label(p);
89923+
89924 if (likely(p->pid)) {
89925 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
89926
89927@@ -1592,6 +1702,8 @@ bad_fork_cleanup_count:
89928 bad_fork_free:
89929 free_task(p);
89930 fork_out:
89931+ gr_log_forkfail(retval);
89932+
89933 return ERR_PTR(retval);
89934 }
89935
89936@@ -1653,6 +1765,7 @@ long do_fork(unsigned long clone_flags,
89937
89938 p = copy_process(clone_flags, stack_start, stack_size,
89939 child_tidptr, NULL, trace);
89940+ add_latent_entropy();
89941 /*
89942 * Do this prior waking up the new thread - the thread pointer
89943 * might get invalid after that point, if the thread exits quickly.
89944@@ -1669,6 +1782,8 @@ long do_fork(unsigned long clone_flags,
89945 if (clone_flags & CLONE_PARENT_SETTID)
89946 put_user(nr, parent_tidptr);
89947
89948+ gr_handle_brute_check();
89949+
89950 if (clone_flags & CLONE_VFORK) {
89951 p->vfork_done = &vfork;
89952 init_completion(&vfork);
89953@@ -1787,7 +1902,7 @@ void __init proc_caches_init(void)
89954 mm_cachep = kmem_cache_create("mm_struct",
89955 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
89956 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
89957- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
89958+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
89959 mmap_init();
89960 nsproxy_cache_init();
89961 }
89962@@ -1827,7 +1942,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
89963 return 0;
89964
89965 /* don't need lock here; in the worst case we'll do useless copy */
89966- if (fs->users == 1)
89967+ if (atomic_read(&fs->users) == 1)
89968 return 0;
89969
89970 *new_fsp = copy_fs_struct(fs);
89971@@ -1939,7 +2054,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
89972 fs = current->fs;
89973 spin_lock(&fs->lock);
89974 current->fs = new_fs;
89975- if (--fs->users)
89976+ gr_set_chroot_entries(current, &current->fs->root);
89977+ if (atomic_dec_return(&fs->users))
89978 new_fs = NULL;
89979 else
89980 new_fs = fs;
89981diff --git a/kernel/futex.c b/kernel/futex.c
89982index 63678b5..512f9af 100644
89983--- a/kernel/futex.c
89984+++ b/kernel/futex.c
89985@@ -201,7 +201,7 @@ struct futex_pi_state {
89986 atomic_t refcount;
89987
89988 union futex_key key;
89989-};
89990+} __randomize_layout;
89991
89992 /**
89993 * struct futex_q - The hashed futex queue entry, one per waiting task
89994@@ -235,7 +235,7 @@ struct futex_q {
89995 struct rt_mutex_waiter *rt_waiter;
89996 union futex_key *requeue_pi_key;
89997 u32 bitset;
89998-};
89999+} __randomize_layout;
90000
90001 static const struct futex_q futex_q_init = {
90002 /* list gets initialized in queue_me()*/
90003@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
90004 struct page *page, *page_head;
90005 int err, ro = 0;
90006
90007+#ifdef CONFIG_PAX_SEGMEXEC
90008+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
90009+ return -EFAULT;
90010+#endif
90011+
90012 /*
90013 * The futex address must be "naturally" aligned.
90014 */
90015@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
90016
90017 static int get_futex_value_locked(u32 *dest, u32 __user *from)
90018 {
90019- int ret;
90020+ unsigned long ret;
90021
90022 pagefault_disable();
90023 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
90024@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
90025 {
90026 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
90027 u32 curval;
90028+ mm_segment_t oldfs;
90029
90030 /*
90031 * This will fail and we want it. Some arch implementations do
90032@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
90033 * implementation, the non-functional ones will return
90034 * -ENOSYS.
90035 */
90036+ oldfs = get_fs();
90037+ set_fs(USER_DS);
90038 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
90039 futex_cmpxchg_enabled = 1;
90040+ set_fs(oldfs);
90041 #endif
90042 }
90043
90044diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
90045index 55c8c93..9ba7ad6 100644
90046--- a/kernel/futex_compat.c
90047+++ b/kernel/futex_compat.c
90048@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
90049 return 0;
90050 }
90051
90052-static void __user *futex_uaddr(struct robust_list __user *entry,
90053+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
90054 compat_long_t futex_offset)
90055 {
90056 compat_uptr_t base = ptr_to_compat(entry);
90057diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
90058index b358a80..fc25240 100644
90059--- a/kernel/gcov/base.c
90060+++ b/kernel/gcov/base.c
90061@@ -114,11 +114,6 @@ void gcov_enable_events(void)
90062 }
90063
90064 #ifdef CONFIG_MODULES
90065-static inline int within(void *addr, void *start, unsigned long size)
90066-{
90067- return ((addr >= start) && (addr < start + size));
90068-}
90069-
90070 /* Update list and generate events when modules are unloaded. */
90071 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90072 void *data)
90073@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90074
90075 /* Remove entries located in module from linked list. */
90076 while ((info = gcov_info_next(info))) {
90077- if (within(info, mod->module_core, mod->core_size)) {
90078+ if (within_module_core_rw((unsigned long)info, mod)) {
90079 gcov_info_unlink(prev, info);
90080 if (gcov_events_enabled)
90081 gcov_event(GCOV_REMOVE, info);
90082diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
90083index 8069237..fe712d0 100644
90084--- a/kernel/irq/manage.c
90085+++ b/kernel/irq/manage.c
90086@@ -871,7 +871,7 @@ static int irq_thread(void *data)
90087
90088 action_ret = handler_fn(desc, action);
90089 if (action_ret == IRQ_HANDLED)
90090- atomic_inc(&desc->threads_handled);
90091+ atomic_inc_unchecked(&desc->threads_handled);
90092
90093 wake_threads_waitq(desc);
90094 }
90095diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
90096index e2514b0..de3dfe0 100644
90097--- a/kernel/irq/spurious.c
90098+++ b/kernel/irq/spurious.c
90099@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
90100 * count. We just care about the count being
90101 * different than the one we saw before.
90102 */
90103- handled = atomic_read(&desc->threads_handled);
90104+ handled = atomic_read_unchecked(&desc->threads_handled);
90105 handled |= SPURIOUS_DEFERRED;
90106 if (handled != desc->threads_handled_last) {
90107 action_ret = IRQ_HANDLED;
90108diff --git a/kernel/jump_label.c b/kernel/jump_label.c
90109index 9019f15..9a3c42e 100644
90110--- a/kernel/jump_label.c
90111+++ b/kernel/jump_label.c
90112@@ -14,6 +14,7 @@
90113 #include <linux/err.h>
90114 #include <linux/static_key.h>
90115 #include <linux/jump_label_ratelimit.h>
90116+#include <linux/mm.h>
90117
90118 #ifdef HAVE_JUMP_LABEL
90119
90120@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
90121
90122 size = (((unsigned long)stop - (unsigned long)start)
90123 / sizeof(struct jump_entry));
90124+ pax_open_kernel();
90125 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
90126+ pax_close_kernel();
90127 }
90128
90129 static void jump_label_update(struct static_key *key, int enable);
90130@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
90131 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
90132 struct jump_entry *iter;
90133
90134+ pax_open_kernel();
90135 for (iter = iter_start; iter < iter_stop; iter++) {
90136 if (within_module_init(iter->code, mod))
90137 iter->code = 0;
90138 }
90139+ pax_close_kernel();
90140 }
90141
90142 static int
90143diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
90144index 5c5987f..bc502b0 100644
90145--- a/kernel/kallsyms.c
90146+++ b/kernel/kallsyms.c
90147@@ -11,6 +11,9 @@
90148 * Changed the compression method from stem compression to "table lookup"
90149 * compression (see scripts/kallsyms.c for a more complete description)
90150 */
90151+#ifdef CONFIG_GRKERNSEC_HIDESYM
90152+#define __INCLUDED_BY_HIDESYM 1
90153+#endif
90154 #include <linux/kallsyms.h>
90155 #include <linux/module.h>
90156 #include <linux/init.h>
90157@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
90158
90159 static inline int is_kernel_inittext(unsigned long addr)
90160 {
90161+ if (system_state != SYSTEM_BOOTING)
90162+ return 0;
90163+
90164 if (addr >= (unsigned long)_sinittext
90165 && addr <= (unsigned long)_einittext)
90166 return 1;
90167 return 0;
90168 }
90169
90170+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90171+#ifdef CONFIG_MODULES
90172+static inline int is_module_text(unsigned long addr)
90173+{
90174+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
90175+ return 1;
90176+
90177+ addr = ktla_ktva(addr);
90178+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
90179+}
90180+#else
90181+static inline int is_module_text(unsigned long addr)
90182+{
90183+ return 0;
90184+}
90185+#endif
90186+#endif
90187+
90188 static inline int is_kernel_text(unsigned long addr)
90189 {
90190 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
90191@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
90192
90193 static inline int is_kernel(unsigned long addr)
90194 {
90195+
90196+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90197+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
90198+ return 1;
90199+
90200+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
90201+#else
90202 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
90203+#endif
90204+
90205 return 1;
90206 return in_gate_area_no_mm(addr);
90207 }
90208
90209 static int is_ksym_addr(unsigned long addr)
90210 {
90211+
90212+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90213+ if (is_module_text(addr))
90214+ return 0;
90215+#endif
90216+
90217 if (all_var)
90218 return is_kernel(addr);
90219
90220@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
90221
90222 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
90223 {
90224- iter->name[0] = '\0';
90225 iter->nameoff = get_symbol_offset(new_pos);
90226 iter->pos = new_pos;
90227 }
90228@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
90229 {
90230 struct kallsym_iter *iter = m->private;
90231
90232+#ifdef CONFIG_GRKERNSEC_HIDESYM
90233+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
90234+ return 0;
90235+#endif
90236+
90237 /* Some debugging symbols have no name. Ignore them. */
90238 if (!iter->name[0])
90239 return 0;
90240@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
90241 */
90242 type = iter->exported ? toupper(iter->type) :
90243 tolower(iter->type);
90244+
90245 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
90246 type, iter->name, iter->module_name);
90247 } else
90248diff --git a/kernel/kcmp.c b/kernel/kcmp.c
90249index 0aa69ea..a7fcafb 100644
90250--- a/kernel/kcmp.c
90251+++ b/kernel/kcmp.c
90252@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
90253 struct task_struct *task1, *task2;
90254 int ret;
90255
90256+#ifdef CONFIG_GRKERNSEC
90257+ return -ENOSYS;
90258+#endif
90259+
90260 rcu_read_lock();
90261
90262 /*
90263diff --git a/kernel/kexec.c b/kernel/kexec.c
90264index 9a8a01a..3c35dd6 100644
90265--- a/kernel/kexec.c
90266+++ b/kernel/kexec.c
90267@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
90268 compat_ulong_t, flags)
90269 {
90270 struct compat_kexec_segment in;
90271- struct kexec_segment out, __user *ksegments;
90272+ struct kexec_segment out;
90273+ struct kexec_segment __user *ksegments;
90274 unsigned long i, result;
90275
90276 /* Don't allow clients that don't understand the native
90277diff --git a/kernel/kmod.c b/kernel/kmod.c
90278index 2777f40..a689506 100644
90279--- a/kernel/kmod.c
90280+++ b/kernel/kmod.c
90281@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
90282 kfree(info->argv);
90283 }
90284
90285-static int call_modprobe(char *module_name, int wait)
90286+static int call_modprobe(char *module_name, char *module_param, int wait)
90287 {
90288 struct subprocess_info *info;
90289 static char *envp[] = {
90290@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
90291 NULL
90292 };
90293
90294- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
90295+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
90296 if (!argv)
90297 goto out;
90298
90299@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
90300 argv[1] = "-q";
90301 argv[2] = "--";
90302 argv[3] = module_name; /* check free_modprobe_argv() */
90303- argv[4] = NULL;
90304+ argv[4] = module_param;
90305+ argv[5] = NULL;
90306
90307 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
90308 NULL, free_modprobe_argv, NULL);
90309@@ -122,9 +123,8 @@ out:
90310 * If module auto-loading support is disabled then this function
90311 * becomes a no-operation.
90312 */
90313-int __request_module(bool wait, const char *fmt, ...)
90314+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
90315 {
90316- va_list args;
90317 char module_name[MODULE_NAME_LEN];
90318 unsigned int max_modprobes;
90319 int ret;
90320@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
90321 if (!modprobe_path[0])
90322 return 0;
90323
90324- va_start(args, fmt);
90325- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
90326- va_end(args);
90327+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
90328 if (ret >= MODULE_NAME_LEN)
90329 return -ENAMETOOLONG;
90330
90331@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
90332 if (ret)
90333 return ret;
90334
90335+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90336+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
90337+ /* hack to workaround consolekit/udisks stupidity */
90338+ read_lock(&tasklist_lock);
90339+ if (!strcmp(current->comm, "mount") &&
90340+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
90341+ read_unlock(&tasklist_lock);
90342+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
90343+ return -EPERM;
90344+ }
90345+ read_unlock(&tasklist_lock);
90346+ }
90347+#endif
90348+
90349 /* If modprobe needs a service that is in a module, we get a recursive
90350 * loop. Limit the number of running kmod threads to max_threads/2 or
90351 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
90352@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
90353
90354 trace_module_request(module_name, wait, _RET_IP_);
90355
90356- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
90357+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
90358
90359 atomic_dec(&kmod_concurrent);
90360 return ret;
90361 }
90362+
90363+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
90364+{
90365+ va_list args;
90366+ int ret;
90367+
90368+ va_start(args, fmt);
90369+ ret = ____request_module(wait, module_param, fmt, args);
90370+ va_end(args);
90371+
90372+ return ret;
90373+}
90374+
90375+int __request_module(bool wait, const char *fmt, ...)
90376+{
90377+ va_list args;
90378+ int ret;
90379+
90380+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90381+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
90382+ char module_param[MODULE_NAME_LEN];
90383+
90384+ memset(module_param, 0, sizeof(module_param));
90385+
90386+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
90387+
90388+ va_start(args, fmt);
90389+ ret = ____request_module(wait, module_param, fmt, args);
90390+ va_end(args);
90391+
90392+ return ret;
90393+ }
90394+#endif
90395+
90396+ va_start(args, fmt);
90397+ ret = ____request_module(wait, NULL, fmt, args);
90398+ va_end(args);
90399+
90400+ return ret;
90401+}
90402+
90403 EXPORT_SYMBOL(__request_module);
90404 #endif /* CONFIG_MODULES */
90405
90406 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
90407 {
90408+#ifdef CONFIG_GRKERNSEC
90409+ kfree(info->path);
90410+ info->path = info->origpath;
90411+#endif
90412 if (info->cleanup)
90413 (*info->cleanup)(info);
90414 kfree(info);
90415@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
90416 */
90417 set_user_nice(current, 0);
90418
90419+#ifdef CONFIG_GRKERNSEC
90420+ /* this is race-free as far as userland is concerned as we copied
90421+ out the path to be used prior to this point and are now operating
90422+ on that copy
90423+ */
90424+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
90425+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
90426+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
90427+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
90428+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
90429+ retval = -EPERM;
90430+ goto out;
90431+ }
90432+#endif
90433+
90434 retval = -ENOMEM;
90435 new = prepare_kernel_cred(current);
90436 if (!new)
90437@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
90438 commit_creds(new);
90439
90440 retval = do_execve(getname_kernel(sub_info->path),
90441- (const char __user *const __user *)sub_info->argv,
90442- (const char __user *const __user *)sub_info->envp);
90443+ (const char __user *const __force_user *)sub_info->argv,
90444+ (const char __user *const __force_user *)sub_info->envp);
90445 out:
90446 sub_info->retval = retval;
90447 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
90448@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
90449 *
90450 * Thus the __user pointer cast is valid here.
90451 */
90452- sys_wait4(pid, (int __user *)&ret, 0, NULL);
90453+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
90454
90455 /*
90456 * If ret is 0, either ____call_usermodehelper failed and the
90457@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
90458 goto out;
90459
90460 INIT_WORK(&sub_info->work, __call_usermodehelper);
90461+#ifdef CONFIG_GRKERNSEC
90462+ sub_info->origpath = path;
90463+ sub_info->path = kstrdup(path, gfp_mask);
90464+#else
90465 sub_info->path = path;
90466+#endif
90467 sub_info->argv = argv;
90468 sub_info->envp = envp;
90469
90470@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
90471 static int proc_cap_handler(struct ctl_table *table, int write,
90472 void __user *buffer, size_t *lenp, loff_t *ppos)
90473 {
90474- struct ctl_table t;
90475+ ctl_table_no_const t;
90476 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
90477 kernel_cap_t new_cap;
90478 int err, i;
90479diff --git a/kernel/kprobes.c b/kernel/kprobes.c
90480index ee61992..62142b1 100644
90481--- a/kernel/kprobes.c
90482+++ b/kernel/kprobes.c
90483@@ -31,6 +31,9 @@
90484 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
90485 * <prasanna@in.ibm.com> added function-return probes.
90486 */
90487+#ifdef CONFIG_GRKERNSEC_HIDESYM
90488+#define __INCLUDED_BY_HIDESYM 1
90489+#endif
90490 #include <linux/kprobes.h>
90491 #include <linux/hash.h>
90492 #include <linux/init.h>
90493@@ -122,12 +125,12 @@ enum kprobe_slot_state {
90494
90495 static void *alloc_insn_page(void)
90496 {
90497- return module_alloc(PAGE_SIZE);
90498+ return module_alloc_exec(PAGE_SIZE);
90499 }
90500
90501 static void free_insn_page(void *page)
90502 {
90503- module_memfree(page);
90504+ module_memfree_exec(page);
90505 }
90506
90507 struct kprobe_insn_cache kprobe_insn_slots = {
90508@@ -2191,11 +2194,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
90509 kprobe_type = "k";
90510
90511 if (sym)
90512- seq_printf(pi, "%p %s %s+0x%x %s ",
90513+ seq_printf(pi, "%pK %s %s+0x%x %s ",
90514 p->addr, kprobe_type, sym, offset,
90515 (modname ? modname : " "));
90516 else
90517- seq_printf(pi, "%p %s %p ",
90518+ seq_printf(pi, "%pK %s %pK ",
90519 p->addr, kprobe_type, p->addr);
90520
90521 if (!pp)
90522diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
90523index 6683cce..daf8999 100644
90524--- a/kernel/ksysfs.c
90525+++ b/kernel/ksysfs.c
90526@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
90527 {
90528 if (count+1 > UEVENT_HELPER_PATH_LEN)
90529 return -ENOENT;
90530+ if (!capable(CAP_SYS_ADMIN))
90531+ return -EPERM;
90532 memcpy(uevent_helper, buf, count);
90533 uevent_helper[count] = '\0';
90534 if (count && uevent_helper[count-1] == '\n')
90535@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
90536 return count;
90537 }
90538
90539-static struct bin_attribute notes_attr = {
90540+static bin_attribute_no_const notes_attr __read_only = {
90541 .attr = {
90542 .name = "notes",
90543 .mode = S_IRUGO,
90544diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
90545index 88d0d44..e9ce0ee 100644
90546--- a/kernel/locking/lockdep.c
90547+++ b/kernel/locking/lockdep.c
90548@@ -599,6 +599,10 @@ static int static_obj(void *obj)
90549 end = (unsigned long) &_end,
90550 addr = (unsigned long) obj;
90551
90552+#ifdef CONFIG_PAX_KERNEXEC
90553+ start = ktla_ktva(start);
90554+#endif
90555+
90556 /*
90557 * static variable?
90558 */
90559@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
90560 if (!static_obj(lock->key)) {
90561 debug_locks_off();
90562 printk("INFO: trying to register non-static key.\n");
90563+ printk("lock:%pS key:%pS.\n", lock, lock->key);
90564 printk("the code is fine but needs lockdep annotation.\n");
90565 printk("turning off the locking correctness validator.\n");
90566 dump_stack();
90567@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
90568 if (!class)
90569 return 0;
90570 }
90571- atomic_inc((atomic_t *)&class->ops);
90572+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
90573 if (very_verbose(class)) {
90574 printk("\nacquire class [%p] %s", class->key, class->name);
90575 if (class->name_version > 1)
90576diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
90577index ef43ac4..2720dfa 100644
90578--- a/kernel/locking/lockdep_proc.c
90579+++ b/kernel/locking/lockdep_proc.c
90580@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
90581 return 0;
90582 }
90583
90584- seq_printf(m, "%p", class->key);
90585+ seq_printf(m, "%pK", class->key);
90586 #ifdef CONFIG_DEBUG_LOCKDEP
90587 seq_printf(m, " OPS:%8ld", class->ops);
90588 #endif
90589@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
90590
90591 list_for_each_entry(entry, &class->locks_after, entry) {
90592 if (entry->distance == 1) {
90593- seq_printf(m, " -> [%p] ", entry->class->key);
90594+ seq_printf(m, " -> [%pK] ", entry->class->key);
90595 print_name(m, entry->class);
90596 seq_puts(m, "\n");
90597 }
90598@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
90599 if (!class->key)
90600 continue;
90601
90602- seq_printf(m, "[%p] ", class->key);
90603+ seq_printf(m, "[%pK] ", class->key);
90604 print_name(m, class);
90605 seq_puts(m, "\n");
90606 }
90607@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
90608 if (!i)
90609 seq_line(m, '-', 40-namelen, namelen);
90610
90611- snprintf(ip, sizeof(ip), "[<%p>]",
90612+ snprintf(ip, sizeof(ip), "[<%pK>]",
90613 (void *)class->contention_point[i]);
90614 seq_printf(m, "%40s %14lu %29s %pS\n",
90615 name, stats->contention_point[i],
90616@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
90617 if (!i)
90618 seq_line(m, '-', 40-namelen, namelen);
90619
90620- snprintf(ip, sizeof(ip), "[<%p>]",
90621+ snprintf(ip, sizeof(ip), "[<%pK>]",
90622 (void *)class->contending_point[i]);
90623 seq_printf(m, "%40s %14lu %29s %pS\n",
90624 name, stats->contending_point[i],
90625diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
90626index 9887a90..0cd2b1d 100644
90627--- a/kernel/locking/mcs_spinlock.c
90628+++ b/kernel/locking/mcs_spinlock.c
90629@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
90630
90631 prev = decode_cpu(old);
90632 node->prev = prev;
90633- ACCESS_ONCE(prev->next) = node;
90634+ ACCESS_ONCE_RW(prev->next) = node;
90635
90636 /*
90637 * Normally @prev is untouchable after the above store; because at that
90638@@ -172,8 +172,8 @@ unqueue:
90639 * it will wait in Step-A.
90640 */
90641
90642- ACCESS_ONCE(next->prev) = prev;
90643- ACCESS_ONCE(prev->next) = next;
90644+ ACCESS_ONCE_RW(next->prev) = prev;
90645+ ACCESS_ONCE_RW(prev->next) = next;
90646
90647 return false;
90648 }
90649@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
90650 node = this_cpu_ptr(&osq_node);
90651 next = xchg(&node->next, NULL);
90652 if (next) {
90653- ACCESS_ONCE(next->locked) = 1;
90654+ ACCESS_ONCE_RW(next->locked) = 1;
90655 return;
90656 }
90657
90658 next = osq_wait_next(lock, node, NULL);
90659 if (next)
90660- ACCESS_ONCE(next->locked) = 1;
90661+ ACCESS_ONCE_RW(next->locked) = 1;
90662 }
90663
90664 #endif
90665diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
90666index 4d60986..5d351c1 100644
90667--- a/kernel/locking/mcs_spinlock.h
90668+++ b/kernel/locking/mcs_spinlock.h
90669@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
90670 */
90671 return;
90672 }
90673- ACCESS_ONCE(prev->next) = node;
90674+ ACCESS_ONCE_RW(prev->next) = node;
90675
90676 /* Wait until the lock holder passes the lock down. */
90677 arch_mcs_spin_lock_contended(&node->locked);
90678diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
90679index 3ef3736..9c951fa 100644
90680--- a/kernel/locking/mutex-debug.c
90681+++ b/kernel/locking/mutex-debug.c
90682@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
90683 }
90684
90685 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90686- struct thread_info *ti)
90687+ struct task_struct *task)
90688 {
90689 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
90690
90691 /* Mark the current thread as blocked on the lock: */
90692- ti->task->blocked_on = waiter;
90693+ task->blocked_on = waiter;
90694 }
90695
90696 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90697- struct thread_info *ti)
90698+ struct task_struct *task)
90699 {
90700 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
90701- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
90702- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
90703- ti->task->blocked_on = NULL;
90704+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
90705+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
90706+ task->blocked_on = NULL;
90707
90708 list_del_init(&waiter->list);
90709 waiter->task = NULL;
90710diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
90711index 0799fd3..d06ae3b 100644
90712--- a/kernel/locking/mutex-debug.h
90713+++ b/kernel/locking/mutex-debug.h
90714@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
90715 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
90716 extern void debug_mutex_add_waiter(struct mutex *lock,
90717 struct mutex_waiter *waiter,
90718- struct thread_info *ti);
90719+ struct task_struct *task);
90720 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90721- struct thread_info *ti);
90722+ struct task_struct *task);
90723 extern void debug_mutex_unlock(struct mutex *lock);
90724 extern void debug_mutex_init(struct mutex *lock, const char *name,
90725 struct lock_class_key *key);
90726diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
90727index 4541951..39fe90a 100644
90728--- a/kernel/locking/mutex.c
90729+++ b/kernel/locking/mutex.c
90730@@ -524,7 +524,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90731 goto skip_wait;
90732
90733 debug_mutex_lock_common(lock, &waiter);
90734- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
90735+ debug_mutex_add_waiter(lock, &waiter, task);
90736
90737 /* add waiting tasks to the end of the waitqueue (FIFO): */
90738 list_add_tail(&waiter.list, &lock->wait_list);
90739@@ -569,7 +569,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90740 schedule_preempt_disabled();
90741 spin_lock_mutex(&lock->wait_lock, flags);
90742 }
90743- mutex_remove_waiter(lock, &waiter, current_thread_info());
90744+ mutex_remove_waiter(lock, &waiter, task);
90745 /* set it to 0 if there are no waiters left: */
90746 if (likely(list_empty(&lock->wait_list)))
90747 atomic_set(&lock->count, 0);
90748@@ -606,7 +606,7 @@ skip_wait:
90749 return 0;
90750
90751 err:
90752- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
90753+ mutex_remove_waiter(lock, &waiter, task);
90754 spin_unlock_mutex(&lock->wait_lock, flags);
90755 debug_mutex_free_waiter(&waiter);
90756 mutex_release(&lock->dep_map, 1, ip);
90757diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
90758index 1d96dd0..994ff19 100644
90759--- a/kernel/locking/rtmutex-tester.c
90760+++ b/kernel/locking/rtmutex-tester.c
90761@@ -22,7 +22,7 @@
90762 #define MAX_RT_TEST_MUTEXES 8
90763
90764 static spinlock_t rttest_lock;
90765-static atomic_t rttest_event;
90766+static atomic_unchecked_t rttest_event;
90767
90768 struct test_thread_data {
90769 int opcode;
90770@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90771
90772 case RTTEST_LOCKCONT:
90773 td->mutexes[td->opdata] = 1;
90774- td->event = atomic_add_return(1, &rttest_event);
90775+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90776 return 0;
90777
90778 case RTTEST_RESET:
90779@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90780 return 0;
90781
90782 case RTTEST_RESETEVENT:
90783- atomic_set(&rttest_event, 0);
90784+ atomic_set_unchecked(&rttest_event, 0);
90785 return 0;
90786
90787 default:
90788@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90789 return ret;
90790
90791 td->mutexes[id] = 1;
90792- td->event = atomic_add_return(1, &rttest_event);
90793+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90794 rt_mutex_lock(&mutexes[id]);
90795- td->event = atomic_add_return(1, &rttest_event);
90796+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90797 td->mutexes[id] = 4;
90798 return 0;
90799
90800@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90801 return ret;
90802
90803 td->mutexes[id] = 1;
90804- td->event = atomic_add_return(1, &rttest_event);
90805+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90806 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
90807- td->event = atomic_add_return(1, &rttest_event);
90808+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90809 td->mutexes[id] = ret ? 0 : 4;
90810 return ret ? -EINTR : 0;
90811
90812@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90813 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
90814 return ret;
90815
90816- td->event = atomic_add_return(1, &rttest_event);
90817+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90818 rt_mutex_unlock(&mutexes[id]);
90819- td->event = atomic_add_return(1, &rttest_event);
90820+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90821 td->mutexes[id] = 0;
90822 return 0;
90823
90824@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90825 break;
90826
90827 td->mutexes[dat] = 2;
90828- td->event = atomic_add_return(1, &rttest_event);
90829+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90830 break;
90831
90832 default:
90833@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90834 return;
90835
90836 td->mutexes[dat] = 3;
90837- td->event = atomic_add_return(1, &rttest_event);
90838+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90839 break;
90840
90841 case RTTEST_LOCKNOWAIT:
90842@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90843 return;
90844
90845 td->mutexes[dat] = 1;
90846- td->event = atomic_add_return(1, &rttest_event);
90847+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90848 return;
90849
90850 default:
90851diff --git a/kernel/module.c b/kernel/module.c
90852index d856e96..b82225c 100644
90853--- a/kernel/module.c
90854+++ b/kernel/module.c
90855@@ -59,6 +59,7 @@
90856 #include <linux/jump_label.h>
90857 #include <linux/pfn.h>
90858 #include <linux/bsearch.h>
90859+#include <linux/grsecurity.h>
90860 #include <uapi/linux/module.h>
90861 #include "module-internal.h"
90862
90863@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
90864
90865 /* Bounds of module allocation, for speeding __module_address.
90866 * Protected by module_mutex. */
90867-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
90868+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
90869+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
90870
90871 int register_module_notifier(struct notifier_block *nb)
90872 {
90873@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90874 return true;
90875
90876 list_for_each_entry_rcu(mod, &modules, list) {
90877- struct symsearch arr[] = {
90878+ struct symsearch modarr[] = {
90879 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
90880 NOT_GPL_ONLY, false },
90881 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
90882@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90883 if (mod->state == MODULE_STATE_UNFORMED)
90884 continue;
90885
90886- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
90887+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
90888 return true;
90889 }
90890 return false;
90891@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
90892 if (!pcpusec->sh_size)
90893 return 0;
90894
90895- if (align > PAGE_SIZE) {
90896+ if (align-1 >= PAGE_SIZE) {
90897 pr_warn("%s: per-cpu alignment %li > %li\n",
90898 mod->name, align, PAGE_SIZE);
90899 align = PAGE_SIZE;
90900@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
90901 static ssize_t show_coresize(struct module_attribute *mattr,
90902 struct module_kobject *mk, char *buffer)
90903 {
90904- return sprintf(buffer, "%u\n", mk->mod->core_size);
90905+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
90906 }
90907
90908 static struct module_attribute modinfo_coresize =
90909@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
90910 static ssize_t show_initsize(struct module_attribute *mattr,
90911 struct module_kobject *mk, char *buffer)
90912 {
90913- return sprintf(buffer, "%u\n", mk->mod->init_size);
90914+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
90915 }
90916
90917 static struct module_attribute modinfo_initsize =
90918@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
90919 goto bad_version;
90920 }
90921
90922+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90923+ /*
90924+ * avoid potentially printing jibberish on attempted load
90925+ * of a module randomized with a different seed
90926+ */
90927+ pr_warn("no symbol version for %s\n", symname);
90928+#else
90929 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
90930+#endif
90931 return 0;
90932
90933 bad_version:
90934+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90935+ /*
90936+ * avoid potentially printing jibberish on attempted load
90937+ * of a module randomized with a different seed
90938+ */
90939+ pr_warn("attempted module disagrees about version of symbol %s\n",
90940+ symname);
90941+#else
90942 pr_warn("%s: disagrees about version of symbol %s\n",
90943 mod->name, symname);
90944+#endif
90945 return 0;
90946 }
90947
90948@@ -1275,7 +1294,7 @@ resolve_symbol_wait(struct module *mod,
90949 */
90950 #ifdef CONFIG_SYSFS
90951
90952-#ifdef CONFIG_KALLSYMS
90953+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
90954 static inline bool sect_empty(const Elf_Shdr *sect)
90955 {
90956 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
90957@@ -1413,7 +1432,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
90958 {
90959 unsigned int notes, loaded, i;
90960 struct module_notes_attrs *notes_attrs;
90961- struct bin_attribute *nattr;
90962+ bin_attribute_no_const *nattr;
90963
90964 /* failed to create section attributes, so can't create notes */
90965 if (!mod->sect_attrs)
90966@@ -1525,7 +1544,7 @@ static void del_usage_links(struct module *mod)
90967 static int module_add_modinfo_attrs(struct module *mod)
90968 {
90969 struct module_attribute *attr;
90970- struct module_attribute *temp_attr;
90971+ module_attribute_no_const *temp_attr;
90972 int error = 0;
90973 int i;
90974
90975@@ -1735,21 +1754,21 @@ static void set_section_ro_nx(void *base,
90976
90977 static void unset_module_core_ro_nx(struct module *mod)
90978 {
90979- set_page_attributes(mod->module_core + mod->core_text_size,
90980- mod->module_core + mod->core_size,
90981+ set_page_attributes(mod->module_core_rw,
90982+ mod->module_core_rw + mod->core_size_rw,
90983 set_memory_x);
90984- set_page_attributes(mod->module_core,
90985- mod->module_core + mod->core_ro_size,
90986+ set_page_attributes(mod->module_core_rx,
90987+ mod->module_core_rx + mod->core_size_rx,
90988 set_memory_rw);
90989 }
90990
90991 static void unset_module_init_ro_nx(struct module *mod)
90992 {
90993- set_page_attributes(mod->module_init + mod->init_text_size,
90994- mod->module_init + mod->init_size,
90995+ set_page_attributes(mod->module_init_rw,
90996+ mod->module_init_rw + mod->init_size_rw,
90997 set_memory_x);
90998- set_page_attributes(mod->module_init,
90999- mod->module_init + mod->init_ro_size,
91000+ set_page_attributes(mod->module_init_rx,
91001+ mod->module_init_rx + mod->init_size_rx,
91002 set_memory_rw);
91003 }
91004
91005@@ -1762,14 +1781,14 @@ void set_all_modules_text_rw(void)
91006 list_for_each_entry_rcu(mod, &modules, list) {
91007 if (mod->state == MODULE_STATE_UNFORMED)
91008 continue;
91009- if ((mod->module_core) && (mod->core_text_size)) {
91010- set_page_attributes(mod->module_core,
91011- mod->module_core + mod->core_text_size,
91012+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91013+ set_page_attributes(mod->module_core_rx,
91014+ mod->module_core_rx + mod->core_size_rx,
91015 set_memory_rw);
91016 }
91017- if ((mod->module_init) && (mod->init_text_size)) {
91018- set_page_attributes(mod->module_init,
91019- mod->module_init + mod->init_text_size,
91020+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91021+ set_page_attributes(mod->module_init_rx,
91022+ mod->module_init_rx + mod->init_size_rx,
91023 set_memory_rw);
91024 }
91025 }
91026@@ -1785,14 +1804,14 @@ void set_all_modules_text_ro(void)
91027 list_for_each_entry_rcu(mod, &modules, list) {
91028 if (mod->state == MODULE_STATE_UNFORMED)
91029 continue;
91030- if ((mod->module_core) && (mod->core_text_size)) {
91031- set_page_attributes(mod->module_core,
91032- mod->module_core + mod->core_text_size,
91033+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91034+ set_page_attributes(mod->module_core_rx,
91035+ mod->module_core_rx + mod->core_size_rx,
91036 set_memory_ro);
91037 }
91038- if ((mod->module_init) && (mod->init_text_size)) {
91039- set_page_attributes(mod->module_init,
91040- mod->module_init + mod->init_text_size,
91041+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91042+ set_page_attributes(mod->module_init_rx,
91043+ mod->module_init_rx + mod->init_size_rx,
91044 set_memory_ro);
91045 }
91046 }
91047@@ -1801,7 +1820,15 @@ void set_all_modules_text_ro(void)
91048 #else
91049 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
91050 static void unset_module_core_ro_nx(struct module *mod) { }
91051-static void unset_module_init_ro_nx(struct module *mod) { }
91052+static void unset_module_init_ro_nx(struct module *mod)
91053+{
91054+
91055+#ifdef CONFIG_PAX_KERNEXEC
91056+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91057+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91058+#endif
91059+
91060+}
91061 #endif
91062
91063 void __weak module_memfree(void *module_region)
91064@@ -1855,16 +1882,19 @@ static void free_module(struct module *mod)
91065 /* This may be NULL, but that's OK */
91066 unset_module_init_ro_nx(mod);
91067 module_arch_freeing_init(mod);
91068- module_memfree(mod->module_init);
91069+ module_memfree(mod->module_init_rw);
91070+ module_memfree_exec(mod->module_init_rx);
91071 kfree(mod->args);
91072 percpu_modfree(mod);
91073
91074 /* Free lock-classes: */
91075- lockdep_free_key_range(mod->module_core, mod->core_size);
91076+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
91077+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
91078
91079 /* Finally, free the core (containing the module structure) */
91080 unset_module_core_ro_nx(mod);
91081- module_memfree(mod->module_core);
91082+ module_memfree_exec(mod->module_core_rx);
91083+ module_memfree(mod->module_core_rw);
91084
91085 #ifdef CONFIG_MPU
91086 update_protections(current->mm);
91087@@ -1933,9 +1963,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91088 int ret = 0;
91089 const struct kernel_symbol *ksym;
91090
91091+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91092+ int is_fs_load = 0;
91093+ int register_filesystem_found = 0;
91094+ char *p;
91095+
91096+ p = strstr(mod->args, "grsec_modharden_fs");
91097+ if (p) {
91098+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
91099+ /* copy \0 as well */
91100+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
91101+ is_fs_load = 1;
91102+ }
91103+#endif
91104+
91105 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
91106 const char *name = info->strtab + sym[i].st_name;
91107
91108+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91109+ /* it's a real shame this will never get ripped and copied
91110+ upstream! ;(
91111+ */
91112+ if (is_fs_load && !strcmp(name, "register_filesystem"))
91113+ register_filesystem_found = 1;
91114+#endif
91115+
91116 switch (sym[i].st_shndx) {
91117 case SHN_COMMON:
91118 /* Ignore common symbols */
91119@@ -1960,7 +2012,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91120 ksym = resolve_symbol_wait(mod, info, name);
91121 /* Ok if resolved. */
91122 if (ksym && !IS_ERR(ksym)) {
91123+ pax_open_kernel();
91124 sym[i].st_value = ksym->value;
91125+ pax_close_kernel();
91126 break;
91127 }
91128
91129@@ -1979,11 +2033,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91130 secbase = (unsigned long)mod_percpu(mod);
91131 else
91132 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
91133+ pax_open_kernel();
91134 sym[i].st_value += secbase;
91135+ pax_close_kernel();
91136 break;
91137 }
91138 }
91139
91140+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91141+ if (is_fs_load && !register_filesystem_found) {
91142+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
91143+ ret = -EPERM;
91144+ }
91145+#endif
91146+
91147 return ret;
91148 }
91149
91150@@ -2067,22 +2130,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
91151 || s->sh_entsize != ~0UL
91152 || strstarts(sname, ".init"))
91153 continue;
91154- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
91155+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91156+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
91157+ else
91158+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
91159 pr_debug("\t%s\n", sname);
91160 }
91161- switch (m) {
91162- case 0: /* executable */
91163- mod->core_size = debug_align(mod->core_size);
91164- mod->core_text_size = mod->core_size;
91165- break;
91166- case 1: /* RO: text and ro-data */
91167- mod->core_size = debug_align(mod->core_size);
91168- mod->core_ro_size = mod->core_size;
91169- break;
91170- case 3: /* whole core */
91171- mod->core_size = debug_align(mod->core_size);
91172- break;
91173- }
91174 }
91175
91176 pr_debug("Init section allocation order:\n");
91177@@ -2096,23 +2149,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
91178 || s->sh_entsize != ~0UL
91179 || !strstarts(sname, ".init"))
91180 continue;
91181- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
91182- | INIT_OFFSET_MASK);
91183+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91184+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
91185+ else
91186+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
91187+ s->sh_entsize |= INIT_OFFSET_MASK;
91188 pr_debug("\t%s\n", sname);
91189 }
91190- switch (m) {
91191- case 0: /* executable */
91192- mod->init_size = debug_align(mod->init_size);
91193- mod->init_text_size = mod->init_size;
91194- break;
91195- case 1: /* RO: text and ro-data */
91196- mod->init_size = debug_align(mod->init_size);
91197- mod->init_ro_size = mod->init_size;
91198- break;
91199- case 3: /* whole init */
91200- mod->init_size = debug_align(mod->init_size);
91201- break;
91202- }
91203 }
91204 }
91205
91206@@ -2285,7 +2328,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91207
91208 /* Put symbol section at end of init part of module. */
91209 symsect->sh_flags |= SHF_ALLOC;
91210- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
91211+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
91212 info->index.sym) | INIT_OFFSET_MASK;
91213 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
91214
91215@@ -2302,13 +2345,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91216 }
91217
91218 /* Append room for core symbols at end of core part. */
91219- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
91220- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
91221- mod->core_size += strtab_size;
91222+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
91223+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
91224+ mod->core_size_rx += strtab_size;
91225
91226 /* Put string table section at end of init part of module. */
91227 strsect->sh_flags |= SHF_ALLOC;
91228- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
91229+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
91230 info->index.str) | INIT_OFFSET_MASK;
91231 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
91232 }
91233@@ -2326,12 +2369,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91234 /* Make sure we get permanent strtab: don't use info->strtab. */
91235 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
91236
91237+ pax_open_kernel();
91238+
91239 /* Set types up while we still have access to sections. */
91240 for (i = 0; i < mod->num_symtab; i++)
91241 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
91242
91243- mod->core_symtab = dst = mod->module_core + info->symoffs;
91244- mod->core_strtab = s = mod->module_core + info->stroffs;
91245+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
91246+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
91247 src = mod->symtab;
91248 for (ndst = i = 0; i < mod->num_symtab; i++) {
91249 if (i == 0 ||
91250@@ -2343,6 +2388,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91251 }
91252 }
91253 mod->core_num_syms = ndst;
91254+
91255+ pax_close_kernel();
91256 }
91257 #else
91258 static inline void layout_symtab(struct module *mod, struct load_info *info)
91259@@ -2376,17 +2423,33 @@ void * __weak module_alloc(unsigned long size)
91260 return vmalloc_exec(size);
91261 }
91262
91263-static void *module_alloc_update_bounds(unsigned long size)
91264+static void *module_alloc_update_bounds_rw(unsigned long size)
91265 {
91266 void *ret = module_alloc(size);
91267
91268 if (ret) {
91269 mutex_lock(&module_mutex);
91270 /* Update module bounds. */
91271- if ((unsigned long)ret < module_addr_min)
91272- module_addr_min = (unsigned long)ret;
91273- if ((unsigned long)ret + size > module_addr_max)
91274- module_addr_max = (unsigned long)ret + size;
91275+ if ((unsigned long)ret < module_addr_min_rw)
91276+ module_addr_min_rw = (unsigned long)ret;
91277+ if ((unsigned long)ret + size > module_addr_max_rw)
91278+ module_addr_max_rw = (unsigned long)ret + size;
91279+ mutex_unlock(&module_mutex);
91280+ }
91281+ return ret;
91282+}
91283+
91284+static void *module_alloc_update_bounds_rx(unsigned long size)
91285+{
91286+ void *ret = module_alloc_exec(size);
91287+
91288+ if (ret) {
91289+ mutex_lock(&module_mutex);
91290+ /* Update module bounds. */
91291+ if ((unsigned long)ret < module_addr_min_rx)
91292+ module_addr_min_rx = (unsigned long)ret;
91293+ if ((unsigned long)ret + size > module_addr_max_rx)
91294+ module_addr_max_rx = (unsigned long)ret + size;
91295 mutex_unlock(&module_mutex);
91296 }
91297 return ret;
91298@@ -2640,7 +2703,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91299 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
91300
91301 if (info->index.sym == 0) {
91302+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
91303+ /*
91304+ * avoid potentially printing jibberish on attempted load
91305+ * of a module randomized with a different seed
91306+ */
91307+ pr_warn("module has no symbols (stripped?)\n");
91308+#else
91309 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
91310+#endif
91311 return ERR_PTR(-ENOEXEC);
91312 }
91313
91314@@ -2656,8 +2727,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91315 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91316 {
91317 const char *modmagic = get_modinfo(info, "vermagic");
91318+ const char *license = get_modinfo(info, "license");
91319 int err;
91320
91321+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
91322+ if (!license || !license_is_gpl_compatible(license))
91323+ return -ENOEXEC;
91324+#endif
91325+
91326 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
91327 modmagic = NULL;
91328
91329@@ -2682,7 +2759,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91330 }
91331
91332 /* Set up license info based on the info section */
91333- set_license(mod, get_modinfo(info, "license"));
91334+ set_license(mod, license);
91335
91336 return 0;
91337 }
91338@@ -2776,7 +2853,7 @@ static int move_module(struct module *mod, struct load_info *info)
91339 void *ptr;
91340
91341 /* Do the allocs. */
91342- ptr = module_alloc_update_bounds(mod->core_size);
91343+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
91344 /*
91345 * The pointer to this block is stored in the module structure
91346 * which is inside the block. Just mark it as not being a
91347@@ -2786,11 +2863,11 @@ static int move_module(struct module *mod, struct load_info *info)
91348 if (!ptr)
91349 return -ENOMEM;
91350
91351- memset(ptr, 0, mod->core_size);
91352- mod->module_core = ptr;
91353+ memset(ptr, 0, mod->core_size_rw);
91354+ mod->module_core_rw = ptr;
91355
91356- if (mod->init_size) {
91357- ptr = module_alloc_update_bounds(mod->init_size);
91358+ if (mod->init_size_rw) {
91359+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
91360 /*
91361 * The pointer to this block is stored in the module structure
91362 * which is inside the block. This block doesn't need to be
91363@@ -2799,13 +2876,45 @@ static int move_module(struct module *mod, struct load_info *info)
91364 */
91365 kmemleak_ignore(ptr);
91366 if (!ptr) {
91367- module_memfree(mod->module_core);
91368+ module_memfree(mod->module_core_rw);
91369 return -ENOMEM;
91370 }
91371- memset(ptr, 0, mod->init_size);
91372- mod->module_init = ptr;
91373+ memset(ptr, 0, mod->init_size_rw);
91374+ mod->module_init_rw = ptr;
91375 } else
91376- mod->module_init = NULL;
91377+ mod->module_init_rw = NULL;
91378+
91379+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
91380+ kmemleak_not_leak(ptr);
91381+ if (!ptr) {
91382+ if (mod->module_init_rw)
91383+ module_memfree(mod->module_init_rw);
91384+ module_memfree(mod->module_core_rw);
91385+ return -ENOMEM;
91386+ }
91387+
91388+ pax_open_kernel();
91389+ memset(ptr, 0, mod->core_size_rx);
91390+ pax_close_kernel();
91391+ mod->module_core_rx = ptr;
91392+
91393+ if (mod->init_size_rx) {
91394+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
91395+ kmemleak_ignore(ptr);
91396+ if (!ptr && mod->init_size_rx) {
91397+ module_memfree_exec(mod->module_core_rx);
91398+ if (mod->module_init_rw)
91399+ module_memfree(mod->module_init_rw);
91400+ module_memfree(mod->module_core_rw);
91401+ return -ENOMEM;
91402+ }
91403+
91404+ pax_open_kernel();
91405+ memset(ptr, 0, mod->init_size_rx);
91406+ pax_close_kernel();
91407+ mod->module_init_rx = ptr;
91408+ } else
91409+ mod->module_init_rx = NULL;
91410
91411 /* Transfer each section which specifies SHF_ALLOC */
91412 pr_debug("final section addresses:\n");
91413@@ -2816,16 +2925,45 @@ static int move_module(struct module *mod, struct load_info *info)
91414 if (!(shdr->sh_flags & SHF_ALLOC))
91415 continue;
91416
91417- if (shdr->sh_entsize & INIT_OFFSET_MASK)
91418- dest = mod->module_init
91419- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91420- else
91421- dest = mod->module_core + shdr->sh_entsize;
91422+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
91423+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
91424+ dest = mod->module_init_rw
91425+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91426+ else
91427+ dest = mod->module_init_rx
91428+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
91429+ } else {
91430+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
91431+ dest = mod->module_core_rw + shdr->sh_entsize;
91432+ else
91433+ dest = mod->module_core_rx + shdr->sh_entsize;
91434+ }
91435+
91436+ if (shdr->sh_type != SHT_NOBITS) {
91437+
91438+#ifdef CONFIG_PAX_KERNEXEC
91439+#ifdef CONFIG_X86_64
91440+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
91441+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
91442+#endif
91443+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
91444+ pax_open_kernel();
91445+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
91446+ pax_close_kernel();
91447+ } else
91448+#endif
91449
91450- if (shdr->sh_type != SHT_NOBITS)
91451 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
91452+ }
91453 /* Update sh_addr to point to copy in image. */
91454- shdr->sh_addr = (unsigned long)dest;
91455+
91456+#ifdef CONFIG_PAX_KERNEXEC
91457+ if (shdr->sh_flags & SHF_EXECINSTR)
91458+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
91459+ else
91460+#endif
91461+
91462+ shdr->sh_addr = (unsigned long)dest;
91463 pr_debug("\t0x%lx %s\n",
91464 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
91465 }
91466@@ -2882,12 +3020,12 @@ static void flush_module_icache(const struct module *mod)
91467 * Do it before processing of module parameters, so the module
91468 * can provide parameter accessor functions of its own.
91469 */
91470- if (mod->module_init)
91471- flush_icache_range((unsigned long)mod->module_init,
91472- (unsigned long)mod->module_init
91473- + mod->init_size);
91474- flush_icache_range((unsigned long)mod->module_core,
91475- (unsigned long)mod->module_core + mod->core_size);
91476+ if (mod->module_init_rx)
91477+ flush_icache_range((unsigned long)mod->module_init_rx,
91478+ (unsigned long)mod->module_init_rx
91479+ + mod->init_size_rx);
91480+ flush_icache_range((unsigned long)mod->module_core_rx,
91481+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
91482
91483 set_fs(old_fs);
91484 }
91485@@ -2945,8 +3083,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
91486 {
91487 percpu_modfree(mod);
91488 module_arch_freeing_init(mod);
91489- module_memfree(mod->module_init);
91490- module_memfree(mod->module_core);
91491+ module_memfree_exec(mod->module_init_rx);
91492+ module_memfree_exec(mod->module_core_rx);
91493+ module_memfree(mod->module_init_rw);
91494+ module_memfree(mod->module_core_rw);
91495 }
91496
91497 int __weak module_finalize(const Elf_Ehdr *hdr,
91498@@ -2959,7 +3099,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
91499 static int post_relocation(struct module *mod, const struct load_info *info)
91500 {
91501 /* Sort exception table now relocations are done. */
91502+ pax_open_kernel();
91503 sort_extable(mod->extable, mod->extable + mod->num_exentries);
91504+ pax_close_kernel();
91505
91506 /* Copy relocated percpu area over. */
91507 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
91508@@ -3001,13 +3143,15 @@ static void do_mod_ctors(struct module *mod)
91509 /* For freeing module_init on success, in case kallsyms traversing */
91510 struct mod_initfree {
91511 struct rcu_head rcu;
91512- void *module_init;
91513+ void *module_init_rw;
91514+ void *module_init_rx;
91515 };
91516
91517 static void do_free_init(struct rcu_head *head)
91518 {
91519 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
91520- module_memfree(m->module_init);
91521+ module_memfree(m->module_init_rw);
91522+ module_memfree_exec(m->module_init_rx);
91523 kfree(m);
91524 }
91525
91526@@ -3022,7 +3166,8 @@ static int do_init_module(struct module *mod)
91527 ret = -ENOMEM;
91528 goto fail;
91529 }
91530- freeinit->module_init = mod->module_init;
91531+ freeinit->module_init_rw = mod->module_init_rw;
91532+ freeinit->module_init_rx = mod->module_init_rx;
91533
91534 /*
91535 * We want to find out whether @mod uses async during init. Clear
91536@@ -3081,10 +3226,10 @@ static int do_init_module(struct module *mod)
91537 #endif
91538 unset_module_init_ro_nx(mod);
91539 module_arch_freeing_init(mod);
91540- mod->module_init = NULL;
91541- mod->init_size = 0;
91542- mod->init_ro_size = 0;
91543- mod->init_text_size = 0;
91544+ mod->module_init_rw = NULL;
91545+ mod->module_init_rx = NULL;
91546+ mod->init_size_rw = 0;
91547+ mod->init_size_rx = 0;
91548 /*
91549 * We want to free module_init, but be aware that kallsyms may be
91550 * walking this with preempt disabled. In all the failure paths,
91551@@ -3198,16 +3343,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
91552 module_bug_finalize(info->hdr, info->sechdrs, mod);
91553
91554 /* Set RO and NX regions for core */
91555- set_section_ro_nx(mod->module_core,
91556- mod->core_text_size,
91557- mod->core_ro_size,
91558- mod->core_size);
91559+ set_section_ro_nx(mod->module_core_rx,
91560+ mod->core_size_rx,
91561+ mod->core_size_rx,
91562+ mod->core_size_rx);
91563
91564 /* Set RO and NX regions for init */
91565- set_section_ro_nx(mod->module_init,
91566- mod->init_text_size,
91567- mod->init_ro_size,
91568- mod->init_size);
91569+ set_section_ro_nx(mod->module_init_rx,
91570+ mod->init_size_rx,
91571+ mod->init_size_rx,
91572+ mod->init_size_rx);
91573
91574 /* Mark state as coming so strong_try_module_get() ignores us,
91575 * but kallsyms etc. can see us. */
91576@@ -3291,9 +3436,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
91577 if (err)
91578 goto free_unload;
91579
91580+ /* Now copy in args */
91581+ mod->args = strndup_user(uargs, ~0UL >> 1);
91582+ if (IS_ERR(mod->args)) {
91583+ err = PTR_ERR(mod->args);
91584+ goto free_unload;
91585+ }
91586+
91587 /* Set up MODINFO_ATTR fields */
91588 setup_modinfo(mod, info);
91589
91590+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91591+ {
91592+ char *p, *p2;
91593+
91594+ if (strstr(mod->args, "grsec_modharden_netdev")) {
91595+ 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);
91596+ err = -EPERM;
91597+ goto free_modinfo;
91598+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
91599+ p += sizeof("grsec_modharden_normal") - 1;
91600+ p2 = strstr(p, "_");
91601+ if (p2) {
91602+ *p2 = '\0';
91603+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
91604+ *p2 = '_';
91605+ }
91606+ err = -EPERM;
91607+ goto free_modinfo;
91608+ }
91609+ }
91610+#endif
91611+
91612 /* Fix up syms, so that st_value is a pointer to location. */
91613 err = simplify_symbols(mod, info);
91614 if (err < 0)
91615@@ -3309,13 +3483,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
91616
91617 flush_module_icache(mod);
91618
91619- /* Now copy in args */
91620- mod->args = strndup_user(uargs, ~0UL >> 1);
91621- if (IS_ERR(mod->args)) {
91622- err = PTR_ERR(mod->args);
91623- goto free_arch_cleanup;
91624- }
91625-
91626 dynamic_debug_setup(info->debug, info->num_debug);
91627
91628 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
91629@@ -3363,11 +3530,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
91630 ddebug_cleanup:
91631 dynamic_debug_remove(info->debug);
91632 synchronize_sched();
91633- kfree(mod->args);
91634- free_arch_cleanup:
91635 module_arch_cleanup(mod);
91636 free_modinfo:
91637 free_modinfo(mod);
91638+ kfree(mod->args);
91639 free_unload:
91640 module_unload_free(mod);
91641 unlink_mod:
91642@@ -3454,10 +3620,16 @@ static const char *get_ksymbol(struct module *mod,
91643 unsigned long nextval;
91644
91645 /* At worse, next value is at end of module */
91646- if (within_module_init(addr, mod))
91647- nextval = (unsigned long)mod->module_init+mod->init_text_size;
91648+ if (within_module_init_rx(addr, mod))
91649+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
91650+ else if (within_module_init_rw(addr, mod))
91651+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
91652+ else if (within_module_core_rx(addr, mod))
91653+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
91654+ else if (within_module_core_rw(addr, mod))
91655+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
91656 else
91657- nextval = (unsigned long)mod->module_core+mod->core_text_size;
91658+ return NULL;
91659
91660 /* Scan for closest preceding symbol, and next symbol. (ELF
91661 starts real symbols at 1). */
91662@@ -3705,7 +3877,7 @@ static int m_show(struct seq_file *m, void *p)
91663 return 0;
91664
91665 seq_printf(m, "%s %u",
91666- mod->name, mod->init_size + mod->core_size);
91667+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
91668 print_unload_info(m, mod);
91669
91670 /* Informative for users. */
91671@@ -3714,7 +3886,7 @@ static int m_show(struct seq_file *m, void *p)
91672 mod->state == MODULE_STATE_COMING ? "Loading" :
91673 "Live");
91674 /* Used by oprofile and other similar tools. */
91675- seq_printf(m, " 0x%pK", mod->module_core);
91676+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
91677
91678 /* Taints info */
91679 if (mod->taints)
91680@@ -3750,7 +3922,17 @@ static const struct file_operations proc_modules_operations = {
91681
91682 static int __init proc_modules_init(void)
91683 {
91684+#ifndef CONFIG_GRKERNSEC_HIDESYM
91685+#ifdef CONFIG_GRKERNSEC_PROC_USER
91686+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
91687+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
91688+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
91689+#else
91690 proc_create("modules", 0, NULL, &proc_modules_operations);
91691+#endif
91692+#else
91693+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
91694+#endif
91695 return 0;
91696 }
91697 module_init(proc_modules_init);
91698@@ -3811,7 +3993,8 @@ struct module *__module_address(unsigned long addr)
91699 {
91700 struct module *mod;
91701
91702- if (addr < module_addr_min || addr > module_addr_max)
91703+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
91704+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
91705 return NULL;
91706
91707 list_for_each_entry_rcu(mod, &modules, list) {
91708@@ -3852,11 +4035,20 @@ bool is_module_text_address(unsigned long addr)
91709 */
91710 struct module *__module_text_address(unsigned long addr)
91711 {
91712- struct module *mod = __module_address(addr);
91713+ struct module *mod;
91714+
91715+#ifdef CONFIG_X86_32
91716+ addr = ktla_ktva(addr);
91717+#endif
91718+
91719+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
91720+ return NULL;
91721+
91722+ mod = __module_address(addr);
91723+
91724 if (mod) {
91725 /* Make sure it's within the text section. */
91726- if (!within(addr, mod->module_init, mod->init_text_size)
91727- && !within(addr, mod->module_core, mod->core_text_size))
91728+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
91729 mod = NULL;
91730 }
91731 return mod;
91732diff --git a/kernel/notifier.c b/kernel/notifier.c
91733index 4803da6..1c5eea6 100644
91734--- a/kernel/notifier.c
91735+++ b/kernel/notifier.c
91736@@ -5,6 +5,7 @@
91737 #include <linux/rcupdate.h>
91738 #include <linux/vmalloc.h>
91739 #include <linux/reboot.h>
91740+#include <linux/mm.h>
91741
91742 /*
91743 * Notifier list for kernel code which wants to be called
91744@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
91745 while ((*nl) != NULL) {
91746 if (n->priority > (*nl)->priority)
91747 break;
91748- nl = &((*nl)->next);
91749+ nl = (struct notifier_block **)&((*nl)->next);
91750 }
91751- n->next = *nl;
91752+ pax_open_kernel();
91753+ *(const void **)&n->next = *nl;
91754 rcu_assign_pointer(*nl, n);
91755+ pax_close_kernel();
91756 return 0;
91757 }
91758
91759@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
91760 return 0;
91761 if (n->priority > (*nl)->priority)
91762 break;
91763- nl = &((*nl)->next);
91764+ nl = (struct notifier_block **)&((*nl)->next);
91765 }
91766- n->next = *nl;
91767+ pax_open_kernel();
91768+ *(const void **)&n->next = *nl;
91769 rcu_assign_pointer(*nl, n);
91770+ pax_close_kernel();
91771 return 0;
91772 }
91773
91774@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
91775 {
91776 while ((*nl) != NULL) {
91777 if ((*nl) == n) {
91778+ pax_open_kernel();
91779 rcu_assign_pointer(*nl, n->next);
91780+ pax_close_kernel();
91781 return 0;
91782 }
91783- nl = &((*nl)->next);
91784+ nl = (struct notifier_block **)&((*nl)->next);
91785 }
91786 return -ENOENT;
91787 }
91788diff --git a/kernel/padata.c b/kernel/padata.c
91789index 161402f..598814c 100644
91790--- a/kernel/padata.c
91791+++ b/kernel/padata.c
91792@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
91793 * seq_nr mod. number of cpus in use.
91794 */
91795
91796- seq_nr = atomic_inc_return(&pd->seq_nr);
91797+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
91798 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
91799
91800 return padata_index_to_cpu(pd, cpu_index);
91801@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
91802 padata_init_pqueues(pd);
91803 padata_init_squeues(pd);
91804 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
91805- atomic_set(&pd->seq_nr, -1);
91806+ atomic_set_unchecked(&pd->seq_nr, -1);
91807 atomic_set(&pd->reorder_objects, 0);
91808 atomic_set(&pd->refcnt, 0);
91809 pd->pinst = pinst;
91810diff --git a/kernel/panic.c b/kernel/panic.c
91811index 4d8d6f9..97b9b9c 100644
91812--- a/kernel/panic.c
91813+++ b/kernel/panic.c
91814@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
91815 /*
91816 * Stop ourself in panic -- architecture code may override this
91817 */
91818-void __weak panic_smp_self_stop(void)
91819+void __weak __noreturn panic_smp_self_stop(void)
91820 {
91821 while (1)
91822 cpu_relax();
91823@@ -423,7 +423,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
91824 disable_trace_on_warning();
91825
91826 pr_warn("------------[ cut here ]------------\n");
91827- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
91828+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
91829 raw_smp_processor_id(), current->pid, file, line, caller);
91830
91831 if (args)
91832@@ -488,7 +488,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
91833 */
91834 __visible void __stack_chk_fail(void)
91835 {
91836- panic("stack-protector: Kernel stack is corrupted in: %p\n",
91837+ dump_stack();
91838+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
91839 __builtin_return_address(0));
91840 }
91841 EXPORT_SYMBOL(__stack_chk_fail);
91842diff --git a/kernel/pid.c b/kernel/pid.c
91843index cd36a5e..11f185d 100644
91844--- a/kernel/pid.c
91845+++ b/kernel/pid.c
91846@@ -33,6 +33,7 @@
91847 #include <linux/rculist.h>
91848 #include <linux/bootmem.h>
91849 #include <linux/hash.h>
91850+#include <linux/security.h>
91851 #include <linux/pid_namespace.h>
91852 #include <linux/init_task.h>
91853 #include <linux/syscalls.h>
91854@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
91855
91856 int pid_max = PID_MAX_DEFAULT;
91857
91858-#define RESERVED_PIDS 300
91859+#define RESERVED_PIDS 500
91860
91861 int pid_max_min = RESERVED_PIDS + 1;
91862 int pid_max_max = PID_MAX_LIMIT;
91863@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
91864 */
91865 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
91866 {
91867+ struct task_struct *task;
91868+
91869 rcu_lockdep_assert(rcu_read_lock_held(),
91870 "find_task_by_pid_ns() needs rcu_read_lock()"
91871 " protection");
91872- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91873+
91874+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91875+
91876+ if (gr_pid_is_chrooted(task))
91877+ return NULL;
91878+
91879+ return task;
91880 }
91881
91882 struct task_struct *find_task_by_vpid(pid_t vnr)
91883@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
91884 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
91885 }
91886
91887+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
91888+{
91889+ rcu_lockdep_assert(rcu_read_lock_held(),
91890+ "find_task_by_pid_ns() needs rcu_read_lock()"
91891+ " protection");
91892+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
91893+}
91894+
91895 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
91896 {
91897 struct pid *pid;
91898diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
91899index a65ba13..f600dbb 100644
91900--- a/kernel/pid_namespace.c
91901+++ b/kernel/pid_namespace.c
91902@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
91903 void __user *buffer, size_t *lenp, loff_t *ppos)
91904 {
91905 struct pid_namespace *pid_ns = task_active_pid_ns(current);
91906- struct ctl_table tmp = *table;
91907+ ctl_table_no_const tmp = *table;
91908
91909 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
91910 return -EPERM;
91911diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
91912index 48b28d3..c63ccaf 100644
91913--- a/kernel/power/Kconfig
91914+++ b/kernel/power/Kconfig
91915@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
91916 config HIBERNATION
91917 bool "Hibernation (aka 'suspend to disk')"
91918 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
91919+ depends on !GRKERNSEC_KMEM
91920+ depends on !PAX_MEMORY_SANITIZE
91921 select HIBERNATE_CALLBACKS
91922 select LZO_COMPRESS
91923 select LZO_DECOMPRESS
91924diff --git a/kernel/power/process.c b/kernel/power/process.c
91925index 5a6ec86..3a8c884 100644
91926--- a/kernel/power/process.c
91927+++ b/kernel/power/process.c
91928@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
91929 unsigned int elapsed_msecs;
91930 bool wakeup = false;
91931 int sleep_usecs = USEC_PER_MSEC;
91932+ bool timedout = false;
91933
91934 do_gettimeofday(&start);
91935
91936@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
91937
91938 while (true) {
91939 todo = 0;
91940+ if (time_after(jiffies, end_time))
91941+ timedout = true;
91942 read_lock(&tasklist_lock);
91943 for_each_process_thread(g, p) {
91944 if (p == current || !freeze_task(p))
91945 continue;
91946
91947- if (!freezer_should_skip(p))
91948+ if (!freezer_should_skip(p)) {
91949 todo++;
91950+ if (timedout) {
91951+ printk(KERN_ERR "Task refusing to freeze:\n");
91952+ sched_show_task(p);
91953+ }
91954+ }
91955 }
91956 read_unlock(&tasklist_lock);
91957
91958@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
91959 todo += wq_busy;
91960 }
91961
91962- if (!todo || time_after(jiffies, end_time))
91963+ if (!todo || timedout)
91964 break;
91965
91966 if (pm_wakeup_pending()) {
91967diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
91968index 2cdd353..7df1786 100644
91969--- a/kernel/printk/printk.c
91970+++ b/kernel/printk/printk.c
91971@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
91972 if (from_file && type != SYSLOG_ACTION_OPEN)
91973 return 0;
91974
91975+#ifdef CONFIG_GRKERNSEC_DMESG
91976+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
91977+ return -EPERM;
91978+#endif
91979+
91980 if (syslog_action_restricted(type)) {
91981 if (capable(CAP_SYSLOG))
91982 return 0;
91983diff --git a/kernel/profile.c b/kernel/profile.c
91984index 54bf5ba..df6e0a2 100644
91985--- a/kernel/profile.c
91986+++ b/kernel/profile.c
91987@@ -37,7 +37,7 @@ struct profile_hit {
91988 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
91989 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
91990
91991-static atomic_t *prof_buffer;
91992+static atomic_unchecked_t *prof_buffer;
91993 static unsigned long prof_len, prof_shift;
91994
91995 int prof_on __read_mostly;
91996@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
91997 hits[i].pc = 0;
91998 continue;
91999 }
92000- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92001+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92002 hits[i].hits = hits[i].pc = 0;
92003 }
92004 }
92005@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92006 * Add the current hit(s) and flush the write-queue out
92007 * to the global buffer:
92008 */
92009- atomic_add(nr_hits, &prof_buffer[pc]);
92010+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
92011 for (i = 0; i < NR_PROFILE_HIT; ++i) {
92012- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92013+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92014 hits[i].pc = hits[i].hits = 0;
92015 }
92016 out:
92017@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92018 {
92019 unsigned long pc;
92020 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
92021- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92022+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92023 }
92024 #endif /* !CONFIG_SMP */
92025
92026@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
92027 return -EFAULT;
92028 buf++; p++; count--; read++;
92029 }
92030- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
92031+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
92032 if (copy_to_user(buf, (void *)pnt, count))
92033 return -EFAULT;
92034 read += count;
92035@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
92036 }
92037 #endif
92038 profile_discard_flip_buffers();
92039- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
92040+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
92041 return count;
92042 }
92043
92044diff --git a/kernel/ptrace.c b/kernel/ptrace.c
92045index 1eb9d90..d40d21e 100644
92046--- a/kernel/ptrace.c
92047+++ b/kernel/ptrace.c
92048@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
92049 if (seize)
92050 flags |= PT_SEIZED;
92051 rcu_read_lock();
92052- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92053+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92054 flags |= PT_PTRACE_CAP;
92055 rcu_read_unlock();
92056 task->ptrace = flags;
92057@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
92058 break;
92059 return -EIO;
92060 }
92061- if (copy_to_user(dst, buf, retval))
92062+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
92063 return -EFAULT;
92064 copied += retval;
92065 src += retval;
92066@@ -783,7 +783,7 @@ int ptrace_request(struct task_struct *child, long request,
92067 bool seized = child->ptrace & PT_SEIZED;
92068 int ret = -EIO;
92069 siginfo_t siginfo, *si;
92070- void __user *datavp = (void __user *) data;
92071+ void __user *datavp = (__force void __user *) data;
92072 unsigned long __user *datalp = datavp;
92073 unsigned long flags;
92074
92075@@ -1029,14 +1029,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
92076 goto out;
92077 }
92078
92079+ if (gr_handle_ptrace(child, request)) {
92080+ ret = -EPERM;
92081+ goto out_put_task_struct;
92082+ }
92083+
92084 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92085 ret = ptrace_attach(child, request, addr, data);
92086 /*
92087 * Some architectures need to do book-keeping after
92088 * a ptrace attach.
92089 */
92090- if (!ret)
92091+ if (!ret) {
92092 arch_ptrace_attach(child);
92093+ gr_audit_ptrace(child);
92094+ }
92095 goto out_put_task_struct;
92096 }
92097
92098@@ -1064,7 +1071,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
92099 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
92100 if (copied != sizeof(tmp))
92101 return -EIO;
92102- return put_user(tmp, (unsigned long __user *)data);
92103+ return put_user(tmp, (__force unsigned long __user *)data);
92104 }
92105
92106 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
92107@@ -1158,7 +1165,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
92108 }
92109
92110 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92111- compat_long_t, addr, compat_long_t, data)
92112+ compat_ulong_t, addr, compat_ulong_t, data)
92113 {
92114 struct task_struct *child;
92115 long ret;
92116@@ -1174,14 +1181,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92117 goto out;
92118 }
92119
92120+ if (gr_handle_ptrace(child, request)) {
92121+ ret = -EPERM;
92122+ goto out_put_task_struct;
92123+ }
92124+
92125 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92126 ret = ptrace_attach(child, request, addr, data);
92127 /*
92128 * Some architectures need to do book-keeping after
92129 * a ptrace attach.
92130 */
92131- if (!ret)
92132+ if (!ret) {
92133 arch_ptrace_attach(child);
92134+ gr_audit_ptrace(child);
92135+ }
92136 goto out_put_task_struct;
92137 }
92138
92139diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
92140index 4d559ba..053da37 100644
92141--- a/kernel/rcu/rcutorture.c
92142+++ b/kernel/rcu/rcutorture.c
92143@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92144 rcu_torture_count) = { 0 };
92145 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92146 rcu_torture_batch) = { 0 };
92147-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92148-static atomic_t n_rcu_torture_alloc;
92149-static atomic_t n_rcu_torture_alloc_fail;
92150-static atomic_t n_rcu_torture_free;
92151-static atomic_t n_rcu_torture_mberror;
92152-static atomic_t n_rcu_torture_error;
92153+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92154+static atomic_unchecked_t n_rcu_torture_alloc;
92155+static atomic_unchecked_t n_rcu_torture_alloc_fail;
92156+static atomic_unchecked_t n_rcu_torture_free;
92157+static atomic_unchecked_t n_rcu_torture_mberror;
92158+static atomic_unchecked_t n_rcu_torture_error;
92159 static long n_rcu_torture_barrier_error;
92160 static long n_rcu_torture_boost_ktrerror;
92161 static long n_rcu_torture_boost_rterror;
92162@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
92163 static long n_rcu_torture_timers;
92164 static long n_barrier_attempts;
92165 static long n_barrier_successes;
92166-static atomic_long_t n_cbfloods;
92167+static atomic_long_unchecked_t n_cbfloods;
92168 static struct list_head rcu_torture_removed;
92169
92170 static int rcu_torture_writer_state;
92171@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
92172
92173 spin_lock_bh(&rcu_torture_lock);
92174 if (list_empty(&rcu_torture_freelist)) {
92175- atomic_inc(&n_rcu_torture_alloc_fail);
92176+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
92177 spin_unlock_bh(&rcu_torture_lock);
92178 return NULL;
92179 }
92180- atomic_inc(&n_rcu_torture_alloc);
92181+ atomic_inc_unchecked(&n_rcu_torture_alloc);
92182 p = rcu_torture_freelist.next;
92183 list_del_init(p);
92184 spin_unlock_bh(&rcu_torture_lock);
92185@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
92186 static void
92187 rcu_torture_free(struct rcu_torture *p)
92188 {
92189- atomic_inc(&n_rcu_torture_free);
92190+ atomic_inc_unchecked(&n_rcu_torture_free);
92191 spin_lock_bh(&rcu_torture_lock);
92192 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
92193 spin_unlock_bh(&rcu_torture_lock);
92194@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
92195 i = rp->rtort_pipe_count;
92196 if (i > RCU_TORTURE_PIPE_LEN)
92197 i = RCU_TORTURE_PIPE_LEN;
92198- atomic_inc(&rcu_torture_wcount[i]);
92199+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92200 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
92201 rp->rtort_mbtest = 0;
92202 return true;
92203@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
92204 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
92205 do {
92206 schedule_timeout_interruptible(cbflood_inter_holdoff);
92207- atomic_long_inc(&n_cbfloods);
92208+ atomic_long_inc_unchecked(&n_cbfloods);
92209 WARN_ON(signal_pending(current));
92210 for (i = 0; i < cbflood_n_burst; i++) {
92211 for (j = 0; j < cbflood_n_per_burst; j++) {
92212@@ -918,7 +918,7 @@ rcu_torture_writer(void *arg)
92213 i = old_rp->rtort_pipe_count;
92214 if (i > RCU_TORTURE_PIPE_LEN)
92215 i = RCU_TORTURE_PIPE_LEN;
92216- atomic_inc(&rcu_torture_wcount[i]);
92217+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92218 old_rp->rtort_pipe_count++;
92219 switch (synctype[torture_random(&rand) % nsynctypes]) {
92220 case RTWS_DEF_FREE:
92221@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
92222 return;
92223 }
92224 if (p->rtort_mbtest == 0)
92225- atomic_inc(&n_rcu_torture_mberror);
92226+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92227 spin_lock(&rand_lock);
92228 cur_ops->read_delay(&rand);
92229 n_rcu_torture_timers++;
92230@@ -1106,7 +1106,7 @@ rcu_torture_reader(void *arg)
92231 continue;
92232 }
92233 if (p->rtort_mbtest == 0)
92234- atomic_inc(&n_rcu_torture_mberror);
92235+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92236 cur_ops->read_delay(&rand);
92237 preempt_disable();
92238 pipe_count = p->rtort_pipe_count;
92239@@ -1173,11 +1173,11 @@ rcu_torture_stats_print(void)
92240 rcu_torture_current,
92241 rcu_torture_current_version,
92242 list_empty(&rcu_torture_freelist),
92243- atomic_read(&n_rcu_torture_alloc),
92244- atomic_read(&n_rcu_torture_alloc_fail),
92245- atomic_read(&n_rcu_torture_free));
92246+ atomic_read_unchecked(&n_rcu_torture_alloc),
92247+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
92248+ atomic_read_unchecked(&n_rcu_torture_free));
92249 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
92250- atomic_read(&n_rcu_torture_mberror),
92251+ atomic_read_unchecked(&n_rcu_torture_mberror),
92252 n_rcu_torture_boost_ktrerror,
92253 n_rcu_torture_boost_rterror);
92254 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
92255@@ -1189,17 +1189,17 @@ rcu_torture_stats_print(void)
92256 n_barrier_successes,
92257 n_barrier_attempts,
92258 n_rcu_torture_barrier_error);
92259- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
92260+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
92261
92262 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92263- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
92264+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
92265 n_rcu_torture_barrier_error != 0 ||
92266 n_rcu_torture_boost_ktrerror != 0 ||
92267 n_rcu_torture_boost_rterror != 0 ||
92268 n_rcu_torture_boost_failure != 0 ||
92269 i > 1) {
92270 pr_cont("%s", "!!! ");
92271- atomic_inc(&n_rcu_torture_error);
92272+ atomic_inc_unchecked(&n_rcu_torture_error);
92273 WARN_ON_ONCE(1);
92274 }
92275 pr_cont("Reader Pipe: ");
92276@@ -1216,7 +1216,7 @@ rcu_torture_stats_print(void)
92277 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92278 pr_cont("Free-Block Circulation: ");
92279 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92280- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
92281+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
92282 }
92283 pr_cont("\n");
92284
92285@@ -1560,7 +1560,7 @@ rcu_torture_cleanup(void)
92286
92287 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
92288
92289- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92290+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92291 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
92292 else if (torture_onoff_failures())
92293 rcu_torture_print_module_parms(cur_ops,
92294@@ -1685,18 +1685,18 @@ rcu_torture_init(void)
92295
92296 rcu_torture_current = NULL;
92297 rcu_torture_current_version = 0;
92298- atomic_set(&n_rcu_torture_alloc, 0);
92299- atomic_set(&n_rcu_torture_alloc_fail, 0);
92300- atomic_set(&n_rcu_torture_free, 0);
92301- atomic_set(&n_rcu_torture_mberror, 0);
92302- atomic_set(&n_rcu_torture_error, 0);
92303+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
92304+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
92305+ atomic_set_unchecked(&n_rcu_torture_free, 0);
92306+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
92307+ atomic_set_unchecked(&n_rcu_torture_error, 0);
92308 n_rcu_torture_barrier_error = 0;
92309 n_rcu_torture_boost_ktrerror = 0;
92310 n_rcu_torture_boost_rterror = 0;
92311 n_rcu_torture_boost_failure = 0;
92312 n_rcu_torture_boosts = 0;
92313 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
92314- atomic_set(&rcu_torture_wcount[i], 0);
92315+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
92316 for_each_possible_cpu(cpu) {
92317 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92318 per_cpu(rcu_torture_count, cpu)[i] = 0;
92319diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
92320index 0db5649..e6ec167 100644
92321--- a/kernel/rcu/tiny.c
92322+++ b/kernel/rcu/tiny.c
92323@@ -42,7 +42,7 @@
92324 /* Forward declarations for tiny_plugin.h. */
92325 struct rcu_ctrlblk;
92326 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
92327-static void rcu_process_callbacks(struct softirq_action *unused);
92328+static void rcu_process_callbacks(void);
92329 static void __call_rcu(struct rcu_head *head,
92330 void (*func)(struct rcu_head *rcu),
92331 struct rcu_ctrlblk *rcp);
92332@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
92333 false));
92334 }
92335
92336-static void rcu_process_callbacks(struct softirq_action *unused)
92337+static __latent_entropy void rcu_process_callbacks(void)
92338 {
92339 __rcu_process_callbacks(&rcu_sched_ctrlblk);
92340 __rcu_process_callbacks(&rcu_bh_ctrlblk);
92341diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
92342index 858c565..7efd915 100644
92343--- a/kernel/rcu/tiny_plugin.h
92344+++ b/kernel/rcu/tiny_plugin.h
92345@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
92346 dump_stack();
92347 }
92348 if (*rcp->curtail && ULONG_CMP_GE(j, js))
92349- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
92350+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
92351 3 * rcu_jiffies_till_stall_check() + 3;
92352 else if (ULONG_CMP_GE(j, js))
92353- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92354+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92355 }
92356
92357 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
92358 {
92359 rcp->ticks_this_gp = 0;
92360 rcp->gp_start = jiffies;
92361- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92362+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
92363 }
92364
92365 static void check_cpu_stalls(void)
92366diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
92367index 7680fc2..b8e9161 100644
92368--- a/kernel/rcu/tree.c
92369+++ b/kernel/rcu/tree.c
92370@@ -261,7 +261,7 @@ static void rcu_momentary_dyntick_idle(void)
92371 */
92372 rdtp = this_cpu_ptr(&rcu_dynticks);
92373 smp_mb__before_atomic(); /* Earlier stuff before QS. */
92374- atomic_add(2, &rdtp->dynticks); /* QS. */
92375+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
92376 smp_mb__after_atomic(); /* Later stuff after QS. */
92377 break;
92378 }
92379@@ -521,9 +521,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
92380 rcu_prepare_for_idle();
92381 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
92382 smp_mb__before_atomic(); /* See above. */
92383- atomic_inc(&rdtp->dynticks);
92384+ atomic_inc_unchecked(&rdtp->dynticks);
92385 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
92386- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
92387+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
92388 rcu_dynticks_task_enter();
92389
92390 /*
92391@@ -644,10 +644,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
92392
92393 rcu_dynticks_task_exit();
92394 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
92395- atomic_inc(&rdtp->dynticks);
92396+ atomic_inc_unchecked(&rdtp->dynticks);
92397 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
92398 smp_mb__after_atomic(); /* See above. */
92399- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
92400+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
92401 rcu_cleanup_after_idle();
92402 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
92403 if (!user && !is_idle_task(current)) {
92404@@ -768,14 +768,14 @@ void rcu_nmi_enter(void)
92405 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
92406
92407 if (rdtp->dynticks_nmi_nesting == 0 &&
92408- (atomic_read(&rdtp->dynticks) & 0x1))
92409+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
92410 return;
92411 rdtp->dynticks_nmi_nesting++;
92412 smp_mb__before_atomic(); /* Force delay from prior write. */
92413- atomic_inc(&rdtp->dynticks);
92414+ atomic_inc_unchecked(&rdtp->dynticks);
92415 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
92416 smp_mb__after_atomic(); /* See above. */
92417- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
92418+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
92419 }
92420
92421 /**
92422@@ -794,9 +794,9 @@ void rcu_nmi_exit(void)
92423 return;
92424 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
92425 smp_mb__before_atomic(); /* See above. */
92426- atomic_inc(&rdtp->dynticks);
92427+ atomic_inc_unchecked(&rdtp->dynticks);
92428 smp_mb__after_atomic(); /* Force delay to next write. */
92429- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
92430+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
92431 }
92432
92433 /**
92434@@ -809,7 +809,7 @@ void rcu_nmi_exit(void)
92435 */
92436 bool notrace __rcu_is_watching(void)
92437 {
92438- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
92439+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
92440 }
92441
92442 /**
92443@@ -892,7 +892,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
92444 static int dyntick_save_progress_counter(struct rcu_data *rdp,
92445 bool *isidle, unsigned long *maxj)
92446 {
92447- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
92448+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
92449 rcu_sysidle_check_cpu(rdp, isidle, maxj);
92450 if ((rdp->dynticks_snap & 0x1) == 0) {
92451 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
92452@@ -921,7 +921,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
92453 int *rcrmp;
92454 unsigned int snap;
92455
92456- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
92457+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
92458 snap = (unsigned int)rdp->dynticks_snap;
92459
92460 /*
92461@@ -984,10 +984,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
92462 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
92463 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
92464 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
92465- ACCESS_ONCE(rdp->cond_resched_completed) =
92466+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
92467 ACCESS_ONCE(rdp->mynode->completed);
92468 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
92469- ACCESS_ONCE(*rcrmp) =
92470+ ACCESS_ONCE_RW(*rcrmp) =
92471 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
92472 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
92473 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
92474@@ -1009,7 +1009,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
92475 rsp->gp_start = j;
92476 smp_wmb(); /* Record start time before stall time. */
92477 j1 = rcu_jiffies_till_stall_check();
92478- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
92479+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
92480 rsp->jiffies_resched = j + j1 / 2;
92481 }
92482
92483@@ -1050,7 +1050,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
92484 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92485 return;
92486 }
92487- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
92488+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
92489 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92490
92491 /*
92492@@ -1127,7 +1127,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
92493
92494 raw_spin_lock_irqsave(&rnp->lock, flags);
92495 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
92496- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
92497+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
92498 3 * rcu_jiffies_till_stall_check() + 3;
92499 raw_spin_unlock_irqrestore(&rnp->lock, flags);
92500
92501@@ -1211,7 +1211,7 @@ void rcu_cpu_stall_reset(void)
92502 struct rcu_state *rsp;
92503
92504 for_each_rcu_flavor(rsp)
92505- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
92506+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
92507 }
92508
92509 /*
92510@@ -1597,7 +1597,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
92511 raw_spin_unlock_irq(&rnp->lock);
92512 return 0;
92513 }
92514- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
92515+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
92516
92517 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
92518 /*
92519@@ -1638,9 +1638,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
92520 rdp = this_cpu_ptr(rsp->rda);
92521 rcu_preempt_check_blocked_tasks(rnp);
92522 rnp->qsmask = rnp->qsmaskinit;
92523- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
92524+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
92525 WARN_ON_ONCE(rnp->completed != rsp->completed);
92526- ACCESS_ONCE(rnp->completed) = rsp->completed;
92527+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
92528 if (rnp == rdp->mynode)
92529 (void)__note_gp_changes(rsp, rnp, rdp);
92530 rcu_preempt_boost_start_gp(rnp);
92531@@ -1685,7 +1685,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
92532 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
92533 raw_spin_lock_irq(&rnp->lock);
92534 smp_mb__after_unlock_lock();
92535- ACCESS_ONCE(rsp->gp_flags) =
92536+ ACCESS_ONCE_RW(rsp->gp_flags) =
92537 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
92538 raw_spin_unlock_irq(&rnp->lock);
92539 }
92540@@ -1731,7 +1731,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
92541 rcu_for_each_node_breadth_first(rsp, rnp) {
92542 raw_spin_lock_irq(&rnp->lock);
92543 smp_mb__after_unlock_lock();
92544- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
92545+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
92546 rdp = this_cpu_ptr(rsp->rda);
92547 if (rnp == rdp->mynode)
92548 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
92549@@ -1746,14 +1746,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
92550 rcu_nocb_gp_set(rnp, nocb);
92551
92552 /* Declare grace period done. */
92553- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
92554+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
92555 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
92556 rsp->fqs_state = RCU_GP_IDLE;
92557 rdp = this_cpu_ptr(rsp->rda);
92558 /* Advance CBs to reduce false positives below. */
92559 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
92560 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
92561- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92562+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92563 trace_rcu_grace_period(rsp->name,
92564 ACCESS_ONCE(rsp->gpnum),
92565 TPS("newreq"));
92566@@ -1878,7 +1878,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
92567 */
92568 return false;
92569 }
92570- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92571+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
92572 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
92573 TPS("newreq"));
92574
92575@@ -2099,7 +2099,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
92576 rsp->qlen += rdp->qlen;
92577 rdp->n_cbs_orphaned += rdp->qlen;
92578 rdp->qlen_lazy = 0;
92579- ACCESS_ONCE(rdp->qlen) = 0;
92580+ ACCESS_ONCE_RW(rdp->qlen) = 0;
92581 }
92582
92583 /*
92584@@ -2344,7 +2344,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
92585 }
92586 smp_mb(); /* List handling before counting for rcu_barrier(). */
92587 rdp->qlen_lazy -= count_lazy;
92588- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
92589+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
92590 rdp->n_cbs_invoked += count;
92591
92592 /* Reinstate batch limit if we have worked down the excess. */
92593@@ -2507,7 +2507,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
92594 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
92595 return; /* Someone beat us to it. */
92596 }
92597- ACCESS_ONCE(rsp->gp_flags) =
92598+ ACCESS_ONCE_RW(rsp->gp_flags) =
92599 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
92600 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
92601 rcu_gp_kthread_wake(rsp);
92602@@ -2553,7 +2553,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
92603 /*
92604 * Do RCU core processing for the current CPU.
92605 */
92606-static void rcu_process_callbacks(struct softirq_action *unused)
92607+static void rcu_process_callbacks(void)
92608 {
92609 struct rcu_state *rsp;
92610
92611@@ -2665,7 +2665,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
92612 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
92613 if (debug_rcu_head_queue(head)) {
92614 /* Probable double call_rcu(), so leak the callback. */
92615- ACCESS_ONCE(head->func) = rcu_leak_callback;
92616+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
92617 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
92618 return;
92619 }
92620@@ -2693,7 +2693,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
92621 local_irq_restore(flags);
92622 return;
92623 }
92624- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
92625+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
92626 if (lazy)
92627 rdp->qlen_lazy++;
92628 else
92629@@ -2966,11 +2966,11 @@ void synchronize_sched_expedited(void)
92630 * counter wrap on a 32-bit system. Quite a few more CPUs would of
92631 * course be required on a 64-bit system.
92632 */
92633- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
92634+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
92635 (ulong)atomic_long_read(&rsp->expedited_done) +
92636 ULONG_MAX / 8)) {
92637 synchronize_sched();
92638- atomic_long_inc(&rsp->expedited_wrap);
92639+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
92640 return;
92641 }
92642
92643@@ -2978,12 +2978,12 @@ void synchronize_sched_expedited(void)
92644 * Take a ticket. Note that atomic_inc_return() implies a
92645 * full memory barrier.
92646 */
92647- snap = atomic_long_inc_return(&rsp->expedited_start);
92648+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
92649 firstsnap = snap;
92650 if (!try_get_online_cpus()) {
92651 /* CPU hotplug operation in flight, fall back to normal GP. */
92652 wait_rcu_gp(call_rcu_sched);
92653- atomic_long_inc(&rsp->expedited_normal);
92654+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92655 return;
92656 }
92657 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
92658@@ -2996,7 +2996,7 @@ void synchronize_sched_expedited(void)
92659 for_each_cpu(cpu, cm) {
92660 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
92661
92662- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
92663+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
92664 cpumask_clear_cpu(cpu, cm);
92665 }
92666 if (cpumask_weight(cm) == 0)
92667@@ -3011,14 +3011,14 @@ void synchronize_sched_expedited(void)
92668 synchronize_sched_expedited_cpu_stop,
92669 NULL) == -EAGAIN) {
92670 put_online_cpus();
92671- atomic_long_inc(&rsp->expedited_tryfail);
92672+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
92673
92674 /* Check to see if someone else did our work for us. */
92675 s = atomic_long_read(&rsp->expedited_done);
92676 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
92677 /* ensure test happens before caller kfree */
92678 smp_mb__before_atomic(); /* ^^^ */
92679- atomic_long_inc(&rsp->expedited_workdone1);
92680+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
92681 free_cpumask_var(cm);
92682 return;
92683 }
92684@@ -3028,7 +3028,7 @@ void synchronize_sched_expedited(void)
92685 udelay(trycount * num_online_cpus());
92686 } else {
92687 wait_rcu_gp(call_rcu_sched);
92688- atomic_long_inc(&rsp->expedited_normal);
92689+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92690 free_cpumask_var(cm);
92691 return;
92692 }
92693@@ -3038,7 +3038,7 @@ void synchronize_sched_expedited(void)
92694 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
92695 /* ensure test happens before caller kfree */
92696 smp_mb__before_atomic(); /* ^^^ */
92697- atomic_long_inc(&rsp->expedited_workdone2);
92698+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
92699 free_cpumask_var(cm);
92700 return;
92701 }
92702@@ -3053,14 +3053,14 @@ void synchronize_sched_expedited(void)
92703 if (!try_get_online_cpus()) {
92704 /* CPU hotplug operation in flight, use normal GP. */
92705 wait_rcu_gp(call_rcu_sched);
92706- atomic_long_inc(&rsp->expedited_normal);
92707+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92708 free_cpumask_var(cm);
92709 return;
92710 }
92711- snap = atomic_long_read(&rsp->expedited_start);
92712+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
92713 smp_mb(); /* ensure read is before try_stop_cpus(). */
92714 }
92715- atomic_long_inc(&rsp->expedited_stoppedcpus);
92716+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
92717
92718 all_cpus_idle:
92719 free_cpumask_var(cm);
92720@@ -3072,16 +3072,16 @@ all_cpus_idle:
92721 * than we did already did their update.
92722 */
92723 do {
92724- atomic_long_inc(&rsp->expedited_done_tries);
92725+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
92726 s = atomic_long_read(&rsp->expedited_done);
92727 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
92728 /* ensure test happens before caller kfree */
92729 smp_mb__before_atomic(); /* ^^^ */
92730- atomic_long_inc(&rsp->expedited_done_lost);
92731+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
92732 break;
92733 }
92734 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
92735- atomic_long_inc(&rsp->expedited_done_exit);
92736+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
92737
92738 put_online_cpus();
92739 }
92740@@ -3287,7 +3287,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92741 * ACCESS_ONCE() to prevent the compiler from speculating
92742 * the increment to precede the early-exit check.
92743 */
92744- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92745+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92746 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
92747 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
92748 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
92749@@ -3342,7 +3342,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92750
92751 /* Increment ->n_barrier_done to prevent duplicate work. */
92752 smp_mb(); /* Keep increment after above mechanism. */
92753- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92754+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92755 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
92756 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
92757 smp_mb(); /* Keep increment before caller's subsequent code. */
92758@@ -3387,10 +3387,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
92759 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
92760 init_callback_list(rdp);
92761 rdp->qlen_lazy = 0;
92762- ACCESS_ONCE(rdp->qlen) = 0;
92763+ ACCESS_ONCE_RW(rdp->qlen) = 0;
92764 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
92765 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
92766- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
92767+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
92768 rdp->cpu = cpu;
92769 rdp->rsp = rsp;
92770 rcu_boot_init_nocb_percpu_data(rdp);
92771@@ -3423,8 +3423,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
92772 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
92773 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
92774 rcu_sysidle_init_percpu_data(rdp->dynticks);
92775- atomic_set(&rdp->dynticks->dynticks,
92776- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
92777+ atomic_set_unchecked(&rdp->dynticks->dynticks,
92778+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
92779 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
92780
92781 /* Add CPU to rcu_node bitmasks. */
92782diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
92783index 8e7b184..9c55768 100644
92784--- a/kernel/rcu/tree.h
92785+++ b/kernel/rcu/tree.h
92786@@ -87,11 +87,11 @@ struct rcu_dynticks {
92787 long long dynticks_nesting; /* Track irq/process nesting level. */
92788 /* Process level is worth LLONG_MAX/2. */
92789 int dynticks_nmi_nesting; /* Track NMI nesting level. */
92790- atomic_t dynticks; /* Even value for idle, else odd. */
92791+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
92792 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
92793 long long dynticks_idle_nesting;
92794 /* irq/process nesting level from idle. */
92795- atomic_t dynticks_idle; /* Even value for idle, else odd. */
92796+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
92797 /* "Idle" excludes userspace execution. */
92798 unsigned long dynticks_idle_jiffies;
92799 /* End of last non-NMI non-idle period. */
92800@@ -466,17 +466,17 @@ struct rcu_state {
92801 /* _rcu_barrier(). */
92802 /* End of fields guarded by barrier_mutex. */
92803
92804- atomic_long_t expedited_start; /* Starting ticket. */
92805- atomic_long_t expedited_done; /* Done ticket. */
92806- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
92807- atomic_long_t expedited_tryfail; /* # acquisition failures. */
92808- atomic_long_t expedited_workdone1; /* # done by others #1. */
92809- atomic_long_t expedited_workdone2; /* # done by others #2. */
92810- atomic_long_t expedited_normal; /* # fallbacks to normal. */
92811- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
92812- atomic_long_t expedited_done_tries; /* # tries to update _done. */
92813- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
92814- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
92815+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
92816+ atomic_long_t expedited_done; /* Done ticket. */
92817+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
92818+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
92819+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
92820+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
92821+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
92822+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
92823+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
92824+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
92825+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
92826
92827 unsigned long jiffies_force_qs; /* Time at which to invoke */
92828 /* force_quiescent_state(). */
92829diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
92830index 3ec85cb..3687925 100644
92831--- a/kernel/rcu/tree_plugin.h
92832+++ b/kernel/rcu/tree_plugin.h
92833@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
92834 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
92835 {
92836 return !rcu_preempted_readers_exp(rnp) &&
92837- ACCESS_ONCE(rnp->expmask) == 0;
92838+ ACCESS_ONCE_RW(rnp->expmask) == 0;
92839 }
92840
92841 /*
92842@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
92843
92844 /* Clean up and exit. */
92845 smp_mb(); /* ensure expedited GP seen before counter increment. */
92846- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
92847+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
92848 sync_rcu_preempt_exp_count + 1;
92849 unlock_mb_ret:
92850 mutex_unlock(&sync_rcu_preempt_exp_mutex);
92851@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
92852 free_cpumask_var(cm);
92853 }
92854
92855-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
92856+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
92857 .store = &rcu_cpu_kthread_task,
92858 .thread_should_run = rcu_cpu_kthread_should_run,
92859 .thread_fn = rcu_cpu_kthread,
92860@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
92861 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
92862 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
92863 cpu, ticks_value, ticks_title,
92864- atomic_read(&rdtp->dynticks) & 0xfff,
92865+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
92866 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
92867 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
92868 fast_no_hz);
92869@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
92870 return;
92871 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
92872 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
92873- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
92874+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
92875 wake_up(&rdp_leader->nocb_wq);
92876 }
92877 }
92878@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
92879
92880 /* Enqueue the callback on the nocb list and update counts. */
92881 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
92882- ACCESS_ONCE(*old_rhpp) = rhp;
92883+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
92884 atomic_long_add(rhcount, &rdp->nocb_q_count);
92885 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
92886 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
92887@@ -2286,7 +2286,7 @@ wait_again:
92888 continue; /* No CBs here, try next follower. */
92889
92890 /* Move callbacks to wait-for-GP list, which is empty. */
92891- ACCESS_ONCE(rdp->nocb_head) = NULL;
92892+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
92893 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
92894 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
92895 rdp->nocb_gp_count_lazy =
92896@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
92897 list = ACCESS_ONCE(rdp->nocb_follower_head);
92898 BUG_ON(!list);
92899 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
92900- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
92901+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
92902 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
92903 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
92904 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
92905@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
92906 list = next;
92907 }
92908 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
92909- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92910- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
92911+ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92912+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
92913 rdp->nocb_p_count_lazy - cl;
92914 rdp->n_nocbs_invoked += c;
92915 }
92916@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
92917 if (!rcu_nocb_need_deferred_wakeup(rdp))
92918 return;
92919 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
92920- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92921+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92922 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
92923 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
92924 }
92925@@ -2588,7 +2588,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
92926 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
92927 "rcuo%c/%d", rsp->abbr, cpu);
92928 BUG_ON(IS_ERR(t));
92929- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
92930+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
92931 }
92932
92933 /*
92934@@ -2793,11 +2793,11 @@ static void rcu_sysidle_enter(int irq)
92935
92936 /* Record start of fully idle period. */
92937 j = jiffies;
92938- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
92939+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
92940 smp_mb__before_atomic();
92941- atomic_inc(&rdtp->dynticks_idle);
92942+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92943 smp_mb__after_atomic();
92944- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
92945+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
92946 }
92947
92948 /*
92949@@ -2868,9 +2868,9 @@ static void rcu_sysidle_exit(int irq)
92950
92951 /* Record end of idle period. */
92952 smp_mb__before_atomic();
92953- atomic_inc(&rdtp->dynticks_idle);
92954+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92955 smp_mb__after_atomic();
92956- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
92957+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
92958
92959 /*
92960 * If we are the timekeeping CPU, we are permitted to be non-idle
92961@@ -2915,7 +2915,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
92962 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
92963
92964 /* Pick up current idle and NMI-nesting counter and check. */
92965- cur = atomic_read(&rdtp->dynticks_idle);
92966+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
92967 if (cur & 0x1) {
92968 *isidle = false; /* We are not idle! */
92969 return;
92970@@ -2964,7 +2964,7 @@ static void rcu_sysidle(unsigned long j)
92971 case RCU_SYSIDLE_NOT:
92972
92973 /* First time all are idle, so note a short idle period. */
92974- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92975+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92976 break;
92977
92978 case RCU_SYSIDLE_SHORT:
92979@@ -3002,7 +3002,7 @@ static void rcu_sysidle_cancel(void)
92980 {
92981 smp_mb();
92982 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
92983- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
92984+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
92985 }
92986
92987 /*
92988@@ -3054,7 +3054,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
92989 smp_mb(); /* grace period precedes setting inuse. */
92990
92991 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
92992- ACCESS_ONCE(rshp->inuse) = 0;
92993+ ACCESS_ONCE_RW(rshp->inuse) = 0;
92994 }
92995
92996 /*
92997@@ -3207,7 +3207,7 @@ static void rcu_bind_gp_kthread(void)
92998 static void rcu_dynticks_task_enter(void)
92999 {
93000 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93001- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
93002+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
93003 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93004 }
93005
93006@@ -3215,6 +3215,6 @@ static void rcu_dynticks_task_enter(void)
93007 static void rcu_dynticks_task_exit(void)
93008 {
93009 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93010- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
93011+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
93012 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93013 }
93014diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
93015index 5cdc62e..cc52e88 100644
93016--- a/kernel/rcu/tree_trace.c
93017+++ b/kernel/rcu/tree_trace.c
93018@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
93019 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
93020 rdp->passed_quiesce, rdp->qs_pending);
93021 seq_printf(m, " dt=%d/%llx/%d df=%lu",
93022- atomic_read(&rdp->dynticks->dynticks),
93023+ atomic_read_unchecked(&rdp->dynticks->dynticks),
93024 rdp->dynticks->dynticks_nesting,
93025 rdp->dynticks->dynticks_nmi_nesting,
93026 rdp->dynticks_fqs);
93027@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
93028 struct rcu_state *rsp = (struct rcu_state *)m->private;
93029
93030 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",
93031- atomic_long_read(&rsp->expedited_start),
93032+ atomic_long_read_unchecked(&rsp->expedited_start),
93033 atomic_long_read(&rsp->expedited_done),
93034- atomic_long_read(&rsp->expedited_wrap),
93035- atomic_long_read(&rsp->expedited_tryfail),
93036- atomic_long_read(&rsp->expedited_workdone1),
93037- atomic_long_read(&rsp->expedited_workdone2),
93038- atomic_long_read(&rsp->expedited_normal),
93039- atomic_long_read(&rsp->expedited_stoppedcpus),
93040- atomic_long_read(&rsp->expedited_done_tries),
93041- atomic_long_read(&rsp->expedited_done_lost),
93042- atomic_long_read(&rsp->expedited_done_exit));
93043+ atomic_long_read_unchecked(&rsp->expedited_wrap),
93044+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
93045+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
93046+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
93047+ atomic_long_read_unchecked(&rsp->expedited_normal),
93048+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
93049+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
93050+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
93051+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
93052 return 0;
93053 }
93054
93055diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
93056index e0d31a3..f4dafe3 100644
93057--- a/kernel/rcu/update.c
93058+++ b/kernel/rcu/update.c
93059@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
93060 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
93061 */
93062 if (till_stall_check < 3) {
93063- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
93064+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
93065 till_stall_check = 3;
93066 } else if (till_stall_check > 300) {
93067- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
93068+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
93069 till_stall_check = 300;
93070 }
93071 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
93072@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
93073 !ACCESS_ONCE(t->on_rq) ||
93074 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
93075 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
93076- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
93077+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
93078 list_del_init(&t->rcu_tasks_holdout_list);
93079 put_task_struct(t);
93080 return;
93081@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
93082 !is_idle_task(t)) {
93083 get_task_struct(t);
93084 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
93085- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
93086+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
93087 list_add(&t->rcu_tasks_holdout_list,
93088 &rcu_tasks_holdouts);
93089 }
93090@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
93091 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
93092 BUG_ON(IS_ERR(t));
93093 smp_mb(); /* Ensure others see full kthread. */
93094- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
93095+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
93096 mutex_unlock(&rcu_tasks_kthread_mutex);
93097 }
93098
93099diff --git a/kernel/resource.c b/kernel/resource.c
93100index 0bcebff..e7cd5b2 100644
93101--- a/kernel/resource.c
93102+++ b/kernel/resource.c
93103@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
93104
93105 static int __init ioresources_init(void)
93106 {
93107+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93108+#ifdef CONFIG_GRKERNSEC_PROC_USER
93109+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
93110+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
93111+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
93112+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
93113+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
93114+#endif
93115+#else
93116 proc_create("ioports", 0, NULL, &proc_ioports_operations);
93117 proc_create("iomem", 0, NULL, &proc_iomem_operations);
93118+#endif
93119 return 0;
93120 }
93121 __initcall(ioresources_init);
93122diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
93123index eae160d..c9aa22e 100644
93124--- a/kernel/sched/auto_group.c
93125+++ b/kernel/sched/auto_group.c
93126@@ -11,7 +11,7 @@
93127
93128 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
93129 static struct autogroup autogroup_default;
93130-static atomic_t autogroup_seq_nr;
93131+static atomic_unchecked_t autogroup_seq_nr;
93132
93133 void __init autogroup_init(struct task_struct *init_task)
93134 {
93135@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
93136
93137 kref_init(&ag->kref);
93138 init_rwsem(&ag->lock);
93139- ag->id = atomic_inc_return(&autogroup_seq_nr);
93140+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
93141 ag->tg = tg;
93142 #ifdef CONFIG_RT_GROUP_SCHED
93143 /*
93144diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
93145index 607f852..486bc87 100644
93146--- a/kernel/sched/completion.c
93147+++ b/kernel/sched/completion.c
93148@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
93149 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93150 * or number of jiffies left till timeout) if completed.
93151 */
93152-long __sched
93153+long __sched __intentional_overflow(-1)
93154 wait_for_completion_interruptible_timeout(struct completion *x,
93155 unsigned long timeout)
93156 {
93157@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
93158 *
93159 * Return: -ERESTARTSYS if interrupted, 0 if completed.
93160 */
93161-int __sched wait_for_completion_killable(struct completion *x)
93162+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
93163 {
93164 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
93165 if (t == -ERESTARTSYS)
93166@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
93167 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93168 * or number of jiffies left till timeout) if completed.
93169 */
93170-long __sched
93171+long __sched __intentional_overflow(-1)
93172 wait_for_completion_killable_timeout(struct completion *x,
93173 unsigned long timeout)
93174 {
93175diff --git a/kernel/sched/core.c b/kernel/sched/core.c
93176index d400c82..50fca96 100644
93177--- a/kernel/sched/core.c
93178+++ b/kernel/sched/core.c
93179@@ -1902,7 +1902,7 @@ void set_numabalancing_state(bool enabled)
93180 int sysctl_numa_balancing(struct ctl_table *table, int write,
93181 void __user *buffer, size_t *lenp, loff_t *ppos)
93182 {
93183- struct ctl_table t;
93184+ ctl_table_no_const t;
93185 int err;
93186 int state = numabalancing_enabled;
93187
93188@@ -2352,8 +2352,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
93189 next->active_mm = oldmm;
93190 atomic_inc(&oldmm->mm_count);
93191 enter_lazy_tlb(oldmm, next);
93192- } else
93193+ } else {
93194 switch_mm(oldmm, mm, next);
93195+ populate_stack();
93196+ }
93197
93198 if (!prev->mm) {
93199 prev->active_mm = NULL;
93200@@ -3154,6 +3156,8 @@ int can_nice(const struct task_struct *p, const int nice)
93201 /* convert nice value [19,-20] to rlimit style value [1,40] */
93202 int nice_rlim = nice_to_rlimit(nice);
93203
93204+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
93205+
93206 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
93207 capable(CAP_SYS_NICE));
93208 }
93209@@ -3180,7 +3184,8 @@ SYSCALL_DEFINE1(nice, int, increment)
93210 nice = task_nice(current) + increment;
93211
93212 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
93213- if (increment < 0 && !can_nice(current, nice))
93214+ if (increment < 0 && (!can_nice(current, nice) ||
93215+ gr_handle_chroot_nice()))
93216 return -EPERM;
93217
93218 retval = security_task_setnice(current, nice);
93219@@ -3475,6 +3480,7 @@ recheck:
93220 if (policy != p->policy && !rlim_rtprio)
93221 return -EPERM;
93222
93223+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
93224 /* can't increase priority */
93225 if (attr->sched_priority > p->rt_priority &&
93226 attr->sched_priority > rlim_rtprio)
93227@@ -4975,6 +4981,7 @@ void idle_task_exit(void)
93228
93229 if (mm != &init_mm) {
93230 switch_mm(mm, &init_mm, current);
93231+ populate_stack();
93232 finish_arch_post_lock_switch();
93233 }
93234 mmdrop(mm);
93235@@ -5070,7 +5077,7 @@ static void migrate_tasks(unsigned int dead_cpu)
93236
93237 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
93238
93239-static struct ctl_table sd_ctl_dir[] = {
93240+static ctl_table_no_const sd_ctl_dir[] __read_only = {
93241 {
93242 .procname = "sched_domain",
93243 .mode = 0555,
93244@@ -5087,17 +5094,17 @@ static struct ctl_table sd_ctl_root[] = {
93245 {}
93246 };
93247
93248-static struct ctl_table *sd_alloc_ctl_entry(int n)
93249+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
93250 {
93251- struct ctl_table *entry =
93252+ ctl_table_no_const *entry =
93253 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
93254
93255 return entry;
93256 }
93257
93258-static void sd_free_ctl_entry(struct ctl_table **tablep)
93259+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
93260 {
93261- struct ctl_table *entry;
93262+ ctl_table_no_const *entry;
93263
93264 /*
93265 * In the intermediate directories, both the child directory and
93266@@ -5105,22 +5112,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
93267 * will always be set. In the lowest directory the names are
93268 * static strings and all have proc handlers.
93269 */
93270- for (entry = *tablep; entry->mode; entry++) {
93271- if (entry->child)
93272- sd_free_ctl_entry(&entry->child);
93273+ for (entry = tablep; entry->mode; entry++) {
93274+ if (entry->child) {
93275+ sd_free_ctl_entry(entry->child);
93276+ pax_open_kernel();
93277+ entry->child = NULL;
93278+ pax_close_kernel();
93279+ }
93280 if (entry->proc_handler == NULL)
93281 kfree(entry->procname);
93282 }
93283
93284- kfree(*tablep);
93285- *tablep = NULL;
93286+ kfree(tablep);
93287 }
93288
93289 static int min_load_idx = 0;
93290 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
93291
93292 static void
93293-set_table_entry(struct ctl_table *entry,
93294+set_table_entry(ctl_table_no_const *entry,
93295 const char *procname, void *data, int maxlen,
93296 umode_t mode, proc_handler *proc_handler,
93297 bool load_idx)
93298@@ -5140,7 +5150,7 @@ set_table_entry(struct ctl_table *entry,
93299 static struct ctl_table *
93300 sd_alloc_ctl_domain_table(struct sched_domain *sd)
93301 {
93302- struct ctl_table *table = sd_alloc_ctl_entry(14);
93303+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
93304
93305 if (table == NULL)
93306 return NULL;
93307@@ -5178,9 +5188,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
93308 return table;
93309 }
93310
93311-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
93312+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
93313 {
93314- struct ctl_table *entry, *table;
93315+ ctl_table_no_const *entry, *table;
93316 struct sched_domain *sd;
93317 int domain_num = 0, i;
93318 char buf[32];
93319@@ -5207,11 +5217,13 @@ static struct ctl_table_header *sd_sysctl_header;
93320 static void register_sched_domain_sysctl(void)
93321 {
93322 int i, cpu_num = num_possible_cpus();
93323- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
93324+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
93325 char buf[32];
93326
93327 WARN_ON(sd_ctl_dir[0].child);
93328+ pax_open_kernel();
93329 sd_ctl_dir[0].child = entry;
93330+ pax_close_kernel();
93331
93332 if (entry == NULL)
93333 return;
93334@@ -5234,8 +5246,12 @@ static void unregister_sched_domain_sysctl(void)
93335 if (sd_sysctl_header)
93336 unregister_sysctl_table(sd_sysctl_header);
93337 sd_sysctl_header = NULL;
93338- if (sd_ctl_dir[0].child)
93339- sd_free_ctl_entry(&sd_ctl_dir[0].child);
93340+ if (sd_ctl_dir[0].child) {
93341+ sd_free_ctl_entry(sd_ctl_dir[0].child);
93342+ pax_open_kernel();
93343+ sd_ctl_dir[0].child = NULL;
93344+ pax_close_kernel();
93345+ }
93346 }
93347 #else
93348 static void register_sched_domain_sysctl(void)
93349diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
93350index fe331fc..29d620e 100644
93351--- a/kernel/sched/fair.c
93352+++ b/kernel/sched/fair.c
93353@@ -2089,7 +2089,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
93354
93355 static void reset_ptenuma_scan(struct task_struct *p)
93356 {
93357- ACCESS_ONCE(p->mm->numa_scan_seq)++;
93358+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
93359 p->mm->numa_scan_offset = 0;
93360 }
93361
93362@@ -7651,7 +7651,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
93363 * run_rebalance_domains is triggered when needed from the scheduler tick.
93364 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
93365 */
93366-static void run_rebalance_domains(struct softirq_action *h)
93367+static __latent_entropy void run_rebalance_domains(void)
93368 {
93369 struct rq *this_rq = this_rq();
93370 enum cpu_idle_type idle = this_rq->idle_balance ?
93371diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
93372index 9a2a45c..bb91ace 100644
93373--- a/kernel/sched/sched.h
93374+++ b/kernel/sched/sched.h
93375@@ -1182,7 +1182,7 @@ struct sched_class {
93376 #ifdef CONFIG_FAIR_GROUP_SCHED
93377 void (*task_move_group) (struct task_struct *p, int on_rq);
93378 #endif
93379-};
93380+} __do_const;
93381
93382 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
93383 {
93384diff --git a/kernel/seccomp.c b/kernel/seccomp.c
93385index 4ef9687..4f44028 100644
93386--- a/kernel/seccomp.c
93387+++ b/kernel/seccomp.c
93388@@ -629,7 +629,9 @@ static u32 __seccomp_phase1_filter(int this_syscall, struct seccomp_data *sd)
93389
93390 switch (action) {
93391 case SECCOMP_RET_ERRNO:
93392- /* Set the low-order 16-bits as a errno. */
93393+ /* Set low-order bits as an errno, capped at MAX_ERRNO. */
93394+ if (data > MAX_ERRNO)
93395+ data = MAX_ERRNO;
93396 syscall_set_return_value(current, task_pt_regs(current),
93397 -data, 0);
93398 goto skip;
93399diff --git a/kernel/signal.c b/kernel/signal.c
93400index 16a30529..25ad033 100644
93401--- a/kernel/signal.c
93402+++ b/kernel/signal.c
93403@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
93404
93405 int print_fatal_signals __read_mostly;
93406
93407-static void __user *sig_handler(struct task_struct *t, int sig)
93408+static __sighandler_t sig_handler(struct task_struct *t, int sig)
93409 {
93410 return t->sighand->action[sig - 1].sa.sa_handler;
93411 }
93412
93413-static int sig_handler_ignored(void __user *handler, int sig)
93414+static int sig_handler_ignored(__sighandler_t handler, int sig)
93415 {
93416 /* Is it explicitly or implicitly ignored? */
93417 return handler == SIG_IGN ||
93418@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
93419
93420 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
93421 {
93422- void __user *handler;
93423+ __sighandler_t handler;
93424
93425 handler = sig_handler(t, sig);
93426
93427@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
93428 atomic_inc(&user->sigpending);
93429 rcu_read_unlock();
93430
93431+ if (!override_rlimit)
93432+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
93433+
93434 if (override_rlimit ||
93435 atomic_read(&user->sigpending) <=
93436 task_rlimit(t, RLIMIT_SIGPENDING)) {
93437@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
93438
93439 int unhandled_signal(struct task_struct *tsk, int sig)
93440 {
93441- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
93442+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
93443 if (is_global_init(tsk))
93444 return 1;
93445 if (handler != SIG_IGN && handler != SIG_DFL)
93446@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
93447 }
93448 }
93449
93450+ /* allow glibc communication via tgkill to other threads in our
93451+ thread group */
93452+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
93453+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
93454+ && gr_handle_signal(t, sig))
93455+ return -EPERM;
93456+
93457 return security_task_kill(t, info, sig, 0);
93458 }
93459
93460@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
93461 return send_signal(sig, info, p, 1);
93462 }
93463
93464-static int
93465+int
93466 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93467 {
93468 return send_signal(sig, info, t, 0);
93469@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93470 unsigned long int flags;
93471 int ret, blocked, ignored;
93472 struct k_sigaction *action;
93473+ int is_unhandled = 0;
93474
93475 spin_lock_irqsave(&t->sighand->siglock, flags);
93476 action = &t->sighand->action[sig-1];
93477@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
93478 }
93479 if (action->sa.sa_handler == SIG_DFL)
93480 t->signal->flags &= ~SIGNAL_UNKILLABLE;
93481+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
93482+ is_unhandled = 1;
93483 ret = specific_send_sig_info(sig, info, t);
93484 spin_unlock_irqrestore(&t->sighand->siglock, flags);
93485
93486+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
93487+ normal operation */
93488+ if (is_unhandled) {
93489+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
93490+ gr_handle_crash(t, sig);
93491+ }
93492+
93493 return ret;
93494 }
93495
93496@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
93497 ret = check_kill_permission(sig, info, p);
93498 rcu_read_unlock();
93499
93500- if (!ret && sig)
93501+ if (!ret && sig) {
93502 ret = do_send_sig_info(sig, info, p, true);
93503+ if (!ret)
93504+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
93505+ }
93506
93507 return ret;
93508 }
93509@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
93510 int error = -ESRCH;
93511
93512 rcu_read_lock();
93513- p = find_task_by_vpid(pid);
93514+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93515+ /* allow glibc communication via tgkill to other threads in our
93516+ thread group */
93517+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
93518+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
93519+ p = find_task_by_vpid_unrestricted(pid);
93520+ else
93521+#endif
93522+ p = find_task_by_vpid(pid);
93523 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
93524 error = check_kill_permission(sig, info, p);
93525 /*
93526@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
93527 }
93528 seg = get_fs();
93529 set_fs(KERNEL_DS);
93530- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
93531- (stack_t __force __user *) &uoss,
93532+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
93533+ (stack_t __force_user *) &uoss,
93534 compat_user_stack_pointer());
93535 set_fs(seg);
93536 if (ret >= 0 && uoss_ptr) {
93537diff --git a/kernel/smpboot.c b/kernel/smpboot.c
93538index 40190f2..8861d40 100644
93539--- a/kernel/smpboot.c
93540+++ b/kernel/smpboot.c
93541@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
93542 }
93543 smpboot_unpark_thread(plug_thread, cpu);
93544 }
93545- list_add(&plug_thread->list, &hotplug_threads);
93546+ pax_list_add(&plug_thread->list, &hotplug_threads);
93547 out:
93548 mutex_unlock(&smpboot_threads_lock);
93549 put_online_cpus();
93550@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
93551 {
93552 get_online_cpus();
93553 mutex_lock(&smpboot_threads_lock);
93554- list_del(&plug_thread->list);
93555+ pax_list_del(&plug_thread->list);
93556 smpboot_destroy_threads(plug_thread);
93557 mutex_unlock(&smpboot_threads_lock);
93558 put_online_cpus();
93559diff --git a/kernel/softirq.c b/kernel/softirq.c
93560index c497fcd..e8f90a9 100644
93561--- a/kernel/softirq.c
93562+++ b/kernel/softirq.c
93563@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
93564 EXPORT_SYMBOL(irq_stat);
93565 #endif
93566
93567-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
93568+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
93569
93570 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
93571
93572@@ -266,7 +266,7 @@ restart:
93573 kstat_incr_softirqs_this_cpu(vec_nr);
93574
93575 trace_softirq_entry(vec_nr);
93576- h->action(h);
93577+ h->action();
93578 trace_softirq_exit(vec_nr);
93579 if (unlikely(prev_count != preempt_count())) {
93580 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
93581@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
93582 or_softirq_pending(1UL << nr);
93583 }
93584
93585-void open_softirq(int nr, void (*action)(struct softirq_action *))
93586+void __init open_softirq(int nr, void (*action)(void))
93587 {
93588 softirq_vec[nr].action = action;
93589 }
93590@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
93591 }
93592 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
93593
93594-static void tasklet_action(struct softirq_action *a)
93595+static void tasklet_action(void)
93596 {
93597 struct tasklet_struct *list;
93598
93599@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
93600 }
93601 }
93602
93603-static void tasklet_hi_action(struct softirq_action *a)
93604+static __latent_entropy void tasklet_hi_action(void)
93605 {
93606 struct tasklet_struct *list;
93607
93608@@ -745,7 +745,7 @@ static struct notifier_block cpu_nfb = {
93609 .notifier_call = cpu_callback
93610 };
93611
93612-static struct smp_hotplug_thread softirq_threads = {
93613+static struct smp_hotplug_thread softirq_threads __read_only = {
93614 .store = &ksoftirqd,
93615 .thread_should_run = ksoftirqd_should_run,
93616 .thread_fn = run_ksoftirqd,
93617diff --git a/kernel/sys.c b/kernel/sys.c
93618index ea9c881..2194af5 100644
93619--- a/kernel/sys.c
93620+++ b/kernel/sys.c
93621@@ -154,6 +154,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
93622 error = -EACCES;
93623 goto out;
93624 }
93625+
93626+ if (gr_handle_chroot_setpriority(p, niceval)) {
93627+ error = -EACCES;
93628+ goto out;
93629+ }
93630+
93631 no_nice = security_task_setnice(p, niceval);
93632 if (no_nice) {
93633 error = no_nice;
93634@@ -359,6 +365,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
93635 goto error;
93636 }
93637
93638+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
93639+ goto error;
93640+
93641+ if (!gid_eq(new->gid, old->gid)) {
93642+ /* make sure we generate a learn log for what will
93643+ end up being a role transition after a full-learning
93644+ policy is generated
93645+ CAP_SETGID is required to perform a transition
93646+ we may not log a CAP_SETGID check above, e.g.
93647+ in the case where new rgid = old egid
93648+ */
93649+ gr_learn_cap(current, new, CAP_SETGID);
93650+ }
93651+
93652 if (rgid != (gid_t) -1 ||
93653 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
93654 new->sgid = new->egid;
93655@@ -394,6 +414,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
93656 old = current_cred();
93657
93658 retval = -EPERM;
93659+
93660+ if (gr_check_group_change(kgid, kgid, kgid))
93661+ goto error;
93662+
93663 if (ns_capable(old->user_ns, CAP_SETGID))
93664 new->gid = new->egid = new->sgid = new->fsgid = kgid;
93665 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
93666@@ -411,7 +435,7 @@ error:
93667 /*
93668 * change the user struct in a credentials set to match the new UID
93669 */
93670-static int set_user(struct cred *new)
93671+int set_user(struct cred *new)
93672 {
93673 struct user_struct *new_user;
93674
93675@@ -491,7 +515,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
93676 goto error;
93677 }
93678
93679+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
93680+ goto error;
93681+
93682 if (!uid_eq(new->uid, old->uid)) {
93683+ /* make sure we generate a learn log for what will
93684+ end up being a role transition after a full-learning
93685+ policy is generated
93686+ CAP_SETUID is required to perform a transition
93687+ we may not log a CAP_SETUID check above, e.g.
93688+ in the case where new ruid = old euid
93689+ */
93690+ gr_learn_cap(current, new, CAP_SETUID);
93691 retval = set_user(new);
93692 if (retval < 0)
93693 goto error;
93694@@ -541,6 +576,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
93695 old = current_cred();
93696
93697 retval = -EPERM;
93698+
93699+ if (gr_check_crash_uid(kuid))
93700+ goto error;
93701+ if (gr_check_user_change(kuid, kuid, kuid))
93702+ goto error;
93703+
93704 if (ns_capable(old->user_ns, CAP_SETUID)) {
93705 new->suid = new->uid = kuid;
93706 if (!uid_eq(kuid, old->uid)) {
93707@@ -610,6 +651,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
93708 goto error;
93709 }
93710
93711+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
93712+ goto error;
93713+
93714 if (ruid != (uid_t) -1) {
93715 new->uid = kruid;
93716 if (!uid_eq(kruid, old->uid)) {
93717@@ -694,6 +738,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
93718 goto error;
93719 }
93720
93721+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
93722+ goto error;
93723+
93724 if (rgid != (gid_t) -1)
93725 new->gid = krgid;
93726 if (egid != (gid_t) -1)
93727@@ -758,12 +805,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
93728 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
93729 ns_capable(old->user_ns, CAP_SETUID)) {
93730 if (!uid_eq(kuid, old->fsuid)) {
93731+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
93732+ goto error;
93733+
93734 new->fsuid = kuid;
93735 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
93736 goto change_okay;
93737 }
93738 }
93739
93740+error:
93741 abort_creds(new);
93742 return old_fsuid;
93743
93744@@ -796,12 +847,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
93745 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
93746 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
93747 ns_capable(old->user_ns, CAP_SETGID)) {
93748+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
93749+ goto error;
93750+
93751 if (!gid_eq(kgid, old->fsgid)) {
93752 new->fsgid = kgid;
93753 goto change_okay;
93754 }
93755 }
93756
93757+error:
93758 abort_creds(new);
93759 return old_fsgid;
93760
93761@@ -1178,19 +1233,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
93762 return -EFAULT;
93763
93764 down_read(&uts_sem);
93765- error = __copy_to_user(&name->sysname, &utsname()->sysname,
93766+ error = __copy_to_user(name->sysname, &utsname()->sysname,
93767 __OLD_UTS_LEN);
93768 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
93769- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
93770+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
93771 __OLD_UTS_LEN);
93772 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
93773- error |= __copy_to_user(&name->release, &utsname()->release,
93774+ error |= __copy_to_user(name->release, &utsname()->release,
93775 __OLD_UTS_LEN);
93776 error |= __put_user(0, name->release + __OLD_UTS_LEN);
93777- error |= __copy_to_user(&name->version, &utsname()->version,
93778+ error |= __copy_to_user(name->version, &utsname()->version,
93779 __OLD_UTS_LEN);
93780 error |= __put_user(0, name->version + __OLD_UTS_LEN);
93781- error |= __copy_to_user(&name->machine, &utsname()->machine,
93782+ error |= __copy_to_user(name->machine, &utsname()->machine,
93783 __OLD_UTS_LEN);
93784 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
93785 up_read(&uts_sem);
93786@@ -1391,6 +1446,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
93787 */
93788 new_rlim->rlim_cur = 1;
93789 }
93790+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
93791+ is changed to a lower value. Since tasks can be created by the same
93792+ user in between this limit change and an execve by this task, force
93793+ a recheck only for this task by setting PF_NPROC_EXCEEDED
93794+ */
93795+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
93796+ tsk->flags |= PF_NPROC_EXCEEDED;
93797 }
93798 if (!retval) {
93799 if (old_rlim)
93800diff --git a/kernel/sysctl.c b/kernel/sysctl.c
93801index 88ea2d6..88acc77 100644
93802--- a/kernel/sysctl.c
93803+++ b/kernel/sysctl.c
93804@@ -94,7 +94,6 @@
93805
93806
93807 #if defined(CONFIG_SYSCTL)
93808-
93809 /* External variables not in a header file. */
93810 extern int max_threads;
93811 extern int suid_dumpable;
93812@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
93813
93814 /* Constants used for minimum and maximum */
93815 #ifdef CONFIG_LOCKUP_DETECTOR
93816-static int sixty = 60;
93817+static int sixty __read_only = 60;
93818 #endif
93819
93820-static int __maybe_unused neg_one = -1;
93821+static int __maybe_unused neg_one __read_only = -1;
93822
93823-static int zero;
93824-static int __maybe_unused one = 1;
93825-static int __maybe_unused two = 2;
93826-static int __maybe_unused four = 4;
93827-static unsigned long one_ul = 1;
93828-static int one_hundred = 100;
93829+static int zero __read_only = 0;
93830+static int __maybe_unused one __read_only = 1;
93831+static int __maybe_unused two __read_only = 2;
93832+static int __maybe_unused three __read_only = 3;
93833+static int __maybe_unused four __read_only = 4;
93834+static unsigned long one_ul __read_only = 1;
93835+static int one_hundred __read_only = 100;
93836 #ifdef CONFIG_PRINTK
93837-static int ten_thousand = 10000;
93838+static int ten_thousand __read_only = 10000;
93839 #endif
93840
93841 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
93842@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
93843 void __user *buffer, size_t *lenp, loff_t *ppos);
93844 #endif
93845
93846-#ifdef CONFIG_PRINTK
93847 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93848 void __user *buffer, size_t *lenp, loff_t *ppos);
93849-#endif
93850
93851 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
93852 void __user *buffer, size_t *lenp, loff_t *ppos);
93853@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
93854
93855 #endif
93856
93857+extern struct ctl_table grsecurity_table[];
93858+
93859 static struct ctl_table kern_table[];
93860 static struct ctl_table vm_table[];
93861 static struct ctl_table fs_table[];
93862@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
93863 int sysctl_legacy_va_layout;
93864 #endif
93865
93866+#ifdef CONFIG_PAX_SOFTMODE
93867+static struct ctl_table pax_table[] = {
93868+ {
93869+ .procname = "softmode",
93870+ .data = &pax_softmode,
93871+ .maxlen = sizeof(unsigned int),
93872+ .mode = 0600,
93873+ .proc_handler = &proc_dointvec,
93874+ },
93875+
93876+ { }
93877+};
93878+#endif
93879+
93880 /* The default sysctl tables: */
93881
93882 static struct ctl_table sysctl_base_table[] = {
93883@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
93884 #endif
93885
93886 static struct ctl_table kern_table[] = {
93887+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
93888+ {
93889+ .procname = "grsecurity",
93890+ .mode = 0500,
93891+ .child = grsecurity_table,
93892+ },
93893+#endif
93894+
93895+#ifdef CONFIG_PAX_SOFTMODE
93896+ {
93897+ .procname = "pax",
93898+ .mode = 0500,
93899+ .child = pax_table,
93900+ },
93901+#endif
93902+
93903 {
93904 .procname = "sched_child_runs_first",
93905 .data = &sysctl_sched_child_runs_first,
93906@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
93907 .data = &modprobe_path,
93908 .maxlen = KMOD_PATH_LEN,
93909 .mode = 0644,
93910- .proc_handler = proc_dostring,
93911+ .proc_handler = proc_dostring_modpriv,
93912 },
93913 {
93914 .procname = "modules_disabled",
93915@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
93916 .extra1 = &zero,
93917 .extra2 = &one,
93918 },
93919+#endif
93920 {
93921 .procname = "kptr_restrict",
93922 .data = &kptr_restrict,
93923 .maxlen = sizeof(int),
93924 .mode = 0644,
93925 .proc_handler = proc_dointvec_minmax_sysadmin,
93926+#ifdef CONFIG_GRKERNSEC_HIDESYM
93927+ .extra1 = &two,
93928+#else
93929 .extra1 = &zero,
93930+#endif
93931 .extra2 = &two,
93932 },
93933-#endif
93934 {
93935 .procname = "ngroups_max",
93936 .data = &ngroups_max,
93937@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
93938 */
93939 {
93940 .procname = "perf_event_paranoid",
93941- .data = &sysctl_perf_event_paranoid,
93942- .maxlen = sizeof(sysctl_perf_event_paranoid),
93943+ .data = &sysctl_perf_event_legitimately_concerned,
93944+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
93945 .mode = 0644,
93946- .proc_handler = proc_dointvec,
93947+ /* go ahead, be a hero */
93948+ .proc_handler = proc_dointvec_minmax_sysadmin,
93949+ .extra1 = &neg_one,
93950+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
93951+ .extra2 = &three,
93952+#else
93953+ .extra2 = &two,
93954+#endif
93955 },
93956 {
93957 .procname = "perf_event_mlock_kb",
93958@@ -1340,6 +1381,13 @@ static struct ctl_table vm_table[] = {
93959 .proc_handler = proc_dointvec_minmax,
93960 .extra1 = &zero,
93961 },
93962+ {
93963+ .procname = "heap_stack_gap",
93964+ .data = &sysctl_heap_stack_gap,
93965+ .maxlen = sizeof(sysctl_heap_stack_gap),
93966+ .mode = 0644,
93967+ .proc_handler = proc_doulongvec_minmax,
93968+ },
93969 #else
93970 {
93971 .procname = "nr_trim_pages",
93972@@ -1822,6 +1870,16 @@ int proc_dostring(struct ctl_table *table, int write,
93973 (char __user *)buffer, lenp, ppos);
93974 }
93975
93976+int proc_dostring_modpriv(struct ctl_table *table, int write,
93977+ void __user *buffer, size_t *lenp, loff_t *ppos)
93978+{
93979+ if (write && !capable(CAP_SYS_MODULE))
93980+ return -EPERM;
93981+
93982+ return _proc_do_string(table->data, table->maxlen, write,
93983+ buffer, lenp, ppos);
93984+}
93985+
93986 static size_t proc_skip_spaces(char **buf)
93987 {
93988 size_t ret;
93989@@ -1927,6 +1985,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
93990 len = strlen(tmp);
93991 if (len > *size)
93992 len = *size;
93993+ if (len > sizeof(tmp))
93994+ len = sizeof(tmp);
93995 if (copy_to_user(*buf, tmp, len))
93996 return -EFAULT;
93997 *size -= len;
93998@@ -2104,7 +2164,7 @@ int proc_dointvec(struct ctl_table *table, int write,
93999 static int proc_taint(struct ctl_table *table, int write,
94000 void __user *buffer, size_t *lenp, loff_t *ppos)
94001 {
94002- struct ctl_table t;
94003+ ctl_table_no_const t;
94004 unsigned long tmptaint = get_taint();
94005 int err;
94006
94007@@ -2132,7 +2192,6 @@ static int proc_taint(struct ctl_table *table, int write,
94008 return err;
94009 }
94010
94011-#ifdef CONFIG_PRINTK
94012 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94013 void __user *buffer, size_t *lenp, loff_t *ppos)
94014 {
94015@@ -2141,7 +2200,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94016
94017 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
94018 }
94019-#endif
94020
94021 struct do_proc_dointvec_minmax_conv_param {
94022 int *min;
94023@@ -2701,6 +2759,12 @@ int proc_dostring(struct ctl_table *table, int write,
94024 return -ENOSYS;
94025 }
94026
94027+int proc_dostring_modpriv(struct ctl_table *table, int write,
94028+ void __user *buffer, size_t *lenp, loff_t *ppos)
94029+{
94030+ return -ENOSYS;
94031+}
94032+
94033 int proc_dointvec(struct ctl_table *table, int write,
94034 void __user *buffer, size_t *lenp, loff_t *ppos)
94035 {
94036@@ -2757,5 +2821,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
94037 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
94038 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
94039 EXPORT_SYMBOL(proc_dostring);
94040+EXPORT_SYMBOL(proc_dostring_modpriv);
94041 EXPORT_SYMBOL(proc_doulongvec_minmax);
94042 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
94043diff --git a/kernel/taskstats.c b/kernel/taskstats.c
94044index 670fff8..a247812 100644
94045--- a/kernel/taskstats.c
94046+++ b/kernel/taskstats.c
94047@@ -28,9 +28,12 @@
94048 #include <linux/fs.h>
94049 #include <linux/file.h>
94050 #include <linux/pid_namespace.h>
94051+#include <linux/grsecurity.h>
94052 #include <net/genetlink.h>
94053 #include <linux/atomic.h>
94054
94055+extern int gr_is_taskstats_denied(int pid);
94056+
94057 /*
94058 * Maximum length of a cpumask that can be specified in
94059 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
94060@@ -576,6 +579,9 @@ err:
94061
94062 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
94063 {
94064+ if (gr_is_taskstats_denied(current->pid))
94065+ return -EACCES;
94066+
94067 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
94068 return cmd_attr_register_cpumask(info);
94069 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
94070diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
94071index a7077d3..dd48a49 100644
94072--- a/kernel/time/alarmtimer.c
94073+++ b/kernel/time/alarmtimer.c
94074@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
94075 struct platform_device *pdev;
94076 int error = 0;
94077 int i;
94078- struct k_clock alarm_clock = {
94079+ static struct k_clock alarm_clock = {
94080 .clock_getres = alarm_clock_getres,
94081 .clock_get = alarm_clock_get,
94082 .timer_create = alarm_timer_create,
94083diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
94084index d8c724c..6b331a4 100644
94085--- a/kernel/time/hrtimer.c
94086+++ b/kernel/time/hrtimer.c
94087@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
94088 local_irq_restore(flags);
94089 }
94090
94091-static void run_hrtimer_softirq(struct softirq_action *h)
94092+static __latent_entropy void run_hrtimer_softirq(void)
94093 {
94094 hrtimer_peek_ahead_timers();
94095 }
94096diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
94097index a16b678..8c5bd9d 100644
94098--- a/kernel/time/posix-cpu-timers.c
94099+++ b/kernel/time/posix-cpu-timers.c
94100@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
94101
94102 static __init int init_posix_cpu_timers(void)
94103 {
94104- struct k_clock process = {
94105+ static struct k_clock process = {
94106 .clock_getres = process_cpu_clock_getres,
94107 .clock_get = process_cpu_clock_get,
94108 .timer_create = process_cpu_timer_create,
94109 .nsleep = process_cpu_nsleep,
94110 .nsleep_restart = process_cpu_nsleep_restart,
94111 };
94112- struct k_clock thread = {
94113+ static struct k_clock thread = {
94114 .clock_getres = thread_cpu_clock_getres,
94115 .clock_get = thread_cpu_clock_get,
94116 .timer_create = thread_cpu_timer_create,
94117diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
94118index 31ea01f..7fc61ef 100644
94119--- a/kernel/time/posix-timers.c
94120+++ b/kernel/time/posix-timers.c
94121@@ -43,6 +43,7 @@
94122 #include <linux/hash.h>
94123 #include <linux/posix-clock.h>
94124 #include <linux/posix-timers.h>
94125+#include <linux/grsecurity.h>
94126 #include <linux/syscalls.h>
94127 #include <linux/wait.h>
94128 #include <linux/workqueue.h>
94129@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
94130 * which we beg off on and pass to do_sys_settimeofday().
94131 */
94132
94133-static struct k_clock posix_clocks[MAX_CLOCKS];
94134+static struct k_clock *posix_clocks[MAX_CLOCKS];
94135
94136 /*
94137 * These ones are defined below.
94138@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
94139 */
94140 static __init int init_posix_timers(void)
94141 {
94142- struct k_clock clock_realtime = {
94143+ static struct k_clock clock_realtime = {
94144 .clock_getres = hrtimer_get_res,
94145 .clock_get = posix_clock_realtime_get,
94146 .clock_set = posix_clock_realtime_set,
94147@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
94148 .timer_get = common_timer_get,
94149 .timer_del = common_timer_del,
94150 };
94151- struct k_clock clock_monotonic = {
94152+ static struct k_clock clock_monotonic = {
94153 .clock_getres = hrtimer_get_res,
94154 .clock_get = posix_ktime_get_ts,
94155 .nsleep = common_nsleep,
94156@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
94157 .timer_get = common_timer_get,
94158 .timer_del = common_timer_del,
94159 };
94160- struct k_clock clock_monotonic_raw = {
94161+ static struct k_clock clock_monotonic_raw = {
94162 .clock_getres = hrtimer_get_res,
94163 .clock_get = posix_get_monotonic_raw,
94164 };
94165- struct k_clock clock_realtime_coarse = {
94166+ static struct k_clock clock_realtime_coarse = {
94167 .clock_getres = posix_get_coarse_res,
94168 .clock_get = posix_get_realtime_coarse,
94169 };
94170- struct k_clock clock_monotonic_coarse = {
94171+ static struct k_clock clock_monotonic_coarse = {
94172 .clock_getres = posix_get_coarse_res,
94173 .clock_get = posix_get_monotonic_coarse,
94174 };
94175- struct k_clock clock_tai = {
94176+ static struct k_clock clock_tai = {
94177 .clock_getres = hrtimer_get_res,
94178 .clock_get = posix_get_tai,
94179 .nsleep = common_nsleep,
94180@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
94181 .timer_get = common_timer_get,
94182 .timer_del = common_timer_del,
94183 };
94184- struct k_clock clock_boottime = {
94185+ static struct k_clock clock_boottime = {
94186 .clock_getres = hrtimer_get_res,
94187 .clock_get = posix_get_boottime,
94188 .nsleep = common_nsleep,
94189@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
94190 return;
94191 }
94192
94193- posix_clocks[clock_id] = *new_clock;
94194+ posix_clocks[clock_id] = new_clock;
94195 }
94196 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
94197
94198@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
94199 return (id & CLOCKFD_MASK) == CLOCKFD ?
94200 &clock_posix_dynamic : &clock_posix_cpu;
94201
94202- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
94203+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
94204 return NULL;
94205- return &posix_clocks[id];
94206+ return posix_clocks[id];
94207 }
94208
94209 static int common_timer_create(struct k_itimer *new_timer)
94210@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
94211 struct k_clock *kc = clockid_to_kclock(which_clock);
94212 struct k_itimer *new_timer;
94213 int error, new_timer_id;
94214- sigevent_t event;
94215+ sigevent_t event = { };
94216 int it_id_set = IT_ID_NOT_SET;
94217
94218 if (!kc)
94219@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
94220 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
94221 return -EFAULT;
94222
94223+ /* only the CLOCK_REALTIME clock can be set, all other clocks
94224+ have their clock_set fptr set to a nosettime dummy function
94225+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
94226+ call common_clock_set, which calls do_sys_settimeofday, which
94227+ we hook
94228+ */
94229+
94230 return kc->clock_set(which_clock, &new_tp);
94231 }
94232
94233diff --git a/kernel/time/time.c b/kernel/time/time.c
94234index 2c85b77..6530536 100644
94235--- a/kernel/time/time.c
94236+++ b/kernel/time/time.c
94237@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
94238 return error;
94239
94240 if (tz) {
94241+ /* we log in do_settimeofday called below, so don't log twice
94242+ */
94243+ if (!tv)
94244+ gr_log_timechange();
94245+
94246 sys_tz = *tz;
94247 update_vsyscall_tz();
94248 if (firsttime) {
94249diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
94250index 6a93185..288c331 100644
94251--- a/kernel/time/timekeeping.c
94252+++ b/kernel/time/timekeeping.c
94253@@ -15,6 +15,7 @@
94254 #include <linux/init.h>
94255 #include <linux/mm.h>
94256 #include <linux/sched.h>
94257+#include <linux/grsecurity.h>
94258 #include <linux/syscore_ops.h>
94259 #include <linux/clocksource.h>
94260 #include <linux/jiffies.h>
94261@@ -775,6 +776,8 @@ int do_settimeofday64(const struct timespec64 *ts)
94262 if (!timespec64_valid_strict(ts))
94263 return -EINVAL;
94264
94265+ gr_log_timechange();
94266+
94267 raw_spin_lock_irqsave(&timekeeper_lock, flags);
94268 write_seqcount_begin(&tk_core.seq);
94269
94270diff --git a/kernel/time/timer.c b/kernel/time/timer.c
94271index 2d3f5c5..7ed7dc5 100644
94272--- a/kernel/time/timer.c
94273+++ b/kernel/time/timer.c
94274@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
94275 /*
94276 * This function runs timers and the timer-tq in bottom half context.
94277 */
94278-static void run_timer_softirq(struct softirq_action *h)
94279+static __latent_entropy void run_timer_softirq(void)
94280 {
94281 struct tvec_base *base = __this_cpu_read(tvec_bases);
94282
94283@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
94284 *
94285 * In all cases the return value is guaranteed to be non-negative.
94286 */
94287-signed long __sched schedule_timeout(signed long timeout)
94288+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
94289 {
94290 struct timer_list timer;
94291 unsigned long expire;
94292diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
94293index 61ed862..3b52c65 100644
94294--- a/kernel/time/timer_list.c
94295+++ b/kernel/time/timer_list.c
94296@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
94297
94298 static void print_name_offset(struct seq_file *m, void *sym)
94299 {
94300+#ifdef CONFIG_GRKERNSEC_HIDESYM
94301+ SEQ_printf(m, "<%p>", NULL);
94302+#else
94303 char symname[KSYM_NAME_LEN];
94304
94305 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
94306 SEQ_printf(m, "<%pK>", sym);
94307 else
94308 SEQ_printf(m, "%s", symname);
94309+#endif
94310 }
94311
94312 static void
94313@@ -119,7 +123,11 @@ next_one:
94314 static void
94315 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
94316 {
94317+#ifdef CONFIG_GRKERNSEC_HIDESYM
94318+ SEQ_printf(m, " .base: %p\n", NULL);
94319+#else
94320 SEQ_printf(m, " .base: %pK\n", base);
94321+#endif
94322 SEQ_printf(m, " .index: %d\n",
94323 base->index);
94324 SEQ_printf(m, " .resolution: %Lu nsecs\n",
94325@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
94326 {
94327 struct proc_dir_entry *pe;
94328
94329+#ifdef CONFIG_GRKERNSEC_PROC_ADD
94330+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
94331+#else
94332 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
94333+#endif
94334 if (!pe)
94335 return -ENOMEM;
94336 return 0;
94337diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
94338index 1fb08f2..ca4bb1e 100644
94339--- a/kernel/time/timer_stats.c
94340+++ b/kernel/time/timer_stats.c
94341@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
94342 static unsigned long nr_entries;
94343 static struct entry entries[MAX_ENTRIES];
94344
94345-static atomic_t overflow_count;
94346+static atomic_unchecked_t overflow_count;
94347
94348 /*
94349 * The entries are in a hash-table, for fast lookup:
94350@@ -140,7 +140,7 @@ static void reset_entries(void)
94351 nr_entries = 0;
94352 memset(entries, 0, sizeof(entries));
94353 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
94354- atomic_set(&overflow_count, 0);
94355+ atomic_set_unchecked(&overflow_count, 0);
94356 }
94357
94358 static struct entry *alloc_entry(void)
94359@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
94360 if (likely(entry))
94361 entry->count++;
94362 else
94363- atomic_inc(&overflow_count);
94364+ atomic_inc_unchecked(&overflow_count);
94365
94366 out_unlock:
94367 raw_spin_unlock_irqrestore(lock, flags);
94368@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
94369
94370 static void print_name_offset(struct seq_file *m, unsigned long addr)
94371 {
94372+#ifdef CONFIG_GRKERNSEC_HIDESYM
94373+ seq_printf(m, "<%p>", NULL);
94374+#else
94375 char symname[KSYM_NAME_LEN];
94376
94377 if (lookup_symbol_name(addr, symname) < 0)
94378- seq_printf(m, "<%p>", (void *)addr);
94379+ seq_printf(m, "<%pK>", (void *)addr);
94380 else
94381 seq_printf(m, "%s", symname);
94382+#endif
94383 }
94384
94385 static int tstats_show(struct seq_file *m, void *v)
94386@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
94387
94388 seq_puts(m, "Timer Stats Version: v0.3\n");
94389 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
94390- if (atomic_read(&overflow_count))
94391- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
94392+ if (atomic_read_unchecked(&overflow_count))
94393+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
94394 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
94395
94396 for (i = 0; i < nr_entries; i++) {
94397@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
94398 {
94399 struct proc_dir_entry *pe;
94400
94401+#ifdef CONFIG_GRKERNSEC_PROC_ADD
94402+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
94403+#else
94404 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
94405+#endif
94406 if (!pe)
94407 return -ENOMEM;
94408 return 0;
94409diff --git a/kernel/torture.c b/kernel/torture.c
94410index dd70993..0bf694b 100644
94411--- a/kernel/torture.c
94412+++ b/kernel/torture.c
94413@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
94414 mutex_lock(&fullstop_mutex);
94415 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
94416 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
94417- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
94418+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
94419 } else {
94420 pr_warn("Concurrent rmmod and shutdown illegal!\n");
94421 }
94422@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
94423 if (!torture_must_stop()) {
94424 if (stutter > 1) {
94425 schedule_timeout_interruptible(stutter - 1);
94426- ACCESS_ONCE(stutter_pause_test) = 2;
94427+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
94428 }
94429 schedule_timeout_interruptible(1);
94430- ACCESS_ONCE(stutter_pause_test) = 1;
94431+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
94432 }
94433 if (!torture_must_stop())
94434 schedule_timeout_interruptible(stutter);
94435- ACCESS_ONCE(stutter_pause_test) = 0;
94436+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
94437 torture_shutdown_absorb("torture_stutter");
94438 } while (!torture_must_stop());
94439 torture_kthread_stopping("torture_stutter");
94440@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
94441 schedule_timeout_uninterruptible(10);
94442 return true;
94443 }
94444- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
94445+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
94446 mutex_unlock(&fullstop_mutex);
94447 torture_shutdown_cleanup();
94448 torture_shuffle_cleanup();
94449diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
94450index 483cecf..ac46091 100644
94451--- a/kernel/trace/blktrace.c
94452+++ b/kernel/trace/blktrace.c
94453@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
94454 struct blk_trace *bt = filp->private_data;
94455 char buf[16];
94456
94457- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
94458+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
94459
94460 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
94461 }
94462@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
94463 return 1;
94464
94465 bt = buf->chan->private_data;
94466- atomic_inc(&bt->dropped);
94467+ atomic_inc_unchecked(&bt->dropped);
94468 return 0;
94469 }
94470
94471@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
94472
94473 bt->dir = dir;
94474 bt->dev = dev;
94475- atomic_set(&bt->dropped, 0);
94476+ atomic_set_unchecked(&bt->dropped, 0);
94477 INIT_LIST_HEAD(&bt->running_list);
94478
94479 ret = -EIO;
94480diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
94481index af5bffd..57664b8 100644
94482--- a/kernel/trace/ftrace.c
94483+++ b/kernel/trace/ftrace.c
94484@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
94485 if (unlikely(ftrace_disabled))
94486 return 0;
94487
94488+ ret = ftrace_arch_code_modify_prepare();
94489+ FTRACE_WARN_ON(ret);
94490+ if (ret)
94491+ return 0;
94492+
94493 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
94494+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
94495 if (ret) {
94496 ftrace_bug(ret, rec);
94497- return 0;
94498 }
94499- return 1;
94500+ return ret ? 0 : 1;
94501 }
94502
94503 /*
94504@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
94505 if (!count)
94506 return 0;
94507
94508+ pax_open_kernel();
94509 sort(start, count, sizeof(*start),
94510 ftrace_cmp_ips, ftrace_swap_ips);
94511+ pax_close_kernel();
94512
94513 start_pg = ftrace_allocate_pages(count);
94514 if (!start_pg)
94515@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
94516
94517 if (t->ret_stack == NULL) {
94518 atomic_set(&t->tracing_graph_pause, 0);
94519- atomic_set(&t->trace_overrun, 0);
94520+ atomic_set_unchecked(&t->trace_overrun, 0);
94521 t->curr_ret_stack = -1;
94522 /* Make sure the tasks see the -1 first: */
94523 smp_wmb();
94524@@ -5876,7 +5883,7 @@ static void
94525 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
94526 {
94527 atomic_set(&t->tracing_graph_pause, 0);
94528- atomic_set(&t->trace_overrun, 0);
94529+ atomic_set_unchecked(&t->trace_overrun, 0);
94530 t->ftrace_timestamp = 0;
94531 /* make curr_ret_stack visible before we add the ret_stack */
94532 smp_wmb();
94533diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
94534index d2e151c..1498973 100644
94535--- a/kernel/trace/ring_buffer.c
94536+++ b/kernel/trace/ring_buffer.c
94537@@ -350,9 +350,9 @@ struct buffer_data_page {
94538 */
94539 struct buffer_page {
94540 struct list_head list; /* list of buffer pages */
94541- local_t write; /* index for next write */
94542+ local_unchecked_t write; /* index for next write */
94543 unsigned read; /* index for next read */
94544- local_t entries; /* entries on this page */
94545+ local_unchecked_t entries; /* entries on this page */
94546 unsigned long real_end; /* real end of data */
94547 struct buffer_data_page *page; /* Actual data page */
94548 };
94549@@ -473,11 +473,11 @@ struct ring_buffer_per_cpu {
94550 unsigned long last_overrun;
94551 local_t entries_bytes;
94552 local_t entries;
94553- local_t overrun;
94554- local_t commit_overrun;
94555- local_t dropped_events;
94556+ local_unchecked_t overrun;
94557+ local_unchecked_t commit_overrun;
94558+ local_unchecked_t dropped_events;
94559 local_t committing;
94560- local_t commits;
94561+ local_unchecked_t commits;
94562 unsigned long read;
94563 unsigned long read_bytes;
94564 u64 write_stamp;
94565@@ -1047,8 +1047,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
94566 *
94567 * We add a counter to the write field to denote this.
94568 */
94569- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
94570- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
94571+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
94572+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
94573
94574 /*
94575 * Just make sure we have seen our old_write and synchronize
94576@@ -1076,8 +1076,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
94577 * cmpxchg to only update if an interrupt did not already
94578 * do it for us. If the cmpxchg fails, we don't care.
94579 */
94580- (void)local_cmpxchg(&next_page->write, old_write, val);
94581- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
94582+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
94583+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
94584
94585 /*
94586 * No need to worry about races with clearing out the commit.
94587@@ -1445,12 +1445,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
94588
94589 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
94590 {
94591- return local_read(&bpage->entries) & RB_WRITE_MASK;
94592+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
94593 }
94594
94595 static inline unsigned long rb_page_write(struct buffer_page *bpage)
94596 {
94597- return local_read(&bpage->write) & RB_WRITE_MASK;
94598+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
94599 }
94600
94601 static int
94602@@ -1545,7 +1545,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
94603 * bytes consumed in ring buffer from here.
94604 * Increment overrun to account for the lost events.
94605 */
94606- local_add(page_entries, &cpu_buffer->overrun);
94607+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
94608 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
94609 }
94610
94611@@ -2107,7 +2107,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
94612 * it is our responsibility to update
94613 * the counters.
94614 */
94615- local_add(entries, &cpu_buffer->overrun);
94616+ local_add_unchecked(entries, &cpu_buffer->overrun);
94617 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
94618
94619 /*
94620@@ -2257,7 +2257,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94621 if (tail == BUF_PAGE_SIZE)
94622 tail_page->real_end = 0;
94623
94624- local_sub(length, &tail_page->write);
94625+ local_sub_unchecked(length, &tail_page->write);
94626 return;
94627 }
94628
94629@@ -2292,7 +2292,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94630 rb_event_set_padding(event);
94631
94632 /* Set the write back to the previous setting */
94633- local_sub(length, &tail_page->write);
94634+ local_sub_unchecked(length, &tail_page->write);
94635 return;
94636 }
94637
94638@@ -2304,7 +2304,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
94639
94640 /* Set write to end of buffer */
94641 length = (tail + length) - BUF_PAGE_SIZE;
94642- local_sub(length, &tail_page->write);
94643+ local_sub_unchecked(length, &tail_page->write);
94644 }
94645
94646 /*
94647@@ -2330,7 +2330,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94648 * about it.
94649 */
94650 if (unlikely(next_page == commit_page)) {
94651- local_inc(&cpu_buffer->commit_overrun);
94652+ local_inc_unchecked(&cpu_buffer->commit_overrun);
94653 goto out_reset;
94654 }
94655
94656@@ -2360,7 +2360,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94657 * this is easy, just stop here.
94658 */
94659 if (!(buffer->flags & RB_FL_OVERWRITE)) {
94660- local_inc(&cpu_buffer->dropped_events);
94661+ local_inc_unchecked(&cpu_buffer->dropped_events);
94662 goto out_reset;
94663 }
94664
94665@@ -2386,7 +2386,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
94666 cpu_buffer->tail_page) &&
94667 (cpu_buffer->commit_page ==
94668 cpu_buffer->reader_page))) {
94669- local_inc(&cpu_buffer->commit_overrun);
94670+ local_inc_unchecked(&cpu_buffer->commit_overrun);
94671 goto out_reset;
94672 }
94673 }
94674@@ -2434,7 +2434,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
94675 length += RB_LEN_TIME_EXTEND;
94676
94677 tail_page = cpu_buffer->tail_page;
94678- write = local_add_return(length, &tail_page->write);
94679+ write = local_add_return_unchecked(length, &tail_page->write);
94680
94681 /* set write to only the index of the write */
94682 write &= RB_WRITE_MASK;
94683@@ -2458,7 +2458,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
94684 kmemcheck_annotate_bitfield(event, bitfield);
94685 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
94686
94687- local_inc(&tail_page->entries);
94688+ local_inc_unchecked(&tail_page->entries);
94689
94690 /*
94691 * If this is the first commit on the page, then update
94692@@ -2491,7 +2491,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94693
94694 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
94695 unsigned long write_mask =
94696- local_read(&bpage->write) & ~RB_WRITE_MASK;
94697+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
94698 unsigned long event_length = rb_event_length(event);
94699 /*
94700 * This is on the tail page. It is possible that
94701@@ -2501,7 +2501,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94702 */
94703 old_index += write_mask;
94704 new_index += write_mask;
94705- index = local_cmpxchg(&bpage->write, old_index, new_index);
94706+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
94707 if (index == old_index) {
94708 /* update counters */
94709 local_sub(event_length, &cpu_buffer->entries_bytes);
94710@@ -2516,7 +2516,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
94711 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
94712 {
94713 local_inc(&cpu_buffer->committing);
94714- local_inc(&cpu_buffer->commits);
94715+ local_inc_unchecked(&cpu_buffer->commits);
94716 }
94717
94718 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94719@@ -2528,7 +2528,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94720 return;
94721
94722 again:
94723- commits = local_read(&cpu_buffer->commits);
94724+ commits = local_read_unchecked(&cpu_buffer->commits);
94725 /* synchronize with interrupts */
94726 barrier();
94727 if (local_read(&cpu_buffer->committing) == 1)
94728@@ -2544,7 +2544,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
94729 * updating of the commit page and the clearing of the
94730 * committing counter.
94731 */
94732- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
94733+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
94734 !local_read(&cpu_buffer->committing)) {
94735 local_inc(&cpu_buffer->committing);
94736 goto again;
94737@@ -2574,7 +2574,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
94738 barrier();
94739 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
94740 local_dec(&cpu_buffer->committing);
94741- local_dec(&cpu_buffer->commits);
94742+ local_dec_unchecked(&cpu_buffer->commits);
94743 return NULL;
94744 }
94745 #endif
94746@@ -2904,7 +2904,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94747
94748 /* Do the likely case first */
94749 if (likely(bpage->page == (void *)addr)) {
94750- local_dec(&bpage->entries);
94751+ local_dec_unchecked(&bpage->entries);
94752 return;
94753 }
94754
94755@@ -2916,7 +2916,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94756 start = bpage;
94757 do {
94758 if (bpage->page == (void *)addr) {
94759- local_dec(&bpage->entries);
94760+ local_dec_unchecked(&bpage->entries);
94761 return;
94762 }
94763 rb_inc_page(cpu_buffer, &bpage);
94764@@ -3200,7 +3200,7 @@ static inline unsigned long
94765 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
94766 {
94767 return local_read(&cpu_buffer->entries) -
94768- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
94769+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
94770 }
94771
94772 /**
94773@@ -3289,7 +3289,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
94774 return 0;
94775
94776 cpu_buffer = buffer->buffers[cpu];
94777- ret = local_read(&cpu_buffer->overrun);
94778+ ret = local_read_unchecked(&cpu_buffer->overrun);
94779
94780 return ret;
94781 }
94782@@ -3312,7 +3312,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
94783 return 0;
94784
94785 cpu_buffer = buffer->buffers[cpu];
94786- ret = local_read(&cpu_buffer->commit_overrun);
94787+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
94788
94789 return ret;
94790 }
94791@@ -3334,7 +3334,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
94792 return 0;
94793
94794 cpu_buffer = buffer->buffers[cpu];
94795- ret = local_read(&cpu_buffer->dropped_events);
94796+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
94797
94798 return ret;
94799 }
94800@@ -3397,7 +3397,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
94801 /* if you care about this being correct, lock the buffer */
94802 for_each_buffer_cpu(buffer, cpu) {
94803 cpu_buffer = buffer->buffers[cpu];
94804- overruns += local_read(&cpu_buffer->overrun);
94805+ overruns += local_read_unchecked(&cpu_buffer->overrun);
94806 }
94807
94808 return overruns;
94809@@ -3568,8 +3568,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94810 /*
94811 * Reset the reader page to size zero.
94812 */
94813- local_set(&cpu_buffer->reader_page->write, 0);
94814- local_set(&cpu_buffer->reader_page->entries, 0);
94815+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94816+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94817 local_set(&cpu_buffer->reader_page->page->commit, 0);
94818 cpu_buffer->reader_page->real_end = 0;
94819
94820@@ -3603,7 +3603,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94821 * want to compare with the last_overrun.
94822 */
94823 smp_mb();
94824- overwrite = local_read(&(cpu_buffer->overrun));
94825+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
94826
94827 /*
94828 * Here's the tricky part.
94829@@ -4175,8 +4175,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94830
94831 cpu_buffer->head_page
94832 = list_entry(cpu_buffer->pages, struct buffer_page, list);
94833- local_set(&cpu_buffer->head_page->write, 0);
94834- local_set(&cpu_buffer->head_page->entries, 0);
94835+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
94836+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
94837 local_set(&cpu_buffer->head_page->page->commit, 0);
94838
94839 cpu_buffer->head_page->read = 0;
94840@@ -4186,18 +4186,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94841
94842 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
94843 INIT_LIST_HEAD(&cpu_buffer->new_pages);
94844- local_set(&cpu_buffer->reader_page->write, 0);
94845- local_set(&cpu_buffer->reader_page->entries, 0);
94846+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94847+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94848 local_set(&cpu_buffer->reader_page->page->commit, 0);
94849 cpu_buffer->reader_page->read = 0;
94850
94851 local_set(&cpu_buffer->entries_bytes, 0);
94852- local_set(&cpu_buffer->overrun, 0);
94853- local_set(&cpu_buffer->commit_overrun, 0);
94854- local_set(&cpu_buffer->dropped_events, 0);
94855+ local_set_unchecked(&cpu_buffer->overrun, 0);
94856+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
94857+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
94858 local_set(&cpu_buffer->entries, 0);
94859 local_set(&cpu_buffer->committing, 0);
94860- local_set(&cpu_buffer->commits, 0);
94861+ local_set_unchecked(&cpu_buffer->commits, 0);
94862 cpu_buffer->read = 0;
94863 cpu_buffer->read_bytes = 0;
94864
94865@@ -4598,8 +4598,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
94866 rb_init_page(bpage);
94867 bpage = reader->page;
94868 reader->page = *data_page;
94869- local_set(&reader->write, 0);
94870- local_set(&reader->entries, 0);
94871+ local_set_unchecked(&reader->write, 0);
94872+ local_set_unchecked(&reader->entries, 0);
94873 reader->read = 0;
94874 *data_page = bpage;
94875
94876diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
94877index 361a827..6a319a3 100644
94878--- a/kernel/trace/trace.c
94879+++ b/kernel/trace/trace.c
94880@@ -3499,7 +3499,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
94881 return 0;
94882 }
94883
94884-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
94885+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
94886 {
94887 /* do nothing if flag is already set */
94888 if (!!(trace_flags & mask) == !!enabled)
94889diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
94890index 8de48ba..3e5b4fa 100644
94891--- a/kernel/trace/trace.h
94892+++ b/kernel/trace/trace.h
94893@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
94894 void trace_printk_init_buffers(void);
94895 void trace_printk_start_comm(void);
94896 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
94897-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
94898+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
94899
94900 /*
94901 * Normal trace_printk() and friends allocates special buffers
94902diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
94903index 57b67b1..66082a9 100644
94904--- a/kernel/trace/trace_clock.c
94905+++ b/kernel/trace/trace_clock.c
94906@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
94907 return now;
94908 }
94909
94910-static atomic64_t trace_counter;
94911+static atomic64_unchecked_t trace_counter;
94912
94913 /*
94914 * trace_clock_counter(): simply an atomic counter.
94915@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
94916 */
94917 u64 notrace trace_clock_counter(void)
94918 {
94919- return atomic64_add_return(1, &trace_counter);
94920+ return atomic64_inc_return_unchecked(&trace_counter);
94921 }
94922diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
94923index b03a0ea..2df3168 100644
94924--- a/kernel/trace/trace_events.c
94925+++ b/kernel/trace/trace_events.c
94926@@ -1755,7 +1755,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
94927 return 0;
94928 }
94929
94930-struct ftrace_module_file_ops;
94931 static void __add_event_to_tracers(struct ftrace_event_call *call);
94932
94933 /* Add an additional event_call dynamically */
94934diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
94935index ba47600..d0e47fa 100644
94936--- a/kernel/trace/trace_functions_graph.c
94937+++ b/kernel/trace/trace_functions_graph.c
94938@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
94939
94940 /* The return trace stack is full */
94941 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
94942- atomic_inc(&current->trace_overrun);
94943+ atomic_inc_unchecked(&current->trace_overrun);
94944 return -EBUSY;
94945 }
94946
94947@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
94948 *ret = current->ret_stack[index].ret;
94949 trace->func = current->ret_stack[index].func;
94950 trace->calltime = current->ret_stack[index].calltime;
94951- trace->overrun = atomic_read(&current->trace_overrun);
94952+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
94953 trace->depth = index;
94954 }
94955
94956diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
94957index 7a9ba62..2e0e4a1 100644
94958--- a/kernel/trace/trace_mmiotrace.c
94959+++ b/kernel/trace/trace_mmiotrace.c
94960@@ -24,7 +24,7 @@ struct header_iter {
94961 static struct trace_array *mmio_trace_array;
94962 static bool overrun_detected;
94963 static unsigned long prev_overruns;
94964-static atomic_t dropped_count;
94965+static atomic_unchecked_t dropped_count;
94966
94967 static void mmio_reset_data(struct trace_array *tr)
94968 {
94969@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
94970
94971 static unsigned long count_overruns(struct trace_iterator *iter)
94972 {
94973- unsigned long cnt = atomic_xchg(&dropped_count, 0);
94974+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
94975 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
94976
94977 if (over > prev_overruns)
94978@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
94979 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
94980 sizeof(*entry), 0, pc);
94981 if (!event) {
94982- atomic_inc(&dropped_count);
94983+ atomic_inc_unchecked(&dropped_count);
94984 return;
94985 }
94986 entry = ring_buffer_event_data(event);
94987@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
94988 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
94989 sizeof(*entry), 0, pc);
94990 if (!event) {
94991- atomic_inc(&dropped_count);
94992+ atomic_inc_unchecked(&dropped_count);
94993 return;
94994 }
94995 entry = ring_buffer_event_data(event);
94996diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
94997index b77b9a6..82f19bd 100644
94998--- a/kernel/trace/trace_output.c
94999+++ b/kernel/trace/trace_output.c
95000@@ -707,14 +707,16 @@ int register_ftrace_event(struct trace_event *event)
95001 goto out;
95002 }
95003
95004+ pax_open_kernel();
95005 if (event->funcs->trace == NULL)
95006- event->funcs->trace = trace_nop_print;
95007+ *(void **)&event->funcs->trace = trace_nop_print;
95008 if (event->funcs->raw == NULL)
95009- event->funcs->raw = trace_nop_print;
95010+ *(void **)&event->funcs->raw = trace_nop_print;
95011 if (event->funcs->hex == NULL)
95012- event->funcs->hex = trace_nop_print;
95013+ *(void **)&event->funcs->hex = trace_nop_print;
95014 if (event->funcs->binary == NULL)
95015- event->funcs->binary = trace_nop_print;
95016+ *(void **)&event->funcs->binary = trace_nop_print;
95017+ pax_close_kernel();
95018
95019 key = event->type & (EVENT_HASHSIZE - 1);
95020
95021diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
95022index f8b45d8..70ff6c8 100644
95023--- a/kernel/trace/trace_seq.c
95024+++ b/kernel/trace/trace_seq.c
95025@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
95026 return 0;
95027 }
95028
95029- seq_buf_path(&s->seq, path, "\n");
95030+ seq_buf_path(&s->seq, path, "\n\\");
95031
95032 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
95033 s->seq.len = save_len;
95034diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
95035index 16eddb3..758b308 100644
95036--- a/kernel/trace/trace_stack.c
95037+++ b/kernel/trace/trace_stack.c
95038@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
95039 return;
95040
95041 /* we do not handle interrupt stacks yet */
95042- if (!object_is_on_stack(stack))
95043+ if (!object_starts_on_stack(stack))
95044 return;
95045
95046 local_irq_save(flags);
95047diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
95048index c6ee36f..78513f3 100644
95049--- a/kernel/trace/trace_syscalls.c
95050+++ b/kernel/trace/trace_syscalls.c
95051@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
95052 int num;
95053
95054 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95055+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95056+ return -EINVAL;
95057
95058 mutex_lock(&syscall_trace_lock);
95059 if (!sys_perf_refcount_enter)
95060@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
95061 int num;
95062
95063 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95064+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95065+ return;
95066
95067 mutex_lock(&syscall_trace_lock);
95068 sys_perf_refcount_enter--;
95069@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
95070 int num;
95071
95072 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95073+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95074+ return -EINVAL;
95075
95076 mutex_lock(&syscall_trace_lock);
95077 if (!sys_perf_refcount_exit)
95078@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
95079 int num;
95080
95081 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95082+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95083+ return;
95084
95085 mutex_lock(&syscall_trace_lock);
95086 sys_perf_refcount_exit--;
95087diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
95088index 4109f83..fe1f830 100644
95089--- a/kernel/user_namespace.c
95090+++ b/kernel/user_namespace.c
95091@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
95092 !kgid_has_mapping(parent_ns, group))
95093 return -EPERM;
95094
95095+#ifdef CONFIG_GRKERNSEC
95096+ /*
95097+ * This doesn't really inspire confidence:
95098+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
95099+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
95100+ * Increases kernel attack surface in areas developers
95101+ * previously cared little about ("low importance due
95102+ * to requiring "root" capability")
95103+ * To be removed when this code receives *proper* review
95104+ */
95105+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
95106+ !capable(CAP_SETGID))
95107+ return -EPERM;
95108+#endif
95109+
95110 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
95111 if (!ns)
95112 return -ENOMEM;
95113@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
95114 if (atomic_read(&current->mm->mm_users) > 1)
95115 return -EINVAL;
95116
95117- if (current->fs->users != 1)
95118+ if (atomic_read(&current->fs->users) != 1)
95119 return -EINVAL;
95120
95121 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
95122diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
95123index c8eac43..4b5f08f 100644
95124--- a/kernel/utsname_sysctl.c
95125+++ b/kernel/utsname_sysctl.c
95126@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
95127 static int proc_do_uts_string(struct ctl_table *table, int write,
95128 void __user *buffer, size_t *lenp, loff_t *ppos)
95129 {
95130- struct ctl_table uts_table;
95131+ ctl_table_no_const uts_table;
95132 int r;
95133 memcpy(&uts_table, table, sizeof(uts_table));
95134 uts_table.data = get_uts(table, write);
95135diff --git a/kernel/watchdog.c b/kernel/watchdog.c
95136index 70bf118..4be3c37 100644
95137--- a/kernel/watchdog.c
95138+++ b/kernel/watchdog.c
95139@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
95140 static void watchdog_nmi_disable(unsigned int cpu) { return; }
95141 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
95142
95143-static struct smp_hotplug_thread watchdog_threads = {
95144+static struct smp_hotplug_thread watchdog_threads __read_only = {
95145 .store = &softlockup_watchdog,
95146 .thread_should_run = watchdog_should_run,
95147 .thread_fn = watchdog,
95148diff --git a/kernel/workqueue.c b/kernel/workqueue.c
95149index 82d0c8d..37f4222 100644
95150--- a/kernel/workqueue.c
95151+++ b/kernel/workqueue.c
95152@@ -4565,7 +4565,7 @@ static void rebind_workers(struct worker_pool *pool)
95153 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
95154 worker_flags |= WORKER_REBOUND;
95155 worker_flags &= ~WORKER_UNBOUND;
95156- ACCESS_ONCE(worker->flags) = worker_flags;
95157+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
95158 }
95159
95160 spin_unlock_irq(&pool->lock);
95161diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
95162index 5f2ce61..85a0b1b 100644
95163--- a/lib/Kconfig.debug
95164+++ b/lib/Kconfig.debug
95165@@ -910,7 +910,7 @@ config DEBUG_MUTEXES
95166
95167 config DEBUG_WW_MUTEX_SLOWPATH
95168 bool "Wait/wound mutex debugging: Slowpath testing"
95169- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95170+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95171 select DEBUG_LOCK_ALLOC
95172 select DEBUG_SPINLOCK
95173 select DEBUG_MUTEXES
95174@@ -927,7 +927,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
95175
95176 config DEBUG_LOCK_ALLOC
95177 bool "Lock debugging: detect incorrect freeing of live locks"
95178- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95179+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95180 select DEBUG_SPINLOCK
95181 select DEBUG_MUTEXES
95182 select LOCKDEP
95183@@ -941,7 +941,7 @@ config DEBUG_LOCK_ALLOC
95184
95185 config PROVE_LOCKING
95186 bool "Lock debugging: prove locking correctness"
95187- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95188+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95189 select LOCKDEP
95190 select DEBUG_SPINLOCK
95191 select DEBUG_MUTEXES
95192@@ -992,7 +992,7 @@ config LOCKDEP
95193
95194 config LOCK_STAT
95195 bool "Lock usage statistics"
95196- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95197+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95198 select LOCKDEP
95199 select DEBUG_SPINLOCK
95200 select DEBUG_MUTEXES
95201@@ -1453,6 +1453,7 @@ config LATENCYTOP
95202 depends on DEBUG_KERNEL
95203 depends on STACKTRACE_SUPPORT
95204 depends on PROC_FS
95205+ depends on !GRKERNSEC_HIDESYM
95206 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
95207 select KALLSYMS
95208 select KALLSYMS_ALL
95209@@ -1469,7 +1470,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95210 config DEBUG_STRICT_USER_COPY_CHECKS
95211 bool "Strict user copy size checks"
95212 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95213- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
95214+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
95215 help
95216 Enabling this option turns a certain set of sanity checks for user
95217 copy operations into compile time failures.
95218@@ -1597,7 +1598,7 @@ endmenu # runtime tests
95219
95220 config PROVIDE_OHCI1394_DMA_INIT
95221 bool "Remote debugging over FireWire early on boot"
95222- depends on PCI && X86
95223+ depends on PCI && X86 && !GRKERNSEC
95224 help
95225 If you want to debug problems which hang or crash the kernel early
95226 on boot and the crashing machine has a FireWire port, you can use
95227diff --git a/lib/Makefile b/lib/Makefile
95228index 3c3b30b..ca29102 100644
95229--- a/lib/Makefile
95230+++ b/lib/Makefile
95231@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
95232 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
95233 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
95234 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
95235-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
95236+obj-y += list_debug.o
95237 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
95238
95239 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
95240diff --git a/lib/average.c b/lib/average.c
95241index 114d1be..ab0350c 100644
95242--- a/lib/average.c
95243+++ b/lib/average.c
95244@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
95245 {
95246 unsigned long internal = ACCESS_ONCE(avg->internal);
95247
95248- ACCESS_ONCE(avg->internal) = internal ?
95249+ ACCESS_ONCE_RW(avg->internal) = internal ?
95250 (((internal << avg->weight) - internal) +
95251 (val << avg->factor)) >> avg->weight :
95252 (val << avg->factor);
95253diff --git a/lib/bitmap.c b/lib/bitmap.c
95254index 324ea9e..46b1ae2 100644
95255--- a/lib/bitmap.c
95256+++ b/lib/bitmap.c
95257@@ -271,7 +271,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
95258 }
95259 EXPORT_SYMBOL(__bitmap_subset);
95260
95261-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95262+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95263 {
95264 unsigned int k, lim = bits/BITS_PER_LONG;
95265 int w = 0;
95266@@ -437,7 +437,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
95267 {
95268 int c, old_c, totaldigits, ndigits, nchunks, nbits;
95269 u32 chunk;
95270- const char __user __force *ubuf = (const char __user __force *)buf;
95271+ const char __user *ubuf = (const char __force_user *)buf;
95272
95273 bitmap_zero(maskp, nmaskbits);
95274
95275@@ -522,7 +522,7 @@ int bitmap_parse_user(const char __user *ubuf,
95276 {
95277 if (!access_ok(VERIFY_READ, ubuf, ulen))
95278 return -EFAULT;
95279- return __bitmap_parse((const char __force *)ubuf,
95280+ return __bitmap_parse((const char __force_kernel *)ubuf,
95281 ulen, 1, maskp, nmaskbits);
95282
95283 }
95284@@ -640,7 +640,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
95285 {
95286 unsigned a, b;
95287 int c, old_c, totaldigits;
95288- const char __user __force *ubuf = (const char __user __force *)buf;
95289+ const char __user *ubuf = (const char __force_user *)buf;
95290 int exp_digit, in_range;
95291
95292 totaldigits = c = 0;
95293@@ -735,7 +735,7 @@ int bitmap_parselist_user(const char __user *ubuf,
95294 {
95295 if (!access_ok(VERIFY_READ, ubuf, ulen))
95296 return -EFAULT;
95297- return __bitmap_parselist((const char __force *)ubuf,
95298+ return __bitmap_parselist((const char __force_kernel *)ubuf,
95299 ulen, 1, maskp, nmaskbits);
95300 }
95301 EXPORT_SYMBOL(bitmap_parselist_user);
95302diff --git a/lib/bug.c b/lib/bug.c
95303index 0c3bd95..5a615a1 100644
95304--- a/lib/bug.c
95305+++ b/lib/bug.c
95306@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
95307 return BUG_TRAP_TYPE_NONE;
95308
95309 bug = find_bug(bugaddr);
95310+ if (!bug)
95311+ return BUG_TRAP_TYPE_NONE;
95312
95313 file = NULL;
95314 line = 0;
95315diff --git a/lib/debugobjects.c b/lib/debugobjects.c
95316index 547f7f9..a6d4ba0 100644
95317--- a/lib/debugobjects.c
95318+++ b/lib/debugobjects.c
95319@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
95320 if (limit > 4)
95321 return;
95322
95323- is_on_stack = object_is_on_stack(addr);
95324+ is_on_stack = object_starts_on_stack(addr);
95325 if (is_on_stack == onstack)
95326 return;
95327
95328diff --git a/lib/div64.c b/lib/div64.c
95329index 4382ad7..08aa558 100644
95330--- a/lib/div64.c
95331+++ b/lib/div64.c
95332@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
95333 EXPORT_SYMBOL(__div64_32);
95334
95335 #ifndef div_s64_rem
95336-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
95337+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
95338 {
95339 u64 quotient;
95340
95341@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
95342 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
95343 */
95344 #ifndef div64_u64
95345-u64 div64_u64(u64 dividend, u64 divisor)
95346+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
95347 {
95348 u32 high = divisor >> 32;
95349 u64 quot;
95350diff --git a/lib/dma-debug.c b/lib/dma-debug.c
95351index 9722bd2..0d826f4 100644
95352--- a/lib/dma-debug.c
95353+++ b/lib/dma-debug.c
95354@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
95355
95356 void dma_debug_add_bus(struct bus_type *bus)
95357 {
95358- struct notifier_block *nb;
95359+ notifier_block_no_const *nb;
95360
95361 if (dma_debug_disabled())
95362 return;
95363@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
95364
95365 static void check_for_stack(struct device *dev, void *addr)
95366 {
95367- if (object_is_on_stack(addr))
95368+ if (object_starts_on_stack(addr))
95369 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
95370 "stack [addr=%p]\n", addr);
95371 }
95372diff --git a/lib/inflate.c b/lib/inflate.c
95373index 013a761..c28f3fc 100644
95374--- a/lib/inflate.c
95375+++ b/lib/inflate.c
95376@@ -269,7 +269,7 @@ static void free(void *where)
95377 malloc_ptr = free_mem_ptr;
95378 }
95379 #else
95380-#define malloc(a) kmalloc(a, GFP_KERNEL)
95381+#define malloc(a) kmalloc((a), GFP_KERNEL)
95382 #define free(a) kfree(a)
95383 #endif
95384
95385diff --git a/lib/ioremap.c b/lib/ioremap.c
95386index 0c9216c..863bd89 100644
95387--- a/lib/ioremap.c
95388+++ b/lib/ioremap.c
95389@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
95390 unsigned long next;
95391
95392 phys_addr -= addr;
95393- pmd = pmd_alloc(&init_mm, pud, addr);
95394+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
95395 if (!pmd)
95396 return -ENOMEM;
95397 do {
95398@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
95399 unsigned long next;
95400
95401 phys_addr -= addr;
95402- pud = pud_alloc(&init_mm, pgd, addr);
95403+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
95404 if (!pud)
95405 return -ENOMEM;
95406 do {
95407diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
95408index bd2bea9..6b3c95e 100644
95409--- a/lib/is_single_threaded.c
95410+++ b/lib/is_single_threaded.c
95411@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
95412 struct task_struct *p, *t;
95413 bool ret;
95414
95415+ if (!mm)
95416+ return true;
95417+
95418 if (atomic_read(&task->signal->live) != 1)
95419 return false;
95420
95421diff --git a/lib/kobject.c b/lib/kobject.c
95422index 03d4ab3..46f6374 100644
95423--- a/lib/kobject.c
95424+++ b/lib/kobject.c
95425@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
95426
95427
95428 static DEFINE_SPINLOCK(kobj_ns_type_lock);
95429-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
95430+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
95431
95432-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
95433+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
95434 {
95435 enum kobj_ns_type type = ops->type;
95436 int error;
95437diff --git a/lib/list_debug.c b/lib/list_debug.c
95438index c24c2f7..f0296f4 100644
95439--- a/lib/list_debug.c
95440+++ b/lib/list_debug.c
95441@@ -11,7 +11,9 @@
95442 #include <linux/bug.h>
95443 #include <linux/kernel.h>
95444 #include <linux/rculist.h>
95445+#include <linux/mm.h>
95446
95447+#ifdef CONFIG_DEBUG_LIST
95448 /*
95449 * Insert a new entry between two known consecutive entries.
95450 *
95451@@ -19,21 +21,40 @@
95452 * the prev/next entries already!
95453 */
95454
95455+static bool __list_add_debug(struct list_head *new,
95456+ struct list_head *prev,
95457+ struct list_head *next)
95458+{
95459+ if (unlikely(next->prev != prev)) {
95460+ printk(KERN_ERR "list_add corruption. next->prev should be "
95461+ "prev (%p), but was %p. (next=%p).\n",
95462+ prev, next->prev, next);
95463+ BUG();
95464+ return false;
95465+ }
95466+ if (unlikely(prev->next != next)) {
95467+ printk(KERN_ERR "list_add corruption. prev->next should be "
95468+ "next (%p), but was %p. (prev=%p).\n",
95469+ next, prev->next, prev);
95470+ BUG();
95471+ return false;
95472+ }
95473+ if (unlikely(new == prev || new == next)) {
95474+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
95475+ new, prev, next);
95476+ BUG();
95477+ return false;
95478+ }
95479+ return true;
95480+}
95481+
95482 void __list_add(struct list_head *new,
95483- struct list_head *prev,
95484- struct list_head *next)
95485+ struct list_head *prev,
95486+ struct list_head *next)
95487 {
95488- WARN(next->prev != prev,
95489- "list_add corruption. next->prev should be "
95490- "prev (%p), but was %p. (next=%p).\n",
95491- prev, next->prev, next);
95492- WARN(prev->next != next,
95493- "list_add corruption. prev->next should be "
95494- "next (%p), but was %p. (prev=%p).\n",
95495- next, prev->next, prev);
95496- WARN(new == prev || new == next,
95497- "list_add double add: new=%p, prev=%p, next=%p.\n",
95498- new, prev, next);
95499+ if (!__list_add_debug(new, prev, next))
95500+ return;
95501+
95502 next->prev = new;
95503 new->next = next;
95504 new->prev = prev;
95505@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
95506 }
95507 EXPORT_SYMBOL(__list_add);
95508
95509-void __list_del_entry(struct list_head *entry)
95510+static bool __list_del_entry_debug(struct list_head *entry)
95511 {
95512 struct list_head *prev, *next;
95513
95514 prev = entry->prev;
95515 next = entry->next;
95516
95517- if (WARN(next == LIST_POISON1,
95518- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
95519- entry, LIST_POISON1) ||
95520- WARN(prev == LIST_POISON2,
95521- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
95522- entry, LIST_POISON2) ||
95523- WARN(prev->next != entry,
95524- "list_del corruption. prev->next should be %p, "
95525- "but was %p\n", entry, prev->next) ||
95526- WARN(next->prev != entry,
95527- "list_del corruption. next->prev should be %p, "
95528- "but was %p\n", entry, next->prev))
95529+ if (unlikely(next == LIST_POISON1)) {
95530+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
95531+ entry, LIST_POISON1);
95532+ BUG();
95533+ return false;
95534+ }
95535+ if (unlikely(prev == LIST_POISON2)) {
95536+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
95537+ entry, LIST_POISON2);
95538+ BUG();
95539+ return false;
95540+ }
95541+ if (unlikely(entry->prev->next != entry)) {
95542+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
95543+ "but was %p\n", entry, prev->next);
95544+ BUG();
95545+ return false;
95546+ }
95547+ if (unlikely(entry->next->prev != entry)) {
95548+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
95549+ "but was %p\n", entry, next->prev);
95550+ BUG();
95551+ return false;
95552+ }
95553+ return true;
95554+}
95555+
95556+void __list_del_entry(struct list_head *entry)
95557+{
95558+ if (!__list_del_entry_debug(entry))
95559 return;
95560
95561- __list_del(prev, next);
95562+ __list_del(entry->prev, entry->next);
95563 }
95564 EXPORT_SYMBOL(__list_del_entry);
95565
95566@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
95567 void __list_add_rcu(struct list_head *new,
95568 struct list_head *prev, struct list_head *next)
95569 {
95570- WARN(next->prev != prev,
95571- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
95572- prev, next->prev, next);
95573- WARN(prev->next != next,
95574- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
95575- next, prev->next, prev);
95576+ if (!__list_add_debug(new, prev, next))
95577+ return;
95578+
95579 new->next = next;
95580 new->prev = prev;
95581 rcu_assign_pointer(list_next_rcu(prev), new);
95582 next->prev = new;
95583 }
95584 EXPORT_SYMBOL(__list_add_rcu);
95585+#endif
95586+
95587+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
95588+{
95589+#ifdef CONFIG_DEBUG_LIST
95590+ if (!__list_add_debug(new, prev, next))
95591+ return;
95592+#endif
95593+
95594+ pax_open_kernel();
95595+ next->prev = new;
95596+ new->next = next;
95597+ new->prev = prev;
95598+ prev->next = new;
95599+ pax_close_kernel();
95600+}
95601+EXPORT_SYMBOL(__pax_list_add);
95602+
95603+void pax_list_del(struct list_head *entry)
95604+{
95605+#ifdef CONFIG_DEBUG_LIST
95606+ if (!__list_del_entry_debug(entry))
95607+ return;
95608+#endif
95609+
95610+ pax_open_kernel();
95611+ __list_del(entry->prev, entry->next);
95612+ entry->next = LIST_POISON1;
95613+ entry->prev = LIST_POISON2;
95614+ pax_close_kernel();
95615+}
95616+EXPORT_SYMBOL(pax_list_del);
95617+
95618+void pax_list_del_init(struct list_head *entry)
95619+{
95620+ pax_open_kernel();
95621+ __list_del(entry->prev, entry->next);
95622+ INIT_LIST_HEAD(entry);
95623+ pax_close_kernel();
95624+}
95625+EXPORT_SYMBOL(pax_list_del_init);
95626+
95627+void __pax_list_add_rcu(struct list_head *new,
95628+ struct list_head *prev, struct list_head *next)
95629+{
95630+#ifdef CONFIG_DEBUG_LIST
95631+ if (!__list_add_debug(new, prev, next))
95632+ return;
95633+#endif
95634+
95635+ pax_open_kernel();
95636+ new->next = next;
95637+ new->prev = prev;
95638+ rcu_assign_pointer(list_next_rcu(prev), new);
95639+ next->prev = new;
95640+ pax_close_kernel();
95641+}
95642+EXPORT_SYMBOL(__pax_list_add_rcu);
95643+
95644+void pax_list_del_rcu(struct list_head *entry)
95645+{
95646+#ifdef CONFIG_DEBUG_LIST
95647+ if (!__list_del_entry_debug(entry))
95648+ return;
95649+#endif
95650+
95651+ pax_open_kernel();
95652+ __list_del(entry->prev, entry->next);
95653+ entry->next = LIST_POISON1;
95654+ entry->prev = LIST_POISON2;
95655+ pax_close_kernel();
95656+}
95657+EXPORT_SYMBOL(pax_list_del_rcu);
95658diff --git a/lib/lockref.c b/lib/lockref.c
95659index d2233de..fa1a2f6 100644
95660--- a/lib/lockref.c
95661+++ b/lib/lockref.c
95662@@ -48,13 +48,13 @@
95663 void lockref_get(struct lockref *lockref)
95664 {
95665 CMPXCHG_LOOP(
95666- new.count++;
95667+ __lockref_inc(&new);
95668 ,
95669 return;
95670 );
95671
95672 spin_lock(&lockref->lock);
95673- lockref->count++;
95674+ __lockref_inc(lockref);
95675 spin_unlock(&lockref->lock);
95676 }
95677 EXPORT_SYMBOL(lockref_get);
95678@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
95679 int retval;
95680
95681 CMPXCHG_LOOP(
95682- new.count++;
95683+ __lockref_inc(&new);
95684 if (!old.count)
95685 return 0;
95686 ,
95687@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
95688 spin_lock(&lockref->lock);
95689 retval = 0;
95690 if (lockref->count) {
95691- lockref->count++;
95692+ __lockref_inc(lockref);
95693 retval = 1;
95694 }
95695 spin_unlock(&lockref->lock);
95696@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
95697 int lockref_get_or_lock(struct lockref *lockref)
95698 {
95699 CMPXCHG_LOOP(
95700- new.count++;
95701+ __lockref_inc(&new);
95702 if (!old.count)
95703 break;
95704 ,
95705@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
95706 spin_lock(&lockref->lock);
95707 if (!lockref->count)
95708 return 0;
95709- lockref->count++;
95710+ __lockref_inc(lockref);
95711 spin_unlock(&lockref->lock);
95712 return 1;
95713 }
95714@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
95715 int lockref_put_or_lock(struct lockref *lockref)
95716 {
95717 CMPXCHG_LOOP(
95718- new.count--;
95719+ __lockref_dec(&new);
95720 if (old.count <= 1)
95721 break;
95722 ,
95723@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
95724 spin_lock(&lockref->lock);
95725 if (lockref->count <= 1)
95726 return 0;
95727- lockref->count--;
95728+ __lockref_dec(lockref);
95729 spin_unlock(&lockref->lock);
95730 return 1;
95731 }
95732@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
95733 int retval;
95734
95735 CMPXCHG_LOOP(
95736- new.count++;
95737+ __lockref_inc(&new);
95738 if ((int)old.count < 0)
95739 return 0;
95740 ,
95741@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
95742 spin_lock(&lockref->lock);
95743 retval = 0;
95744 if ((int) lockref->count >= 0) {
95745- lockref->count++;
95746+ __lockref_inc(lockref);
95747 retval = 1;
95748 }
95749 spin_unlock(&lockref->lock);
95750diff --git a/lib/nlattr.c b/lib/nlattr.c
95751index 9c3e85f..0affd1b 100644
95752--- a/lib/nlattr.c
95753+++ b/lib/nlattr.c
95754@@ -279,7 +279,11 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
95755 {
95756 int minlen = min_t(int, count, nla_len(src));
95757
95758+ BUG_ON(minlen < 0);
95759+
95760 memcpy(dest, nla_data(src), minlen);
95761+ if (count > minlen)
95762+ memset(dest + minlen, 0, count - minlen);
95763
95764 return minlen;
95765 }
95766diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
95767index 6111bcb..02e816b 100644
95768--- a/lib/percpu-refcount.c
95769+++ b/lib/percpu-refcount.c
95770@@ -31,7 +31,7 @@
95771 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
95772 */
95773
95774-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
95775+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
95776
95777 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
95778
95779diff --git a/lib/radix-tree.c b/lib/radix-tree.c
95780index 3291a8e..346a91e 100644
95781--- a/lib/radix-tree.c
95782+++ b/lib/radix-tree.c
95783@@ -67,7 +67,7 @@ struct radix_tree_preload {
95784 int nr;
95785 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
95786 };
95787-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
95788+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
95789
95790 static inline void *ptr_to_indirect(void *ptr)
95791 {
95792diff --git a/lib/random32.c b/lib/random32.c
95793index 0bee183..526f12f 100644
95794--- a/lib/random32.c
95795+++ b/lib/random32.c
95796@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
95797 }
95798 #endif
95799
95800-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
95801+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
95802
95803 /**
95804 * prandom_u32_state - seeded pseudo-random number generator.
95805diff --git a/lib/rbtree.c b/lib/rbtree.c
95806index c16c81a..4dcbda1 100644
95807--- a/lib/rbtree.c
95808+++ b/lib/rbtree.c
95809@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
95810 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
95811
95812 static const struct rb_augment_callbacks dummy_callbacks = {
95813- dummy_propagate, dummy_copy, dummy_rotate
95814+ .propagate = dummy_propagate,
95815+ .copy = dummy_copy,
95816+ .rotate = dummy_rotate
95817 };
95818
95819 void rb_insert_color(struct rb_node *node, struct rb_root *root)
95820diff --git a/lib/show_mem.c b/lib/show_mem.c
95821index 7de89f4..00d70b7 100644
95822--- a/lib/show_mem.c
95823+++ b/lib/show_mem.c
95824@@ -50,6 +50,6 @@ void show_mem(unsigned int filter)
95825 quicklist_total_size());
95826 #endif
95827 #ifdef CONFIG_MEMORY_FAILURE
95828- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
95829+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
95830 #endif
95831 }
95832diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
95833index bb2b201..46abaf9 100644
95834--- a/lib/strncpy_from_user.c
95835+++ b/lib/strncpy_from_user.c
95836@@ -21,7 +21,7 @@
95837 */
95838 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
95839 {
95840- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95841+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95842 long res = 0;
95843
95844 /*
95845diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
95846index a28df52..3d55877 100644
95847--- a/lib/strnlen_user.c
95848+++ b/lib/strnlen_user.c
95849@@ -26,7 +26,7 @@
95850 */
95851 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
95852 {
95853- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95854+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95855 long align, res = 0;
95856 unsigned long c;
95857
95858diff --git a/lib/swiotlb.c b/lib/swiotlb.c
95859index 4abda07..b9d3765 100644
95860--- a/lib/swiotlb.c
95861+++ b/lib/swiotlb.c
95862@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
95863
95864 void
95865 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
95866- dma_addr_t dev_addr)
95867+ dma_addr_t dev_addr, struct dma_attrs *attrs)
95868 {
95869 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
95870
95871diff --git a/lib/usercopy.c b/lib/usercopy.c
95872index 4f5b1dd..7cab418 100644
95873--- a/lib/usercopy.c
95874+++ b/lib/usercopy.c
95875@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
95876 WARN(1, "Buffer overflow detected!\n");
95877 }
95878 EXPORT_SYMBOL(copy_from_user_overflow);
95879+
95880+void copy_to_user_overflow(void)
95881+{
95882+ WARN(1, "Buffer overflow detected!\n");
95883+}
95884+EXPORT_SYMBOL(copy_to_user_overflow);
95885diff --git a/lib/vsprintf.c b/lib/vsprintf.c
95886index ec337f6..8484eb2 100644
95887--- a/lib/vsprintf.c
95888+++ b/lib/vsprintf.c
95889@@ -16,6 +16,9 @@
95890 * - scnprintf and vscnprintf
95891 */
95892
95893+#ifdef CONFIG_GRKERNSEC_HIDESYM
95894+#define __INCLUDED_BY_HIDESYM 1
95895+#endif
95896 #include <stdarg.h>
95897 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
95898 #include <linux/types.h>
95899@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
95900 #ifdef CONFIG_KALLSYMS
95901 if (*fmt == 'B')
95902 sprint_backtrace(sym, value);
95903- else if (*fmt != 'f' && *fmt != 's')
95904+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
95905 sprint_symbol(sym, value);
95906 else
95907 sprint_symbol_no_offset(sym, value);
95908@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
95909 return number(buf, end, num, spec);
95910 }
95911
95912+#ifdef CONFIG_GRKERNSEC_HIDESYM
95913+int kptr_restrict __read_mostly = 2;
95914+#else
95915 int kptr_restrict __read_mostly;
95916+#endif
95917
95918 /*
95919 * Show a '%p' thing. A kernel extension is that the '%p' is followed
95920@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
95921 *
95922 * - 'F' For symbolic function descriptor pointers with offset
95923 * - 'f' For simple symbolic function names without offset
95924+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
95925 * - 'S' For symbolic direct pointers with offset
95926 * - 's' For symbolic direct pointers without offset
95927+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
95928 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
95929 * - 'B' For backtraced symbolic direct pointers with offset
95930 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
95931@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95932
95933 if (!ptr && *fmt != 'K') {
95934 /*
95935- * Print (null) with the same width as a pointer so it makes
95936+ * Print (nil) with the same width as a pointer so it makes
95937 * tabular output look nice.
95938 */
95939 if (spec.field_width == -1)
95940 spec.field_width = default_width;
95941- return string(buf, end, "(null)", spec);
95942+ return string(buf, end, "(nil)", spec);
95943 }
95944
95945 switch (*fmt) {
95946@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95947 /* Fallthrough */
95948 case 'S':
95949 case 's':
95950+#ifdef CONFIG_GRKERNSEC_HIDESYM
95951+ break;
95952+#else
95953+ return symbol_string(buf, end, ptr, spec, fmt);
95954+#endif
95955+ case 'X':
95956+ ptr = dereference_function_descriptor(ptr);
95957+ case 'A':
95958 case 'B':
95959 return symbol_string(buf, end, ptr, spec, fmt);
95960 case 'R':
95961@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95962 va_end(va);
95963 return buf;
95964 }
95965+ case 'P':
95966+ break;
95967 case 'K':
95968 /*
95969 * %pK cannot be used in IRQ context because its test
95970@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95971 ((const struct file *)ptr)->f_path.dentry,
95972 spec, fmt);
95973 }
95974+
95975+#ifdef CONFIG_GRKERNSEC_HIDESYM
95976+ /* 'P' = approved pointers to copy to userland,
95977+ as in the /proc/kallsyms case, as we make it display nothing
95978+ for non-root users, and the real contents for root users
95979+ 'X' = approved simple symbols
95980+ Also ignore 'K' pointers, since we force their NULLing for non-root users
95981+ above
95982+ */
95983+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
95984+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
95985+ dump_stack();
95986+ ptr = NULL;
95987+ }
95988+#endif
95989+
95990 spec.flags |= SMALL;
95991 if (spec.field_width == -1) {
95992 spec.field_width = default_width;
95993@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
95994 typeof(type) value; \
95995 if (sizeof(type) == 8) { \
95996 args = PTR_ALIGN(args, sizeof(u32)); \
95997- *(u32 *)&value = *(u32 *)args; \
95998- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
95999+ *(u32 *)&value = *(const u32 *)args; \
96000+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
96001 } else { \
96002 args = PTR_ALIGN(args, sizeof(type)); \
96003- value = *(typeof(type) *)args; \
96004+ value = *(const typeof(type) *)args; \
96005 } \
96006 args += sizeof(type); \
96007 value; \
96008@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
96009 case FORMAT_TYPE_STR: {
96010 const char *str_arg = args;
96011 args += strlen(str_arg) + 1;
96012- str = string(str, end, (char *)str_arg, spec);
96013+ str = string(str, end, str_arg, spec);
96014 break;
96015 }
96016
96017diff --git a/localversion-grsec b/localversion-grsec
96018new file mode 100644
96019index 0000000..7cd6065
96020--- /dev/null
96021+++ b/localversion-grsec
96022@@ -0,0 +1 @@
96023+-grsec
96024diff --git a/mm/Kconfig b/mm/Kconfig
96025index 1d1ae6b..0f05885 100644
96026--- a/mm/Kconfig
96027+++ b/mm/Kconfig
96028@@ -341,10 +341,11 @@ config KSM
96029 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
96030
96031 config DEFAULT_MMAP_MIN_ADDR
96032- int "Low address space to protect from user allocation"
96033+ int "Low address space to protect from user allocation"
96034 depends on MMU
96035- default 4096
96036- help
96037+ default 32768 if ALPHA || ARM || PARISC || SPARC32
96038+ default 65536
96039+ help
96040 This is the portion of low virtual memory which should be protected
96041 from userspace allocation. Keeping a user from writing to low pages
96042 can help reduce the impact of kernel NULL pointer bugs.
96043@@ -375,7 +376,7 @@ config MEMORY_FAILURE
96044
96045 config HWPOISON_INJECT
96046 tristate "HWPoison pages injector"
96047- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
96048+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
96049 select PROC_PAGE_MONITOR
96050
96051 config NOMMU_INITIAL_TRIM_EXCESS
96052diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
96053index 957d3da..1d34e20 100644
96054--- a/mm/Kconfig.debug
96055+++ b/mm/Kconfig.debug
96056@@ -10,6 +10,7 @@ config PAGE_EXTENSION
96057 config DEBUG_PAGEALLOC
96058 bool "Debug page memory allocations"
96059 depends on DEBUG_KERNEL
96060+ depends on !PAX_MEMORY_SANITIZE
96061 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
96062 depends on !KMEMCHECK
96063 select PAGE_EXTENSION
96064diff --git a/mm/backing-dev.c b/mm/backing-dev.c
96065index 0ae0df5..82ac56b 100644
96066--- a/mm/backing-dev.c
96067+++ b/mm/backing-dev.c
96068@@ -12,7 +12,7 @@
96069 #include <linux/device.h>
96070 #include <trace/events/writeback.h>
96071
96072-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
96073+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
96074
96075 struct backing_dev_info default_backing_dev_info = {
96076 .name = "default",
96077@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
96078 return err;
96079
96080 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
96081- atomic_long_inc_return(&bdi_seq));
96082+ atomic_long_inc_return_unchecked(&bdi_seq));
96083 if (err) {
96084 bdi_destroy(bdi);
96085 return err;
96086diff --git a/mm/filemap.c b/mm/filemap.c
96087index 673e458..7192013 100644
96088--- a/mm/filemap.c
96089+++ b/mm/filemap.c
96090@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
96091 struct address_space *mapping = file->f_mapping;
96092
96093 if (!mapping->a_ops->readpage)
96094- return -ENOEXEC;
96095+ return -ENODEV;
96096 file_accessed(file);
96097 vma->vm_ops = &generic_file_vm_ops;
96098 return 0;
96099@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
96100 *pos = i_size_read(inode);
96101
96102 if (limit != RLIM_INFINITY) {
96103+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
96104 if (*pos >= limit) {
96105 send_sig(SIGXFSZ, current, 0);
96106 return -EFBIG;
96107diff --git a/mm/fremap.c b/mm/fremap.c
96108index 2805d71..8b56e7d 100644
96109--- a/mm/fremap.c
96110+++ b/mm/fremap.c
96111@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
96112 retry:
96113 vma = find_vma(mm, start);
96114
96115+#ifdef CONFIG_PAX_SEGMEXEC
96116+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
96117+ goto out;
96118+#endif
96119+
96120 /*
96121 * Make sure the vma is shared, that it supports prefaulting,
96122 * and that the remapped range is valid and fully within
96123diff --git a/mm/gup.c b/mm/gup.c
96124index e29c374..66e998f 100644
96125--- a/mm/gup.c
96126+++ b/mm/gup.c
96127@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
96128 unsigned int fault_flags = 0;
96129 int ret;
96130
96131- /* For mlock, just skip the stack guard page. */
96132- if ((*flags & FOLL_MLOCK) &&
96133- (stack_guard_page_start(vma, address) ||
96134- stack_guard_page_end(vma, address + PAGE_SIZE)))
96135- return -ENOENT;
96136 if (*flags & FOLL_WRITE)
96137 fault_flags |= FAULT_FLAG_WRITE;
96138 if (nonblocking)
96139@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96140 if (!(gup_flags & FOLL_FORCE))
96141 gup_flags |= FOLL_NUMA;
96142
96143- do {
96144+ while (nr_pages) {
96145 struct page *page;
96146 unsigned int foll_flags = gup_flags;
96147 unsigned int page_increm;
96148
96149 /* first iteration or cross vma bound */
96150 if (!vma || start >= vma->vm_end) {
96151- vma = find_extend_vma(mm, start);
96152+ vma = find_vma(mm, start);
96153 if (!vma && in_gate_area(mm, start)) {
96154 int ret;
96155 ret = get_gate_page(mm, start & PAGE_MASK,
96156@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96157 goto next_page;
96158 }
96159
96160- if (!vma || check_vma_flags(vma, gup_flags))
96161+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
96162 return i ? : -EFAULT;
96163 if (is_vm_hugetlb_page(vma)) {
96164 i = follow_hugetlb_page(mm, vma, pages, vmas,
96165@@ -509,7 +504,7 @@ next_page:
96166 i += page_increm;
96167 start += page_increm * PAGE_SIZE;
96168 nr_pages -= page_increm;
96169- } while (nr_pages);
96170+ }
96171 return i;
96172 }
96173 EXPORT_SYMBOL(__get_user_pages);
96174diff --git a/mm/highmem.c b/mm/highmem.c
96175index 123bcd3..0de52ba 100644
96176--- a/mm/highmem.c
96177+++ b/mm/highmem.c
96178@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
96179 * So no dangers, even with speculative execution.
96180 */
96181 page = pte_page(pkmap_page_table[i]);
96182+ pax_open_kernel();
96183 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
96184-
96185+ pax_close_kernel();
96186 set_page_address(page, NULL);
96187 need_flush = 1;
96188 }
96189@@ -259,9 +260,11 @@ start:
96190 }
96191 }
96192 vaddr = PKMAP_ADDR(last_pkmap_nr);
96193+
96194+ pax_open_kernel();
96195 set_pte_at(&init_mm, vaddr,
96196 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
96197-
96198+ pax_close_kernel();
96199 pkmap_count[last_pkmap_nr] = 1;
96200 set_page_address(page, (void *)vaddr);
96201
96202diff --git a/mm/hugetlb.c b/mm/hugetlb.c
96203index a2bfd02..2126298 100644
96204--- a/mm/hugetlb.c
96205+++ b/mm/hugetlb.c
96206@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96207 struct ctl_table *table, int write,
96208 void __user *buffer, size_t *length, loff_t *ppos)
96209 {
96210+ ctl_table_no_const t;
96211 struct hstate *h = &default_hstate;
96212 unsigned long tmp = h->max_huge_pages;
96213 int ret;
96214@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96215 if (!hugepages_supported())
96216 return -ENOTSUPP;
96217
96218- table->data = &tmp;
96219- table->maxlen = sizeof(unsigned long);
96220- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
96221+ t = *table;
96222+ t.data = &tmp;
96223+ t.maxlen = sizeof(unsigned long);
96224+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
96225 if (ret)
96226 goto out;
96227
96228@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
96229 struct hstate *h = &default_hstate;
96230 unsigned long tmp;
96231 int ret;
96232+ ctl_table_no_const hugetlb_table;
96233
96234 if (!hugepages_supported())
96235 return -ENOTSUPP;
96236@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
96237 if (write && hstate_is_gigantic(h))
96238 return -EINVAL;
96239
96240- table->data = &tmp;
96241- table->maxlen = sizeof(unsigned long);
96242- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
96243+ hugetlb_table = *table;
96244+ hugetlb_table.data = &tmp;
96245+ hugetlb_table.maxlen = sizeof(unsigned long);
96246+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
96247 if (ret)
96248 goto out;
96249
96250@@ -2798,6 +2802,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
96251 i_mmap_unlock_write(mapping);
96252 }
96253
96254+#ifdef CONFIG_PAX_SEGMEXEC
96255+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
96256+{
96257+ struct mm_struct *mm = vma->vm_mm;
96258+ struct vm_area_struct *vma_m;
96259+ unsigned long address_m;
96260+ pte_t *ptep_m;
96261+
96262+ vma_m = pax_find_mirror_vma(vma);
96263+ if (!vma_m)
96264+ return;
96265+
96266+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96267+ address_m = address + SEGMEXEC_TASK_SIZE;
96268+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
96269+ get_page(page_m);
96270+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
96271+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
96272+}
96273+#endif
96274+
96275 /*
96276 * Hugetlb_cow() should be called with page lock of the original hugepage held.
96277 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
96278@@ -2910,6 +2935,11 @@ retry_avoidcopy:
96279 make_huge_pte(vma, new_page, 1));
96280 page_remove_rmap(old_page);
96281 hugepage_add_new_anon_rmap(new_page, vma, address);
96282+
96283+#ifdef CONFIG_PAX_SEGMEXEC
96284+ pax_mirror_huge_pte(vma, address, new_page);
96285+#endif
96286+
96287 /* Make the old page be freed below */
96288 new_page = old_page;
96289 }
96290@@ -3070,6 +3100,10 @@ retry:
96291 && (vma->vm_flags & VM_SHARED)));
96292 set_huge_pte_at(mm, address, ptep, new_pte);
96293
96294+#ifdef CONFIG_PAX_SEGMEXEC
96295+ pax_mirror_huge_pte(vma, address, page);
96296+#endif
96297+
96298 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
96299 /* Optimization, do the COW without a second fault */
96300 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
96301@@ -3137,6 +3171,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96302 struct address_space *mapping;
96303 int need_wait_lock = 0;
96304
96305+#ifdef CONFIG_PAX_SEGMEXEC
96306+ struct vm_area_struct *vma_m;
96307+#endif
96308+
96309 address &= huge_page_mask(h);
96310
96311 ptep = huge_pte_offset(mm, address);
96312@@ -3150,6 +3188,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96313 VM_FAULT_SET_HINDEX(hstate_index(h));
96314 }
96315
96316+#ifdef CONFIG_PAX_SEGMEXEC
96317+ vma_m = pax_find_mirror_vma(vma);
96318+ if (vma_m) {
96319+ unsigned long address_m;
96320+
96321+ if (vma->vm_start > vma_m->vm_start) {
96322+ address_m = address;
96323+ address -= SEGMEXEC_TASK_SIZE;
96324+ vma = vma_m;
96325+ h = hstate_vma(vma);
96326+ } else
96327+ address_m = address + SEGMEXEC_TASK_SIZE;
96328+
96329+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
96330+ return VM_FAULT_OOM;
96331+ address_m &= HPAGE_MASK;
96332+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
96333+ }
96334+#endif
96335+
96336 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
96337 if (!ptep)
96338 return VM_FAULT_OOM;
96339diff --git a/mm/internal.h b/mm/internal.h
96340index efad241..57ae4ca 100644
96341--- a/mm/internal.h
96342+++ b/mm/internal.h
96343@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
96344
96345 extern int __isolate_free_page(struct page *page, unsigned int order);
96346 extern void __free_pages_bootmem(struct page *page, unsigned int order);
96347+extern void free_compound_page(struct page *page);
96348 extern void prep_compound_page(struct page *page, unsigned long order);
96349 #ifdef CONFIG_MEMORY_FAILURE
96350 extern bool is_free_buddy_page(struct page *page);
96351@@ -387,7 +388,7 @@ extern u32 hwpoison_filter_enable;
96352
96353 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
96354 unsigned long, unsigned long,
96355- unsigned long, unsigned long);
96356+ unsigned long, unsigned long) __intentional_overflow(-1);
96357
96358 extern void set_pageblock_order(void);
96359 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
96360diff --git a/mm/kmemleak.c b/mm/kmemleak.c
96361index 3cda50c..032ba634 100644
96362--- a/mm/kmemleak.c
96363+++ b/mm/kmemleak.c
96364@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
96365
96366 for (i = 0; i < object->trace_len; i++) {
96367 void *ptr = (void *)object->trace[i];
96368- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
96369+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
96370 }
96371 }
96372
96373@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
96374 return -ENOMEM;
96375 }
96376
96377- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
96378+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
96379 &kmemleak_fops);
96380 if (!dentry)
96381 pr_warning("Failed to create the debugfs kmemleak file\n");
96382diff --git a/mm/maccess.c b/mm/maccess.c
96383index d53adf9..03a24bf 100644
96384--- a/mm/maccess.c
96385+++ b/mm/maccess.c
96386@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
96387 set_fs(KERNEL_DS);
96388 pagefault_disable();
96389 ret = __copy_from_user_inatomic(dst,
96390- (__force const void __user *)src, size);
96391+ (const void __force_user *)src, size);
96392 pagefault_enable();
96393 set_fs(old_fs);
96394
96395@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
96396
96397 set_fs(KERNEL_DS);
96398 pagefault_disable();
96399- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
96400+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
96401 pagefault_enable();
96402 set_fs(old_fs);
96403
96404diff --git a/mm/madvise.c b/mm/madvise.c
96405index a271adc..5e1a2b4 100644
96406--- a/mm/madvise.c
96407+++ b/mm/madvise.c
96408@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
96409 pgoff_t pgoff;
96410 unsigned long new_flags = vma->vm_flags;
96411
96412+#ifdef CONFIG_PAX_SEGMEXEC
96413+ struct vm_area_struct *vma_m;
96414+#endif
96415+
96416 switch (behavior) {
96417 case MADV_NORMAL:
96418 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
96419@@ -126,6 +130,13 @@ success:
96420 /*
96421 * vm_flags is protected by the mmap_sem held in write mode.
96422 */
96423+
96424+#ifdef CONFIG_PAX_SEGMEXEC
96425+ vma_m = pax_find_mirror_vma(vma);
96426+ if (vma_m)
96427+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
96428+#endif
96429+
96430 vma->vm_flags = new_flags;
96431
96432 out:
96433@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
96434 struct vm_area_struct **prev,
96435 unsigned long start, unsigned long end)
96436 {
96437+
96438+#ifdef CONFIG_PAX_SEGMEXEC
96439+ struct vm_area_struct *vma_m;
96440+#endif
96441+
96442 *prev = vma;
96443 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
96444 return -EINVAL;
96445@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
96446 zap_page_range(vma, start, end - start, &details);
96447 } else
96448 zap_page_range(vma, start, end - start, NULL);
96449+
96450+#ifdef CONFIG_PAX_SEGMEXEC
96451+ vma_m = pax_find_mirror_vma(vma);
96452+ if (vma_m) {
96453+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
96454+ struct zap_details details = {
96455+ .nonlinear_vma = vma_m,
96456+ .last_index = ULONG_MAX,
96457+ };
96458+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, &details);
96459+ } else
96460+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
96461+ }
96462+#endif
96463+
96464 return 0;
96465 }
96466
96467@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
96468 if (end < start)
96469 return error;
96470
96471+#ifdef CONFIG_PAX_SEGMEXEC
96472+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
96473+ if (end > SEGMEXEC_TASK_SIZE)
96474+ return error;
96475+ } else
96476+#endif
96477+
96478+ if (end > TASK_SIZE)
96479+ return error;
96480+
96481 error = 0;
96482 if (end == start)
96483 return error;
96484diff --git a/mm/memory-failure.c b/mm/memory-failure.c
96485index 20c29dd..22bd8e2 100644
96486--- a/mm/memory-failure.c
96487+++ b/mm/memory-failure.c
96488@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
96489
96490 int sysctl_memory_failure_recovery __read_mostly = 1;
96491
96492-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
96493+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
96494
96495 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
96496
96497@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
96498 pfn, t->comm, t->pid);
96499 si.si_signo = SIGBUS;
96500 si.si_errno = 0;
96501- si.si_addr = (void *)addr;
96502+ si.si_addr = (void __user *)addr;
96503 #ifdef __ARCH_SI_TRAPNO
96504 si.si_trapno = trapno;
96505 #endif
96506@@ -786,7 +786,7 @@ static struct page_state {
96507 unsigned long res;
96508 char *msg;
96509 int (*action)(struct page *p, unsigned long pfn);
96510-} error_states[] = {
96511+} __do_const error_states[] = {
96512 { reserved, reserved, "reserved kernel", me_kernel },
96513 /*
96514 * free pages are specially detected outside this table:
96515@@ -1094,7 +1094,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96516 nr_pages = 1 << compound_order(hpage);
96517 else /* normal page or thp */
96518 nr_pages = 1;
96519- atomic_long_add(nr_pages, &num_poisoned_pages);
96520+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
96521
96522 /*
96523 * We need/can do nothing about count=0 pages.
96524@@ -1123,7 +1123,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96525 if (PageHWPoison(hpage)) {
96526 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
96527 || (p != hpage && TestSetPageHWPoison(hpage))) {
96528- atomic_long_sub(nr_pages, &num_poisoned_pages);
96529+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96530 unlock_page(hpage);
96531 return 0;
96532 }
96533@@ -1191,14 +1191,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
96534 */
96535 if (!PageHWPoison(p)) {
96536 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
96537- atomic_long_sub(nr_pages, &num_poisoned_pages);
96538+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96539 put_page(hpage);
96540 res = 0;
96541 goto out;
96542 }
96543 if (hwpoison_filter(p)) {
96544 if (TestClearPageHWPoison(p))
96545- atomic_long_sub(nr_pages, &num_poisoned_pages);
96546+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96547 unlock_page(hpage);
96548 put_page(hpage);
96549 return 0;
96550@@ -1428,7 +1428,7 @@ int unpoison_memory(unsigned long pfn)
96551 return 0;
96552 }
96553 if (TestClearPageHWPoison(p))
96554- atomic_long_dec(&num_poisoned_pages);
96555+ atomic_long_dec_unchecked(&num_poisoned_pages);
96556 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
96557 return 0;
96558 }
96559@@ -1442,7 +1442,7 @@ int unpoison_memory(unsigned long pfn)
96560 */
96561 if (TestClearPageHWPoison(page)) {
96562 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
96563- atomic_long_sub(nr_pages, &num_poisoned_pages);
96564+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
96565 freeit = 1;
96566 if (PageHuge(page))
96567 clear_page_hwpoison_huge_page(page);
96568@@ -1567,11 +1567,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
96569 if (PageHuge(page)) {
96570 set_page_hwpoison_huge_page(hpage);
96571 dequeue_hwpoisoned_huge_page(hpage);
96572- atomic_long_add(1 << compound_order(hpage),
96573+ atomic_long_add_unchecked(1 << compound_order(hpage),
96574 &num_poisoned_pages);
96575 } else {
96576 SetPageHWPoison(page);
96577- atomic_long_inc(&num_poisoned_pages);
96578+ atomic_long_inc_unchecked(&num_poisoned_pages);
96579 }
96580 }
96581 return ret;
96582@@ -1610,7 +1610,7 @@ static int __soft_offline_page(struct page *page, int flags)
96583 put_page(page);
96584 pr_info("soft_offline: %#lx: invalidated\n", pfn);
96585 SetPageHWPoison(page);
96586- atomic_long_inc(&num_poisoned_pages);
96587+ atomic_long_inc_unchecked(&num_poisoned_pages);
96588 return 0;
96589 }
96590
96591@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
96592 if (!is_free_buddy_page(page))
96593 pr_info("soft offline: %#lx: page leaked\n",
96594 pfn);
96595- atomic_long_inc(&num_poisoned_pages);
96596+ atomic_long_inc_unchecked(&num_poisoned_pages);
96597 }
96598 } else {
96599 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
96600@@ -1729,11 +1729,11 @@ int soft_offline_page(struct page *page, int flags)
96601 if (PageHuge(page)) {
96602 set_page_hwpoison_huge_page(hpage);
96603 dequeue_hwpoisoned_huge_page(hpage);
96604- atomic_long_add(1 << compound_order(hpage),
96605+ atomic_long_add_unchecked(1 << compound_order(hpage),
96606 &num_poisoned_pages);
96607 } else {
96608 SetPageHWPoison(page);
96609- atomic_long_inc(&num_poisoned_pages);
96610+ atomic_long_inc_unchecked(&num_poisoned_pages);
96611 }
96612 }
96613 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
96614diff --git a/mm/memory.c b/mm/memory.c
96615index 6aa7822..3c76005 100644
96616--- a/mm/memory.c
96617+++ b/mm/memory.c
96618@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
96619 free_pte_range(tlb, pmd, addr);
96620 } while (pmd++, addr = next, addr != end);
96621
96622+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
96623 start &= PUD_MASK;
96624 if (start < floor)
96625 return;
96626@@ -428,6 +429,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
96627 pmd = pmd_offset(pud, start);
96628 pud_clear(pud);
96629 pmd_free_tlb(tlb, pmd, start);
96630+#endif
96631+
96632 }
96633
96634 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96635@@ -447,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96636 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
96637 } while (pud++, addr = next, addr != end);
96638
96639+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
96640 start &= PGDIR_MASK;
96641 if (start < floor)
96642 return;
96643@@ -461,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
96644 pud = pud_offset(pgd, start);
96645 pgd_clear(pgd);
96646 pud_free_tlb(tlb, pud, start);
96647+#endif
96648+
96649 }
96650
96651 /*
96652@@ -690,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
96653 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
96654 */
96655 if (vma->vm_ops)
96656- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
96657+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
96658 vma->vm_ops->fault);
96659 if (vma->vm_file)
96660- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
96661+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
96662 vma->vm_file->f_op->mmap);
96663 dump_stack();
96664 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
96665@@ -1488,6 +1494,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
96666 page_add_file_rmap(page);
96667 set_pte_at(mm, addr, pte, mk_pte(page, prot));
96668
96669+#ifdef CONFIG_PAX_SEGMEXEC
96670+ pax_mirror_file_pte(vma, addr, page, ptl);
96671+#endif
96672+
96673 retval = 0;
96674 pte_unmap_unlock(pte, ptl);
96675 return retval;
96676@@ -1532,9 +1542,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
96677 if (!page_count(page))
96678 return -EINVAL;
96679 if (!(vma->vm_flags & VM_MIXEDMAP)) {
96680+
96681+#ifdef CONFIG_PAX_SEGMEXEC
96682+ struct vm_area_struct *vma_m;
96683+#endif
96684+
96685 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
96686 BUG_ON(vma->vm_flags & VM_PFNMAP);
96687 vma->vm_flags |= VM_MIXEDMAP;
96688+
96689+#ifdef CONFIG_PAX_SEGMEXEC
96690+ vma_m = pax_find_mirror_vma(vma);
96691+ if (vma_m)
96692+ vma_m->vm_flags |= VM_MIXEDMAP;
96693+#endif
96694+
96695 }
96696 return insert_page(vma, addr, page, vma->vm_page_prot);
96697 }
96698@@ -1617,6 +1639,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
96699 unsigned long pfn)
96700 {
96701 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
96702+ BUG_ON(vma->vm_mirror);
96703
96704 if (addr < vma->vm_start || addr >= vma->vm_end)
96705 return -EFAULT;
96706@@ -1864,7 +1887,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
96707
96708 BUG_ON(pud_huge(*pud));
96709
96710- pmd = pmd_alloc(mm, pud, addr);
96711+ pmd = (mm == &init_mm) ?
96712+ pmd_alloc_kernel(mm, pud, addr) :
96713+ pmd_alloc(mm, pud, addr);
96714 if (!pmd)
96715 return -ENOMEM;
96716 do {
96717@@ -1884,7 +1909,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
96718 unsigned long next;
96719 int err;
96720
96721- pud = pud_alloc(mm, pgd, addr);
96722+ pud = (mm == &init_mm) ?
96723+ pud_alloc_kernel(mm, pgd, addr) :
96724+ pud_alloc(mm, pgd, addr);
96725 if (!pud)
96726 return -ENOMEM;
96727 do {
96728@@ -2006,6 +2033,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
96729 return ret;
96730 }
96731
96732+#ifdef CONFIG_PAX_SEGMEXEC
96733+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
96734+{
96735+ struct mm_struct *mm = vma->vm_mm;
96736+ spinlock_t *ptl;
96737+ pte_t *pte, entry;
96738+
96739+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
96740+ entry = *pte;
96741+ if (!pte_present(entry)) {
96742+ if (!pte_none(entry)) {
96743+ BUG_ON(pte_file(entry));
96744+ free_swap_and_cache(pte_to_swp_entry(entry));
96745+ pte_clear_not_present_full(mm, address, pte, 0);
96746+ }
96747+ } else {
96748+ struct page *page;
96749+
96750+ flush_cache_page(vma, address, pte_pfn(entry));
96751+ entry = ptep_clear_flush(vma, address, pte);
96752+ BUG_ON(pte_dirty(entry));
96753+ page = vm_normal_page(vma, address, entry);
96754+ if (page) {
96755+ update_hiwater_rss(mm);
96756+ if (PageAnon(page))
96757+ dec_mm_counter_fast(mm, MM_ANONPAGES);
96758+ else
96759+ dec_mm_counter_fast(mm, MM_FILEPAGES);
96760+ page_remove_rmap(page);
96761+ page_cache_release(page);
96762+ }
96763+ }
96764+ pte_unmap_unlock(pte, ptl);
96765+}
96766+
96767+/* PaX: if vma is mirrored, synchronize the mirror's PTE
96768+ *
96769+ * the ptl of the lower mapped page is held on entry and is not released on exit
96770+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
96771+ */
96772+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96773+{
96774+ struct mm_struct *mm = vma->vm_mm;
96775+ unsigned long address_m;
96776+ spinlock_t *ptl_m;
96777+ struct vm_area_struct *vma_m;
96778+ pmd_t *pmd_m;
96779+ pte_t *pte_m, entry_m;
96780+
96781+ BUG_ON(!page_m || !PageAnon(page_m));
96782+
96783+ vma_m = pax_find_mirror_vma(vma);
96784+ if (!vma_m)
96785+ return;
96786+
96787+ BUG_ON(!PageLocked(page_m));
96788+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96789+ address_m = address + SEGMEXEC_TASK_SIZE;
96790+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96791+ pte_m = pte_offset_map(pmd_m, address_m);
96792+ ptl_m = pte_lockptr(mm, pmd_m);
96793+ if (ptl != ptl_m) {
96794+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96795+ if (!pte_none(*pte_m))
96796+ goto out;
96797+ }
96798+
96799+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96800+ page_cache_get(page_m);
96801+ page_add_anon_rmap(page_m, vma_m, address_m);
96802+ inc_mm_counter_fast(mm, MM_ANONPAGES);
96803+ set_pte_at(mm, address_m, pte_m, entry_m);
96804+ update_mmu_cache(vma_m, address_m, pte_m);
96805+out:
96806+ if (ptl != ptl_m)
96807+ spin_unlock(ptl_m);
96808+ pte_unmap(pte_m);
96809+ unlock_page(page_m);
96810+}
96811+
96812+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96813+{
96814+ struct mm_struct *mm = vma->vm_mm;
96815+ unsigned long address_m;
96816+ spinlock_t *ptl_m;
96817+ struct vm_area_struct *vma_m;
96818+ pmd_t *pmd_m;
96819+ pte_t *pte_m, entry_m;
96820+
96821+ BUG_ON(!page_m || PageAnon(page_m));
96822+
96823+ vma_m = pax_find_mirror_vma(vma);
96824+ if (!vma_m)
96825+ return;
96826+
96827+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96828+ address_m = address + SEGMEXEC_TASK_SIZE;
96829+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96830+ pte_m = pte_offset_map(pmd_m, address_m);
96831+ ptl_m = pte_lockptr(mm, pmd_m);
96832+ if (ptl != ptl_m) {
96833+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96834+ if (!pte_none(*pte_m))
96835+ goto out;
96836+ }
96837+
96838+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96839+ page_cache_get(page_m);
96840+ page_add_file_rmap(page_m);
96841+ inc_mm_counter_fast(mm, MM_FILEPAGES);
96842+ set_pte_at(mm, address_m, pte_m, entry_m);
96843+ update_mmu_cache(vma_m, address_m, pte_m);
96844+out:
96845+ if (ptl != ptl_m)
96846+ spin_unlock(ptl_m);
96847+ pte_unmap(pte_m);
96848+}
96849+
96850+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
96851+{
96852+ struct mm_struct *mm = vma->vm_mm;
96853+ unsigned long address_m;
96854+ spinlock_t *ptl_m;
96855+ struct vm_area_struct *vma_m;
96856+ pmd_t *pmd_m;
96857+ pte_t *pte_m, entry_m;
96858+
96859+ vma_m = pax_find_mirror_vma(vma);
96860+ if (!vma_m)
96861+ return;
96862+
96863+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96864+ address_m = address + SEGMEXEC_TASK_SIZE;
96865+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96866+ pte_m = pte_offset_map(pmd_m, address_m);
96867+ ptl_m = pte_lockptr(mm, pmd_m);
96868+ if (ptl != ptl_m) {
96869+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96870+ if (!pte_none(*pte_m))
96871+ goto out;
96872+ }
96873+
96874+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
96875+ set_pte_at(mm, address_m, pte_m, entry_m);
96876+out:
96877+ if (ptl != ptl_m)
96878+ spin_unlock(ptl_m);
96879+ pte_unmap(pte_m);
96880+}
96881+
96882+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
96883+{
96884+ struct page *page_m;
96885+ pte_t entry;
96886+
96887+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
96888+ goto out;
96889+
96890+ entry = *pte;
96891+ page_m = vm_normal_page(vma, address, entry);
96892+ if (!page_m)
96893+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
96894+ else if (PageAnon(page_m)) {
96895+ if (pax_find_mirror_vma(vma)) {
96896+ pte_unmap_unlock(pte, ptl);
96897+ lock_page(page_m);
96898+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
96899+ if (pte_same(entry, *pte))
96900+ pax_mirror_anon_pte(vma, address, page_m, ptl);
96901+ else
96902+ unlock_page(page_m);
96903+ }
96904+ } else
96905+ pax_mirror_file_pte(vma, address, page_m, ptl);
96906+
96907+out:
96908+ pte_unmap_unlock(pte, ptl);
96909+}
96910+#endif
96911+
96912 /*
96913 * This routine handles present pages, when users try to write
96914 * to a shared page. It is done by copying the page to a new address
96915@@ -2212,6 +2419,12 @@ gotten:
96916 */
96917 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
96918 if (likely(pte_same(*page_table, orig_pte))) {
96919+
96920+#ifdef CONFIG_PAX_SEGMEXEC
96921+ if (pax_find_mirror_vma(vma))
96922+ BUG_ON(!trylock_page(new_page));
96923+#endif
96924+
96925 if (old_page) {
96926 if (!PageAnon(old_page)) {
96927 dec_mm_counter_fast(mm, MM_FILEPAGES);
96928@@ -2265,6 +2478,10 @@ gotten:
96929 page_remove_rmap(old_page);
96930 }
96931
96932+#ifdef CONFIG_PAX_SEGMEXEC
96933+ pax_mirror_anon_pte(vma, address, new_page, ptl);
96934+#endif
96935+
96936 /* Free the old page.. */
96937 new_page = old_page;
96938 ret |= VM_FAULT_WRITE;
96939@@ -2539,6 +2756,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96940 swap_free(entry);
96941 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
96942 try_to_free_swap(page);
96943+
96944+#ifdef CONFIG_PAX_SEGMEXEC
96945+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
96946+#endif
96947+
96948 unlock_page(page);
96949 if (page != swapcache) {
96950 /*
96951@@ -2562,6 +2784,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96952
96953 /* No need to invalidate - it was non-present before */
96954 update_mmu_cache(vma, address, page_table);
96955+
96956+#ifdef CONFIG_PAX_SEGMEXEC
96957+ pax_mirror_anon_pte(vma, address, page, ptl);
96958+#endif
96959+
96960 unlock:
96961 pte_unmap_unlock(page_table, ptl);
96962 out:
96963@@ -2581,40 +2808,6 @@ out_release:
96964 }
96965
96966 /*
96967- * This is like a special single-page "expand_{down|up}wards()",
96968- * except we must first make sure that 'address{-|+}PAGE_SIZE'
96969- * doesn't hit another vma.
96970- */
96971-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
96972-{
96973- address &= PAGE_MASK;
96974- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
96975- struct vm_area_struct *prev = vma->vm_prev;
96976-
96977- /*
96978- * Is there a mapping abutting this one below?
96979- *
96980- * That's only ok if it's the same stack mapping
96981- * that has gotten split..
96982- */
96983- if (prev && prev->vm_end == address)
96984- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
96985-
96986- return expand_downwards(vma, address - PAGE_SIZE);
96987- }
96988- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
96989- struct vm_area_struct *next = vma->vm_next;
96990-
96991- /* As VM_GROWSDOWN but s/below/above/ */
96992- if (next && next->vm_start == address + PAGE_SIZE)
96993- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
96994-
96995- return expand_upwards(vma, address + PAGE_SIZE);
96996- }
96997- return 0;
96998-}
96999-
97000-/*
97001 * We enter with non-exclusive mmap_sem (to exclude vma changes,
97002 * but allow concurrent faults), and pte mapped but not yet locked.
97003 * We return with mmap_sem still held, but pte unmapped and unlocked.
97004@@ -2624,27 +2817,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97005 unsigned int flags)
97006 {
97007 struct mem_cgroup *memcg;
97008- struct page *page;
97009+ struct page *page = NULL;
97010 spinlock_t *ptl;
97011 pte_t entry;
97012
97013- pte_unmap(page_table);
97014-
97015- /* Check if we need to add a guard page to the stack */
97016- if (check_stack_guard_page(vma, address) < 0)
97017- return VM_FAULT_SIGSEGV;
97018-
97019- /* Use the zero-page for reads */
97020 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
97021 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
97022 vma->vm_page_prot));
97023- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
97024+ ptl = pte_lockptr(mm, pmd);
97025+ spin_lock(ptl);
97026 if (!pte_none(*page_table))
97027 goto unlock;
97028 goto setpte;
97029 }
97030
97031 /* Allocate our own private page. */
97032+ pte_unmap(page_table);
97033+
97034 if (unlikely(anon_vma_prepare(vma)))
97035 goto oom;
97036 page = alloc_zeroed_user_highpage_movable(vma, address);
97037@@ -2668,6 +2857,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97038 if (!pte_none(*page_table))
97039 goto release;
97040
97041+#ifdef CONFIG_PAX_SEGMEXEC
97042+ if (pax_find_mirror_vma(vma))
97043+ BUG_ON(!trylock_page(page));
97044+#endif
97045+
97046 inc_mm_counter_fast(mm, MM_ANONPAGES);
97047 page_add_new_anon_rmap(page, vma, address);
97048 mem_cgroup_commit_charge(page, memcg, false);
97049@@ -2677,6 +2871,12 @@ setpte:
97050
97051 /* No need to invalidate - it was non-present before */
97052 update_mmu_cache(vma, address, page_table);
97053+
97054+#ifdef CONFIG_PAX_SEGMEXEC
97055+ if (page)
97056+ pax_mirror_anon_pte(vma, address, page, ptl);
97057+#endif
97058+
97059 unlock:
97060 pte_unmap_unlock(page_table, ptl);
97061 return 0;
97062@@ -2907,6 +3107,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97063 return ret;
97064 }
97065 do_set_pte(vma, address, fault_page, pte, false, false);
97066+
97067+#ifdef CONFIG_PAX_SEGMEXEC
97068+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97069+#endif
97070+
97071 unlock_page(fault_page);
97072 unlock_out:
97073 pte_unmap_unlock(pte, ptl);
97074@@ -2949,7 +3154,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97075 page_cache_release(fault_page);
97076 goto uncharge_out;
97077 }
97078+
97079+#ifdef CONFIG_PAX_SEGMEXEC
97080+ if (pax_find_mirror_vma(vma))
97081+ BUG_ON(!trylock_page(new_page));
97082+#endif
97083+
97084 do_set_pte(vma, address, new_page, pte, true, true);
97085+
97086+#ifdef CONFIG_PAX_SEGMEXEC
97087+ pax_mirror_anon_pte(vma, address, new_page, ptl);
97088+#endif
97089+
97090 mem_cgroup_commit_charge(new_page, memcg, false);
97091 lru_cache_add_active_or_unevictable(new_page, vma);
97092 pte_unmap_unlock(pte, ptl);
97093@@ -2999,6 +3215,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97094 return ret;
97095 }
97096 do_set_pte(vma, address, fault_page, pte, true, false);
97097+
97098+#ifdef CONFIG_PAX_SEGMEXEC
97099+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97100+#endif
97101+
97102 pte_unmap_unlock(pte, ptl);
97103
97104 if (set_page_dirty(fault_page))
97105@@ -3255,6 +3476,12 @@ static int handle_pte_fault(struct mm_struct *mm,
97106 if (flags & FAULT_FLAG_WRITE)
97107 flush_tlb_fix_spurious_fault(vma, address);
97108 }
97109+
97110+#ifdef CONFIG_PAX_SEGMEXEC
97111+ pax_mirror_pte(vma, address, pte, pmd, ptl);
97112+ return 0;
97113+#endif
97114+
97115 unlock:
97116 pte_unmap_unlock(pte, ptl);
97117 return 0;
97118@@ -3274,9 +3501,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97119 pmd_t *pmd;
97120 pte_t *pte;
97121
97122+#ifdef CONFIG_PAX_SEGMEXEC
97123+ struct vm_area_struct *vma_m;
97124+#endif
97125+
97126 if (unlikely(is_vm_hugetlb_page(vma)))
97127 return hugetlb_fault(mm, vma, address, flags);
97128
97129+#ifdef CONFIG_PAX_SEGMEXEC
97130+ vma_m = pax_find_mirror_vma(vma);
97131+ if (vma_m) {
97132+ unsigned long address_m;
97133+ pgd_t *pgd_m;
97134+ pud_t *pud_m;
97135+ pmd_t *pmd_m;
97136+
97137+ if (vma->vm_start > vma_m->vm_start) {
97138+ address_m = address;
97139+ address -= SEGMEXEC_TASK_SIZE;
97140+ vma = vma_m;
97141+ } else
97142+ address_m = address + SEGMEXEC_TASK_SIZE;
97143+
97144+ pgd_m = pgd_offset(mm, address_m);
97145+ pud_m = pud_alloc(mm, pgd_m, address_m);
97146+ if (!pud_m)
97147+ return VM_FAULT_OOM;
97148+ pmd_m = pmd_alloc(mm, pud_m, address_m);
97149+ if (!pmd_m)
97150+ return VM_FAULT_OOM;
97151+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
97152+ return VM_FAULT_OOM;
97153+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
97154+ }
97155+#endif
97156+
97157 pgd = pgd_offset(mm, address);
97158 pud = pud_alloc(mm, pgd, address);
97159 if (!pud)
97160@@ -3411,6 +3670,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97161 spin_unlock(&mm->page_table_lock);
97162 return 0;
97163 }
97164+
97165+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97166+{
97167+ pud_t *new = pud_alloc_one(mm, address);
97168+ if (!new)
97169+ return -ENOMEM;
97170+
97171+ smp_wmb(); /* See comment in __pte_alloc */
97172+
97173+ spin_lock(&mm->page_table_lock);
97174+ if (pgd_present(*pgd)) /* Another has populated it */
97175+ pud_free(mm, new);
97176+ else
97177+ pgd_populate_kernel(mm, pgd, new);
97178+ spin_unlock(&mm->page_table_lock);
97179+ return 0;
97180+}
97181 #endif /* __PAGETABLE_PUD_FOLDED */
97182
97183 #ifndef __PAGETABLE_PMD_FOLDED
97184@@ -3441,6 +3717,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
97185 spin_unlock(&mm->page_table_lock);
97186 return 0;
97187 }
97188+
97189+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
97190+{
97191+ pmd_t *new = pmd_alloc_one(mm, address);
97192+ if (!new)
97193+ return -ENOMEM;
97194+
97195+ smp_wmb(); /* See comment in __pte_alloc */
97196+
97197+ spin_lock(&mm->page_table_lock);
97198+#ifndef __ARCH_HAS_4LEVEL_HACK
97199+ if (pud_present(*pud)) /* Another has populated it */
97200+ pmd_free(mm, new);
97201+ else
97202+ pud_populate_kernel(mm, pud, new);
97203+#else
97204+ if (pgd_present(*pud)) /* Another has populated it */
97205+ pmd_free(mm, new);
97206+ else
97207+ pgd_populate_kernel(mm, pud, new);
97208+#endif /* __ARCH_HAS_4LEVEL_HACK */
97209+ spin_unlock(&mm->page_table_lock);
97210+ return 0;
97211+}
97212 #endif /* __PAGETABLE_PMD_FOLDED */
97213
97214 static int __follow_pte(struct mm_struct *mm, unsigned long address,
97215@@ -3550,8 +3850,8 @@ out:
97216 return ret;
97217 }
97218
97219-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97220- void *buf, int len, int write)
97221+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97222+ void *buf, size_t len, int write)
97223 {
97224 resource_size_t phys_addr;
97225 unsigned long prot = 0;
97226@@ -3577,8 +3877,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
97227 * Access another process' address space as given in mm. If non-NULL, use the
97228 * given task for page fault accounting.
97229 */
97230-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97231- unsigned long addr, void *buf, int len, int write)
97232+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97233+ unsigned long addr, void *buf, size_t len, int write)
97234 {
97235 struct vm_area_struct *vma;
97236 void *old_buf = buf;
97237@@ -3586,7 +3886,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97238 down_read(&mm->mmap_sem);
97239 /* ignore errors, just check how much was successfully transferred */
97240 while (len) {
97241- int bytes, ret, offset;
97242+ ssize_t bytes, ret, offset;
97243 void *maddr;
97244 struct page *page = NULL;
97245
97246@@ -3647,8 +3947,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97247 *
97248 * The caller must hold a reference on @mm.
97249 */
97250-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97251- void *buf, int len, int write)
97252+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97253+ void *buf, size_t len, int write)
97254 {
97255 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97256 }
97257@@ -3658,11 +3958,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97258 * Source/target buffer must be kernel space,
97259 * Do not walk the page table directly, use get_user_pages
97260 */
97261-int access_process_vm(struct task_struct *tsk, unsigned long addr,
97262- void *buf, int len, int write)
97263+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
97264+ void *buf, size_t len, int write)
97265 {
97266 struct mm_struct *mm;
97267- int ret;
97268+ ssize_t ret;
97269
97270 mm = get_task_mm(tsk);
97271 if (!mm)
97272diff --git a/mm/mempolicy.c b/mm/mempolicy.c
97273index 0e0961b..c9143b9 100644
97274--- a/mm/mempolicy.c
97275+++ b/mm/mempolicy.c
97276@@ -744,6 +744,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
97277 unsigned long vmstart;
97278 unsigned long vmend;
97279
97280+#ifdef CONFIG_PAX_SEGMEXEC
97281+ struct vm_area_struct *vma_m;
97282+#endif
97283+
97284 vma = find_vma(mm, start);
97285 if (!vma || vma->vm_start > start)
97286 return -EFAULT;
97287@@ -787,6 +791,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
97288 err = vma_replace_policy(vma, new_pol);
97289 if (err)
97290 goto out;
97291+
97292+#ifdef CONFIG_PAX_SEGMEXEC
97293+ vma_m = pax_find_mirror_vma(vma);
97294+ if (vma_m) {
97295+ err = vma_replace_policy(vma_m, new_pol);
97296+ if (err)
97297+ goto out;
97298+ }
97299+#endif
97300+
97301 }
97302
97303 out:
97304@@ -1201,6 +1215,17 @@ static long do_mbind(unsigned long start, unsigned long len,
97305
97306 if (end < start)
97307 return -EINVAL;
97308+
97309+#ifdef CONFIG_PAX_SEGMEXEC
97310+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97311+ if (end > SEGMEXEC_TASK_SIZE)
97312+ return -EINVAL;
97313+ } else
97314+#endif
97315+
97316+ if (end > TASK_SIZE)
97317+ return -EINVAL;
97318+
97319 if (end == start)
97320 return 0;
97321
97322@@ -1426,8 +1451,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
97323 */
97324 tcred = __task_cred(task);
97325 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
97326- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
97327- !capable(CAP_SYS_NICE)) {
97328+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
97329 rcu_read_unlock();
97330 err = -EPERM;
97331 goto out_put;
97332@@ -1458,6 +1482,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
97333 goto out;
97334 }
97335
97336+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
97337+ if (mm != current->mm &&
97338+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
97339+ mmput(mm);
97340+ err = -EPERM;
97341+ goto out;
97342+ }
97343+#endif
97344+
97345 err = do_migrate_pages(mm, old, new,
97346 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
97347
97348diff --git a/mm/migrate.c b/mm/migrate.c
97349index be6d1ed..d778cc1 100644
97350--- a/mm/migrate.c
97351+++ b/mm/migrate.c
97352@@ -1504,8 +1504,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
97353 */
97354 tcred = __task_cred(task);
97355 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
97356- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
97357- !capable(CAP_SYS_NICE)) {
97358+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
97359 rcu_read_unlock();
97360 err = -EPERM;
97361 goto out;
97362diff --git a/mm/mlock.c b/mm/mlock.c
97363index 73cf098..ab547c7 100644
97364--- a/mm/mlock.c
97365+++ b/mm/mlock.c
97366@@ -14,6 +14,7 @@
97367 #include <linux/pagevec.h>
97368 #include <linux/mempolicy.h>
97369 #include <linux/syscalls.h>
97370+#include <linux/security.h>
97371 #include <linux/sched.h>
97372 #include <linux/export.h>
97373 #include <linux/rmap.h>
97374@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
97375 {
97376 unsigned long nstart, end, tmp;
97377 struct vm_area_struct * vma, * prev;
97378- int error;
97379+ int error = 0;
97380
97381 VM_BUG_ON(start & ~PAGE_MASK);
97382 VM_BUG_ON(len != PAGE_ALIGN(len));
97383@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
97384 return -EINVAL;
97385 if (end == start)
97386 return 0;
97387+ if (end > TASK_SIZE)
97388+ return -EINVAL;
97389+
97390 vma = find_vma(current->mm, start);
97391 if (!vma || vma->vm_start > start)
97392 return -ENOMEM;
97393@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
97394 for (nstart = start ; ; ) {
97395 vm_flags_t newflags;
97396
97397+#ifdef CONFIG_PAX_SEGMEXEC
97398+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
97399+ break;
97400+#endif
97401+
97402 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
97403
97404 newflags = vma->vm_flags & ~VM_LOCKED;
97405@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
97406 locked += current->mm->locked_vm;
97407
97408 /* check against resource limits */
97409+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
97410 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
97411 error = do_mlock(start, len, 1);
97412
97413@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
97414 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
97415 vm_flags_t newflags;
97416
97417+#ifdef CONFIG_PAX_SEGMEXEC
97418+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
97419+ break;
97420+#endif
97421+
97422 newflags = vma->vm_flags & ~VM_LOCKED;
97423 if (flags & MCL_CURRENT)
97424 newflags |= VM_LOCKED;
97425@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
97426 lock_limit >>= PAGE_SHIFT;
97427
97428 ret = -ENOMEM;
97429+
97430+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
97431+
97432 down_write(&current->mm->mmap_sem);
97433-
97434 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
97435 capable(CAP_IPC_LOCK))
97436 ret = do_mlockall(flags);
97437diff --git a/mm/mmap.c b/mm/mmap.c
97438index 0bc66f1..2bfa432 100644
97439--- a/mm/mmap.c
97440+++ b/mm/mmap.c
97441@@ -41,6 +41,7 @@
97442 #include <linux/notifier.h>
97443 #include <linux/memory.h>
97444 #include <linux/printk.h>
97445+#include <linux/random.h>
97446
97447 #include <asm/uaccess.h>
97448 #include <asm/cacheflush.h>
97449@@ -57,6 +58,16 @@
97450 #define arch_rebalance_pgtables(addr, len) (addr)
97451 #endif
97452
97453+static inline void verify_mm_writelocked(struct mm_struct *mm)
97454+{
97455+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
97456+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97457+ up_read(&mm->mmap_sem);
97458+ BUG();
97459+ }
97460+#endif
97461+}
97462+
97463 static void unmap_region(struct mm_struct *mm,
97464 struct vm_area_struct *vma, struct vm_area_struct *prev,
97465 unsigned long start, unsigned long end);
97466@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
97467 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
97468 *
97469 */
97470-pgprot_t protection_map[16] = {
97471+pgprot_t protection_map[16] __read_only = {
97472 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
97473 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
97474 };
97475
97476-pgprot_t vm_get_page_prot(unsigned long vm_flags)
97477+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
97478 {
97479- return __pgprot(pgprot_val(protection_map[vm_flags &
97480+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
97481 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
97482 pgprot_val(arch_vm_get_page_prot(vm_flags)));
97483+
97484+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97485+ if (!(__supported_pte_mask & _PAGE_NX) &&
97486+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
97487+ (vm_flags & (VM_READ | VM_WRITE)))
97488+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
97489+#endif
97490+
97491+ return prot;
97492 }
97493 EXPORT_SYMBOL(vm_get_page_prot);
97494
97495@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
97496 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
97497 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97498 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97499+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
97500 /*
97501 * Make sure vm_committed_as in one cacheline and not cacheline shared with
97502 * other variables. It can be updated by several CPUs frequently.
97503@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
97504 struct vm_area_struct *next = vma->vm_next;
97505
97506 might_sleep();
97507+ BUG_ON(vma->vm_mirror);
97508 if (vma->vm_ops && vma->vm_ops->close)
97509 vma->vm_ops->close(vma);
97510 if (vma->vm_file)
97511@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
97512
97513 SYSCALL_DEFINE1(brk, unsigned long, brk)
97514 {
97515+ unsigned long rlim;
97516 unsigned long retval;
97517 unsigned long newbrk, oldbrk;
97518 struct mm_struct *mm = current->mm;
97519@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
97520 * segment grow beyond its set limit the in case where the limit is
97521 * not page aligned -Ram Gupta
97522 */
97523- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
97524+ rlim = rlimit(RLIMIT_DATA);
97525+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
97526+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
97527+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
97528+ rlim = 4096 * PAGE_SIZE;
97529+#endif
97530+ if (check_data_rlimit(rlim, brk, mm->start_brk,
97531 mm->end_data, mm->start_data))
97532 goto out;
97533
97534@@ -976,6 +1005,12 @@ static int
97535 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
97536 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
97537 {
97538+
97539+#ifdef CONFIG_PAX_SEGMEXEC
97540+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
97541+ return 0;
97542+#endif
97543+
97544 if (is_mergeable_vma(vma, file, vm_flags) &&
97545 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
97546 if (vma->vm_pgoff == vm_pgoff)
97547@@ -995,6 +1030,12 @@ static int
97548 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
97549 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
97550 {
97551+
97552+#ifdef CONFIG_PAX_SEGMEXEC
97553+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
97554+ return 0;
97555+#endif
97556+
97557 if (is_mergeable_vma(vma, file, vm_flags) &&
97558 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
97559 pgoff_t vm_pglen;
97560@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97561 struct vm_area_struct *area, *next;
97562 int err;
97563
97564+#ifdef CONFIG_PAX_SEGMEXEC
97565+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
97566+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
97567+
97568+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
97569+#endif
97570+
97571 /*
97572 * We later require that vma->vm_flags == vm_flags,
97573 * so this tests vma->vm_flags & VM_SPECIAL, too.
97574@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97575 if (next && next->vm_end == end) /* cases 6, 7, 8 */
97576 next = next->vm_next;
97577
97578+#ifdef CONFIG_PAX_SEGMEXEC
97579+ if (prev)
97580+ prev_m = pax_find_mirror_vma(prev);
97581+ if (area)
97582+ area_m = pax_find_mirror_vma(area);
97583+ if (next)
97584+ next_m = pax_find_mirror_vma(next);
97585+#endif
97586+
97587 /*
97588 * Can it merge with the predecessor?
97589 */
97590@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97591 /* cases 1, 6 */
97592 err = vma_adjust(prev, prev->vm_start,
97593 next->vm_end, prev->vm_pgoff, NULL);
97594- } else /* cases 2, 5, 7 */
97595+
97596+#ifdef CONFIG_PAX_SEGMEXEC
97597+ if (!err && prev_m)
97598+ err = vma_adjust(prev_m, prev_m->vm_start,
97599+ next_m->vm_end, prev_m->vm_pgoff, NULL);
97600+#endif
97601+
97602+ } else { /* cases 2, 5, 7 */
97603 err = vma_adjust(prev, prev->vm_start,
97604 end, prev->vm_pgoff, NULL);
97605+
97606+#ifdef CONFIG_PAX_SEGMEXEC
97607+ if (!err && prev_m)
97608+ err = vma_adjust(prev_m, prev_m->vm_start,
97609+ end_m, prev_m->vm_pgoff, NULL);
97610+#endif
97611+
97612+ }
97613 if (err)
97614 return NULL;
97615 khugepaged_enter_vma_merge(prev, vm_flags);
97616@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
97617 mpol_equal(policy, vma_policy(next)) &&
97618 can_vma_merge_before(next, vm_flags,
97619 anon_vma, file, pgoff+pglen)) {
97620- if (prev && addr < prev->vm_end) /* case 4 */
97621+ if (prev && addr < prev->vm_end) { /* case 4 */
97622 err = vma_adjust(prev, prev->vm_start,
97623 addr, prev->vm_pgoff, NULL);
97624- else /* cases 3, 8 */
97625+
97626+#ifdef CONFIG_PAX_SEGMEXEC
97627+ if (!err && prev_m)
97628+ err = vma_adjust(prev_m, prev_m->vm_start,
97629+ addr_m, prev_m->vm_pgoff, NULL);
97630+#endif
97631+
97632+ } else { /* cases 3, 8 */
97633 err = vma_adjust(area, addr, next->vm_end,
97634 next->vm_pgoff - pglen, NULL);
97635+
97636+#ifdef CONFIG_PAX_SEGMEXEC
97637+ if (!err && area_m)
97638+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
97639+ next_m->vm_pgoff - pglen, NULL);
97640+#endif
97641+
97642+ }
97643 if (err)
97644 return NULL;
97645 khugepaged_enter_vma_merge(area, vm_flags);
97646@@ -1208,8 +1295,10 @@ none:
97647 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
97648 struct file *file, long pages)
97649 {
97650- const unsigned long stack_flags
97651- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
97652+
97653+#ifdef CONFIG_PAX_RANDMMAP
97654+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
97655+#endif
97656
97657 mm->total_vm += pages;
97658
97659@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
97660 mm->shared_vm += pages;
97661 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
97662 mm->exec_vm += pages;
97663- } else if (flags & stack_flags)
97664+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
97665 mm->stack_vm += pages;
97666 }
97667 #endif /* CONFIG_PROC_FS */
97668@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
97669 locked += mm->locked_vm;
97670 lock_limit = rlimit(RLIMIT_MEMLOCK);
97671 lock_limit >>= PAGE_SHIFT;
97672+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
97673 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
97674 return -EAGAIN;
97675 }
97676@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97677 * (the exception is when the underlying filesystem is noexec
97678 * mounted, in which case we dont add PROT_EXEC.)
97679 */
97680- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97681+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97682 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
97683 prot |= PROT_EXEC;
97684
97685@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97686 /* Obtain the address to map to. we verify (or select) it and ensure
97687 * that it represents a valid section of the address space.
97688 */
97689- addr = get_unmapped_area(file, addr, len, pgoff, flags);
97690+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
97691 if (addr & ~PAGE_MASK)
97692 return addr;
97693
97694@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97695 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
97696 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
97697
97698+#ifdef CONFIG_PAX_MPROTECT
97699+ if (mm->pax_flags & MF_PAX_MPROTECT) {
97700+
97701+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
97702+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
97703+ mm->binfmt->handle_mmap)
97704+ mm->binfmt->handle_mmap(file);
97705+#endif
97706+
97707+#ifndef CONFIG_PAX_MPROTECT_COMPAT
97708+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
97709+ gr_log_rwxmmap(file);
97710+
97711+#ifdef CONFIG_PAX_EMUPLT
97712+ vm_flags &= ~VM_EXEC;
97713+#else
97714+ return -EPERM;
97715+#endif
97716+
97717+ }
97718+
97719+ if (!(vm_flags & VM_EXEC))
97720+ vm_flags &= ~VM_MAYEXEC;
97721+#else
97722+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97723+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97724+#endif
97725+ else
97726+ vm_flags &= ~VM_MAYWRITE;
97727+ }
97728+#endif
97729+
97730+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97731+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
97732+ vm_flags &= ~VM_PAGEEXEC;
97733+#endif
97734+
97735 if (flags & MAP_LOCKED)
97736 if (!can_do_mlock())
97737 return -EPERM;
97738@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
97739 vm_flags |= VM_NORESERVE;
97740 }
97741
97742+ if (!gr_acl_handle_mmap(file, prot))
97743+ return -EACCES;
97744+
97745 addr = mmap_region(file, addr, len, vm_flags, pgoff);
97746 if (!IS_ERR_VALUE(addr) &&
97747 ((vm_flags & VM_LOCKED) ||
97748@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
97749 vm_flags_t vm_flags = vma->vm_flags;
97750
97751 /* If it was private or non-writable, the write bit is already clear */
97752- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
97753+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
97754 return 0;
97755
97756 /* The backer wishes to know when pages are first written to? */
97757@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97758 struct rb_node **rb_link, *rb_parent;
97759 unsigned long charged = 0;
97760
97761+#ifdef CONFIG_PAX_SEGMEXEC
97762+ struct vm_area_struct *vma_m = NULL;
97763+#endif
97764+
97765+ /*
97766+ * mm->mmap_sem is required to protect against another thread
97767+ * changing the mappings in case we sleep.
97768+ */
97769+ verify_mm_writelocked(mm);
97770+
97771 /* Check against address space limit. */
97772+
97773+#ifdef CONFIG_PAX_RANDMMAP
97774+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
97775+#endif
97776+
97777 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
97778 unsigned long nr_pages;
97779
97780@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97781
97782 /* Clear old maps */
97783 error = -ENOMEM;
97784-munmap_back:
97785 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97786 if (do_munmap(mm, addr, len))
97787 return -ENOMEM;
97788- goto munmap_back;
97789+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97790 }
97791
97792 /*
97793@@ -1595,6 +1739,16 @@ munmap_back:
97794 goto unacct_error;
97795 }
97796
97797+#ifdef CONFIG_PAX_SEGMEXEC
97798+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
97799+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97800+ if (!vma_m) {
97801+ error = -ENOMEM;
97802+ goto free_vma;
97803+ }
97804+ }
97805+#endif
97806+
97807 vma->vm_mm = mm;
97808 vma->vm_start = addr;
97809 vma->vm_end = addr + len;
97810@@ -1625,6 +1779,13 @@ munmap_back:
97811 if (error)
97812 goto unmap_and_free_vma;
97813
97814+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97815+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
97816+ vma->vm_flags |= VM_PAGEEXEC;
97817+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97818+ }
97819+#endif
97820+
97821 /* Can addr have changed??
97822 *
97823 * Answer: Yes, several device drivers can do it in their
97824@@ -1643,6 +1804,12 @@ munmap_back:
97825 }
97826
97827 vma_link(mm, vma, prev, rb_link, rb_parent);
97828+
97829+#ifdef CONFIG_PAX_SEGMEXEC
97830+ if (vma_m)
97831+ BUG_ON(pax_mirror_vma(vma_m, vma));
97832+#endif
97833+
97834 /* Once vma denies write, undo our temporary denial count */
97835 if (file) {
97836 if (vm_flags & VM_SHARED)
97837@@ -1655,6 +1822,7 @@ out:
97838 perf_event_mmap(vma);
97839
97840 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
97841+ track_exec_limit(mm, addr, addr + len, vm_flags);
97842 if (vm_flags & VM_LOCKED) {
97843 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
97844 vma == get_gate_vma(current->mm)))
97845@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
97846 if (vm_flags & VM_DENYWRITE)
97847 allow_write_access(file);
97848 free_vma:
97849+
97850+#ifdef CONFIG_PAX_SEGMEXEC
97851+ if (vma_m)
97852+ kmem_cache_free(vm_area_cachep, vma_m);
97853+#endif
97854+
97855 kmem_cache_free(vm_area_cachep, vma);
97856 unacct_error:
97857 if (charged)
97858@@ -1699,7 +1873,63 @@ unacct_error:
97859 return error;
97860 }
97861
97862-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97863+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
97864+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
97865+{
97866+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
97867+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
97868+
97869+ return 0;
97870+}
97871+#endif
97872+
97873+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
97874+{
97875+ if (!vma) {
97876+#ifdef CONFIG_STACK_GROWSUP
97877+ if (addr > sysctl_heap_stack_gap)
97878+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
97879+ else
97880+ vma = find_vma(current->mm, 0);
97881+ if (vma && (vma->vm_flags & VM_GROWSUP))
97882+ return false;
97883+#endif
97884+ return true;
97885+ }
97886+
97887+ if (addr + len > vma->vm_start)
97888+ return false;
97889+
97890+ if (vma->vm_flags & VM_GROWSDOWN)
97891+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
97892+#ifdef CONFIG_STACK_GROWSUP
97893+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
97894+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
97895+#endif
97896+ else if (offset)
97897+ return offset <= vma->vm_start - addr - len;
97898+
97899+ return true;
97900+}
97901+
97902+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
97903+{
97904+ if (vma->vm_start < len)
97905+ return -ENOMEM;
97906+
97907+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
97908+ if (offset <= vma->vm_start - len)
97909+ return vma->vm_start - len - offset;
97910+ else
97911+ return -ENOMEM;
97912+ }
97913+
97914+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
97915+ return vma->vm_start - len - sysctl_heap_stack_gap;
97916+ return -ENOMEM;
97917+}
97918+
97919+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
97920 {
97921 /*
97922 * We implement the search by looking for an rbtree node that
97923@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97924 }
97925 }
97926
97927- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
97928+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
97929 check_current:
97930 /* Check if current node has a suitable gap */
97931 if (gap_start > high_limit)
97932 return -ENOMEM;
97933+
97934+ if (gap_end - gap_start > info->threadstack_offset)
97935+ gap_start += info->threadstack_offset;
97936+ else
97937+ gap_start = gap_end;
97938+
97939+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97940+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97941+ gap_start += sysctl_heap_stack_gap;
97942+ else
97943+ gap_start = gap_end;
97944+ }
97945+ if (vma->vm_flags & VM_GROWSDOWN) {
97946+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97947+ gap_end -= sysctl_heap_stack_gap;
97948+ else
97949+ gap_end = gap_start;
97950+ }
97951 if (gap_end >= low_limit && gap_end - gap_start >= length)
97952 goto found;
97953
97954@@ -1801,7 +2049,7 @@ found:
97955 return gap_start;
97956 }
97957
97958-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
97959+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
97960 {
97961 struct mm_struct *mm = current->mm;
97962 struct vm_area_struct *vma;
97963@@ -1855,6 +2103,24 @@ check_current:
97964 gap_end = vma->vm_start;
97965 if (gap_end < low_limit)
97966 return -ENOMEM;
97967+
97968+ if (gap_end - gap_start > info->threadstack_offset)
97969+ gap_end -= info->threadstack_offset;
97970+ else
97971+ gap_end = gap_start;
97972+
97973+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97974+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97975+ gap_start += sysctl_heap_stack_gap;
97976+ else
97977+ gap_start = gap_end;
97978+ }
97979+ if (vma->vm_flags & VM_GROWSDOWN) {
97980+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97981+ gap_end -= sysctl_heap_stack_gap;
97982+ else
97983+ gap_end = gap_start;
97984+ }
97985 if (gap_start <= high_limit && gap_end - gap_start >= length)
97986 goto found;
97987
97988@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
97989 struct mm_struct *mm = current->mm;
97990 struct vm_area_struct *vma;
97991 struct vm_unmapped_area_info info;
97992+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
97993
97994 if (len > TASK_SIZE - mmap_min_addr)
97995 return -ENOMEM;
97996@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
97997 if (flags & MAP_FIXED)
97998 return addr;
97999
98000+#ifdef CONFIG_PAX_RANDMMAP
98001+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98002+#endif
98003+
98004 if (addr) {
98005 addr = PAGE_ALIGN(addr);
98006 vma = find_vma(mm, addr);
98007 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98008- (!vma || addr + len <= vma->vm_start))
98009+ check_heap_stack_gap(vma, addr, len, offset))
98010 return addr;
98011 }
98012
98013@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98014 info.low_limit = mm->mmap_base;
98015 info.high_limit = TASK_SIZE;
98016 info.align_mask = 0;
98017+ info.threadstack_offset = offset;
98018 return vm_unmapped_area(&info);
98019 }
98020 #endif
98021@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98022 struct mm_struct *mm = current->mm;
98023 unsigned long addr = addr0;
98024 struct vm_unmapped_area_info info;
98025+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
98026
98027 /* requested length too big for entire address space */
98028 if (len > TASK_SIZE - mmap_min_addr)
98029@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98030 if (flags & MAP_FIXED)
98031 return addr;
98032
98033+#ifdef CONFIG_PAX_RANDMMAP
98034+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98035+#endif
98036+
98037 /* requesting a specific address */
98038 if (addr) {
98039 addr = PAGE_ALIGN(addr);
98040 vma = find_vma(mm, addr);
98041 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98042- (!vma || addr + len <= vma->vm_start))
98043+ check_heap_stack_gap(vma, addr, len, offset))
98044 return addr;
98045 }
98046
98047@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98048 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
98049 info.high_limit = mm->mmap_base;
98050 info.align_mask = 0;
98051+ info.threadstack_offset = offset;
98052 addr = vm_unmapped_area(&info);
98053
98054 /*
98055@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98056 VM_BUG_ON(addr != -ENOMEM);
98057 info.flags = 0;
98058 info.low_limit = TASK_UNMAPPED_BASE;
98059+
98060+#ifdef CONFIG_PAX_RANDMMAP
98061+ if (mm->pax_flags & MF_PAX_RANDMMAP)
98062+ info.low_limit += mm->delta_mmap;
98063+#endif
98064+
98065 info.high_limit = TASK_SIZE;
98066 addr = vm_unmapped_area(&info);
98067 }
98068@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
98069 return vma;
98070 }
98071
98072+#ifdef CONFIG_PAX_SEGMEXEC
98073+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
98074+{
98075+ struct vm_area_struct *vma_m;
98076+
98077+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
98078+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
98079+ BUG_ON(vma->vm_mirror);
98080+ return NULL;
98081+ }
98082+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
98083+ vma_m = vma->vm_mirror;
98084+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
98085+ BUG_ON(vma->vm_file != vma_m->vm_file);
98086+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
98087+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
98088+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
98089+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
98090+ return vma_m;
98091+}
98092+#endif
98093+
98094 /*
98095 * Verify that the stack growth is acceptable and
98096 * update accounting. This is shared with both the
98097@@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98098
98099 /* Stack limit test */
98100 actual_size = size;
98101- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
98102- actual_size -= PAGE_SIZE;
98103+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
98104 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
98105 return -ENOMEM;
98106
98107@@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98108 locked = mm->locked_vm + grow;
98109 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
98110 limit >>= PAGE_SHIFT;
98111+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
98112 if (locked > limit && !capable(CAP_IPC_LOCK))
98113 return -ENOMEM;
98114 }
98115@@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98116 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
98117 * vma is the last one with address > vma->vm_end. Have to extend vma.
98118 */
98119+#ifndef CONFIG_IA64
98120+static
98121+#endif
98122 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98123 {
98124 int error;
98125+ bool locknext;
98126
98127 if (!(vma->vm_flags & VM_GROWSUP))
98128 return -EFAULT;
98129
98130+ /* Also guard against wrapping around to address 0. */
98131+ if (address < PAGE_ALIGN(address+1))
98132+ address = PAGE_ALIGN(address+1);
98133+ else
98134+ return -ENOMEM;
98135+
98136 /*
98137 * We must make sure the anon_vma is allocated
98138 * so that the anon_vma locking is not a noop.
98139 */
98140 if (unlikely(anon_vma_prepare(vma)))
98141 return -ENOMEM;
98142+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
98143+ if (locknext && anon_vma_prepare(vma->vm_next))
98144+ return -ENOMEM;
98145 vma_lock_anon_vma(vma);
98146+ if (locknext)
98147+ vma_lock_anon_vma(vma->vm_next);
98148
98149 /*
98150 * vma->vm_start/vm_end cannot change under us because the caller
98151 * is required to hold the mmap_sem in read mode. We need the
98152- * anon_vma lock to serialize against concurrent expand_stacks.
98153- * Also guard against wrapping around to address 0.
98154+ * anon_vma locks to serialize against concurrent expand_stacks
98155+ * and expand_upwards.
98156 */
98157- if (address < PAGE_ALIGN(address+4))
98158- address = PAGE_ALIGN(address+4);
98159- else {
98160- vma_unlock_anon_vma(vma);
98161- return -ENOMEM;
98162- }
98163 error = 0;
98164
98165 /* Somebody else might have raced and expanded it already */
98166- if (address > vma->vm_end) {
98167+ 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)
98168+ error = -ENOMEM;
98169+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
98170 unsigned long size, grow;
98171
98172 size = address - vma->vm_start;
98173@@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98174 }
98175 }
98176 }
98177+ if (locknext)
98178+ vma_unlock_anon_vma(vma->vm_next);
98179 vma_unlock_anon_vma(vma);
98180 khugepaged_enter_vma_merge(vma, vma->vm_flags);
98181 validate_mm(vma->vm_mm);
98182@@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
98183 unsigned long address)
98184 {
98185 int error;
98186+ bool lockprev = false;
98187+ struct vm_area_struct *prev;
98188
98189 /*
98190 * We must make sure the anon_vma is allocated
98191@@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
98192 if (error)
98193 return error;
98194
98195+ prev = vma->vm_prev;
98196+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
98197+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
98198+#endif
98199+ if (lockprev && anon_vma_prepare(prev))
98200+ return -ENOMEM;
98201+ if (lockprev)
98202+ vma_lock_anon_vma(prev);
98203+
98204 vma_lock_anon_vma(vma);
98205
98206 /*
98207@@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
98208 */
98209
98210 /* Somebody else might have raced and expanded it already */
98211- if (address < vma->vm_start) {
98212+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
98213+ error = -ENOMEM;
98214+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
98215 unsigned long size, grow;
98216
98217+#ifdef CONFIG_PAX_SEGMEXEC
98218+ struct vm_area_struct *vma_m;
98219+
98220+ vma_m = pax_find_mirror_vma(vma);
98221+#endif
98222+
98223 size = vma->vm_end - address;
98224 grow = (vma->vm_start - address) >> PAGE_SHIFT;
98225
98226@@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
98227 vma->vm_pgoff -= grow;
98228 anon_vma_interval_tree_post_update_vma(vma);
98229 vma_gap_update(vma);
98230+
98231+#ifdef CONFIG_PAX_SEGMEXEC
98232+ if (vma_m) {
98233+ anon_vma_interval_tree_pre_update_vma(vma_m);
98234+ vma_m->vm_start -= grow << PAGE_SHIFT;
98235+ vma_m->vm_pgoff -= grow;
98236+ anon_vma_interval_tree_post_update_vma(vma_m);
98237+ vma_gap_update(vma_m);
98238+ }
98239+#endif
98240+
98241 spin_unlock(&vma->vm_mm->page_table_lock);
98242
98243+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
98244 perf_event_mmap(vma);
98245 }
98246 }
98247 }
98248 vma_unlock_anon_vma(vma);
98249+ if (lockprev)
98250+ vma_unlock_anon_vma(prev);
98251 khugepaged_enter_vma_merge(vma, vma->vm_flags);
98252 validate_mm(vma->vm_mm);
98253 return error;
98254@@ -2382,6 +2734,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
98255 do {
98256 long nrpages = vma_pages(vma);
98257
98258+#ifdef CONFIG_PAX_SEGMEXEC
98259+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
98260+ vma = remove_vma(vma);
98261+ continue;
98262+ }
98263+#endif
98264+
98265 if (vma->vm_flags & VM_ACCOUNT)
98266 nr_accounted += nrpages;
98267 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
98268@@ -2426,6 +2785,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
98269 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
98270 vma->vm_prev = NULL;
98271 do {
98272+
98273+#ifdef CONFIG_PAX_SEGMEXEC
98274+ if (vma->vm_mirror) {
98275+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
98276+ vma->vm_mirror->vm_mirror = NULL;
98277+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
98278+ vma->vm_mirror = NULL;
98279+ }
98280+#endif
98281+
98282 vma_rb_erase(vma, &mm->mm_rb);
98283 mm->map_count--;
98284 tail_vma = vma;
98285@@ -2453,14 +2822,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98286 struct vm_area_struct *new;
98287 int err = -ENOMEM;
98288
98289+#ifdef CONFIG_PAX_SEGMEXEC
98290+ struct vm_area_struct *vma_m, *new_m = NULL;
98291+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
98292+#endif
98293+
98294 if (is_vm_hugetlb_page(vma) && (addr &
98295 ~(huge_page_mask(hstate_vma(vma)))))
98296 return -EINVAL;
98297
98298+#ifdef CONFIG_PAX_SEGMEXEC
98299+ vma_m = pax_find_mirror_vma(vma);
98300+#endif
98301+
98302 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
98303 if (!new)
98304 goto out_err;
98305
98306+#ifdef CONFIG_PAX_SEGMEXEC
98307+ if (vma_m) {
98308+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
98309+ if (!new_m) {
98310+ kmem_cache_free(vm_area_cachep, new);
98311+ goto out_err;
98312+ }
98313+ }
98314+#endif
98315+
98316 /* most fields are the same, copy all, and then fixup */
98317 *new = *vma;
98318
98319@@ -2473,6 +2861,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98320 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
98321 }
98322
98323+#ifdef CONFIG_PAX_SEGMEXEC
98324+ if (vma_m) {
98325+ *new_m = *vma_m;
98326+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
98327+ new_m->vm_mirror = new;
98328+ new->vm_mirror = new_m;
98329+
98330+ if (new_below)
98331+ new_m->vm_end = addr_m;
98332+ else {
98333+ new_m->vm_start = addr_m;
98334+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
98335+ }
98336+ }
98337+#endif
98338+
98339 err = vma_dup_policy(vma, new);
98340 if (err)
98341 goto out_free_vma;
98342@@ -2493,6 +2897,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98343 else
98344 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
98345
98346+#ifdef CONFIG_PAX_SEGMEXEC
98347+ if (!err && vma_m) {
98348+ struct mempolicy *pol = vma_policy(new);
98349+
98350+ if (anon_vma_clone(new_m, vma_m))
98351+ goto out_free_mpol;
98352+
98353+ mpol_get(pol);
98354+ set_vma_policy(new_m, pol);
98355+
98356+ if (new_m->vm_file)
98357+ get_file(new_m->vm_file);
98358+
98359+ if (new_m->vm_ops && new_m->vm_ops->open)
98360+ new_m->vm_ops->open(new_m);
98361+
98362+ if (new_below)
98363+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
98364+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
98365+ else
98366+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
98367+
98368+ if (err) {
98369+ if (new_m->vm_ops && new_m->vm_ops->close)
98370+ new_m->vm_ops->close(new_m);
98371+ if (new_m->vm_file)
98372+ fput(new_m->vm_file);
98373+ mpol_put(pol);
98374+ }
98375+ }
98376+#endif
98377+
98378 /* Success. */
98379 if (!err)
98380 return 0;
98381@@ -2502,10 +2938,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98382 new->vm_ops->close(new);
98383 if (new->vm_file)
98384 fput(new->vm_file);
98385- unlink_anon_vmas(new);
98386 out_free_mpol:
98387 mpol_put(vma_policy(new));
98388 out_free_vma:
98389+
98390+#ifdef CONFIG_PAX_SEGMEXEC
98391+ if (new_m) {
98392+ unlink_anon_vmas(new_m);
98393+ kmem_cache_free(vm_area_cachep, new_m);
98394+ }
98395+#endif
98396+
98397+ unlink_anon_vmas(new);
98398 kmem_cache_free(vm_area_cachep, new);
98399 out_err:
98400 return err;
98401@@ -2518,6 +2962,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98402 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98403 unsigned long addr, int new_below)
98404 {
98405+
98406+#ifdef CONFIG_PAX_SEGMEXEC
98407+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
98408+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
98409+ if (mm->map_count >= sysctl_max_map_count-1)
98410+ return -ENOMEM;
98411+ } else
98412+#endif
98413+
98414 if (mm->map_count >= sysctl_max_map_count)
98415 return -ENOMEM;
98416
98417@@ -2529,11 +2982,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98418 * work. This now handles partial unmappings.
98419 * Jeremy Fitzhardinge <jeremy@goop.org>
98420 */
98421+#ifdef CONFIG_PAX_SEGMEXEC
98422 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98423 {
98424+ int ret = __do_munmap(mm, start, len);
98425+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
98426+ return ret;
98427+
98428+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
98429+}
98430+
98431+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98432+#else
98433+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98434+#endif
98435+{
98436 unsigned long end;
98437 struct vm_area_struct *vma, *prev, *last;
98438
98439+ /*
98440+ * mm->mmap_sem is required to protect against another thread
98441+ * changing the mappings in case we sleep.
98442+ */
98443+ verify_mm_writelocked(mm);
98444+
98445 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
98446 return -EINVAL;
98447
98448@@ -2611,6 +3083,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
98449 /* Fix up all other VM information */
98450 remove_vma_list(mm, vma);
98451
98452+ track_exec_limit(mm, start, end, 0UL);
98453+
98454 return 0;
98455 }
98456
98457@@ -2619,6 +3093,13 @@ int vm_munmap(unsigned long start, size_t len)
98458 int ret;
98459 struct mm_struct *mm = current->mm;
98460
98461+
98462+#ifdef CONFIG_PAX_SEGMEXEC
98463+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
98464+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
98465+ return -EINVAL;
98466+#endif
98467+
98468 down_write(&mm->mmap_sem);
98469 ret = do_munmap(mm, start, len);
98470 up_write(&mm->mmap_sem);
98471@@ -2632,16 +3113,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
98472 return vm_munmap(addr, len);
98473 }
98474
98475-static inline void verify_mm_writelocked(struct mm_struct *mm)
98476-{
98477-#ifdef CONFIG_DEBUG_VM
98478- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
98479- WARN_ON(1);
98480- up_read(&mm->mmap_sem);
98481- }
98482-#endif
98483-}
98484-
98485 /*
98486 * this is really a simplified "do_mmap". it only handles
98487 * anonymous maps. eventually we may be able to do some
98488@@ -2655,6 +3126,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98489 struct rb_node **rb_link, *rb_parent;
98490 pgoff_t pgoff = addr >> PAGE_SHIFT;
98491 int error;
98492+ unsigned long charged;
98493
98494 len = PAGE_ALIGN(len);
98495 if (!len)
98496@@ -2662,10 +3134,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98497
98498 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
98499
98500+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
98501+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
98502+ flags &= ~VM_EXEC;
98503+
98504+#ifdef CONFIG_PAX_MPROTECT
98505+ if (mm->pax_flags & MF_PAX_MPROTECT)
98506+ flags &= ~VM_MAYEXEC;
98507+#endif
98508+
98509+ }
98510+#endif
98511+
98512 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
98513 if (error & ~PAGE_MASK)
98514 return error;
98515
98516+ charged = len >> PAGE_SHIFT;
98517+
98518 error = mlock_future_check(mm, mm->def_flags, len);
98519 if (error)
98520 return error;
98521@@ -2679,21 +3165,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98522 /*
98523 * Clear old maps. this also does some error checking for us
98524 */
98525- munmap_back:
98526 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
98527 if (do_munmap(mm, addr, len))
98528 return -ENOMEM;
98529- goto munmap_back;
98530+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
98531 }
98532
98533 /* Check against address space limits *after* clearing old maps... */
98534- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
98535+ if (!may_expand_vm(mm, charged))
98536 return -ENOMEM;
98537
98538 if (mm->map_count > sysctl_max_map_count)
98539 return -ENOMEM;
98540
98541- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
98542+ if (security_vm_enough_memory_mm(mm, charged))
98543 return -ENOMEM;
98544
98545 /* Can we just expand an old private anonymous mapping? */
98546@@ -2707,7 +3192,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98547 */
98548 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98549 if (!vma) {
98550- vm_unacct_memory(len >> PAGE_SHIFT);
98551+ vm_unacct_memory(charged);
98552 return -ENOMEM;
98553 }
98554
98555@@ -2721,10 +3206,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
98556 vma_link(mm, vma, prev, rb_link, rb_parent);
98557 out:
98558 perf_event_mmap(vma);
98559- mm->total_vm += len >> PAGE_SHIFT;
98560+ mm->total_vm += charged;
98561 if (flags & VM_LOCKED)
98562- mm->locked_vm += (len >> PAGE_SHIFT);
98563+ mm->locked_vm += charged;
98564 vma->vm_flags |= VM_SOFTDIRTY;
98565+ track_exec_limit(mm, addr, addr + len, flags);
98566 return addr;
98567 }
98568
98569@@ -2786,6 +3272,7 @@ void exit_mmap(struct mm_struct *mm)
98570 while (vma) {
98571 if (vma->vm_flags & VM_ACCOUNT)
98572 nr_accounted += vma_pages(vma);
98573+ vma->vm_mirror = NULL;
98574 vma = remove_vma(vma);
98575 }
98576 vm_unacct_memory(nr_accounted);
98577@@ -2803,6 +3290,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
98578 struct vm_area_struct *prev;
98579 struct rb_node **rb_link, *rb_parent;
98580
98581+#ifdef CONFIG_PAX_SEGMEXEC
98582+ struct vm_area_struct *vma_m = NULL;
98583+#endif
98584+
98585+ if (security_mmap_addr(vma->vm_start))
98586+ return -EPERM;
98587+
98588 /*
98589 * The vm_pgoff of a purely anonymous vma should be irrelevant
98590 * until its first write fault, when page's anon_vma and index
98591@@ -2826,7 +3320,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
98592 security_vm_enough_memory_mm(mm, vma_pages(vma)))
98593 return -ENOMEM;
98594
98595+#ifdef CONFIG_PAX_SEGMEXEC
98596+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
98597+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98598+ if (!vma_m)
98599+ return -ENOMEM;
98600+ }
98601+#endif
98602+
98603 vma_link(mm, vma, prev, rb_link, rb_parent);
98604+
98605+#ifdef CONFIG_PAX_SEGMEXEC
98606+ if (vma_m)
98607+ BUG_ON(pax_mirror_vma(vma_m, vma));
98608+#endif
98609+
98610 return 0;
98611 }
98612
98613@@ -2845,6 +3353,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
98614 struct rb_node **rb_link, *rb_parent;
98615 bool faulted_in_anon_vma = true;
98616
98617+ BUG_ON(vma->vm_mirror);
98618+
98619 /*
98620 * If anonymous vma has not yet been faulted, update new pgoff
98621 * to match new location, to increase its chance of merging.
98622@@ -2909,6 +3419,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
98623 return NULL;
98624 }
98625
98626+#ifdef CONFIG_PAX_SEGMEXEC
98627+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
98628+{
98629+ struct vm_area_struct *prev_m;
98630+ struct rb_node **rb_link_m, *rb_parent_m;
98631+ struct mempolicy *pol_m;
98632+
98633+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
98634+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
98635+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
98636+ *vma_m = *vma;
98637+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
98638+ if (anon_vma_clone(vma_m, vma))
98639+ return -ENOMEM;
98640+ pol_m = vma_policy(vma_m);
98641+ mpol_get(pol_m);
98642+ set_vma_policy(vma_m, pol_m);
98643+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
98644+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
98645+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
98646+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
98647+ if (vma_m->vm_file)
98648+ get_file(vma_m->vm_file);
98649+ if (vma_m->vm_ops && vma_m->vm_ops->open)
98650+ vma_m->vm_ops->open(vma_m);
98651+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
98652+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
98653+ vma_m->vm_mirror = vma;
98654+ vma->vm_mirror = vma_m;
98655+ return 0;
98656+}
98657+#endif
98658+
98659 /*
98660 * Return true if the calling process may expand its vm space by the passed
98661 * number of pages
98662@@ -2920,6 +3463,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
98663
98664 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
98665
98666+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
98667 if (cur + npages > lim)
98668 return 0;
98669 return 1;
98670@@ -3002,6 +3546,22 @@ static struct vm_area_struct *__install_special_mapping(
98671 vma->vm_start = addr;
98672 vma->vm_end = addr + len;
98673
98674+#ifdef CONFIG_PAX_MPROTECT
98675+ if (mm->pax_flags & MF_PAX_MPROTECT) {
98676+#ifndef CONFIG_PAX_MPROTECT_COMPAT
98677+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
98678+ return ERR_PTR(-EPERM);
98679+ if (!(vm_flags & VM_EXEC))
98680+ vm_flags &= ~VM_MAYEXEC;
98681+#else
98682+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
98683+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
98684+#endif
98685+ else
98686+ vm_flags &= ~VM_MAYWRITE;
98687+ }
98688+#endif
98689+
98690 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
98691 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
98692
98693diff --git a/mm/mprotect.c b/mm/mprotect.c
98694index ace9345..63320dc 100644
98695--- a/mm/mprotect.c
98696+++ b/mm/mprotect.c
98697@@ -24,10 +24,18 @@
98698 #include <linux/migrate.h>
98699 #include <linux/perf_event.h>
98700 #include <linux/ksm.h>
98701+#include <linux/sched/sysctl.h>
98702+
98703+#ifdef CONFIG_PAX_MPROTECT
98704+#include <linux/elf.h>
98705+#include <linux/binfmts.h>
98706+#endif
98707+
98708 #include <asm/uaccess.h>
98709 #include <asm/pgtable.h>
98710 #include <asm/cacheflush.h>
98711 #include <asm/tlbflush.h>
98712+#include <asm/mmu_context.h>
98713
98714 /*
98715 * For a prot_numa update we only hold mmap_sem for read so there is a
98716@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
98717 return pages;
98718 }
98719
98720+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98721+/* called while holding the mmap semaphor for writing except stack expansion */
98722+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
98723+{
98724+ unsigned long oldlimit, newlimit = 0UL;
98725+
98726+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
98727+ return;
98728+
98729+ spin_lock(&mm->page_table_lock);
98730+ oldlimit = mm->context.user_cs_limit;
98731+ if ((prot & VM_EXEC) && oldlimit < end)
98732+ /* USER_CS limit moved up */
98733+ newlimit = end;
98734+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
98735+ /* USER_CS limit moved down */
98736+ newlimit = start;
98737+
98738+ if (newlimit) {
98739+ mm->context.user_cs_limit = newlimit;
98740+
98741+#ifdef CONFIG_SMP
98742+ wmb();
98743+ cpus_clear(mm->context.cpu_user_cs_mask);
98744+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
98745+#endif
98746+
98747+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
98748+ }
98749+ spin_unlock(&mm->page_table_lock);
98750+ if (newlimit == end) {
98751+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
98752+
98753+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
98754+ if (is_vm_hugetlb_page(vma))
98755+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
98756+ else
98757+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
98758+ }
98759+}
98760+#endif
98761+
98762 int
98763 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98764 unsigned long start, unsigned long end, unsigned long newflags)
98765@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98766 int error;
98767 int dirty_accountable = 0;
98768
98769+#ifdef CONFIG_PAX_SEGMEXEC
98770+ struct vm_area_struct *vma_m = NULL;
98771+ unsigned long start_m, end_m;
98772+
98773+ start_m = start + SEGMEXEC_TASK_SIZE;
98774+ end_m = end + SEGMEXEC_TASK_SIZE;
98775+#endif
98776+
98777 if (newflags == oldflags) {
98778 *pprev = vma;
98779 return 0;
98780 }
98781
98782+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
98783+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
98784+
98785+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
98786+ return -ENOMEM;
98787+
98788+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
98789+ return -ENOMEM;
98790+ }
98791+
98792 /*
98793 * If we make a private mapping writable we increase our commit;
98794 * but (without finer accounting) cannot reduce our commit if we
98795@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98796 }
98797 }
98798
98799+#ifdef CONFIG_PAX_SEGMEXEC
98800+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
98801+ if (start != vma->vm_start) {
98802+ error = split_vma(mm, vma, start, 1);
98803+ if (error)
98804+ goto fail;
98805+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
98806+ *pprev = (*pprev)->vm_next;
98807+ }
98808+
98809+ if (end != vma->vm_end) {
98810+ error = split_vma(mm, vma, end, 0);
98811+ if (error)
98812+ goto fail;
98813+ }
98814+
98815+ if (pax_find_mirror_vma(vma)) {
98816+ error = __do_munmap(mm, start_m, end_m - start_m);
98817+ if (error)
98818+ goto fail;
98819+ } else {
98820+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98821+ if (!vma_m) {
98822+ error = -ENOMEM;
98823+ goto fail;
98824+ }
98825+ vma->vm_flags = newflags;
98826+ error = pax_mirror_vma(vma_m, vma);
98827+ if (error) {
98828+ vma->vm_flags = oldflags;
98829+ goto fail;
98830+ }
98831+ }
98832+ }
98833+#endif
98834+
98835 /*
98836 * First try to merge with previous and/or next vma.
98837 */
98838@@ -314,7 +418,19 @@ success:
98839 * vm_flags and vm_page_prot are protected by the mmap_sem
98840 * held in write mode.
98841 */
98842+
98843+#ifdef CONFIG_PAX_SEGMEXEC
98844+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
98845+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
98846+#endif
98847+
98848 vma->vm_flags = newflags;
98849+
98850+#ifdef CONFIG_PAX_MPROTECT
98851+ if (mm->binfmt && mm->binfmt->handle_mprotect)
98852+ mm->binfmt->handle_mprotect(vma, newflags);
98853+#endif
98854+
98855 dirty_accountable = vma_wants_writenotify(vma);
98856 vma_set_page_prot(vma);
98857
98858@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98859 end = start + len;
98860 if (end <= start)
98861 return -ENOMEM;
98862+
98863+#ifdef CONFIG_PAX_SEGMEXEC
98864+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
98865+ if (end > SEGMEXEC_TASK_SIZE)
98866+ return -EINVAL;
98867+ } else
98868+#endif
98869+
98870+ if (end > TASK_SIZE)
98871+ return -EINVAL;
98872+
98873 if (!arch_validate_prot(prot))
98874 return -EINVAL;
98875
98876@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98877 /*
98878 * Does the application expect PROT_READ to imply PROT_EXEC:
98879 */
98880- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
98881+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
98882 prot |= PROT_EXEC;
98883
98884 vm_flags = calc_vm_prot_bits(prot);
98885@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98886 if (start > vma->vm_start)
98887 prev = vma;
98888
98889+#ifdef CONFIG_PAX_MPROTECT
98890+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
98891+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
98892+#endif
98893+
98894 for (nstart = start ; ; ) {
98895 unsigned long newflags;
98896
98897@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98898
98899 /* newflags >> 4 shift VM_MAY% in place of VM_% */
98900 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
98901+ if (prot & (PROT_WRITE | PROT_EXEC))
98902+ gr_log_rwxmprotect(vma);
98903+
98904+ error = -EACCES;
98905+ goto out;
98906+ }
98907+
98908+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
98909 error = -EACCES;
98910 goto out;
98911 }
98912@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98913 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
98914 if (error)
98915 goto out;
98916+
98917+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
98918+
98919 nstart = tmp;
98920
98921 if (nstart < prev->vm_end)
98922diff --git a/mm/mremap.c b/mm/mremap.c
98923index 17fa018..6f7892b 100644
98924--- a/mm/mremap.c
98925+++ b/mm/mremap.c
98926@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
98927 continue;
98928 pte = ptep_get_and_clear(mm, old_addr, old_pte);
98929 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
98930+
98931+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98932+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
98933+ pte = pte_exprotect(pte);
98934+#endif
98935+
98936 pte = move_soft_dirty_pte(pte);
98937 set_pte_at(mm, new_addr, new_pte, pte);
98938 }
98939@@ -346,6 +352,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
98940 if (is_vm_hugetlb_page(vma))
98941 goto Einval;
98942
98943+#ifdef CONFIG_PAX_SEGMEXEC
98944+ if (pax_find_mirror_vma(vma))
98945+ goto Einval;
98946+#endif
98947+
98948 /* We can't remap across vm area boundaries */
98949 if (old_len > vma->vm_end - addr)
98950 goto Efault;
98951@@ -401,20 +412,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
98952 unsigned long ret = -EINVAL;
98953 unsigned long charged = 0;
98954 unsigned long map_flags;
98955+ unsigned long pax_task_size = TASK_SIZE;
98956
98957 if (new_addr & ~PAGE_MASK)
98958 goto out;
98959
98960- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
98961+#ifdef CONFIG_PAX_SEGMEXEC
98962+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
98963+ pax_task_size = SEGMEXEC_TASK_SIZE;
98964+#endif
98965+
98966+ pax_task_size -= PAGE_SIZE;
98967+
98968+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
98969 goto out;
98970
98971 /* Check if the location we're moving into overlaps the
98972 * old location at all, and fail if it does.
98973 */
98974- if ((new_addr <= addr) && (new_addr+new_len) > addr)
98975- goto out;
98976-
98977- if ((addr <= new_addr) && (addr+old_len) > new_addr)
98978+ if (addr + old_len > new_addr && new_addr + new_len > addr)
98979 goto out;
98980
98981 ret = do_munmap(mm, new_addr, new_len);
98982@@ -483,6 +499,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98983 unsigned long ret = -EINVAL;
98984 unsigned long charged = 0;
98985 bool locked = false;
98986+ unsigned long pax_task_size = TASK_SIZE;
98987
98988 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
98989 return ret;
98990@@ -504,6 +521,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98991 if (!new_len)
98992 return ret;
98993
98994+#ifdef CONFIG_PAX_SEGMEXEC
98995+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
98996+ pax_task_size = SEGMEXEC_TASK_SIZE;
98997+#endif
98998+
98999+ pax_task_size -= PAGE_SIZE;
99000+
99001+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
99002+ old_len > pax_task_size || addr > pax_task_size-old_len)
99003+ return ret;
99004+
99005 down_write(&current->mm->mmap_sem);
99006
99007 if (flags & MREMAP_FIXED) {
99008@@ -554,6 +582,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99009 new_addr = addr;
99010 }
99011 ret = addr;
99012+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
99013 goto out;
99014 }
99015 }
99016@@ -577,7 +606,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99017 goto out;
99018 }
99019
99020+ map_flags = vma->vm_flags;
99021 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
99022+ if (!(ret & ~PAGE_MASK)) {
99023+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
99024+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
99025+ }
99026 }
99027 out:
99028 if (ret & ~PAGE_MASK)
99029diff --git a/mm/nommu.c b/mm/nommu.c
99030index ae5baae..cbb2ed5 100644
99031--- a/mm/nommu.c
99032+++ b/mm/nommu.c
99033@@ -71,7 +71,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
99034 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
99035 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
99036 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
99037-int heap_stack_gap = 0;
99038
99039 atomic_long_t mmap_pages_allocated;
99040
99041@@ -858,15 +857,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
99042 EXPORT_SYMBOL(find_vma);
99043
99044 /*
99045- * find a VMA
99046- * - we don't extend stack VMAs under NOMMU conditions
99047- */
99048-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
99049-{
99050- return find_vma(mm, addr);
99051-}
99052-
99053-/*
99054 * expand a stack to a given address
99055 * - not supported under NOMMU conditions
99056 */
99057@@ -1560,6 +1550,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99058
99059 /* most fields are the same, copy all, and then fixup */
99060 *new = *vma;
99061+ INIT_LIST_HEAD(&new->anon_vma_chain);
99062 *region = *vma->vm_region;
99063 new->vm_region = region;
99064
99065@@ -1990,8 +1981,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
99066 }
99067 EXPORT_SYMBOL(generic_file_remap_pages);
99068
99069-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99070- unsigned long addr, void *buf, int len, int write)
99071+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99072+ unsigned long addr, void *buf, size_t len, int write)
99073 {
99074 struct vm_area_struct *vma;
99075
99076@@ -2032,8 +2023,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99077 *
99078 * The caller must hold a reference on @mm.
99079 */
99080-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99081- void *buf, int len, int write)
99082+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
99083+ void *buf, size_t len, int write)
99084 {
99085 return __access_remote_vm(NULL, mm, addr, buf, len, write);
99086 }
99087@@ -2042,7 +2033,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99088 * Access another process' address space.
99089 * - source/target buffer must be kernel space
99090 */
99091-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
99092+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
99093 {
99094 struct mm_struct *mm;
99095
99096diff --git a/mm/page-writeback.c b/mm/page-writeback.c
99097index f24d4c9..77820e3 100644
99098--- a/mm/page-writeback.c
99099+++ b/mm/page-writeback.c
99100@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
99101 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
99102 * - the bdi dirty thresh drops quickly due to change of JBOD workload
99103 */
99104-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
99105+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
99106 unsigned long thresh,
99107 unsigned long bg_thresh,
99108 unsigned long dirty,
99109diff --git a/mm/page_alloc.c b/mm/page_alloc.c
99110index 8bbef06..a8d1989 100644
99111--- a/mm/page_alloc.c
99112+++ b/mm/page_alloc.c
99113@@ -60,6 +60,7 @@
99114 #include <linux/hugetlb.h>
99115 #include <linux/sched/rt.h>
99116 #include <linux/page_owner.h>
99117+#include <linux/random.h>
99118
99119 #include <asm/sections.h>
99120 #include <asm/tlbflush.h>
99121@@ -358,7 +359,7 @@ out:
99122 * This usage means that zero-order pages may not be compound.
99123 */
99124
99125-static void free_compound_page(struct page *page)
99126+void free_compound_page(struct page *page)
99127 {
99128 __free_pages_ok(page, compound_order(page));
99129 }
99130@@ -511,7 +512,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
99131 __mod_zone_freepage_state(zone, (1 << order), migratetype);
99132 }
99133 #else
99134-struct page_ext_operations debug_guardpage_ops = { NULL, };
99135+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
99136 static inline void set_page_guard(struct zone *zone, struct page *page,
99137 unsigned int order, int migratetype) {}
99138 static inline void clear_page_guard(struct zone *zone, struct page *page,
99139@@ -802,6 +803,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99140 int i;
99141 int bad = 0;
99142
99143+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99144+ unsigned long index = 1UL << order;
99145+#endif
99146+
99147 VM_BUG_ON_PAGE(PageTail(page), page);
99148 VM_BUG_ON_PAGE(PageHead(page) && compound_order(page) != order, page);
99149
99150@@ -823,6 +828,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99151 debug_check_no_obj_freed(page_address(page),
99152 PAGE_SIZE << order);
99153 }
99154+
99155+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99156+ for (; index; --index)
99157+ sanitize_highpage(page + index - 1);
99158+#endif
99159+
99160 arch_free_page(page, order);
99161 kernel_map_pages(page, 1 << order, 0);
99162
99163@@ -846,6 +857,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
99164 local_irq_restore(flags);
99165 }
99166
99167+#ifdef CONFIG_PAX_LATENT_ENTROPY
99168+bool __meminitdata extra_latent_entropy;
99169+
99170+static int __init setup_pax_extra_latent_entropy(char *str)
99171+{
99172+ extra_latent_entropy = true;
99173+ return 0;
99174+}
99175+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
99176+
99177+volatile u64 latent_entropy __latent_entropy;
99178+EXPORT_SYMBOL(latent_entropy);
99179+#endif
99180+
99181 void __init __free_pages_bootmem(struct page *page, unsigned int order)
99182 {
99183 unsigned int nr_pages = 1 << order;
99184@@ -861,6 +886,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
99185 __ClearPageReserved(p);
99186 set_page_count(p, 0);
99187
99188+#ifdef CONFIG_PAX_LATENT_ENTROPY
99189+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
99190+ u64 hash = 0;
99191+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
99192+ const u64 *data = lowmem_page_address(page);
99193+
99194+ for (index = 0; index < end; index++)
99195+ hash ^= hash + data[index];
99196+ latent_entropy ^= hash;
99197+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99198+ }
99199+#endif
99200+
99201 page_zone(page)->managed_pages += nr_pages;
99202 set_page_refcounted(page);
99203 __free_pages(page, order);
99204@@ -986,8 +1024,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
99205 arch_alloc_page(page, order);
99206 kernel_map_pages(page, 1 << order, 1);
99207
99208+#ifndef CONFIG_PAX_MEMORY_SANITIZE
99209 if (gfp_flags & __GFP_ZERO)
99210 prep_zero_page(page, order, gfp_flags);
99211+#endif
99212
99213 if (order && (gfp_flags & __GFP_COMP))
99214 prep_compound_page(page, order);
99215@@ -1700,7 +1740,7 @@ again:
99216 }
99217
99218 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
99219- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
99220+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
99221 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
99222 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
99223
99224@@ -2021,7 +2061,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
99225 do {
99226 mod_zone_page_state(zone, NR_ALLOC_BATCH,
99227 high_wmark_pages(zone) - low_wmark_pages(zone) -
99228- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
99229+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
99230 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
99231 } while (zone++ != preferred_zone);
99232 }
99233@@ -5781,7 +5821,7 @@ static void __setup_per_zone_wmarks(void)
99234
99235 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
99236 high_wmark_pages(zone) - low_wmark_pages(zone) -
99237- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
99238+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
99239
99240 setup_zone_migrate_reserve(zone);
99241 spin_unlock_irqrestore(&zone->lock, flags);
99242diff --git a/mm/percpu.c b/mm/percpu.c
99243index d39e2f4..de5f4b4 100644
99244--- a/mm/percpu.c
99245+++ b/mm/percpu.c
99246@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
99247 static unsigned int pcpu_high_unit_cpu __read_mostly;
99248
99249 /* the address of the first chunk which starts with the kernel static area */
99250-void *pcpu_base_addr __read_mostly;
99251+void *pcpu_base_addr __read_only;
99252 EXPORT_SYMBOL_GPL(pcpu_base_addr);
99253
99254 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
99255diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
99256index 5077afc..846c9ef 100644
99257--- a/mm/process_vm_access.c
99258+++ b/mm/process_vm_access.c
99259@@ -13,6 +13,7 @@
99260 #include <linux/uio.h>
99261 #include <linux/sched.h>
99262 #include <linux/highmem.h>
99263+#include <linux/security.h>
99264 #include <linux/ptrace.h>
99265 #include <linux/slab.h>
99266 #include <linux/syscalls.h>
99267@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
99268 ssize_t iov_len;
99269 size_t total_len = iov_iter_count(iter);
99270
99271+ return -ENOSYS; // PaX: until properly audited
99272+
99273 /*
99274 * Work out how many pages of struct pages we're going to need
99275 * when eventually calling get_user_pages
99276 */
99277 for (i = 0; i < riovcnt; i++) {
99278 iov_len = rvec[i].iov_len;
99279- if (iov_len > 0) {
99280- nr_pages_iov = ((unsigned long)rvec[i].iov_base
99281- + iov_len)
99282- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
99283- / PAGE_SIZE + 1;
99284- nr_pages = max(nr_pages, nr_pages_iov);
99285- }
99286+ if (iov_len <= 0)
99287+ continue;
99288+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
99289+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
99290+ nr_pages = max(nr_pages, nr_pages_iov);
99291 }
99292
99293 if (nr_pages == 0)
99294@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
99295 goto free_proc_pages;
99296 }
99297
99298+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
99299+ rc = -EPERM;
99300+ goto put_task_struct;
99301+ }
99302+
99303 mm = mm_access(task, PTRACE_MODE_ATTACH);
99304 if (!mm || IS_ERR(mm)) {
99305 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
99306diff --git a/mm/rmap.c b/mm/rmap.c
99307index ecb444a..0ff9eb3 100644
99308--- a/mm/rmap.c
99309+++ b/mm/rmap.c
99310@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99311 struct anon_vma *anon_vma = vma->anon_vma;
99312 struct anon_vma_chain *avc;
99313
99314+#ifdef CONFIG_PAX_SEGMEXEC
99315+ struct anon_vma_chain *avc_m = NULL;
99316+#endif
99317+
99318 might_sleep();
99319 if (unlikely(!anon_vma)) {
99320 struct mm_struct *mm = vma->vm_mm;
99321@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99322 if (!avc)
99323 goto out_enomem;
99324
99325+#ifdef CONFIG_PAX_SEGMEXEC
99326+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
99327+ if (!avc_m)
99328+ goto out_enomem_free_avc;
99329+#endif
99330+
99331 anon_vma = find_mergeable_anon_vma(vma);
99332 allocated = NULL;
99333 if (!anon_vma) {
99334@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99335 /* page_table_lock to protect against threads */
99336 spin_lock(&mm->page_table_lock);
99337 if (likely(!vma->anon_vma)) {
99338+
99339+#ifdef CONFIG_PAX_SEGMEXEC
99340+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
99341+
99342+ if (vma_m) {
99343+ BUG_ON(vma_m->anon_vma);
99344+ vma_m->anon_vma = anon_vma;
99345+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
99346+ anon_vma->degree++;
99347+ avc_m = NULL;
99348+ }
99349+#endif
99350+
99351 vma->anon_vma = anon_vma;
99352 anon_vma_chain_link(vma, avc, anon_vma);
99353 /* vma reference or self-parent link for new root */
99354@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
99355
99356 if (unlikely(allocated))
99357 put_anon_vma(allocated);
99358+
99359+#ifdef CONFIG_PAX_SEGMEXEC
99360+ if (unlikely(avc_m))
99361+ anon_vma_chain_free(avc_m);
99362+#endif
99363+
99364 if (unlikely(avc))
99365 anon_vma_chain_free(avc);
99366 }
99367 return 0;
99368
99369 out_enomem_free_avc:
99370+
99371+#ifdef CONFIG_PAX_SEGMEXEC
99372+ if (avc_m)
99373+ anon_vma_chain_free(avc_m);
99374+#endif
99375+
99376 anon_vma_chain_free(avc);
99377 out_enomem:
99378 return -ENOMEM;
99379@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
99380 * good chance of avoiding scanning the whole hierarchy when it searches where
99381 * page is mapped.
99382 */
99383-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
99384+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
99385 {
99386 struct anon_vma_chain *avc, *pavc;
99387 struct anon_vma *root = NULL;
99388@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
99389 * the corresponding VMA in the parent process is attached to.
99390 * Returns 0 on success, non-zero on failure.
99391 */
99392-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
99393+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
99394 {
99395 struct anon_vma_chain *avc;
99396 struct anon_vma *anon_vma;
99397@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
99398 void __init anon_vma_init(void)
99399 {
99400 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
99401- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
99402- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
99403+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
99404+ anon_vma_ctor);
99405+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
99406+ SLAB_PANIC|SLAB_NO_SANITIZE);
99407 }
99408
99409 /*
99410diff --git a/mm/shmem.c b/mm/shmem.c
99411index 993e6ba..a962ba3 100644
99412--- a/mm/shmem.c
99413+++ b/mm/shmem.c
99414@@ -33,7 +33,7 @@
99415 #include <linux/swap.h>
99416 #include <linux/aio.h>
99417
99418-static struct vfsmount *shm_mnt;
99419+struct vfsmount *shm_mnt;
99420
99421 #ifdef CONFIG_SHMEM
99422 /*
99423@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
99424 #define BOGO_DIRENT_SIZE 20
99425
99426 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
99427-#define SHORT_SYMLINK_LEN 128
99428+#define SHORT_SYMLINK_LEN 64
99429
99430 /*
99431 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
99432@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
99433 static int shmem_xattr_validate(const char *name)
99434 {
99435 struct { const char *prefix; size_t len; } arr[] = {
99436+
99437+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
99438+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
99439+#endif
99440+
99441 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
99442 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
99443 };
99444@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
99445 if (err)
99446 return err;
99447
99448+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
99449+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
99450+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
99451+ return -EOPNOTSUPP;
99452+ if (size > 8)
99453+ return -EINVAL;
99454+ }
99455+#endif
99456+
99457 return simple_xattr_set(&info->xattrs, name, value, size, flags);
99458 }
99459
99460@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
99461 int err = -ENOMEM;
99462
99463 /* Round up to L1_CACHE_BYTES to resist false sharing */
99464- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
99465- L1_CACHE_BYTES), GFP_KERNEL);
99466+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
99467 if (!sbinfo)
99468 return -ENOMEM;
99469
99470diff --git a/mm/slab.c b/mm/slab.c
99471index 65b5dcb..d53d866 100644
99472--- a/mm/slab.c
99473+++ b/mm/slab.c
99474@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
99475 if ((x)->max_freeable < i) \
99476 (x)->max_freeable = i; \
99477 } while (0)
99478-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
99479-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
99480-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
99481-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
99482+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
99483+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
99484+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
99485+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
99486+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
99487+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
99488 #else
99489 #define STATS_INC_ACTIVE(x) do { } while (0)
99490 #define STATS_DEC_ACTIVE(x) do { } while (0)
99491@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
99492 #define STATS_INC_ALLOCMISS(x) do { } while (0)
99493 #define STATS_INC_FREEHIT(x) do { } while (0)
99494 #define STATS_INC_FREEMISS(x) do { } while (0)
99495+#define STATS_INC_SANITIZED(x) do { } while (0)
99496+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
99497 #endif
99498
99499 #if DEBUG
99500@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
99501 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
99502 */
99503 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
99504- const struct page *page, void *obj)
99505+ const struct page *page, const void *obj)
99506 {
99507 u32 offset = (obj - page->s_mem);
99508 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
99509@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
99510 * structures first. Without this, further allocations will bug.
99511 */
99512 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
99513- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
99514+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
99515 slab_state = PARTIAL_NODE;
99516
99517 slab_early_init = 0;
99518@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99519
99520 cachep = find_mergeable(size, align, flags, name, ctor);
99521 if (cachep) {
99522- cachep->refcount++;
99523+ atomic_inc(&cachep->refcount);
99524
99525 /*
99526 * Adjust the object sizes so that we clear
99527@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
99528 struct array_cache *ac = cpu_cache_get(cachep);
99529
99530 check_irq_off();
99531+
99532+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99533+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
99534+ STATS_INC_NOT_SANITIZED(cachep);
99535+ else {
99536+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
99537+
99538+ if (cachep->ctor)
99539+ cachep->ctor(objp);
99540+
99541+ STATS_INC_SANITIZED(cachep);
99542+ }
99543+#endif
99544+
99545 kmemleak_free_recursive(objp, cachep->flags);
99546 objp = cache_free_debugcheck(cachep, objp, caller);
99547
99548@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
99549 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
99550 }
99551
99552-void *__kmalloc_node(size_t size, gfp_t flags, int node)
99553+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
99554 {
99555 return __do_kmalloc_node(size, flags, node, _RET_IP_);
99556 }
99557@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
99558 * @flags: the type of memory to allocate (see kmalloc).
99559 * @caller: function caller for debug tracking of the caller
99560 */
99561-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
99562+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
99563 unsigned long caller)
99564 {
99565 struct kmem_cache *cachep;
99566@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
99567
99568 if (unlikely(ZERO_OR_NULL_PTR(objp)))
99569 return;
99570+ VM_BUG_ON(!virt_addr_valid(objp));
99571 local_irq_save(flags);
99572 kfree_debugcheck(objp);
99573 c = virt_to_cache(objp);
99574@@ -3984,14 +4003,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
99575 }
99576 /* cpu stats */
99577 {
99578- unsigned long allochit = atomic_read(&cachep->allochit);
99579- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
99580- unsigned long freehit = atomic_read(&cachep->freehit);
99581- unsigned long freemiss = atomic_read(&cachep->freemiss);
99582+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
99583+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
99584+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
99585+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
99586
99587 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
99588 allochit, allocmiss, freehit, freemiss);
99589 }
99590+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99591+ {
99592+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
99593+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
99594+
99595+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
99596+ }
99597+#endif
99598 #endif
99599 }
99600
99601@@ -4199,13 +4226,69 @@ static const struct file_operations proc_slabstats_operations = {
99602 static int __init slab_proc_init(void)
99603 {
99604 #ifdef CONFIG_DEBUG_SLAB_LEAK
99605- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
99606+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
99607 #endif
99608 return 0;
99609 }
99610 module_init(slab_proc_init);
99611 #endif
99612
99613+bool is_usercopy_object(const void *ptr)
99614+{
99615+ struct page *page;
99616+ struct kmem_cache *cachep;
99617+
99618+ if (ZERO_OR_NULL_PTR(ptr))
99619+ return false;
99620+
99621+ if (!slab_is_available())
99622+ return false;
99623+
99624+ if (!virt_addr_valid(ptr))
99625+ return false;
99626+
99627+ page = virt_to_head_page(ptr);
99628+
99629+ if (!PageSlab(page))
99630+ return false;
99631+
99632+ cachep = page->slab_cache;
99633+ return cachep->flags & SLAB_USERCOPY;
99634+}
99635+
99636+#ifdef CONFIG_PAX_USERCOPY
99637+const char *check_heap_object(const void *ptr, unsigned long n)
99638+{
99639+ struct page *page;
99640+ struct kmem_cache *cachep;
99641+ unsigned int objnr;
99642+ unsigned long offset;
99643+
99644+ if (ZERO_OR_NULL_PTR(ptr))
99645+ return "<null>";
99646+
99647+ if (!virt_addr_valid(ptr))
99648+ return NULL;
99649+
99650+ page = virt_to_head_page(ptr);
99651+
99652+ if (!PageSlab(page))
99653+ return NULL;
99654+
99655+ cachep = page->slab_cache;
99656+ if (!(cachep->flags & SLAB_USERCOPY))
99657+ return cachep->name;
99658+
99659+ objnr = obj_to_index(cachep, page, ptr);
99660+ BUG_ON(objnr >= cachep->num);
99661+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
99662+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
99663+ return NULL;
99664+
99665+ return cachep->name;
99666+}
99667+#endif
99668+
99669 /**
99670 * ksize - get the actual amount of memory allocated for a given object
99671 * @objp: Pointer to the object
99672diff --git a/mm/slab.h b/mm/slab.h
99673index 1cf40054..10ad563 100644
99674--- a/mm/slab.h
99675+++ b/mm/slab.h
99676@@ -22,7 +22,7 @@ struct kmem_cache {
99677 unsigned int align; /* Alignment as calculated */
99678 unsigned long flags; /* Active flags on the slab */
99679 const char *name; /* Slab name for sysfs */
99680- int refcount; /* Use counter */
99681+ atomic_t refcount; /* Use counter */
99682 void (*ctor)(void *); /* Called on object slot creation */
99683 struct list_head list; /* List of all slab caches on the system */
99684 };
99685@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
99686 /* The slab cache that manages slab cache information */
99687 extern struct kmem_cache *kmem_cache;
99688
99689+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99690+#ifdef CONFIG_X86_64
99691+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
99692+#else
99693+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
99694+#endif
99695+enum pax_sanitize_mode {
99696+ PAX_SANITIZE_SLAB_OFF = 0,
99697+ PAX_SANITIZE_SLAB_FAST,
99698+ PAX_SANITIZE_SLAB_FULL,
99699+};
99700+extern enum pax_sanitize_mode pax_sanitize_slab;
99701+#endif
99702+
99703 unsigned long calculate_alignment(unsigned long flags,
99704 unsigned long align, unsigned long size);
99705
99706@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
99707
99708 /* Legal flag mask for kmem_cache_create(), for various configurations */
99709 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
99710- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
99711+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
99712+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
99713
99714 #if defined(CONFIG_DEBUG_SLAB)
99715 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
99716@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
99717 return s;
99718
99719 page = virt_to_head_page(x);
99720+
99721+ BUG_ON(!PageSlab(page));
99722+
99723 cachep = page->slab_cache;
99724 if (slab_equal_or_root(cachep, s))
99725 return cachep;
99726diff --git a/mm/slab_common.c b/mm/slab_common.c
99727index e03dd6f..c475838 100644
99728--- a/mm/slab_common.c
99729+++ b/mm/slab_common.c
99730@@ -25,11 +25,35 @@
99731
99732 #include "slab.h"
99733
99734-enum slab_state slab_state;
99735+enum slab_state slab_state __read_only;
99736 LIST_HEAD(slab_caches);
99737 DEFINE_MUTEX(slab_mutex);
99738 struct kmem_cache *kmem_cache;
99739
99740+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99741+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
99742+static int __init pax_sanitize_slab_setup(char *str)
99743+{
99744+ if (!str)
99745+ return 0;
99746+
99747+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
99748+ pr_info("PaX slab sanitization: %s\n", "disabled");
99749+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
99750+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
99751+ pr_info("PaX slab sanitization: %s\n", "fast");
99752+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
99753+ } else if (!strcmp(str, "full")) {
99754+ pr_info("PaX slab sanitization: %s\n", "full");
99755+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
99756+ } else
99757+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
99758+
99759+ return 0;
99760+}
99761+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
99762+#endif
99763+
99764 /*
99765 * Set of flags that will prevent slab merging
99766 */
99767@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
99768 * Merge control. If this is set then no merging of slab caches will occur.
99769 * (Could be removed. This was introduced to pacify the merge skeptics.)
99770 */
99771-static int slab_nomerge;
99772+static int slab_nomerge = 1;
99773
99774 static int __init setup_slab_nomerge(char *str)
99775 {
99776@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
99777 /*
99778 * We may have set a slab to be unmergeable during bootstrap.
99779 */
99780- if (s->refcount < 0)
99781+ if (atomic_read(&s->refcount) < 0)
99782 return 1;
99783
99784 return 0;
99785@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
99786 if (err)
99787 goto out_free_cache;
99788
99789- s->refcount = 1;
99790+ atomic_set(&s->refcount, 1);
99791 list_add(&s->list, &slab_caches);
99792 out:
99793 if (err)
99794@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
99795 */
99796 flags &= CACHE_CREATE_MASK;
99797
99798+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99799+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
99800+ flags |= SLAB_NO_SANITIZE;
99801+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
99802+ flags &= ~SLAB_NO_SANITIZE;
99803+#endif
99804+
99805 s = __kmem_cache_alias(name, size, align, flags, ctor);
99806 if (s)
99807 goto out_unlock;
99808@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99809
99810 mutex_lock(&slab_mutex);
99811
99812- s->refcount--;
99813- if (s->refcount)
99814+ if (!atomic_dec_and_test(&s->refcount))
99815 goto out_unlock;
99816
99817 if (memcg_cleanup_cache_params(s) != 0)
99818@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99819 rcu_barrier();
99820
99821 memcg_free_cache_params(s);
99822-#ifdef SLAB_SUPPORTS_SYSFS
99823+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99824 sysfs_slab_remove(s);
99825 #else
99826 slab_kmem_cache_release(s);
99827@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
99828 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
99829 name, size, err);
99830
99831- s->refcount = -1; /* Exempt from merging for now */
99832+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
99833 }
99834
99835 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99836@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99837
99838 create_boot_cache(s, name, size, flags);
99839 list_add(&s->list, &slab_caches);
99840- s->refcount = 1;
99841+ atomic_set(&s->refcount, 1);
99842 return s;
99843 }
99844
99845@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99846 EXPORT_SYMBOL(kmalloc_dma_caches);
99847 #endif
99848
99849+#ifdef CONFIG_PAX_USERCOPY_SLABS
99850+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
99851+EXPORT_SYMBOL(kmalloc_usercopy_caches);
99852+#endif
99853+
99854 /*
99855 * Conversion table for small slabs sizes / 8 to the index in the
99856 * kmalloc array. This is necessary for slabs < 192 since we have non power
99857@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
99858 return kmalloc_dma_caches[index];
99859
99860 #endif
99861+
99862+#ifdef CONFIG_PAX_USERCOPY_SLABS
99863+ if (unlikely((flags & GFP_USERCOPY)))
99864+ return kmalloc_usercopy_caches[index];
99865+
99866+#endif
99867+
99868 return kmalloc_caches[index];
99869 }
99870
99871@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
99872 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
99873 if (!kmalloc_caches[i]) {
99874 kmalloc_caches[i] = create_kmalloc_cache(NULL,
99875- 1 << i, flags);
99876+ 1 << i, SLAB_USERCOPY | flags);
99877 }
99878
99879 /*
99880@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
99881 * earlier power of two caches
99882 */
99883 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
99884- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
99885+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
99886
99887 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
99888- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
99889+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
99890 }
99891
99892 /* Kmalloc array is now usable */
99893@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
99894 }
99895 }
99896 #endif
99897+
99898+#ifdef CONFIG_PAX_USERCOPY_SLABS
99899+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
99900+ struct kmem_cache *s = kmalloc_caches[i];
99901+
99902+ if (s) {
99903+ int size = kmalloc_size(i);
99904+ char *n = kasprintf(GFP_NOWAIT,
99905+ "usercopy-kmalloc-%d", size);
99906+
99907+ BUG_ON(!n);
99908+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
99909+ size, SLAB_USERCOPY | flags);
99910+ }
99911+ }
99912+#endif
99913+
99914 }
99915 #endif /* !CONFIG_SLOB */
99916
99917@@ -830,6 +889,9 @@ static void print_slabinfo_header(struct seq_file *m)
99918 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
99919 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
99920 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
99921+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99922+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
99923+#endif
99924 #endif
99925 seq_putc(m, '\n');
99926 }
99927@@ -964,7 +1026,7 @@ static int __init slab_proc_init(void)
99928 module_init(slab_proc_init);
99929 #endif /* CONFIG_SLABINFO */
99930
99931-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
99932+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
99933 gfp_t flags)
99934 {
99935 void *ret;
99936diff --git a/mm/slob.c b/mm/slob.c
99937index 96a8620..46b3f12 100644
99938--- a/mm/slob.c
99939+++ b/mm/slob.c
99940@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
99941 /*
99942 * Return the size of a slob block.
99943 */
99944-static slobidx_t slob_units(slob_t *s)
99945+static slobidx_t slob_units(const slob_t *s)
99946 {
99947 if (s->units > 0)
99948 return s->units;
99949@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
99950 /*
99951 * Return the next free slob block pointer after this one.
99952 */
99953-static slob_t *slob_next(slob_t *s)
99954+static slob_t *slob_next(const slob_t *s)
99955 {
99956 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
99957 slobidx_t next;
99958@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
99959 /*
99960 * Returns true if s is the last free block in its page.
99961 */
99962-static int slob_last(slob_t *s)
99963+static int slob_last(const slob_t *s)
99964 {
99965 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
99966 }
99967
99968-static void *slob_new_pages(gfp_t gfp, int order, int node)
99969+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
99970 {
99971- void *page;
99972+ struct page *page;
99973
99974 #ifdef CONFIG_NUMA
99975 if (node != NUMA_NO_NODE)
99976@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
99977 if (!page)
99978 return NULL;
99979
99980- return page_address(page);
99981+ __SetPageSlab(page);
99982+ return page;
99983 }
99984
99985-static void slob_free_pages(void *b, int order)
99986+static void slob_free_pages(struct page *sp, int order)
99987 {
99988 if (current->reclaim_state)
99989 current->reclaim_state->reclaimed_slab += 1 << order;
99990- free_pages((unsigned long)b, order);
99991+ __ClearPageSlab(sp);
99992+ page_mapcount_reset(sp);
99993+ sp->private = 0;
99994+ __free_pages(sp, order);
99995 }
99996
99997 /*
99998@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
99999
100000 /* Not enough space: must allocate a new page */
100001 if (!b) {
100002- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100003- if (!b)
100004+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100005+ if (!sp)
100006 return NULL;
100007- sp = virt_to_page(b);
100008- __SetPageSlab(sp);
100009+ b = page_address(sp);
100010
100011 spin_lock_irqsave(&slob_lock, flags);
100012 sp->units = SLOB_UNITS(PAGE_SIZE);
100013 sp->freelist = b;
100014+ sp->private = 0;
100015 INIT_LIST_HEAD(&sp->lru);
100016 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
100017 set_slob_page_free(sp, slob_list);
100018@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
100019 /*
100020 * slob_free: entry point into the slob allocator.
100021 */
100022-static void slob_free(void *block, int size)
100023+static void slob_free(struct kmem_cache *c, void *block, int size)
100024 {
100025 struct page *sp;
100026 slob_t *prev, *next, *b = (slob_t *)block;
100027@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
100028 if (slob_page_free(sp))
100029 clear_slob_page_free(sp);
100030 spin_unlock_irqrestore(&slob_lock, flags);
100031- __ClearPageSlab(sp);
100032- page_mapcount_reset(sp);
100033- slob_free_pages(b, 0);
100034+ slob_free_pages(sp, 0);
100035 return;
100036 }
100037
100038+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100039+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
100040+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
100041+#endif
100042+
100043 if (!slob_page_free(sp)) {
100044 /* This slob page is about to become partially free. Easy! */
100045 sp->units = units;
100046@@ -424,11 +431,10 @@ out:
100047 */
100048
100049 static __always_inline void *
100050-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100051+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
100052 {
100053- unsigned int *m;
100054- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100055- void *ret;
100056+ slob_t *m;
100057+ void *ret = NULL;
100058
100059 gfp &= gfp_allowed_mask;
100060
100061@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100062
100063 if (!m)
100064 return NULL;
100065- *m = size;
100066+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
100067+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
100068+ m[0].units = size;
100069+ m[1].units = align;
100070 ret = (void *)m + align;
100071
100072 trace_kmalloc_node(caller, ret,
100073 size, size + align, gfp, node);
100074 } else {
100075 unsigned int order = get_order(size);
100076+ struct page *page;
100077
100078 if (likely(order))
100079 gfp |= __GFP_COMP;
100080- ret = slob_new_pages(gfp, order, node);
100081+ page = slob_new_pages(gfp, order, node);
100082+ if (page) {
100083+ ret = page_address(page);
100084+ page->private = size;
100085+ }
100086
100087 trace_kmalloc_node(caller, ret,
100088 size, PAGE_SIZE << order, gfp, node);
100089 }
100090
100091- kmemleak_alloc(ret, size, 1, gfp);
100092 return ret;
100093 }
100094
100095-void *__kmalloc(size_t size, gfp_t gfp)
100096+static __always_inline void *
100097+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100098+{
100099+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100100+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
100101+
100102+ if (!ZERO_OR_NULL_PTR(ret))
100103+ kmemleak_alloc(ret, size, 1, gfp);
100104+ return ret;
100105+}
100106+
100107+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
100108 {
100109 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
100110 }
100111@@ -491,34 +515,112 @@ void kfree(const void *block)
100112 return;
100113 kmemleak_free(block);
100114
100115+ VM_BUG_ON(!virt_addr_valid(block));
100116 sp = virt_to_page(block);
100117- if (PageSlab(sp)) {
100118+ VM_BUG_ON(!PageSlab(sp));
100119+ if (!sp->private) {
100120 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100121- unsigned int *m = (unsigned int *)(block - align);
100122- slob_free(m, *m + align);
100123- } else
100124+ slob_t *m = (slob_t *)(block - align);
100125+ slob_free(NULL, m, m[0].units + align);
100126+ } else {
100127+ __ClearPageSlab(sp);
100128+ page_mapcount_reset(sp);
100129+ sp->private = 0;
100130 __free_pages(sp, compound_order(sp));
100131+ }
100132 }
100133 EXPORT_SYMBOL(kfree);
100134
100135+bool is_usercopy_object(const void *ptr)
100136+{
100137+ if (!slab_is_available())
100138+ return false;
100139+
100140+ // PAX: TODO
100141+
100142+ return false;
100143+}
100144+
100145+#ifdef CONFIG_PAX_USERCOPY
100146+const char *check_heap_object(const void *ptr, unsigned long n)
100147+{
100148+ struct page *page;
100149+ const slob_t *free;
100150+ const void *base;
100151+ unsigned long flags;
100152+
100153+ if (ZERO_OR_NULL_PTR(ptr))
100154+ return "<null>";
100155+
100156+ if (!virt_addr_valid(ptr))
100157+ return NULL;
100158+
100159+ page = virt_to_head_page(ptr);
100160+ if (!PageSlab(page))
100161+ return NULL;
100162+
100163+ if (page->private) {
100164+ base = page;
100165+ if (base <= ptr && n <= page->private - (ptr - base))
100166+ return NULL;
100167+ return "<slob>";
100168+ }
100169+
100170+ /* some tricky double walking to find the chunk */
100171+ spin_lock_irqsave(&slob_lock, flags);
100172+ base = (void *)((unsigned long)ptr & PAGE_MASK);
100173+ free = page->freelist;
100174+
100175+ while (!slob_last(free) && (void *)free <= ptr) {
100176+ base = free + slob_units(free);
100177+ free = slob_next(free);
100178+ }
100179+
100180+ while (base < (void *)free) {
100181+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
100182+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
100183+ int offset;
100184+
100185+ if (ptr < base + align)
100186+ break;
100187+
100188+ offset = ptr - base - align;
100189+ if (offset >= m) {
100190+ base += size;
100191+ continue;
100192+ }
100193+
100194+ if (n > m - offset)
100195+ break;
100196+
100197+ spin_unlock_irqrestore(&slob_lock, flags);
100198+ return NULL;
100199+ }
100200+
100201+ spin_unlock_irqrestore(&slob_lock, flags);
100202+ return "<slob>";
100203+}
100204+#endif
100205+
100206 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
100207 size_t ksize(const void *block)
100208 {
100209 struct page *sp;
100210 int align;
100211- unsigned int *m;
100212+ slob_t *m;
100213
100214 BUG_ON(!block);
100215 if (unlikely(block == ZERO_SIZE_PTR))
100216 return 0;
100217
100218 sp = virt_to_page(block);
100219- if (unlikely(!PageSlab(sp)))
100220- return PAGE_SIZE << compound_order(sp);
100221+ VM_BUG_ON(!PageSlab(sp));
100222+ if (sp->private)
100223+ return sp->private;
100224
100225 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100226- m = (unsigned int *)(block - align);
100227- return SLOB_UNITS(*m) * SLOB_UNIT;
100228+ m = (slob_t *)(block - align);
100229+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
100230 }
100231 EXPORT_SYMBOL(ksize);
100232
100233@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
100234
100235 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
100236 {
100237- void *b;
100238+ void *b = NULL;
100239
100240 flags &= gfp_allowed_mask;
100241
100242 lockdep_trace_alloc(flags);
100243
100244+#ifdef CONFIG_PAX_USERCOPY_SLABS
100245+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
100246+#else
100247 if (c->size < PAGE_SIZE) {
100248 b = slob_alloc(c->size, flags, c->align, node);
100249 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
100250 SLOB_UNITS(c->size) * SLOB_UNIT,
100251 flags, node);
100252 } else {
100253- b = slob_new_pages(flags, get_order(c->size), node);
100254+ struct page *sp;
100255+
100256+ sp = slob_new_pages(flags, get_order(c->size), node);
100257+ if (sp) {
100258+ b = page_address(sp);
100259+ sp->private = c->size;
100260+ }
100261 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
100262 PAGE_SIZE << get_order(c->size),
100263 flags, node);
100264 }
100265+#endif
100266
100267 if (b && c->ctor)
100268 c->ctor(b);
100269@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
100270 EXPORT_SYMBOL(kmem_cache_alloc);
100271
100272 #ifdef CONFIG_NUMA
100273-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
100274+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
100275 {
100276 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
100277 }
100278@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
100279 EXPORT_SYMBOL(kmem_cache_alloc_node);
100280 #endif
100281
100282-static void __kmem_cache_free(void *b, int size)
100283+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
100284 {
100285- if (size < PAGE_SIZE)
100286- slob_free(b, size);
100287+ struct page *sp;
100288+
100289+ sp = virt_to_page(b);
100290+ BUG_ON(!PageSlab(sp));
100291+ if (!sp->private)
100292+ slob_free(c, b, size);
100293 else
100294- slob_free_pages(b, get_order(size));
100295+ slob_free_pages(sp, get_order(size));
100296 }
100297
100298 static void kmem_rcu_free(struct rcu_head *head)
100299@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
100300 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
100301 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
100302
100303- __kmem_cache_free(b, slob_rcu->size);
100304+ __kmem_cache_free(NULL, b, slob_rcu->size);
100305 }
100306
100307 void kmem_cache_free(struct kmem_cache *c, void *b)
100308 {
100309+ int size = c->size;
100310+
100311+#ifdef CONFIG_PAX_USERCOPY_SLABS
100312+ if (size + c->align < PAGE_SIZE) {
100313+ size += c->align;
100314+ b -= c->align;
100315+ }
100316+#endif
100317+
100318 kmemleak_free_recursive(b, c->flags);
100319 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
100320 struct slob_rcu *slob_rcu;
100321- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
100322- slob_rcu->size = c->size;
100323+ slob_rcu = b + (size - sizeof(struct slob_rcu));
100324+ slob_rcu->size = size;
100325 call_rcu(&slob_rcu->head, kmem_rcu_free);
100326 } else {
100327- __kmem_cache_free(b, c->size);
100328+ __kmem_cache_free(c, b, size);
100329 }
100330
100331+#ifdef CONFIG_PAX_USERCOPY_SLABS
100332+ trace_kfree(_RET_IP_, b);
100333+#else
100334 trace_kmem_cache_free(_RET_IP_, b);
100335+#endif
100336+
100337 }
100338 EXPORT_SYMBOL(kmem_cache_free);
100339
100340diff --git a/mm/slub.c b/mm/slub.c
100341index fe376fe..2f5757c 100644
100342--- a/mm/slub.c
100343+++ b/mm/slub.c
100344@@ -197,7 +197,7 @@ struct track {
100345
100346 enum track_item { TRACK_ALLOC, TRACK_FREE };
100347
100348-#ifdef CONFIG_SYSFS
100349+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100350 static int sysfs_slab_add(struct kmem_cache *);
100351 static int sysfs_slab_alias(struct kmem_cache *, const char *);
100352 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
100353@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
100354 if (!t->addr)
100355 return;
100356
100357- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
100358+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
100359 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
100360 #ifdef CONFIG_STACKTRACE
100361 {
100362@@ -2652,6 +2652,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
100363
100364 slab_free_hook(s, x);
100365
100366+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100367+ if (!(s->flags & SLAB_NO_SANITIZE)) {
100368+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
100369+ if (s->ctor)
100370+ s->ctor(x);
100371+ }
100372+#endif
100373+
100374 redo:
100375 /*
100376 * Determine the currently cpus per cpu slab.
100377@@ -2989,6 +2997,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
100378 s->inuse = size;
100379
100380 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
100381+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100382+ (!(flags & SLAB_NO_SANITIZE)) ||
100383+#endif
100384 s->ctor)) {
100385 /*
100386 * Relocate free pointer after the object if it is not
100387@@ -3243,7 +3254,7 @@ static int __init setup_slub_min_objects(char *str)
100388
100389 __setup("slub_min_objects=", setup_slub_min_objects);
100390
100391-void *__kmalloc(size_t size, gfp_t flags)
100392+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
100393 {
100394 struct kmem_cache *s;
100395 void *ret;
100396@@ -3279,7 +3290,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
100397 return ptr;
100398 }
100399
100400-void *__kmalloc_node(size_t size, gfp_t flags, int node)
100401+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100402 {
100403 struct kmem_cache *s;
100404 void *ret;
100405@@ -3308,6 +3319,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
100406 EXPORT_SYMBOL(__kmalloc_node);
100407 #endif
100408
100409+bool is_usercopy_object(const void *ptr)
100410+{
100411+ struct page *page;
100412+ struct kmem_cache *s;
100413+
100414+ if (ZERO_OR_NULL_PTR(ptr))
100415+ return false;
100416+
100417+ if (!slab_is_available())
100418+ return false;
100419+
100420+ if (!virt_addr_valid(ptr))
100421+ return false;
100422+
100423+ page = virt_to_head_page(ptr);
100424+
100425+ if (!PageSlab(page))
100426+ return false;
100427+
100428+ s = page->slab_cache;
100429+ return s->flags & SLAB_USERCOPY;
100430+}
100431+
100432+#ifdef CONFIG_PAX_USERCOPY
100433+const char *check_heap_object(const void *ptr, unsigned long n)
100434+{
100435+ struct page *page;
100436+ struct kmem_cache *s;
100437+ unsigned long offset;
100438+
100439+ if (ZERO_OR_NULL_PTR(ptr))
100440+ return "<null>";
100441+
100442+ if (!virt_addr_valid(ptr))
100443+ return NULL;
100444+
100445+ page = virt_to_head_page(ptr);
100446+
100447+ if (!PageSlab(page))
100448+ return NULL;
100449+
100450+ s = page->slab_cache;
100451+ if (!(s->flags & SLAB_USERCOPY))
100452+ return s->name;
100453+
100454+ offset = (ptr - page_address(page)) % s->size;
100455+ if (offset <= s->object_size && n <= s->object_size - offset)
100456+ return NULL;
100457+
100458+ return s->name;
100459+}
100460+#endif
100461+
100462 size_t ksize(const void *object)
100463 {
100464 struct page *page;
100465@@ -3336,6 +3400,7 @@ void kfree(const void *x)
100466 if (unlikely(ZERO_OR_NULL_PTR(x)))
100467 return;
100468
100469+ VM_BUG_ON(!virt_addr_valid(x));
100470 page = virt_to_head_page(x);
100471 if (unlikely(!PageSlab(page))) {
100472 BUG_ON(!PageCompound(page));
100473@@ -3631,7 +3696,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
100474 int i;
100475 struct kmem_cache *c;
100476
100477- s->refcount++;
100478+ atomic_inc(&s->refcount);
100479
100480 /*
100481 * Adjust the object sizes so that we clear
100482@@ -3650,7 +3715,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
100483 }
100484
100485 if (sysfs_slab_alias(s, name)) {
100486- s->refcount--;
100487+ atomic_dec(&s->refcount);
100488 s = NULL;
100489 }
100490 }
100491@@ -3767,7 +3832,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
100492 }
100493 #endif
100494
100495-#ifdef CONFIG_SYSFS
100496+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100497 static int count_inuse(struct page *page)
100498 {
100499 return page->inuse;
100500@@ -4048,7 +4113,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
100501 len += sprintf(buf + len, "%7ld ", l->count);
100502
100503 if (l->addr)
100504+#ifdef CONFIG_GRKERNSEC_HIDESYM
100505+ len += sprintf(buf + len, "%pS", NULL);
100506+#else
100507 len += sprintf(buf + len, "%pS", (void *)l->addr);
100508+#endif
100509 else
100510 len += sprintf(buf + len, "<not-available>");
100511
100512@@ -4150,12 +4219,12 @@ static void __init resiliency_test(void)
100513 validate_slab_cache(kmalloc_caches[9]);
100514 }
100515 #else
100516-#ifdef CONFIG_SYSFS
100517+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100518 static void resiliency_test(void) {};
100519 #endif
100520 #endif
100521
100522-#ifdef CONFIG_SYSFS
100523+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100524 enum slab_stat_type {
100525 SL_ALL, /* All slabs */
100526 SL_PARTIAL, /* Only partially allocated slabs */
100527@@ -4392,13 +4461,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
100528 {
100529 if (!s->ctor)
100530 return 0;
100531+#ifdef CONFIG_GRKERNSEC_HIDESYM
100532+ return sprintf(buf, "%pS\n", NULL);
100533+#else
100534 return sprintf(buf, "%pS\n", s->ctor);
100535+#endif
100536 }
100537 SLAB_ATTR_RO(ctor);
100538
100539 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
100540 {
100541- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
100542+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
100543 }
100544 SLAB_ATTR_RO(aliases);
100545
100546@@ -4486,6 +4559,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
100547 SLAB_ATTR_RO(cache_dma);
100548 #endif
100549
100550+#ifdef CONFIG_PAX_USERCOPY_SLABS
100551+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
100552+{
100553+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
100554+}
100555+SLAB_ATTR_RO(usercopy);
100556+#endif
100557+
100558+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100559+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
100560+{
100561+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
100562+}
100563+SLAB_ATTR_RO(sanitize);
100564+#endif
100565+
100566 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
100567 {
100568 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
100569@@ -4541,7 +4630,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
100570 * as well as cause other issues like converting a mergeable
100571 * cache into an umergeable one.
100572 */
100573- if (s->refcount > 1)
100574+ if (atomic_read(&s->refcount) > 1)
100575 return -EINVAL;
100576
100577 s->flags &= ~SLAB_TRACE;
100578@@ -4661,7 +4750,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
100579 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
100580 size_t length)
100581 {
100582- if (s->refcount > 1)
100583+ if (atomic_read(&s->refcount) > 1)
100584 return -EINVAL;
100585
100586 s->flags &= ~SLAB_FAILSLAB;
100587@@ -4831,6 +4920,12 @@ static struct attribute *slab_attrs[] = {
100588 #ifdef CONFIG_ZONE_DMA
100589 &cache_dma_attr.attr,
100590 #endif
100591+#ifdef CONFIG_PAX_USERCOPY_SLABS
100592+ &usercopy_attr.attr,
100593+#endif
100594+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100595+ &sanitize_attr.attr,
100596+#endif
100597 #ifdef CONFIG_NUMA
100598 &remote_node_defrag_ratio_attr.attr,
100599 #endif
100600@@ -5075,6 +5170,7 @@ static char *create_unique_id(struct kmem_cache *s)
100601 return name;
100602 }
100603
100604+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100605 static int sysfs_slab_add(struct kmem_cache *s)
100606 {
100607 int err;
100608@@ -5148,6 +5244,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
100609 kobject_del(&s->kobj);
100610 kobject_put(&s->kobj);
100611 }
100612+#endif
100613
100614 /*
100615 * Need to buffer aliases during bootup until sysfs becomes
100616@@ -5161,6 +5258,7 @@ struct saved_alias {
100617
100618 static struct saved_alias *alias_list;
100619
100620+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100621 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
100622 {
100623 struct saved_alias *al;
100624@@ -5183,6 +5281,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
100625 alias_list = al;
100626 return 0;
100627 }
100628+#endif
100629
100630 static int __init slab_sysfs_init(void)
100631 {
100632diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
100633index 4cba9c2..b4f9fcc 100644
100634--- a/mm/sparse-vmemmap.c
100635+++ b/mm/sparse-vmemmap.c
100636@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
100637 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
100638 if (!p)
100639 return NULL;
100640- pud_populate(&init_mm, pud, p);
100641+ pud_populate_kernel(&init_mm, pud, p);
100642 }
100643 return pud;
100644 }
100645@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
100646 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
100647 if (!p)
100648 return NULL;
100649- pgd_populate(&init_mm, pgd, p);
100650+ pgd_populate_kernel(&init_mm, pgd, p);
100651 }
100652 return pgd;
100653 }
100654diff --git a/mm/sparse.c b/mm/sparse.c
100655index d1b48b6..6e8590e 100644
100656--- a/mm/sparse.c
100657+++ b/mm/sparse.c
100658@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
100659
100660 for (i = 0; i < PAGES_PER_SECTION; i++) {
100661 if (PageHWPoison(&memmap[i])) {
100662- atomic_long_sub(1, &num_poisoned_pages);
100663+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
100664 ClearPageHWPoison(&memmap[i]);
100665 }
100666 }
100667diff --git a/mm/swap.c b/mm/swap.c
100668index 8a12b33..7068e78 100644
100669--- a/mm/swap.c
100670+++ b/mm/swap.c
100671@@ -31,6 +31,7 @@
100672 #include <linux/memcontrol.h>
100673 #include <linux/gfp.h>
100674 #include <linux/uio.h>
100675+#include <linux/hugetlb.h>
100676
100677 #include "internal.h"
100678
100679@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
100680
100681 __page_cache_release(page);
100682 dtor = get_compound_page_dtor(page);
100683+ if (!PageHuge(page))
100684+ BUG_ON(dtor != free_compound_page);
100685 (*dtor)(page);
100686 }
100687
100688diff --git a/mm/swapfile.c b/mm/swapfile.c
100689index 63f55cc..31874e6 100644
100690--- a/mm/swapfile.c
100691+++ b/mm/swapfile.c
100692@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
100693
100694 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
100695 /* Activity counter to indicate that a swapon or swapoff has occurred */
100696-static atomic_t proc_poll_event = ATOMIC_INIT(0);
100697+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
100698
100699 static inline unsigned char swap_count(unsigned char ent)
100700 {
100701@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
100702 spin_unlock(&swap_lock);
100703
100704 err = 0;
100705- atomic_inc(&proc_poll_event);
100706+ atomic_inc_unchecked(&proc_poll_event);
100707 wake_up_interruptible(&proc_poll_wait);
100708
100709 out_dput:
100710@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
100711
100712 poll_wait(file, &proc_poll_wait, wait);
100713
100714- if (seq->poll_event != atomic_read(&proc_poll_event)) {
100715- seq->poll_event = atomic_read(&proc_poll_event);
100716+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
100717+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
100718 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
100719 }
100720
100721@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
100722 return ret;
100723
100724 seq = file->private_data;
100725- seq->poll_event = atomic_read(&proc_poll_event);
100726+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
100727 return 0;
100728 }
100729
100730@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
100731 (frontswap_map) ? "FS" : "");
100732
100733 mutex_unlock(&swapon_mutex);
100734- atomic_inc(&proc_poll_event);
100735+ atomic_inc_unchecked(&proc_poll_event);
100736 wake_up_interruptible(&proc_poll_wait);
100737
100738 if (S_ISREG(inode->i_mode))
100739diff --git a/mm/util.c b/mm/util.c
100740index fec39d4..3e60325 100644
100741--- a/mm/util.c
100742+++ b/mm/util.c
100743@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
100744 void arch_pick_mmap_layout(struct mm_struct *mm)
100745 {
100746 mm->mmap_base = TASK_UNMAPPED_BASE;
100747+
100748+#ifdef CONFIG_PAX_RANDMMAP
100749+ if (mm->pax_flags & MF_PAX_RANDMMAP)
100750+ mm->mmap_base += mm->delta_mmap;
100751+#endif
100752+
100753 mm->get_unmapped_area = arch_get_unmapped_area;
100754 }
100755 #endif
100756@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
100757 if (!mm->arg_end)
100758 goto out_mm; /* Shh! No looking before we're done */
100759
100760+ if (gr_acl_handle_procpidmem(task))
100761+ goto out_mm;
100762+
100763 len = mm->arg_end - mm->arg_start;
100764
100765 if (len > buflen)
100766diff --git a/mm/vmalloc.c b/mm/vmalloc.c
100767index 39c3388..7d976d4 100644
100768--- a/mm/vmalloc.c
100769+++ b/mm/vmalloc.c
100770@@ -39,20 +39,65 @@ struct vfree_deferred {
100771 struct work_struct wq;
100772 };
100773 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
100774+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
100775+
100776+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100777+struct stack_deferred_llist {
100778+ struct llist_head list;
100779+ void *stack;
100780+ void *lowmem_stack;
100781+};
100782+
100783+struct stack_deferred {
100784+ struct stack_deferred_llist list;
100785+ struct work_struct wq;
100786+};
100787+
100788+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
100789+#endif
100790
100791 static void __vunmap(const void *, int);
100792
100793-static void free_work(struct work_struct *w)
100794+static void vfree_work(struct work_struct *w)
100795+{
100796+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
100797+ struct llist_node *llnode = llist_del_all(&p->list);
100798+ while (llnode) {
100799+ void *x = llnode;
100800+ llnode = llist_next(llnode);
100801+ __vunmap(x, 1);
100802+ }
100803+}
100804+
100805+static void vunmap_work(struct work_struct *w)
100806 {
100807 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
100808 struct llist_node *llnode = llist_del_all(&p->list);
100809 while (llnode) {
100810 void *p = llnode;
100811 llnode = llist_next(llnode);
100812- __vunmap(p, 1);
100813+ __vunmap(p, 0);
100814 }
100815 }
100816
100817+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100818+static void unmap_work(struct work_struct *w)
100819+{
100820+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
100821+ struct llist_node *llnode = llist_del_all(&p->list.list);
100822+ while (llnode) {
100823+ struct stack_deferred_llist *x =
100824+ llist_entry((struct llist_head *)llnode,
100825+ struct stack_deferred_llist, list);
100826+ void *stack = ACCESS_ONCE(x->stack);
100827+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
100828+ llnode = llist_next(llnode);
100829+ __vunmap(stack, 0);
100830+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
100831+ }
100832+}
100833+#endif
100834+
100835 /*** Page table manipulation functions ***/
100836
100837 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100838@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100839
100840 pte = pte_offset_kernel(pmd, addr);
100841 do {
100842- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100843- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100844+
100845+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100846+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
100847+ BUG_ON(!pte_exec(*pte));
100848+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
100849+ continue;
100850+ }
100851+#endif
100852+
100853+ {
100854+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100855+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100856+ }
100857 } while (pte++, addr += PAGE_SIZE, addr != end);
100858 }
100859
100860@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
100861 pte = pte_alloc_kernel(pmd, addr);
100862 if (!pte)
100863 return -ENOMEM;
100864+
100865+ pax_open_kernel();
100866 do {
100867 struct page *page = pages[*nr];
100868
100869- if (WARN_ON(!pte_none(*pte)))
100870+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100871+ if (pgprot_val(prot) & _PAGE_NX)
100872+#endif
100873+
100874+ if (!pte_none(*pte)) {
100875+ pax_close_kernel();
100876+ WARN_ON(1);
100877 return -EBUSY;
100878- if (WARN_ON(!page))
100879+ }
100880+ if (!page) {
100881+ pax_close_kernel();
100882+ WARN_ON(1);
100883 return -ENOMEM;
100884+ }
100885 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
100886 (*nr)++;
100887 } while (pte++, addr += PAGE_SIZE, addr != end);
100888+ pax_close_kernel();
100889 return 0;
100890 }
100891
100892@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
100893 pmd_t *pmd;
100894 unsigned long next;
100895
100896- pmd = pmd_alloc(&init_mm, pud, addr);
100897+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
100898 if (!pmd)
100899 return -ENOMEM;
100900 do {
100901@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
100902 pud_t *pud;
100903 unsigned long next;
100904
100905- pud = pud_alloc(&init_mm, pgd, addr);
100906+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
100907 if (!pud)
100908 return -ENOMEM;
100909 do {
100910@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
100911 if (addr >= MODULES_VADDR && addr < MODULES_END)
100912 return 1;
100913 #endif
100914+
100915+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100916+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
100917+ return 1;
100918+#endif
100919+
100920 return is_vmalloc_addr(x);
100921 }
100922
100923@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
100924
100925 if (!pgd_none(*pgd)) {
100926 pud_t *pud = pud_offset(pgd, addr);
100927+#ifdef CONFIG_X86
100928+ if (!pud_large(*pud))
100929+#endif
100930 if (!pud_none(*pud)) {
100931 pmd_t *pmd = pmd_offset(pud, addr);
100932+#ifdef CONFIG_X86
100933+ if (!pmd_large(*pmd))
100934+#endif
100935 if (!pmd_none(*pmd)) {
100936 pte_t *ptep, pte;
100937
100938@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
100939 * Allocate a region of KVA of the specified size and alignment, within the
100940 * vstart and vend.
100941 */
100942-static struct vmap_area *alloc_vmap_area(unsigned long size,
100943+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
100944 unsigned long align,
100945 unsigned long vstart, unsigned long vend,
100946 int node, gfp_t gfp_mask)
100947@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
100948 for_each_possible_cpu(i) {
100949 struct vmap_block_queue *vbq;
100950 struct vfree_deferred *p;
100951+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100952+ struct stack_deferred *p2;
100953+#endif
100954
100955 vbq = &per_cpu(vmap_block_queue, i);
100956 spin_lock_init(&vbq->lock);
100957 INIT_LIST_HEAD(&vbq->free);
100958+
100959 p = &per_cpu(vfree_deferred, i);
100960 init_llist_head(&p->list);
100961- INIT_WORK(&p->wq, free_work);
100962+ INIT_WORK(&p->wq, vfree_work);
100963+
100964+ p = &per_cpu(vunmap_deferred, i);
100965+ init_llist_head(&p->list);
100966+ INIT_WORK(&p->wq, vunmap_work);
100967+
100968+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100969+ p2 = &per_cpu(stack_deferred, i);
100970+ init_llist_head(&p2->list.list);
100971+ INIT_WORK(&p2->wq, unmap_work);
100972+#endif
100973 }
100974
100975 /* Import existing vmlist entries. */
100976@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
100977 struct vm_struct *area;
100978
100979 BUG_ON(in_interrupt());
100980+
100981+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100982+ if (flags & VM_KERNEXEC) {
100983+ if (start != VMALLOC_START || end != VMALLOC_END)
100984+ return NULL;
100985+ start = (unsigned long)MODULES_EXEC_VADDR;
100986+ end = (unsigned long)MODULES_EXEC_END;
100987+ }
100988+#endif
100989+
100990 if (flags & VM_IOREMAP)
100991 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
100992
100993@@ -1511,13 +1616,37 @@ EXPORT_SYMBOL(vfree);
100994 */
100995 void vunmap(const void *addr)
100996 {
100997- BUG_ON(in_interrupt());
100998- might_sleep();
100999- if (addr)
101000+ if (!addr)
101001+ return;
101002+
101003+ if (unlikely(in_interrupt())) {
101004+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
101005+ if (llist_add((struct llist_node *)addr, &p->list))
101006+ schedule_work(&p->wq);
101007+ } else {
101008+ might_sleep();
101009 __vunmap(addr, 0);
101010+ }
101011 }
101012 EXPORT_SYMBOL(vunmap);
101013
101014+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101015+void unmap_process_stacks(struct task_struct *task)
101016+{
101017+ if (unlikely(in_interrupt())) {
101018+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
101019+ struct stack_deferred_llist *list = task->stack;
101020+ list->stack = task->stack;
101021+ list->lowmem_stack = task->lowmem_stack;
101022+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
101023+ schedule_work(&p->wq);
101024+ } else {
101025+ __vunmap(task->stack, 0);
101026+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
101027+ }
101028+}
101029+#endif
101030+
101031 /**
101032 * vmap - map an array of pages into virtually contiguous space
101033 * @pages: array of page pointers
101034@@ -1538,6 +1667,11 @@ void *vmap(struct page **pages, unsigned int count,
101035 if (count > totalram_pages)
101036 return NULL;
101037
101038+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101039+ if (!(pgprot_val(prot) & _PAGE_NX))
101040+ flags |= VM_KERNEXEC;
101041+#endif
101042+
101043 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
101044 __builtin_return_address(0));
101045 if (!area)
101046@@ -1640,6 +1774,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
101047 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
101048 goto fail;
101049
101050+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101051+ if (!(pgprot_val(prot) & _PAGE_NX))
101052+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
101053+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
101054+ else
101055+#endif
101056+
101057 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
101058 start, end, node, gfp_mask, caller);
101059 if (!area)
101060@@ -1816,10 +1957,9 @@ EXPORT_SYMBOL(vzalloc_node);
101061 * For tight control over page level allocator and protection flags
101062 * use __vmalloc() instead.
101063 */
101064-
101065 void *vmalloc_exec(unsigned long size)
101066 {
101067- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
101068+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
101069 NUMA_NO_NODE, __builtin_return_address(0));
101070 }
101071
101072@@ -2126,6 +2266,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
101073 {
101074 struct vm_struct *area;
101075
101076+ BUG_ON(vma->vm_mirror);
101077+
101078 size = PAGE_ALIGN(size);
101079
101080 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
101081@@ -2608,7 +2750,11 @@ static int s_show(struct seq_file *m, void *p)
101082 v->addr, v->addr + v->size, v->size);
101083
101084 if (v->caller)
101085+#ifdef CONFIG_GRKERNSEC_HIDESYM
101086+ seq_printf(m, " %pK", v->caller);
101087+#else
101088 seq_printf(m, " %pS", v->caller);
101089+#endif
101090
101091 if (v->nr_pages)
101092 seq_printf(m, " pages=%d", v->nr_pages);
101093diff --git a/mm/vmstat.c b/mm/vmstat.c
101094index cdac773..7dd324e 100644
101095--- a/mm/vmstat.c
101096+++ b/mm/vmstat.c
101097@@ -24,6 +24,7 @@
101098 #include <linux/mm_inline.h>
101099 #include <linux/page_ext.h>
101100 #include <linux/page_owner.h>
101101+#include <linux/grsecurity.h>
101102
101103 #include "internal.h"
101104
101105@@ -83,7 +84,7 @@ void vm_events_fold_cpu(int cpu)
101106 *
101107 * vm_stat contains the global counters
101108 */
101109-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101110+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101111 EXPORT_SYMBOL(vm_stat);
101112
101113 #ifdef CONFIG_SMP
101114@@ -435,7 +436,7 @@ static int fold_diff(int *diff)
101115
101116 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101117 if (diff[i]) {
101118- atomic_long_add(diff[i], &vm_stat[i]);
101119+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
101120 changes++;
101121 }
101122 return changes;
101123@@ -473,7 +474,7 @@ static int refresh_cpu_vm_stats(void)
101124 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
101125 if (v) {
101126
101127- atomic_long_add(v, &zone->vm_stat[i]);
101128+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101129 global_diff[i] += v;
101130 #ifdef CONFIG_NUMA
101131 /* 3 seconds idle till flush */
101132@@ -537,7 +538,7 @@ void cpu_vm_stats_fold(int cpu)
101133
101134 v = p->vm_stat_diff[i];
101135 p->vm_stat_diff[i] = 0;
101136- atomic_long_add(v, &zone->vm_stat[i]);
101137+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101138 global_diff[i] += v;
101139 }
101140 }
101141@@ -557,8 +558,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
101142 if (pset->vm_stat_diff[i]) {
101143 int v = pset->vm_stat_diff[i];
101144 pset->vm_stat_diff[i] = 0;
101145- atomic_long_add(v, &zone->vm_stat[i]);
101146- atomic_long_add(v, &vm_stat[i]);
101147+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101148+ atomic_long_add_unchecked(v, &vm_stat[i]);
101149 }
101150 }
101151 #endif
101152@@ -1291,10 +1292,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
101153 stat_items_size += sizeof(struct vm_event_state);
101154 #endif
101155
101156- v = kmalloc(stat_items_size, GFP_KERNEL);
101157+ v = kzalloc(stat_items_size, GFP_KERNEL);
101158 m->private = v;
101159 if (!v)
101160 return ERR_PTR(-ENOMEM);
101161+
101162+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101163+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101164+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
101165+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
101166+ && !in_group_p(grsec_proc_gid)
101167+#endif
101168+ )
101169+ return (unsigned long *)m->private + *pos;
101170+#endif
101171+#endif
101172+
101173 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101174 v[i] = global_page_state(i);
101175 v += NR_VM_ZONE_STAT_ITEMS;
101176@@ -1526,10 +1539,16 @@ static int __init setup_vmstat(void)
101177 cpu_notifier_register_done();
101178 #endif
101179 #ifdef CONFIG_PROC_FS
101180- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
101181- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
101182- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101183- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
101184+ {
101185+ mode_t gr_mode = S_IRUGO;
101186+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101187+ gr_mode = S_IRUSR;
101188+#endif
101189+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
101190+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
101191+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101192+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
101193+ }
101194 #endif
101195 return 0;
101196 }
101197diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
101198index 64c6bed..b79a5de 100644
101199--- a/net/8021q/vlan.c
101200+++ b/net/8021q/vlan.c
101201@@ -481,7 +481,7 @@ out:
101202 return NOTIFY_DONE;
101203 }
101204
101205-static struct notifier_block vlan_notifier_block __read_mostly = {
101206+static struct notifier_block vlan_notifier_block = {
101207 .notifier_call = vlan_device_event,
101208 };
101209
101210@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
101211 err = -EPERM;
101212 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
101213 break;
101214- if ((args.u.name_type >= 0) &&
101215- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
101216+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
101217 struct vlan_net *vn;
101218
101219 vn = net_generic(net, vlan_net_id);
101220diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
101221index 8ac8a5c..991defc 100644
101222--- a/net/8021q/vlan_netlink.c
101223+++ b/net/8021q/vlan_netlink.c
101224@@ -238,7 +238,7 @@ nla_put_failure:
101225 return -EMSGSIZE;
101226 }
101227
101228-struct rtnl_link_ops vlan_link_ops __read_mostly = {
101229+struct rtnl_link_ops vlan_link_ops = {
101230 .kind = "vlan",
101231 .maxtype = IFLA_VLAN_MAX,
101232 .policy = vlan_policy,
101233diff --git a/net/9p/client.c b/net/9p/client.c
101234index e86a9bea..e91f70e 100644
101235--- a/net/9p/client.c
101236+++ b/net/9p/client.c
101237@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
101238 len - inline_len);
101239 } else {
101240 err = copy_from_user(ename + inline_len,
101241- uidata, len - inline_len);
101242+ (char __force_user *)uidata, len - inline_len);
101243 if (err) {
101244 err = -EFAULT;
101245 goto out_err;
101246@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
101247 kernel_buf = 1;
101248 indata = data;
101249 } else
101250- indata = (__force char *)udata;
101251+ indata = (__force_kernel char *)udata;
101252 /*
101253 * response header len is 11
101254 * PDU Header(7) + IO Size (4)
101255@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
101256 kernel_buf = 1;
101257 odata = data;
101258 } else
101259- odata = (char *)udata;
101260+ odata = (char __force_kernel *)udata;
101261 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
101262 P9_ZC_HDR_SZ, kernel_buf, "dqd",
101263 fid->fid, offset, rsize);
101264diff --git a/net/9p/mod.c b/net/9p/mod.c
101265index 6ab36ae..6f1841b 100644
101266--- a/net/9p/mod.c
101267+++ b/net/9p/mod.c
101268@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
101269 void v9fs_register_trans(struct p9_trans_module *m)
101270 {
101271 spin_lock(&v9fs_trans_lock);
101272- list_add_tail(&m->list, &v9fs_trans_list);
101273+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
101274 spin_unlock(&v9fs_trans_lock);
101275 }
101276 EXPORT_SYMBOL(v9fs_register_trans);
101277@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
101278 void v9fs_unregister_trans(struct p9_trans_module *m)
101279 {
101280 spin_lock(&v9fs_trans_lock);
101281- list_del_init(&m->list);
101282+ pax_list_del_init((struct list_head *)&m->list);
101283 spin_unlock(&v9fs_trans_lock);
101284 }
101285 EXPORT_SYMBOL(v9fs_unregister_trans);
101286diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
101287index 80d08f6..de63fd1 100644
101288--- a/net/9p/trans_fd.c
101289+++ b/net/9p/trans_fd.c
101290@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
101291 oldfs = get_fs();
101292 set_fs(get_ds());
101293 /* The cast to a user pointer is valid due to the set_fs() */
101294- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
101295+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
101296 set_fs(oldfs);
101297
101298 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
101299diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
101300index af46bc4..f9adfcd 100644
101301--- a/net/appletalk/atalk_proc.c
101302+++ b/net/appletalk/atalk_proc.c
101303@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
101304 struct proc_dir_entry *p;
101305 int rc = -ENOMEM;
101306
101307- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
101308+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
101309 if (!atalk_proc_dir)
101310 goto out;
101311
101312diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
101313index 876fbe8..8bbea9f 100644
101314--- a/net/atm/atm_misc.c
101315+++ b/net/atm/atm_misc.c
101316@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
101317 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
101318 return 1;
101319 atm_return(vcc, truesize);
101320- atomic_inc(&vcc->stats->rx_drop);
101321+ atomic_inc_unchecked(&vcc->stats->rx_drop);
101322 return 0;
101323 }
101324 EXPORT_SYMBOL(atm_charge);
101325@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
101326 }
101327 }
101328 atm_return(vcc, guess);
101329- atomic_inc(&vcc->stats->rx_drop);
101330+ atomic_inc_unchecked(&vcc->stats->rx_drop);
101331 return NULL;
101332 }
101333 EXPORT_SYMBOL(atm_alloc_charge);
101334@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
101335
101336 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
101337 {
101338-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
101339+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
101340 __SONET_ITEMS
101341 #undef __HANDLE_ITEM
101342 }
101343@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
101344
101345 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
101346 {
101347-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
101348+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
101349 __SONET_ITEMS
101350 #undef __HANDLE_ITEM
101351 }
101352diff --git a/net/atm/lec.c b/net/atm/lec.c
101353index 4b98f89..5a2f6cb 100644
101354--- a/net/atm/lec.c
101355+++ b/net/atm/lec.c
101356@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
101357 }
101358
101359 static struct lane2_ops lane2_ops = {
101360- lane2_resolve, /* resolve, spec 3.1.3 */
101361- lane2_associate_req, /* associate_req, spec 3.1.4 */
101362- NULL /* associate indicator, spec 3.1.5 */
101363+ .resolve = lane2_resolve,
101364+ .associate_req = lane2_associate_req,
101365+ .associate_indicator = NULL
101366 };
101367
101368 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
101369diff --git a/net/atm/lec.h b/net/atm/lec.h
101370index 4149db1..f2ab682 100644
101371--- a/net/atm/lec.h
101372+++ b/net/atm/lec.h
101373@@ -48,7 +48,7 @@ struct lane2_ops {
101374 const u8 *tlvs, u32 sizeoftlvs);
101375 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
101376 const u8 *tlvs, u32 sizeoftlvs);
101377-};
101378+} __no_const;
101379
101380 /*
101381 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
101382diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
101383index d1b2d9a..d549f7f 100644
101384--- a/net/atm/mpoa_caches.c
101385+++ b/net/atm/mpoa_caches.c
101386@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
101387
101388
101389 static struct in_cache_ops ingress_ops = {
101390- in_cache_add_entry, /* add_entry */
101391- in_cache_get, /* get */
101392- in_cache_get_with_mask, /* get_with_mask */
101393- in_cache_get_by_vcc, /* get_by_vcc */
101394- in_cache_put, /* put */
101395- in_cache_remove_entry, /* remove_entry */
101396- cache_hit, /* cache_hit */
101397- clear_count_and_expired, /* clear_count */
101398- check_resolving_entries, /* check_resolving */
101399- refresh_entries, /* refresh */
101400- in_destroy_cache /* destroy_cache */
101401+ .add_entry = in_cache_add_entry,
101402+ .get = in_cache_get,
101403+ .get_with_mask = in_cache_get_with_mask,
101404+ .get_by_vcc = in_cache_get_by_vcc,
101405+ .put = in_cache_put,
101406+ .remove_entry = in_cache_remove_entry,
101407+ .cache_hit = cache_hit,
101408+ .clear_count = clear_count_and_expired,
101409+ .check_resolving = check_resolving_entries,
101410+ .refresh = refresh_entries,
101411+ .destroy_cache = in_destroy_cache
101412 };
101413
101414 static struct eg_cache_ops egress_ops = {
101415- eg_cache_add_entry, /* add_entry */
101416- eg_cache_get_by_cache_id, /* get_by_cache_id */
101417- eg_cache_get_by_tag, /* get_by_tag */
101418- eg_cache_get_by_vcc, /* get_by_vcc */
101419- eg_cache_get_by_src_ip, /* get_by_src_ip */
101420- eg_cache_put, /* put */
101421- eg_cache_remove_entry, /* remove_entry */
101422- update_eg_cache_entry, /* update */
101423- clear_expired, /* clear_expired */
101424- eg_destroy_cache /* destroy_cache */
101425+ .add_entry = eg_cache_add_entry,
101426+ .get_by_cache_id = eg_cache_get_by_cache_id,
101427+ .get_by_tag = eg_cache_get_by_tag,
101428+ .get_by_vcc = eg_cache_get_by_vcc,
101429+ .get_by_src_ip = eg_cache_get_by_src_ip,
101430+ .put = eg_cache_put,
101431+ .remove_entry = eg_cache_remove_entry,
101432+ .update = update_eg_cache_entry,
101433+ .clear_expired = clear_expired,
101434+ .destroy_cache = eg_destroy_cache
101435 };
101436
101437
101438diff --git a/net/atm/proc.c b/net/atm/proc.c
101439index bbb6461..cf04016 100644
101440--- a/net/atm/proc.c
101441+++ b/net/atm/proc.c
101442@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
101443 const struct k_atm_aal_stats *stats)
101444 {
101445 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
101446- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
101447- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
101448- atomic_read(&stats->rx_drop));
101449+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
101450+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
101451+ atomic_read_unchecked(&stats->rx_drop));
101452 }
101453
101454 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
101455diff --git a/net/atm/resources.c b/net/atm/resources.c
101456index 0447d5d..3cf4728 100644
101457--- a/net/atm/resources.c
101458+++ b/net/atm/resources.c
101459@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
101460 static void copy_aal_stats(struct k_atm_aal_stats *from,
101461 struct atm_aal_stats *to)
101462 {
101463-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
101464+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
101465 __AAL_STAT_ITEMS
101466 #undef __HANDLE_ITEM
101467 }
101468@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
101469 static void subtract_aal_stats(struct k_atm_aal_stats *from,
101470 struct atm_aal_stats *to)
101471 {
101472-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
101473+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
101474 __AAL_STAT_ITEMS
101475 #undef __HANDLE_ITEM
101476 }
101477diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
101478index 919a5ce..cc6b444 100644
101479--- a/net/ax25/sysctl_net_ax25.c
101480+++ b/net/ax25/sysctl_net_ax25.c
101481@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
101482 {
101483 char path[sizeof("net/ax25/") + IFNAMSIZ];
101484 int k;
101485- struct ctl_table *table;
101486+ ctl_table_no_const *table;
101487
101488 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
101489 if (!table)
101490diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
101491index 1e80539..676c37a 100644
101492--- a/net/batman-adv/bat_iv_ogm.c
101493+++ b/net/batman-adv/bat_iv_ogm.c
101494@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
101495
101496 /* randomize initial seqno to avoid collision */
101497 get_random_bytes(&random_seqno, sizeof(random_seqno));
101498- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
101499+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
101500
101501 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
101502 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
101503@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
101504 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
101505
101506 /* change sequence number to network order */
101507- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
101508+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
101509 batadv_ogm_packet->seqno = htonl(seqno);
101510- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
101511+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
101512
101513 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
101514
101515@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
101516 return;
101517
101518 /* could be changed by schedule_own_packet() */
101519- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
101520+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
101521
101522 if (ogm_packet->flags & BATADV_DIRECTLINK)
101523 has_directlink_flag = true;
101524diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
101525index 00f9e14..e1c7203 100644
101526--- a/net/batman-adv/fragmentation.c
101527+++ b/net/batman-adv/fragmentation.c
101528@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
101529 frag_header.packet_type = BATADV_UNICAST_FRAG;
101530 frag_header.version = BATADV_COMPAT_VERSION;
101531 frag_header.ttl = BATADV_TTL;
101532- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
101533+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
101534 frag_header.reserved = 0;
101535 frag_header.no = 0;
101536 frag_header.total_size = htons(skb->len);
101537diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
101538index 5467955..75ad4e3 100644
101539--- a/net/batman-adv/soft-interface.c
101540+++ b/net/batman-adv/soft-interface.c
101541@@ -296,7 +296,7 @@ send:
101542 primary_if->net_dev->dev_addr);
101543
101544 /* set broadcast sequence number */
101545- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
101546+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
101547 bcast_packet->seqno = htonl(seqno);
101548
101549 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
101550@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
101551 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
101552
101553 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
101554- atomic_set(&bat_priv->bcast_seqno, 1);
101555+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
101556 atomic_set(&bat_priv->tt.vn, 0);
101557 atomic_set(&bat_priv->tt.local_changes, 0);
101558 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
101559@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
101560
101561 /* randomize initial seqno to avoid collision */
101562 get_random_bytes(&random_seqno, sizeof(random_seqno));
101563- atomic_set(&bat_priv->frag_seqno, random_seqno);
101564+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
101565
101566 bat_priv->primary_if = NULL;
101567 bat_priv->num_ifaces = 0;
101568@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
101569 return 0;
101570 }
101571
101572-struct rtnl_link_ops batadv_link_ops __read_mostly = {
101573+struct rtnl_link_ops batadv_link_ops = {
101574 .kind = "batadv",
101575 .priv_size = sizeof(struct batadv_priv),
101576 .setup = batadv_softif_init_early,
101577diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
101578index 8854c05..ee5d5497 100644
101579--- a/net/batman-adv/types.h
101580+++ b/net/batman-adv/types.h
101581@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
101582 struct batadv_hard_iface_bat_iv {
101583 unsigned char *ogm_buff;
101584 int ogm_buff_len;
101585- atomic_t ogm_seqno;
101586+ atomic_unchecked_t ogm_seqno;
101587 };
101588
101589 /**
101590@@ -768,7 +768,7 @@ struct batadv_priv {
101591 atomic_t bonding;
101592 atomic_t fragmentation;
101593 atomic_t packet_size_max;
101594- atomic_t frag_seqno;
101595+ atomic_unchecked_t frag_seqno;
101596 #ifdef CONFIG_BATMAN_ADV_BLA
101597 atomic_t bridge_loop_avoidance;
101598 #endif
101599@@ -787,7 +787,7 @@ struct batadv_priv {
101600 #endif
101601 uint32_t isolation_mark;
101602 uint32_t isolation_mark_mask;
101603- atomic_t bcast_seqno;
101604+ atomic_unchecked_t bcast_seqno;
101605 atomic_t bcast_queue_left;
101606 atomic_t batman_queue_left;
101607 char num_ifaces;
101608diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
101609index 2c245fd..dccf543 100644
101610--- a/net/bluetooth/hci_sock.c
101611+++ b/net/bluetooth/hci_sock.c
101612@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
101613 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
101614 }
101615
101616- len = min_t(unsigned int, len, sizeof(uf));
101617+ len = min((size_t)len, sizeof(uf));
101618 if (copy_from_user(&uf, optval, len)) {
101619 err = -EFAULT;
101620 break;
101621diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
101622index d04dc00..d25d576 100644
101623--- a/net/bluetooth/l2cap_core.c
101624+++ b/net/bluetooth/l2cap_core.c
101625@@ -3524,8 +3524,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
101626 break;
101627
101628 case L2CAP_CONF_RFC:
101629- if (olen == sizeof(rfc))
101630- memcpy(&rfc, (void *)val, olen);
101631+ if (olen != sizeof(rfc))
101632+ break;
101633+
101634+ memcpy(&rfc, (void *)val, olen);
101635
101636 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
101637 rfc.mode != chan->mode)
101638diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
101639index f65caf4..c07110c 100644
101640--- a/net/bluetooth/l2cap_sock.c
101641+++ b/net/bluetooth/l2cap_sock.c
101642@@ -634,7 +634,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
101643 struct sock *sk = sock->sk;
101644 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
101645 struct l2cap_options opts;
101646- int len, err = 0;
101647+ int err = 0;
101648+ size_t len = optlen;
101649 u32 opt;
101650
101651 BT_DBG("sk %p", sk);
101652@@ -661,7 +662,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
101653 opts.max_tx = chan->max_tx;
101654 opts.txwin_size = chan->tx_win;
101655
101656- len = min_t(unsigned int, sizeof(opts), optlen);
101657+ len = min(sizeof(opts), len);
101658 if (copy_from_user((char *) &opts, optval, len)) {
101659 err = -EFAULT;
101660 break;
101661@@ -748,7 +749,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101662 struct bt_security sec;
101663 struct bt_power pwr;
101664 struct l2cap_conn *conn;
101665- int len, err = 0;
101666+ int err = 0;
101667+ size_t len = optlen;
101668 u32 opt;
101669
101670 BT_DBG("sk %p", sk);
101671@@ -772,7 +774,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101672
101673 sec.level = BT_SECURITY_LOW;
101674
101675- len = min_t(unsigned int, sizeof(sec), optlen);
101676+ len = min(sizeof(sec), len);
101677 if (copy_from_user((char *) &sec, optval, len)) {
101678 err = -EFAULT;
101679 break;
101680@@ -868,7 +870,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
101681
101682 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
101683
101684- len = min_t(unsigned int, sizeof(pwr), optlen);
101685+ len = min(sizeof(pwr), len);
101686 if (copy_from_user((char *) &pwr, optval, len)) {
101687 err = -EFAULT;
101688 break;
101689diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
101690index 2348176..b9b6cf2 100644
101691--- a/net/bluetooth/rfcomm/sock.c
101692+++ b/net/bluetooth/rfcomm/sock.c
101693@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
101694 struct sock *sk = sock->sk;
101695 struct bt_security sec;
101696 int err = 0;
101697- size_t len;
101698+ size_t len = optlen;
101699 u32 opt;
101700
101701 BT_DBG("sk %p", sk);
101702@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
101703
101704 sec.level = BT_SECURITY_LOW;
101705
101706- len = min_t(unsigned int, sizeof(sec), optlen);
101707+ len = min(sizeof(sec), len);
101708 if (copy_from_user((char *) &sec, optval, len)) {
101709 err = -EFAULT;
101710 break;
101711diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
101712index 8e385a0..a5bdd8e 100644
101713--- a/net/bluetooth/rfcomm/tty.c
101714+++ b/net/bluetooth/rfcomm/tty.c
101715@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
101716 BT_DBG("tty %p id %d", tty, tty->index);
101717
101718 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
101719- dev->channel, dev->port.count);
101720+ dev->channel, atomic_read(&dev->port.count));
101721
101722 err = tty_port_open(&dev->port, tty, filp);
101723 if (err)
101724@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
101725 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
101726
101727 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
101728- dev->port.count);
101729+ atomic_read(&dev->port.count));
101730
101731 tty_port_close(&dev->port, tty, filp);
101732 }
101733diff --git a/net/bridge/br.c b/net/bridge/br.c
101734index 44425af..4ee730e 100644
101735--- a/net/bridge/br.c
101736+++ b/net/bridge/br.c
101737@@ -147,6 +147,8 @@ static int __init br_init(void)
101738 {
101739 int err;
101740
101741+ BUILD_BUG_ON(sizeof(struct br_input_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
101742+
101743 err = stp_proto_register(&br_stp_proto);
101744 if (err < 0) {
101745 pr_err("bridge: can't register sap for STP\n");
101746diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
101747index 9f5eb55..45ab9c5 100644
101748--- a/net/bridge/br_netlink.c
101749+++ b/net/bridge/br_netlink.c
101750@@ -566,7 +566,7 @@ static struct rtnl_af_ops br_af_ops = {
101751 .get_link_af_size = br_get_link_af_size,
101752 };
101753
101754-struct rtnl_link_ops br_link_ops __read_mostly = {
101755+struct rtnl_link_ops br_link_ops = {
101756 .kind = "bridge",
101757 .priv_size = sizeof(struct net_bridge),
101758 .setup = br_dev_setup,
101759diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
101760index d9a8c05..8dadc6c6 100644
101761--- a/net/bridge/netfilter/ebtables.c
101762+++ b/net/bridge/netfilter/ebtables.c
101763@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
101764 tmp.valid_hooks = t->table->valid_hooks;
101765 }
101766 mutex_unlock(&ebt_mutex);
101767- if (copy_to_user(user, &tmp, *len) != 0) {
101768+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101769 BUGPRINT("c2u Didn't work\n");
101770 ret = -EFAULT;
101771 break;
101772@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
101773 goto out;
101774 tmp.valid_hooks = t->valid_hooks;
101775
101776- if (copy_to_user(user, &tmp, *len) != 0) {
101777+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101778 ret = -EFAULT;
101779 break;
101780 }
101781@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
101782 tmp.entries_size = t->table->entries_size;
101783 tmp.valid_hooks = t->table->valid_hooks;
101784
101785- if (copy_to_user(user, &tmp, *len) != 0) {
101786+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
101787 ret = -EFAULT;
101788 break;
101789 }
101790diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
101791index f5afda1..dcf770a 100644
101792--- a/net/caif/cfctrl.c
101793+++ b/net/caif/cfctrl.c
101794@@ -10,6 +10,7 @@
101795 #include <linux/spinlock.h>
101796 #include <linux/slab.h>
101797 #include <linux/pkt_sched.h>
101798+#include <linux/sched.h>
101799 #include <net/caif/caif_layer.h>
101800 #include <net/caif/cfpkt.h>
101801 #include <net/caif/cfctrl.h>
101802@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
101803 memset(&dev_info, 0, sizeof(dev_info));
101804 dev_info.id = 0xff;
101805 cfsrvl_init(&this->serv, 0, &dev_info, false);
101806- atomic_set(&this->req_seq_no, 1);
101807- atomic_set(&this->rsp_seq_no, 1);
101808+ atomic_set_unchecked(&this->req_seq_no, 1);
101809+ atomic_set_unchecked(&this->rsp_seq_no, 1);
101810 this->serv.layer.receive = cfctrl_recv;
101811 sprintf(this->serv.layer.name, "ctrl");
101812 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
101813@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
101814 struct cfctrl_request_info *req)
101815 {
101816 spin_lock_bh(&ctrl->info_list_lock);
101817- atomic_inc(&ctrl->req_seq_no);
101818- req->sequence_no = atomic_read(&ctrl->req_seq_no);
101819+ atomic_inc_unchecked(&ctrl->req_seq_no);
101820+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
101821 list_add_tail(&req->list, &ctrl->list);
101822 spin_unlock_bh(&ctrl->info_list_lock);
101823 }
101824@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
101825 if (p != first)
101826 pr_warn("Requests are not received in order\n");
101827
101828- atomic_set(&ctrl->rsp_seq_no,
101829+ atomic_set_unchecked(&ctrl->rsp_seq_no,
101830 p->sequence_no);
101831 list_del(&p->list);
101832 goto out;
101833diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
101834index 67a4a36..8d28068 100644
101835--- a/net/caif/chnl_net.c
101836+++ b/net/caif/chnl_net.c
101837@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
101838 };
101839
101840
101841-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
101842+static struct rtnl_link_ops ipcaif_link_ops = {
101843 .kind = "caif",
101844 .priv_size = sizeof(struct chnl_net),
101845 .setup = ipcaif_net_setup,
101846diff --git a/net/can/af_can.c b/net/can/af_can.c
101847index 32d710e..93bcf05 100644
101848--- a/net/can/af_can.c
101849+++ b/net/can/af_can.c
101850@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
101851 };
101852
101853 /* notifier block for netdevice event */
101854-static struct notifier_block can_netdev_notifier __read_mostly = {
101855+static struct notifier_block can_netdev_notifier = {
101856 .notifier_call = can_notifier,
101857 };
101858
101859diff --git a/net/can/bcm.c b/net/can/bcm.c
101860index ee9ffd9..dfdf3d4 100644
101861--- a/net/can/bcm.c
101862+++ b/net/can/bcm.c
101863@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
101864 }
101865
101866 /* create /proc/net/can-bcm directory */
101867- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
101868+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
101869 return 0;
101870 }
101871
101872diff --git a/net/can/gw.c b/net/can/gw.c
101873index 295f62e..0c3b09e 100644
101874--- a/net/can/gw.c
101875+++ b/net/can/gw.c
101876@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
101877 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
101878
101879 static HLIST_HEAD(cgw_list);
101880-static struct notifier_block notifier;
101881
101882 static struct kmem_cache *cgw_cache __read_mostly;
101883
101884@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
101885 return err;
101886 }
101887
101888+static struct notifier_block notifier = {
101889+ .notifier_call = cgw_notifier
101890+};
101891+
101892 static __init int cgw_module_init(void)
101893 {
101894 /* sanitize given module parameter */
101895@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
101896 return -ENOMEM;
101897
101898 /* set notifier */
101899- notifier.notifier_call = cgw_notifier;
101900 register_netdevice_notifier(&notifier);
101901
101902 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
101903diff --git a/net/can/proc.c b/net/can/proc.c
101904index 1a19b98..df2b4ec 100644
101905--- a/net/can/proc.c
101906+++ b/net/can/proc.c
101907@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
101908 void can_init_proc(void)
101909 {
101910 /* create /proc/net/can directory */
101911- can_dir = proc_mkdir("can", init_net.proc_net);
101912+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
101913
101914 if (!can_dir) {
101915 printk(KERN_INFO "can: failed to create /proc/net/can . "
101916diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
101917index 74d30ec..25df678 100644
101918--- a/net/ceph/messenger.c
101919+++ b/net/ceph/messenger.c
101920@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
101921 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
101922
101923 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
101924-static atomic_t addr_str_seq = ATOMIC_INIT(0);
101925+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
101926
101927 static struct page *zero_page; /* used in certain error cases */
101928
101929@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
101930 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
101931 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
101932
101933- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101934+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101935 s = addr_str[i];
101936
101937 switch (ss->ss_family) {
101938diff --git a/net/compat.c b/net/compat.c
101939index f7bd286..76ea56a 100644
101940--- a/net/compat.c
101941+++ b/net/compat.c
101942@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
101943
101944 #define CMSG_COMPAT_FIRSTHDR(msg) \
101945 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
101946- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
101947+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
101948 (struct compat_cmsghdr __user *)NULL)
101949
101950 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
101951 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
101952 (ucmlen) <= (unsigned long) \
101953 ((mhdr)->msg_controllen - \
101954- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
101955+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
101956
101957 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
101958 struct compat_cmsghdr __user *cmsg, int cmsg_len)
101959 {
101960 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
101961- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
101962+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
101963 msg->msg_controllen)
101964 return NULL;
101965 return (struct compat_cmsghdr __user *)ptr;
101966@@ -203,7 +203,7 @@ Efault:
101967
101968 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
101969 {
101970- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101971+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101972 struct compat_cmsghdr cmhdr;
101973 struct compat_timeval ctv;
101974 struct compat_timespec cts[3];
101975@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
101976
101977 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
101978 {
101979- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101980+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101981 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
101982 int fdnum = scm->fp->count;
101983 struct file **fp = scm->fp->fp;
101984@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
101985 return -EFAULT;
101986 old_fs = get_fs();
101987 set_fs(KERNEL_DS);
101988- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
101989+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
101990 set_fs(old_fs);
101991
101992 return err;
101993@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
101994 len = sizeof(ktime);
101995 old_fs = get_fs();
101996 set_fs(KERNEL_DS);
101997- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
101998+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
101999 set_fs(old_fs);
102000
102001 if (!err) {
102002@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102003 case MCAST_JOIN_GROUP:
102004 case MCAST_LEAVE_GROUP:
102005 {
102006- struct compat_group_req __user *gr32 = (void *)optval;
102007+ struct compat_group_req __user *gr32 = (void __user *)optval;
102008 struct group_req __user *kgr =
102009 compat_alloc_user_space(sizeof(struct group_req));
102010 u32 interface;
102011@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102012 case MCAST_BLOCK_SOURCE:
102013 case MCAST_UNBLOCK_SOURCE:
102014 {
102015- struct compat_group_source_req __user *gsr32 = (void *)optval;
102016+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
102017 struct group_source_req __user *kgsr = compat_alloc_user_space(
102018 sizeof(struct group_source_req));
102019 u32 interface;
102020@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102021 }
102022 case MCAST_MSFILTER:
102023 {
102024- struct compat_group_filter __user *gf32 = (void *)optval;
102025+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102026 struct group_filter __user *kgf;
102027 u32 interface, fmode, numsrc;
102028
102029@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
102030 char __user *optval, int __user *optlen,
102031 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
102032 {
102033- struct compat_group_filter __user *gf32 = (void *)optval;
102034+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102035 struct group_filter __user *kgf;
102036 int __user *koptlen;
102037 u32 interface, fmode, numsrc;
102038@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
102039
102040 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
102041 return -EINVAL;
102042- if (copy_from_user(a, args, nas[call]))
102043+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
102044 return -EFAULT;
102045 a0 = a[0];
102046 a1 = a[1];
102047diff --git a/net/core/datagram.c b/net/core/datagram.c
102048index df493d6..1145766 100644
102049--- a/net/core/datagram.c
102050+++ b/net/core/datagram.c
102051@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
102052 }
102053
102054 kfree_skb(skb);
102055- atomic_inc(&sk->sk_drops);
102056+ atomic_inc_unchecked(&sk->sk_drops);
102057 sk_mem_reclaim_partial(sk);
102058
102059 return err;
102060diff --git a/net/core/dev.c b/net/core/dev.c
102061index 5dd905c..a95d262 100644
102062--- a/net/core/dev.c
102063+++ b/net/core/dev.c
102064@@ -1680,14 +1680,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
102065 {
102066 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
102067 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
102068- atomic_long_inc(&dev->rx_dropped);
102069+ atomic_long_inc_unchecked(&dev->rx_dropped);
102070 kfree_skb(skb);
102071 return NET_RX_DROP;
102072 }
102073 }
102074
102075 if (unlikely(!is_skb_forwardable(dev, skb))) {
102076- atomic_long_inc(&dev->rx_dropped);
102077+ atomic_long_inc_unchecked(&dev->rx_dropped);
102078 kfree_skb(skb);
102079 return NET_RX_DROP;
102080 }
102081@@ -2960,7 +2960,7 @@ recursion_alert:
102082 drop:
102083 rcu_read_unlock_bh();
102084
102085- atomic_long_inc(&dev->tx_dropped);
102086+ atomic_long_inc_unchecked(&dev->tx_dropped);
102087 kfree_skb_list(skb);
102088 return rc;
102089 out:
102090@@ -3303,7 +3303,7 @@ enqueue:
102091
102092 local_irq_restore(flags);
102093
102094- atomic_long_inc(&skb->dev->rx_dropped);
102095+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102096 kfree_skb(skb);
102097 return NET_RX_DROP;
102098 }
102099@@ -3380,7 +3380,7 @@ int netif_rx_ni(struct sk_buff *skb)
102100 }
102101 EXPORT_SYMBOL(netif_rx_ni);
102102
102103-static void net_tx_action(struct softirq_action *h)
102104+static __latent_entropy void net_tx_action(void)
102105 {
102106 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102107
102108@@ -3713,7 +3713,7 @@ ncls:
102109 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
102110 } else {
102111 drop:
102112- atomic_long_inc(&skb->dev->rx_dropped);
102113+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102114 kfree_skb(skb);
102115 /* Jamal, now you will not able to escape explaining
102116 * me how you were going to use this. :-)
102117@@ -4601,7 +4601,7 @@ out_unlock:
102118 return work;
102119 }
102120
102121-static void net_rx_action(struct softirq_action *h)
102122+static __latent_entropy void net_rx_action(void)
102123 {
102124 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102125 unsigned long time_limit = jiffies + 2;
102126@@ -6612,8 +6612,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
102127 } else {
102128 netdev_stats_to_stats64(storage, &dev->stats);
102129 }
102130- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
102131- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
102132+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
102133+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
102134 return storage;
102135 }
102136 EXPORT_SYMBOL(dev_get_stats);
102137diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
102138index b94b1d2..da3ed7c 100644
102139--- a/net/core/dev_ioctl.c
102140+++ b/net/core/dev_ioctl.c
102141@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
102142 no_module = !dev;
102143 if (no_module && capable(CAP_NET_ADMIN))
102144 no_module = request_module("netdev-%s", name);
102145- if (no_module && capable(CAP_SYS_MODULE))
102146+ if (no_module && capable(CAP_SYS_MODULE)) {
102147+#ifdef CONFIG_GRKERNSEC_MODHARDEN
102148+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
102149+#else
102150 request_module("%s", name);
102151+#endif
102152+ }
102153 }
102154 EXPORT_SYMBOL(dev_load);
102155
102156diff --git a/net/core/filter.c b/net/core/filter.c
102157index ec9baea..dd6195d 100644
102158--- a/net/core/filter.c
102159+++ b/net/core/filter.c
102160@@ -533,7 +533,11 @@ do_pass:
102161
102162 /* Unkown instruction. */
102163 default:
102164- goto err;
102165+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
102166+ fp->code, fp->jt, fp->jf, fp->k);
102167+ kfree(addrs);
102168+ BUG();
102169+ return -EINVAL;
102170 }
102171
102172 insn++;
102173@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
102174 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
102175 int pc, ret = 0;
102176
102177- BUILD_BUG_ON(BPF_MEMWORDS > 16);
102178+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
102179
102180 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
102181 if (!masks)
102182@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
102183 if (!fp)
102184 return -ENOMEM;
102185
102186- memcpy(fp->insns, fprog->filter, fsize);
102187+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
102188
102189 fp->len = fprog->len;
102190 /* Since unattached filters are not copied back to user
102191diff --git a/net/core/flow.c b/net/core/flow.c
102192index 1033725..340f65d 100644
102193--- a/net/core/flow.c
102194+++ b/net/core/flow.c
102195@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
102196 static int flow_entry_valid(struct flow_cache_entry *fle,
102197 struct netns_xfrm *xfrm)
102198 {
102199- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
102200+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
102201 return 0;
102202 if (fle->object && !fle->object->ops->check(fle->object))
102203 return 0;
102204@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
102205 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
102206 fcp->hash_count++;
102207 }
102208- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
102209+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
102210 flo = fle->object;
102211 if (!flo)
102212 goto ret_object;
102213@@ -263,7 +263,7 @@ nocache:
102214 }
102215 flo = resolver(net, key, family, dir, flo, ctx);
102216 if (fle) {
102217- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
102218+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
102219 if (!IS_ERR(flo))
102220 fle->object = flo;
102221 else
102222diff --git a/net/core/neighbour.c b/net/core/neighbour.c
102223index 8d614c9..55752ea 100644
102224--- a/net/core/neighbour.c
102225+++ b/net/core/neighbour.c
102226@@ -2802,7 +2802,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
102227 void __user *buffer, size_t *lenp, loff_t *ppos)
102228 {
102229 int size, ret;
102230- struct ctl_table tmp = *ctl;
102231+ ctl_table_no_const tmp = *ctl;
102232
102233 tmp.extra1 = &zero;
102234 tmp.extra2 = &unres_qlen_max;
102235@@ -2864,7 +2864,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
102236 void __user *buffer,
102237 size_t *lenp, loff_t *ppos)
102238 {
102239- struct ctl_table tmp = *ctl;
102240+ ctl_table_no_const tmp = *ctl;
102241 int ret;
102242
102243 tmp.extra1 = &zero;
102244diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
102245index 2bf8329..2eb1423 100644
102246--- a/net/core/net-procfs.c
102247+++ b/net/core/net-procfs.c
102248@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
102249 struct rtnl_link_stats64 temp;
102250 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
102251
102252- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102253+ if (gr_proc_is_restricted())
102254+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102255+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
102256+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
102257+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
102258+ else
102259+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
102260 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
102261 dev->name, stats->rx_bytes, stats->rx_packets,
102262 stats->rx_errors,
102263@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
102264 return 0;
102265 }
102266
102267-static const struct seq_operations dev_seq_ops = {
102268+const struct seq_operations dev_seq_ops = {
102269 .start = dev_seq_start,
102270 .next = dev_seq_next,
102271 .stop = dev_seq_stop,
102272@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
102273
102274 static int softnet_seq_open(struct inode *inode, struct file *file)
102275 {
102276- return seq_open(file, &softnet_seq_ops);
102277+ return seq_open_restrict(file, &softnet_seq_ops);
102278 }
102279
102280 static const struct file_operations softnet_seq_fops = {
102281@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
102282 else
102283 seq_printf(seq, "%04x", ntohs(pt->type));
102284
102285+#ifdef CONFIG_GRKERNSEC_HIDESYM
102286+ seq_printf(seq, " %-8s %pf\n",
102287+ pt->dev ? pt->dev->name : "", NULL);
102288+#else
102289 seq_printf(seq, " %-8s %pf\n",
102290 pt->dev ? pt->dev->name : "", pt->func);
102291+#endif
102292 }
102293
102294 return 0;
102295diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
102296index 9993412..2a4672b 100644
102297--- a/net/core/net-sysfs.c
102298+++ b/net/core/net-sysfs.c
102299@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
102300 {
102301 struct net_device *netdev = to_net_dev(dev);
102302 return sprintf(buf, fmt_dec,
102303- atomic_read(&netdev->carrier_changes));
102304+ atomic_read_unchecked(&netdev->carrier_changes));
102305 }
102306 static DEVICE_ATTR_RO(carrier_changes);
102307
102308diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
102309index ce780c7..6d296b3 100644
102310--- a/net/core/net_namespace.c
102311+++ b/net/core/net_namespace.c
102312@@ -448,7 +448,7 @@ static int __register_pernet_operations(struct list_head *list,
102313 int error;
102314 LIST_HEAD(net_exit_list);
102315
102316- list_add_tail(&ops->list, list);
102317+ pax_list_add_tail((struct list_head *)&ops->list, list);
102318 if (ops->init || (ops->id && ops->size)) {
102319 for_each_net(net) {
102320 error = ops_init(ops, net);
102321@@ -461,7 +461,7 @@ static int __register_pernet_operations(struct list_head *list,
102322
102323 out_undo:
102324 /* If I have an error cleanup all namespaces I initialized */
102325- list_del(&ops->list);
102326+ pax_list_del((struct list_head *)&ops->list);
102327 ops_exit_list(ops, &net_exit_list);
102328 ops_free_list(ops, &net_exit_list);
102329 return error;
102330@@ -472,7 +472,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
102331 struct net *net;
102332 LIST_HEAD(net_exit_list);
102333
102334- list_del(&ops->list);
102335+ pax_list_del((struct list_head *)&ops->list);
102336 for_each_net(net)
102337 list_add_tail(&net->exit_list, &net_exit_list);
102338 ops_exit_list(ops, &net_exit_list);
102339@@ -606,7 +606,7 @@ int register_pernet_device(struct pernet_operations *ops)
102340 mutex_lock(&net_mutex);
102341 error = register_pernet_operations(&pernet_list, ops);
102342 if (!error && (first_device == &pernet_list))
102343- first_device = &ops->list;
102344+ first_device = (struct list_head *)&ops->list;
102345 mutex_unlock(&net_mutex);
102346 return error;
102347 }
102348diff --git a/net/core/netpoll.c b/net/core/netpoll.c
102349index e0ad5d1..04fa7f7 100644
102350--- a/net/core/netpoll.c
102351+++ b/net/core/netpoll.c
102352@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
102353 struct udphdr *udph;
102354 struct iphdr *iph;
102355 struct ethhdr *eth;
102356- static atomic_t ip_ident;
102357+ static atomic_unchecked_t ip_ident;
102358 struct ipv6hdr *ip6h;
102359
102360 udp_len = len + sizeof(*udph);
102361@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
102362 put_unaligned(0x45, (unsigned char *)iph);
102363 iph->tos = 0;
102364 put_unaligned(htons(ip_len), &(iph->tot_len));
102365- iph->id = htons(atomic_inc_return(&ip_ident));
102366+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
102367 iph->frag_off = 0;
102368 iph->ttl = 64;
102369 iph->protocol = IPPROTO_UDP;
102370diff --git a/net/core/pktgen.c b/net/core/pktgen.c
102371index 352d183..1bddfaf 100644
102372--- a/net/core/pktgen.c
102373+++ b/net/core/pktgen.c
102374@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
102375 pn->net = net;
102376 INIT_LIST_HEAD(&pn->pktgen_threads);
102377 pn->pktgen_exiting = false;
102378- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
102379+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
102380 if (!pn->proc_dir) {
102381 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
102382 return -ENODEV;
102383diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
102384index 76ec6c5..9cfb81c 100644
102385--- a/net/core/rtnetlink.c
102386+++ b/net/core/rtnetlink.c
102387@@ -60,7 +60,7 @@ struct rtnl_link {
102388 rtnl_doit_func doit;
102389 rtnl_dumpit_func dumpit;
102390 rtnl_calcit_func calcit;
102391-};
102392+} __no_const;
102393
102394 static DEFINE_MUTEX(rtnl_mutex);
102395
102396@@ -306,10 +306,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
102397 * to use the ops for creating device. So do not
102398 * fill up dellink as well. That disables rtnl_dellink.
102399 */
102400- if (ops->setup && !ops->dellink)
102401- ops->dellink = unregister_netdevice_queue;
102402+ if (ops->setup && !ops->dellink) {
102403+ pax_open_kernel();
102404+ *(void **)&ops->dellink = unregister_netdevice_queue;
102405+ pax_close_kernel();
102406+ }
102407
102408- list_add_tail(&ops->list, &link_ops);
102409+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
102410 return 0;
102411 }
102412 EXPORT_SYMBOL_GPL(__rtnl_link_register);
102413@@ -356,7 +359,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
102414 for_each_net(net) {
102415 __rtnl_kill_links(net, ops);
102416 }
102417- list_del(&ops->list);
102418+ pax_list_del((struct list_head *)&ops->list);
102419 }
102420 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
102421
102422@@ -1035,7 +1038,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
102423 (dev->ifalias &&
102424 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
102425 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
102426- atomic_read(&dev->carrier_changes)))
102427+ atomic_read_unchecked(&dev->carrier_changes)))
102428 goto nla_put_failure;
102429
102430 if (1) {
102431@@ -2094,6 +2097,10 @@ replay:
102432 if (IS_ERR(dest_net))
102433 return PTR_ERR(dest_net);
102434
102435+ err = -EPERM;
102436+ if (!netlink_ns_capable(skb, dest_net->user_ns, CAP_NET_ADMIN))
102437+ goto out;
102438+
102439 dev = rtnl_create_link(dest_net, ifname, name_assign_type, ops, tb);
102440 if (IS_ERR(dev)) {
102441 err = PTR_ERR(dev);
102442diff --git a/net/core/scm.c b/net/core/scm.c
102443index 3b6899b..cf36238 100644
102444--- a/net/core/scm.c
102445+++ b/net/core/scm.c
102446@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
102447 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
102448 {
102449 struct cmsghdr __user *cm
102450- = (__force struct cmsghdr __user *)msg->msg_control;
102451+ = (struct cmsghdr __force_user *)msg->msg_control;
102452 struct cmsghdr cmhdr;
102453 int cmlen = CMSG_LEN(len);
102454 int err;
102455@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
102456 err = -EFAULT;
102457 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
102458 goto out;
102459- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
102460+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
102461 goto out;
102462 cmlen = CMSG_SPACE(len);
102463 if (msg->msg_controllen < cmlen)
102464@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
102465 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
102466 {
102467 struct cmsghdr __user *cm
102468- = (__force struct cmsghdr __user*)msg->msg_control;
102469+ = (struct cmsghdr __force_user *)msg->msg_control;
102470
102471 int fdmax = 0;
102472 int fdnum = scm->fp->count;
102473@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
102474 if (fdnum < fdmax)
102475 fdmax = fdnum;
102476
102477- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
102478+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
102479 i++, cmfptr++)
102480 {
102481 struct socket *sock;
102482diff --git a/net/core/skbuff.c b/net/core/skbuff.c
102483index 39c444c..361c354 100644
102484--- a/net/core/skbuff.c
102485+++ b/net/core/skbuff.c
102486@@ -2123,7 +2123,7 @@ EXPORT_SYMBOL(__skb_checksum);
102487 __wsum skb_checksum(const struct sk_buff *skb, int offset,
102488 int len, __wsum csum)
102489 {
102490- const struct skb_checksum_ops ops = {
102491+ static const struct skb_checksum_ops ops = {
102492 .update = csum_partial_ext,
102493 .combine = csum_block_add_ext,
102494 };
102495@@ -3363,12 +3363,14 @@ void __init skb_init(void)
102496 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
102497 sizeof(struct sk_buff),
102498 0,
102499- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
102500+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
102501+ SLAB_NO_SANITIZE,
102502 NULL);
102503 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
102504 sizeof(struct sk_buff_fclones),
102505 0,
102506- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
102507+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
102508+ SLAB_NO_SANITIZE,
102509 NULL);
102510 }
102511
102512diff --git a/net/core/sock.c b/net/core/sock.c
102513index a91f99f..603a20c 100644
102514--- a/net/core/sock.c
102515+++ b/net/core/sock.c
102516@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102517 struct sk_buff_head *list = &sk->sk_receive_queue;
102518
102519 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
102520- atomic_inc(&sk->sk_drops);
102521+ atomic_inc_unchecked(&sk->sk_drops);
102522 trace_sock_rcvqueue_full(sk, skb);
102523 return -ENOMEM;
102524 }
102525@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102526 return err;
102527
102528 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
102529- atomic_inc(&sk->sk_drops);
102530+ atomic_inc_unchecked(&sk->sk_drops);
102531 return -ENOBUFS;
102532 }
102533
102534@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
102535 skb_dst_force(skb);
102536
102537 spin_lock_irqsave(&list->lock, flags);
102538- skb->dropcount = atomic_read(&sk->sk_drops);
102539+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
102540 __skb_queue_tail(list, skb);
102541 spin_unlock_irqrestore(&list->lock, flags);
102542
102543@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
102544 skb->dev = NULL;
102545
102546 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
102547- atomic_inc(&sk->sk_drops);
102548+ atomic_inc_unchecked(&sk->sk_drops);
102549 goto discard_and_relse;
102550 }
102551 if (nested)
102552@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
102553 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
102554 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
102555 bh_unlock_sock(sk);
102556- atomic_inc(&sk->sk_drops);
102557+ atomic_inc_unchecked(&sk->sk_drops);
102558 goto discard_and_relse;
102559 }
102560
102561@@ -907,6 +907,7 @@ set_rcvbuf:
102562 }
102563 break;
102564
102565+#ifndef GRKERNSEC_BPF_HARDEN
102566 case SO_ATTACH_BPF:
102567 ret = -EINVAL;
102568 if (optlen == sizeof(u32)) {
102569@@ -919,7 +920,7 @@ set_rcvbuf:
102570 ret = sk_attach_bpf(ufd, sk);
102571 }
102572 break;
102573-
102574+#endif
102575 case SO_DETACH_FILTER:
102576 ret = sk_detach_filter(sk);
102577 break;
102578@@ -1023,12 +1024,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102579 struct timeval tm;
102580 } v;
102581
102582- int lv = sizeof(int);
102583- int len;
102584+ unsigned int lv = sizeof(int);
102585+ unsigned int len;
102586
102587 if (get_user(len, optlen))
102588 return -EFAULT;
102589- if (len < 0)
102590+ if (len > INT_MAX)
102591 return -EINVAL;
102592
102593 memset(&v, 0, sizeof(v));
102594@@ -1166,11 +1167,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102595
102596 case SO_PEERNAME:
102597 {
102598- char address[128];
102599+ char address[_K_SS_MAXSIZE];
102600
102601 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
102602 return -ENOTCONN;
102603- if (lv < len)
102604+ if (lv < len || sizeof address < len)
102605 return -EINVAL;
102606 if (copy_to_user(optval, address, len))
102607 return -EFAULT;
102608@@ -1255,7 +1256,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
102609
102610 if (len > lv)
102611 len = lv;
102612- if (copy_to_user(optval, &v, len))
102613+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
102614 return -EFAULT;
102615 lenout:
102616 if (put_user(len, optlen))
102617@@ -2368,7 +2369,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
102618 */
102619 smp_wmb();
102620 atomic_set(&sk->sk_refcnt, 1);
102621- atomic_set(&sk->sk_drops, 0);
102622+ atomic_set_unchecked(&sk->sk_drops, 0);
102623 }
102624 EXPORT_SYMBOL(sock_init_data);
102625
102626@@ -2496,6 +2497,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
102627 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
102628 int level, int type)
102629 {
102630+ struct sock_extended_err ee;
102631 struct sock_exterr_skb *serr;
102632 struct sk_buff *skb;
102633 int copied, err;
102634@@ -2517,7 +2519,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
102635 sock_recv_timestamp(msg, sk, skb);
102636
102637 serr = SKB_EXT_ERR(skb);
102638- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
102639+ ee = serr->ee;
102640+ put_cmsg(msg, level, type, sizeof ee, &ee);
102641
102642 msg->msg_flags |= MSG_ERRQUEUE;
102643 err = copied;
102644diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
102645index ad704c7..ca48aff 100644
102646--- a/net/core/sock_diag.c
102647+++ b/net/core/sock_diag.c
102648@@ -9,26 +9,33 @@
102649 #include <linux/inet_diag.h>
102650 #include <linux/sock_diag.h>
102651
102652-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
102653+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
102654 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
102655 static DEFINE_MUTEX(sock_diag_table_mutex);
102656
102657 int sock_diag_check_cookie(void *sk, __u32 *cookie)
102658 {
102659+#ifndef CONFIG_GRKERNSEC_HIDESYM
102660 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
102661 cookie[1] != INET_DIAG_NOCOOKIE) &&
102662 ((u32)(unsigned long)sk != cookie[0] ||
102663 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
102664 return -ESTALE;
102665 else
102666+#endif
102667 return 0;
102668 }
102669 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
102670
102671 void sock_diag_save_cookie(void *sk, __u32 *cookie)
102672 {
102673+#ifdef CONFIG_GRKERNSEC_HIDESYM
102674+ cookie[0] = 0;
102675+ cookie[1] = 0;
102676+#else
102677 cookie[0] = (u32)(unsigned long)sk;
102678 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
102679+#endif
102680 }
102681 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
102682
102683@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
102684 mutex_lock(&sock_diag_table_mutex);
102685 if (sock_diag_handlers[hndl->family])
102686 err = -EBUSY;
102687- else
102688+ else {
102689+ pax_open_kernel();
102690 sock_diag_handlers[hndl->family] = hndl;
102691+ pax_close_kernel();
102692+ }
102693 mutex_unlock(&sock_diag_table_mutex);
102694
102695 return err;
102696@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
102697
102698 mutex_lock(&sock_diag_table_mutex);
102699 BUG_ON(sock_diag_handlers[family] != hnld);
102700+ pax_open_kernel();
102701 sock_diag_handlers[family] = NULL;
102702+ pax_close_kernel();
102703 mutex_unlock(&sock_diag_table_mutex);
102704 }
102705 EXPORT_SYMBOL_GPL(sock_diag_unregister);
102706diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
102707index bbb1d5a..754e2e5 100644
102708--- a/net/core/sysctl_net_core.c
102709+++ b/net/core/sysctl_net_core.c
102710@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
102711 {
102712 unsigned int orig_size, size;
102713 int ret, i;
102714- struct ctl_table tmp = {
102715+ ctl_table_no_const tmp = {
102716 .data = &size,
102717 .maxlen = sizeof(size),
102718 .mode = table->mode
102719@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
102720 void __user *buffer, size_t *lenp, loff_t *ppos)
102721 {
102722 char id[IFNAMSIZ];
102723- struct ctl_table tbl = {
102724+ ctl_table_no_const tbl = {
102725 .data = id,
102726 .maxlen = IFNAMSIZ,
102727 };
102728@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
102729 static int proc_do_rss_key(struct ctl_table *table, int write,
102730 void __user *buffer, size_t *lenp, loff_t *ppos)
102731 {
102732- struct ctl_table fake_table;
102733+ ctl_table_no_const fake_table;
102734 char buf[NETDEV_RSS_KEY_LEN * 3];
102735
102736 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
102737@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
102738 .mode = 0444,
102739 .proc_handler = proc_do_rss_key,
102740 },
102741-#ifdef CONFIG_BPF_JIT
102742+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
102743 {
102744 .procname = "bpf_jit_enable",
102745 .data = &bpf_jit_enable,
102746@@ -402,13 +402,12 @@ static struct ctl_table netns_core_table[] = {
102747
102748 static __net_init int sysctl_core_net_init(struct net *net)
102749 {
102750- struct ctl_table *tbl;
102751+ ctl_table_no_const *tbl = NULL;
102752
102753 net->core.sysctl_somaxconn = SOMAXCONN;
102754
102755- tbl = netns_core_table;
102756 if (!net_eq(net, &init_net)) {
102757- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
102758+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
102759 if (tbl == NULL)
102760 goto err_dup;
102761
102762@@ -418,17 +417,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
102763 if (net->user_ns != &init_user_ns) {
102764 tbl[0].procname = NULL;
102765 }
102766- }
102767-
102768- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
102769+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
102770+ } else
102771+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
102772 if (net->core.sysctl_hdr == NULL)
102773 goto err_reg;
102774
102775 return 0;
102776
102777 err_reg:
102778- if (tbl != netns_core_table)
102779- kfree(tbl);
102780+ kfree(tbl);
102781 err_dup:
102782 return -ENOMEM;
102783 }
102784@@ -443,7 +441,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
102785 kfree(tbl);
102786 }
102787
102788-static __net_initdata struct pernet_operations sysctl_core_ops = {
102789+static __net_initconst struct pernet_operations sysctl_core_ops = {
102790 .init = sysctl_core_net_init,
102791 .exit = sysctl_core_net_exit,
102792 };
102793diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
102794index 8102286..a0c2755 100644
102795--- a/net/decnet/af_decnet.c
102796+++ b/net/decnet/af_decnet.c
102797@@ -466,6 +466,7 @@ static struct proto dn_proto = {
102798 .sysctl_rmem = sysctl_decnet_rmem,
102799 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
102800 .obj_size = sizeof(struct dn_sock),
102801+ .slab_flags = SLAB_USERCOPY,
102802 };
102803
102804 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
102805diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
102806index 4400da7..3429972 100644
102807--- a/net/decnet/dn_dev.c
102808+++ b/net/decnet/dn_dev.c
102809@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
102810 .extra1 = &min_t3,
102811 .extra2 = &max_t3
102812 },
102813- {0}
102814+ { }
102815 },
102816 };
102817
102818diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
102819index 5325b54..a0d4d69 100644
102820--- a/net/decnet/sysctl_net_decnet.c
102821+++ b/net/decnet/sysctl_net_decnet.c
102822@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
102823
102824 if (len > *lenp) len = *lenp;
102825
102826- if (copy_to_user(buffer, addr, len))
102827+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
102828 return -EFAULT;
102829
102830 *lenp = len;
102831@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
102832
102833 if (len > *lenp) len = *lenp;
102834
102835- if (copy_to_user(buffer, devname, len))
102836+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
102837 return -EFAULT;
102838
102839 *lenp = len;
102840diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
102841index a2c7e4c..3dc9f67 100644
102842--- a/net/hsr/hsr_netlink.c
102843+++ b/net/hsr/hsr_netlink.c
102844@@ -102,7 +102,7 @@ nla_put_failure:
102845 return -EMSGSIZE;
102846 }
102847
102848-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
102849+static struct rtnl_link_ops hsr_link_ops = {
102850 .kind = "hsr",
102851 .maxtype = IFLA_HSR_MAX,
102852 .policy = hsr_policy,
102853diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
102854index 27eaa65..7083217 100644
102855--- a/net/ieee802154/6lowpan_rtnl.c
102856+++ b/net/ieee802154/6lowpan_rtnl.c
102857@@ -642,7 +642,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
102858 dev_put(real_dev);
102859 }
102860
102861-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
102862+static struct rtnl_link_ops lowpan_link_ops = {
102863 .kind = "lowpan",
102864 .priv_size = sizeof(struct lowpan_dev_info),
102865 .setup = lowpan_setup,
102866diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
102867index 9d980ed..7d01e12 100644
102868--- a/net/ieee802154/reassembly.c
102869+++ b/net/ieee802154/reassembly.c
102870@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
102871
102872 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102873 {
102874- struct ctl_table *table;
102875+ ctl_table_no_const *table = NULL;
102876 struct ctl_table_header *hdr;
102877 struct netns_ieee802154_lowpan *ieee802154_lowpan =
102878 net_ieee802154_lowpan(net);
102879
102880- table = lowpan_frags_ns_ctl_table;
102881 if (!net_eq(net, &init_net)) {
102882- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
102883+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
102884 GFP_KERNEL);
102885 if (table == NULL)
102886 goto err_alloc;
102887@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102888 /* Don't export sysctls to unprivileged users */
102889 if (net->user_ns != &init_user_ns)
102890 table[0].procname = NULL;
102891- }
102892-
102893- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102894+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102895+ } else
102896+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
102897 if (hdr == NULL)
102898 goto err_reg;
102899
102900@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102901 return 0;
102902
102903 err_reg:
102904- if (!net_eq(net, &init_net))
102905- kfree(table);
102906+ kfree(table);
102907 err_alloc:
102908 return -ENOMEM;
102909 }
102910diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
102911index a44773c..a6ae415 100644
102912--- a/net/ipv4/af_inet.c
102913+++ b/net/ipv4/af_inet.c
102914@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
102915 return ip_recv_error(sk, msg, len, addr_len);
102916 #if IS_ENABLED(CONFIG_IPV6)
102917 if (sk->sk_family == AF_INET6)
102918- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
102919+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
102920 #endif
102921 return -EINVAL;
102922 }
102923diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
102924index 214882e..ec032f6 100644
102925--- a/net/ipv4/devinet.c
102926+++ b/net/ipv4/devinet.c
102927@@ -69,7 +69,8 @@
102928
102929 static struct ipv4_devconf ipv4_devconf = {
102930 .data = {
102931- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102932+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102933+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102934 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102935 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102936 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102937@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
102938
102939 static struct ipv4_devconf ipv4_devconf_dflt = {
102940 .data = {
102941- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102942+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102943+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102944 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102945 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102946 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102947@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
102948 idx = 0;
102949 head = &net->dev_index_head[h];
102950 rcu_read_lock();
102951- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102952+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102953 net->dev_base_seq;
102954 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102955 if (idx < s_idx)
102956@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
102957 idx = 0;
102958 head = &net->dev_index_head[h];
102959 rcu_read_lock();
102960- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102961+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102962 net->dev_base_seq;
102963 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102964 if (idx < s_idx)
102965@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
102966 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
102967 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
102968
102969-static struct devinet_sysctl_table {
102970+static const struct devinet_sysctl_table {
102971 struct ctl_table_header *sysctl_header;
102972 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
102973 } devinet_sysctl = {
102974@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
102975 int err;
102976 struct ipv4_devconf *all, *dflt;
102977 #ifdef CONFIG_SYSCTL
102978- struct ctl_table *tbl = ctl_forward_entry;
102979+ ctl_table_no_const *tbl = NULL;
102980 struct ctl_table_header *forw_hdr;
102981 #endif
102982
102983@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
102984 goto err_alloc_dflt;
102985
102986 #ifdef CONFIG_SYSCTL
102987- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
102988+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
102989 if (tbl == NULL)
102990 goto err_alloc_ctl;
102991
102992@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
102993 goto err_reg_dflt;
102994
102995 err = -ENOMEM;
102996- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
102997+ if (!net_eq(net, &init_net))
102998+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
102999+ else
103000+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
103001 if (forw_hdr == NULL)
103002 goto err_reg_ctl;
103003 net->ipv4.forw_hdr = forw_hdr;
103004@@ -2287,8 +2292,7 @@ err_reg_ctl:
103005 err_reg_dflt:
103006 __devinet_sysctl_unregister(all);
103007 err_reg_all:
103008- if (tbl != ctl_forward_entry)
103009- kfree(tbl);
103010+ kfree(tbl);
103011 err_alloc_ctl:
103012 #endif
103013 if (dflt != &ipv4_devconf_dflt)
103014diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
103015index 23104a3..9f5570b 100644
103016--- a/net/ipv4/fib_frontend.c
103017+++ b/net/ipv4/fib_frontend.c
103018@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
103019 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103020 fib_sync_up(dev);
103021 #endif
103022- atomic_inc(&net->ipv4.dev_addr_genid);
103023+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103024 rt_cache_flush(dev_net(dev));
103025 break;
103026 case NETDEV_DOWN:
103027 fib_del_ifaddr(ifa, NULL);
103028- atomic_inc(&net->ipv4.dev_addr_genid);
103029+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103030 if (ifa->ifa_dev->ifa_list == NULL) {
103031 /* Last address was deleted from this interface.
103032 * Disable IP.
103033@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
103034 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103035 fib_sync_up(dev);
103036 #endif
103037- atomic_inc(&net->ipv4.dev_addr_genid);
103038+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103039 rt_cache_flush(net);
103040 break;
103041 case NETDEV_DOWN:
103042diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
103043index f99f41b..1879da9 100644
103044--- a/net/ipv4/fib_semantics.c
103045+++ b/net/ipv4/fib_semantics.c
103046@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
103047 nh->nh_saddr = inet_select_addr(nh->nh_dev,
103048 nh->nh_gw,
103049 nh->nh_parent->fib_scope);
103050- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
103051+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
103052
103053 return nh->nh_saddr;
103054 }
103055diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
103056index b986298..7e726da 100644
103057--- a/net/ipv4/fou.c
103058+++ b/net/ipv4/fou.c
103059@@ -765,12 +765,12 @@ EXPORT_SYMBOL(gue_build_header);
103060
103061 #ifdef CONFIG_NET_FOU_IP_TUNNELS
103062
103063-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
103064+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
103065 .encap_hlen = fou_encap_hlen,
103066 .build_header = fou_build_header,
103067 };
103068
103069-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
103070+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
103071 .encap_hlen = gue_encap_hlen,
103072 .build_header = gue_build_header,
103073 };
103074diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
103075index 9111a4e..3576905 100644
103076--- a/net/ipv4/inet_hashtables.c
103077+++ b/net/ipv4/inet_hashtables.c
103078@@ -18,6 +18,7 @@
103079 #include <linux/sched.h>
103080 #include <linux/slab.h>
103081 #include <linux/wait.h>
103082+#include <linux/security.h>
103083
103084 #include <net/inet_connection_sock.h>
103085 #include <net/inet_hashtables.h>
103086@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
103087 return inet_ehashfn(net, laddr, lport, faddr, fport);
103088 }
103089
103090+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
103091+
103092 /*
103093 * Allocate and initialize a new local port bind bucket.
103094 * The bindhash mutex for snum's hash chain must be held here.
103095@@ -554,6 +557,8 @@ ok:
103096 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
103097 spin_unlock(&head->lock);
103098
103099+ gr_update_task_in_ip_table(inet_sk(sk));
103100+
103101 if (tw) {
103102 inet_twsk_deschedule(tw, death_row);
103103 while (twrefcnt) {
103104diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
103105index 241afd7..31b95d5 100644
103106--- a/net/ipv4/inetpeer.c
103107+++ b/net/ipv4/inetpeer.c
103108@@ -461,7 +461,7 @@ relookup:
103109 if (p) {
103110 p->daddr = *daddr;
103111 atomic_set(&p->refcnt, 1);
103112- atomic_set(&p->rid, 0);
103113+ atomic_set_unchecked(&p->rid, 0);
103114 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
103115 p->rate_tokens = 0;
103116 /* 60*HZ is arbitrary, but chosen enough high so that the first
103117diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
103118index 145a50c..5dd8cc5 100644
103119--- a/net/ipv4/ip_fragment.c
103120+++ b/net/ipv4/ip_fragment.c
103121@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
103122 return 0;
103123
103124 start = qp->rid;
103125- end = atomic_inc_return(&peer->rid);
103126+ end = atomic_inc_return_unchecked(&peer->rid);
103127 qp->rid = end;
103128
103129 rc = qp->q.fragments && (end - start) > max;
103130@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
103131
103132 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103133 {
103134- struct ctl_table *table;
103135+ ctl_table_no_const *table = NULL;
103136 struct ctl_table_header *hdr;
103137
103138- table = ip4_frags_ns_ctl_table;
103139 if (!net_eq(net, &init_net)) {
103140- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103141+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103142 if (table == NULL)
103143 goto err_alloc;
103144
103145@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103146 /* Don't export sysctls to unprivileged users */
103147 if (net->user_ns != &init_user_ns)
103148 table[0].procname = NULL;
103149- }
103150+ hdr = register_net_sysctl(net, "net/ipv4", table);
103151+ } else
103152+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
103153
103154- hdr = register_net_sysctl(net, "net/ipv4", table);
103155 if (hdr == NULL)
103156 goto err_reg;
103157
103158@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103159 return 0;
103160
103161 err_reg:
103162- if (!net_eq(net, &init_net))
103163- kfree(table);
103164+ kfree(table);
103165 err_alloc:
103166 return -ENOMEM;
103167 }
103168diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
103169index 4f4bf5b..2c936fe 100644
103170--- a/net/ipv4/ip_gre.c
103171+++ b/net/ipv4/ip_gre.c
103172@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
103173 module_param(log_ecn_error, bool, 0644);
103174 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
103175
103176-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
103177+static struct rtnl_link_ops ipgre_link_ops;
103178 static int ipgre_tunnel_init(struct net_device *dev);
103179
103180 static int ipgre_net_id __read_mostly;
103181@@ -816,7 +816,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
103182 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
103183 };
103184
103185-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103186+static struct rtnl_link_ops ipgre_link_ops = {
103187 .kind = "gre",
103188 .maxtype = IFLA_GRE_MAX,
103189 .policy = ipgre_policy,
103190@@ -830,7 +830,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103191 .fill_info = ipgre_fill_info,
103192 };
103193
103194-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
103195+static struct rtnl_link_ops ipgre_tap_ops = {
103196 .kind = "gretap",
103197 .maxtype = IFLA_GRE_MAX,
103198 .policy = ipgre_policy,
103199diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
103200index 3d4da2c..40f9c29 100644
103201--- a/net/ipv4/ip_input.c
103202+++ b/net/ipv4/ip_input.c
103203@@ -147,6 +147,10 @@
103204 #include <linux/mroute.h>
103205 #include <linux/netlink.h>
103206
103207+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103208+extern int grsec_enable_blackhole;
103209+#endif
103210+
103211 /*
103212 * Process Router Attention IP option (RFC 2113)
103213 */
103214@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
103215 if (!raw) {
103216 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
103217 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
103218+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103219+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103220+#endif
103221 icmp_send(skb, ICMP_DEST_UNREACH,
103222 ICMP_PROT_UNREACH, 0);
103223 }
103224diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
103225index 6b85adb..cd7e5d3 100644
103226--- a/net/ipv4/ip_sockglue.c
103227+++ b/net/ipv4/ip_sockglue.c
103228@@ -1193,7 +1193,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
103229 len = min_t(unsigned int, len, opt->optlen);
103230 if (put_user(len, optlen))
103231 return -EFAULT;
103232- if (copy_to_user(optval, opt->__data, len))
103233+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
103234+ copy_to_user(optval, opt->__data, len))
103235 return -EFAULT;
103236 return 0;
103237 }
103238@@ -1324,7 +1325,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
103239 if (sk->sk_type != SOCK_STREAM)
103240 return -ENOPROTOOPT;
103241
103242- msg.msg_control = (__force void *) optval;
103243+ msg.msg_control = (__force_kernel void *) optval;
103244 msg.msg_controllen = len;
103245 msg.msg_flags = flags;
103246
103247diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
103248index 1a7e979..fd05aa4 100644
103249--- a/net/ipv4/ip_vti.c
103250+++ b/net/ipv4/ip_vti.c
103251@@ -45,7 +45,7 @@
103252 #include <net/net_namespace.h>
103253 #include <net/netns/generic.h>
103254
103255-static struct rtnl_link_ops vti_link_ops __read_mostly;
103256+static struct rtnl_link_ops vti_link_ops;
103257
103258 static int vti_net_id __read_mostly;
103259 static int vti_tunnel_init(struct net_device *dev);
103260@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
103261 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
103262 };
103263
103264-static struct rtnl_link_ops vti_link_ops __read_mostly = {
103265+static struct rtnl_link_ops vti_link_ops = {
103266 .kind = "vti",
103267 .maxtype = IFLA_VTI_MAX,
103268 .policy = vti_policy,
103269diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
103270index 7fa18bc..bea16af 100644
103271--- a/net/ipv4/ipconfig.c
103272+++ b/net/ipv4/ipconfig.c
103273@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
103274
103275 mm_segment_t oldfs = get_fs();
103276 set_fs(get_ds());
103277- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
103278+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
103279 set_fs(oldfs);
103280 return res;
103281 }
103282@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
103283
103284 mm_segment_t oldfs = get_fs();
103285 set_fs(get_ds());
103286- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
103287+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
103288 set_fs(oldfs);
103289 return res;
103290 }
103291@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
103292
103293 mm_segment_t oldfs = get_fs();
103294 set_fs(get_ds());
103295- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
103296+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
103297 set_fs(oldfs);
103298 return res;
103299 }
103300diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
103301index 40403114..c35c647 100644
103302--- a/net/ipv4/ipip.c
103303+++ b/net/ipv4/ipip.c
103304@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
103305 static int ipip_net_id __read_mostly;
103306
103307 static int ipip_tunnel_init(struct net_device *dev);
103308-static struct rtnl_link_ops ipip_link_ops __read_mostly;
103309+static struct rtnl_link_ops ipip_link_ops;
103310
103311 static int ipip_err(struct sk_buff *skb, u32 info)
103312 {
103313@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
103314 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
103315 };
103316
103317-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
103318+static struct rtnl_link_ops ipip_link_ops = {
103319 .kind = "ipip",
103320 .maxtype = IFLA_IPTUN_MAX,
103321 .policy = ipip_policy,
103322diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
103323index f95b6f9..2ee2097 100644
103324--- a/net/ipv4/netfilter/arp_tables.c
103325+++ b/net/ipv4/netfilter/arp_tables.c
103326@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
103327 #endif
103328
103329 static int get_info(struct net *net, void __user *user,
103330- const int *len, int compat)
103331+ int len, int compat)
103332 {
103333 char name[XT_TABLE_MAXNAMELEN];
103334 struct xt_table *t;
103335 int ret;
103336
103337- if (*len != sizeof(struct arpt_getinfo)) {
103338- duprintf("length %u != %Zu\n", *len,
103339+ if (len != sizeof(struct arpt_getinfo)) {
103340+ duprintf("length %u != %Zu\n", len,
103341 sizeof(struct arpt_getinfo));
103342 return -EINVAL;
103343 }
103344@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
103345 info.size = private->size;
103346 strcpy(info.name, name);
103347
103348- if (copy_to_user(user, &info, *len) != 0)
103349+ if (copy_to_user(user, &info, len) != 0)
103350 ret = -EFAULT;
103351 else
103352 ret = 0;
103353@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
103354
103355 switch (cmd) {
103356 case ARPT_SO_GET_INFO:
103357- ret = get_info(sock_net(sk), user, len, 1);
103358+ ret = get_info(sock_net(sk), user, *len, 1);
103359 break;
103360 case ARPT_SO_GET_ENTRIES:
103361 ret = compat_get_entries(sock_net(sk), user, len);
103362@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
103363
103364 switch (cmd) {
103365 case ARPT_SO_GET_INFO:
103366- ret = get_info(sock_net(sk), user, len, 0);
103367+ ret = get_info(sock_net(sk), user, *len, 0);
103368 break;
103369
103370 case ARPT_SO_GET_ENTRIES:
103371diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
103372index 99e810f..3711b81 100644
103373--- a/net/ipv4/netfilter/ip_tables.c
103374+++ b/net/ipv4/netfilter/ip_tables.c
103375@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
103376 #endif
103377
103378 static int get_info(struct net *net, void __user *user,
103379- const int *len, int compat)
103380+ int len, int compat)
103381 {
103382 char name[XT_TABLE_MAXNAMELEN];
103383 struct xt_table *t;
103384 int ret;
103385
103386- if (*len != sizeof(struct ipt_getinfo)) {
103387- duprintf("length %u != %zu\n", *len,
103388+ if (len != sizeof(struct ipt_getinfo)) {
103389+ duprintf("length %u != %zu\n", len,
103390 sizeof(struct ipt_getinfo));
103391 return -EINVAL;
103392 }
103393@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
103394 info.size = private->size;
103395 strcpy(info.name, name);
103396
103397- if (copy_to_user(user, &info, *len) != 0)
103398+ if (copy_to_user(user, &info, len) != 0)
103399 ret = -EFAULT;
103400 else
103401 ret = 0;
103402@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103403
103404 switch (cmd) {
103405 case IPT_SO_GET_INFO:
103406- ret = get_info(sock_net(sk), user, len, 1);
103407+ ret = get_info(sock_net(sk), user, *len, 1);
103408 break;
103409 case IPT_SO_GET_ENTRIES:
103410 ret = compat_get_entries(sock_net(sk), user, len);
103411@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103412
103413 switch (cmd) {
103414 case IPT_SO_GET_INFO:
103415- ret = get_info(sock_net(sk), user, len, 0);
103416+ ret = get_info(sock_net(sk), user, *len, 0);
103417 break;
103418
103419 case IPT_SO_GET_ENTRIES:
103420diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
103421index e90f83a..3e6acca 100644
103422--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
103423+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
103424@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
103425 spin_lock_init(&cn->lock);
103426
103427 #ifdef CONFIG_PROC_FS
103428- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
103429+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
103430 if (!cn->procdir) {
103431 pr_err("Unable to proc dir entry\n");
103432 return -ENOMEM;
103433diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
103434index 0ae28f5..bacfcd5 100644
103435--- a/net/ipv4/ping.c
103436+++ b/net/ipv4/ping.c
103437@@ -59,7 +59,7 @@ struct ping_table {
103438 };
103439
103440 static struct ping_table ping_table;
103441-struct pingv6_ops pingv6_ops;
103442+struct pingv6_ops *pingv6_ops;
103443 EXPORT_SYMBOL_GPL(pingv6_ops);
103444
103445 static u16 ping_port_rover;
103446@@ -158,6 +158,7 @@ void ping_unhash(struct sock *sk)
103447 if (sk_hashed(sk)) {
103448 write_lock_bh(&ping_table.lock);
103449 hlist_nulls_del(&sk->sk_nulls_node);
103450+ sk_nulls_node_init(&sk->sk_nulls_node);
103451 sock_put(sk);
103452 isk->inet_num = 0;
103453 isk->inet_sport = 0;
103454@@ -358,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
103455 return -ENODEV;
103456 }
103457 }
103458- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
103459+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
103460 scoped);
103461 rcu_read_unlock();
103462
103463@@ -566,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
103464 }
103465 #if IS_ENABLED(CONFIG_IPV6)
103466 } else if (skb->protocol == htons(ETH_P_IPV6)) {
103467- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
103468+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
103469 #endif
103470 }
103471
103472@@ -584,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
103473 info, (u8 *)icmph);
103474 #if IS_ENABLED(CONFIG_IPV6)
103475 } else if (family == AF_INET6) {
103476- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
103477+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
103478 info, (u8 *)icmph);
103479 #endif
103480 }
103481@@ -919,10 +920,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
103482 }
103483
103484 if (inet6_sk(sk)->rxopt.all)
103485- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
103486+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
103487 if (skb->protocol == htons(ETH_P_IPV6) &&
103488 inet6_sk(sk)->rxopt.all)
103489- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
103490+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
103491 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
103492 ip_cmsg_recv(msg, skb);
103493 #endif
103494@@ -1117,7 +1118,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
103495 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
103496 0, sock_i_ino(sp),
103497 atomic_read(&sp->sk_refcnt), sp,
103498- atomic_read(&sp->sk_drops));
103499+ atomic_read_unchecked(&sp->sk_drops));
103500 }
103501
103502 static int ping_v4_seq_show(struct seq_file *seq, void *v)
103503diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
103504index 0bb68df..59405fc 100644
103505--- a/net/ipv4/raw.c
103506+++ b/net/ipv4/raw.c
103507@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
103508 int raw_rcv(struct sock *sk, struct sk_buff *skb)
103509 {
103510 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
103511- atomic_inc(&sk->sk_drops);
103512+ atomic_inc_unchecked(&sk->sk_drops);
103513 kfree_skb(skb);
103514 return NET_RX_DROP;
103515 }
103516@@ -774,16 +774,20 @@ static int raw_init(struct sock *sk)
103517
103518 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
103519 {
103520+ struct icmp_filter filter;
103521+
103522 if (optlen > sizeof(struct icmp_filter))
103523 optlen = sizeof(struct icmp_filter);
103524- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
103525+ if (copy_from_user(&filter, optval, optlen))
103526 return -EFAULT;
103527+ raw_sk(sk)->filter = filter;
103528 return 0;
103529 }
103530
103531 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
103532 {
103533 int len, ret = -EFAULT;
103534+ struct icmp_filter filter;
103535
103536 if (get_user(len, optlen))
103537 goto out;
103538@@ -793,8 +797,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
103539 if (len > sizeof(struct icmp_filter))
103540 len = sizeof(struct icmp_filter);
103541 ret = -EFAULT;
103542- if (put_user(len, optlen) ||
103543- copy_to_user(optval, &raw_sk(sk)->filter, len))
103544+ filter = raw_sk(sk)->filter;
103545+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
103546 goto out;
103547 ret = 0;
103548 out: return ret;
103549@@ -1023,7 +1027,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
103550 0, 0L, 0,
103551 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
103552 0, sock_i_ino(sp),
103553- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
103554+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
103555 }
103556
103557 static int raw_seq_show(struct seq_file *seq, void *v)
103558diff --git a/net/ipv4/route.c b/net/ipv4/route.c
103559index 52e1f2b..e736cb4 100644
103560--- a/net/ipv4/route.c
103561+++ b/net/ipv4/route.c
103562@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
103563
103564 static int rt_cache_seq_open(struct inode *inode, struct file *file)
103565 {
103566- return seq_open(file, &rt_cache_seq_ops);
103567+ return seq_open_restrict(file, &rt_cache_seq_ops);
103568 }
103569
103570 static const struct file_operations rt_cache_seq_fops = {
103571@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
103572
103573 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
103574 {
103575- return seq_open(file, &rt_cpu_seq_ops);
103576+ return seq_open_restrict(file, &rt_cpu_seq_ops);
103577 }
103578
103579 static const struct file_operations rt_cpu_seq_fops = {
103580@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
103581
103582 static int rt_acct_proc_open(struct inode *inode, struct file *file)
103583 {
103584- return single_open(file, rt_acct_proc_show, NULL);
103585+ return single_open_restrict(file, rt_acct_proc_show, NULL);
103586 }
103587
103588 static const struct file_operations rt_acct_proc_fops = {
103589@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
103590
103591 #define IP_IDENTS_SZ 2048u
103592 struct ip_ident_bucket {
103593- atomic_t id;
103594+ atomic_unchecked_t id;
103595 u32 stamp32;
103596 };
103597
103598-static struct ip_ident_bucket *ip_idents __read_mostly;
103599+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
103600
103601 /* In order to protect privacy, we add a perturbation to identifiers
103602 * if one generator is seldom used. This makes hard for an attacker
103603@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
103604 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
103605 delta = prandom_u32_max(now - old);
103606
103607- return atomic_add_return(segs + delta, &bucket->id) - segs;
103608+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
103609 }
103610 EXPORT_SYMBOL(ip_idents_reserve);
103611
103612@@ -2628,34 +2628,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
103613 .maxlen = sizeof(int),
103614 .mode = 0200,
103615 .proc_handler = ipv4_sysctl_rtcache_flush,
103616+ .extra1 = &init_net,
103617 },
103618 { },
103619 };
103620
103621 static __net_init int sysctl_route_net_init(struct net *net)
103622 {
103623- struct ctl_table *tbl;
103624+ ctl_table_no_const *tbl = NULL;
103625
103626- tbl = ipv4_route_flush_table;
103627 if (!net_eq(net, &init_net)) {
103628- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
103629+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
103630 if (tbl == NULL)
103631 goto err_dup;
103632
103633 /* Don't export sysctls to unprivileged users */
103634 if (net->user_ns != &init_user_ns)
103635 tbl[0].procname = NULL;
103636- }
103637- tbl[0].extra1 = net;
103638+ tbl[0].extra1 = net;
103639+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
103640+ } else
103641+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
103642
103643- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
103644 if (net->ipv4.route_hdr == NULL)
103645 goto err_reg;
103646 return 0;
103647
103648 err_reg:
103649- if (tbl != ipv4_route_flush_table)
103650- kfree(tbl);
103651+ kfree(tbl);
103652 err_dup:
103653 return -ENOMEM;
103654 }
103655@@ -2678,8 +2678,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
103656
103657 static __net_init int rt_genid_init(struct net *net)
103658 {
103659- atomic_set(&net->ipv4.rt_genid, 0);
103660- atomic_set(&net->fnhe_genid, 0);
103661+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
103662+ atomic_set_unchecked(&net->fnhe_genid, 0);
103663 get_random_bytes(&net->ipv4.dev_addr_genid,
103664 sizeof(net->ipv4.dev_addr_genid));
103665 return 0;
103666@@ -2722,11 +2722,7 @@ int __init ip_rt_init(void)
103667 {
103668 int rc = 0;
103669
103670- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
103671- if (!ip_idents)
103672- panic("IP: failed to allocate ip_idents\n");
103673-
103674- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
103675+ prandom_bytes(ip_idents, sizeof(ip_idents));
103676
103677 #ifdef CONFIG_IP_ROUTE_CLASSID
103678 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
103679diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
103680index e0ee384..e2688d9 100644
103681--- a/net/ipv4/sysctl_net_ipv4.c
103682+++ b/net/ipv4/sysctl_net_ipv4.c
103683@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
103684 container_of(table->data, struct net, ipv4.ip_local_ports.range);
103685 int ret;
103686 int range[2];
103687- struct ctl_table tmp = {
103688+ ctl_table_no_const tmp = {
103689 .data = &range,
103690 .maxlen = sizeof(range),
103691 .mode = table->mode,
103692@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
103693 int ret;
103694 gid_t urange[2];
103695 kgid_t low, high;
103696- struct ctl_table tmp = {
103697+ ctl_table_no_const tmp = {
103698 .data = &urange,
103699 .maxlen = sizeof(urange),
103700 .mode = table->mode,
103701@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
103702 void __user *buffer, size_t *lenp, loff_t *ppos)
103703 {
103704 char val[TCP_CA_NAME_MAX];
103705- struct ctl_table tbl = {
103706+ ctl_table_no_const tbl = {
103707 .data = val,
103708 .maxlen = TCP_CA_NAME_MAX,
103709 };
103710@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
103711 void __user *buffer, size_t *lenp,
103712 loff_t *ppos)
103713 {
103714- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
103715+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
103716 int ret;
103717
103718 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
103719@@ -185,7 +185,7 @@ static int proc_allowed_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@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
103729 void __user *buffer, size_t *lenp,
103730 loff_t *ppos)
103731 {
103732- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
103733+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
103734 struct tcp_fastopen_context *ctxt;
103735 int ret;
103736 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
103737@@ -881,13 +881,12 @@ static struct ctl_table ipv4_net_table[] = {
103738
103739 static __net_init int ipv4_sysctl_init_net(struct net *net)
103740 {
103741- struct ctl_table *table;
103742+ ctl_table_no_const *table = NULL;
103743
103744- table = ipv4_net_table;
103745 if (!net_eq(net, &init_net)) {
103746 int i;
103747
103748- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
103749+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
103750 if (table == NULL)
103751 goto err_alloc;
103752
103753@@ -896,7 +895,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
103754 table[i].data += (void *)net - (void *)&init_net;
103755 }
103756
103757- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103758+ if (!net_eq(net, &init_net))
103759+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103760+ else
103761+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
103762 if (net->ipv4.ipv4_hdr == NULL)
103763 goto err_reg;
103764
103765diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
103766index 3075723..aa6f6e5 100644
103767--- a/net/ipv4/tcp.c
103768+++ b/net/ipv4/tcp.c
103769@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
103770
103771 /* Race breaker. If space is freed after
103772 * wspace test but before the flags are set,
103773- * IO signal will be lost.
103774+ * IO signal will be lost. Memory barrier
103775+ * pairs with the input side.
103776 */
103777+ smp_mb__after_atomic();
103778 if (sk_stream_is_writeable(sk))
103779 mask |= POLLOUT | POLLWRNORM;
103780 }
103781diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
103782index 08ccca6..28e7ce6 100644
103783--- a/net/ipv4/tcp_input.c
103784+++ b/net/ipv4/tcp_input.c
103785@@ -766,7 +766,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
103786 * without any lock. We want to make sure compiler wont store
103787 * intermediate values in this location.
103788 */
103789- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
103790+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
103791 sk->sk_max_pacing_rate);
103792 }
103793
103794@@ -4529,7 +4529,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
103795 * simplifies code)
103796 */
103797 static void
103798-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103799+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103800 struct sk_buff *head, struct sk_buff *tail,
103801 u32 start, u32 end)
103802 {
103803@@ -4787,6 +4787,8 @@ static void tcp_check_space(struct sock *sk)
103804 {
103805 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
103806 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
103807+ /* pairs with tcp_poll() */
103808+ smp_mb__after_atomic();
103809 if (sk->sk_socket &&
103810 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
103811 tcp_new_space(sk);
103812@@ -5507,6 +5509,7 @@ discard:
103813 tcp_paws_reject(&tp->rx_opt, 0))
103814 goto discard_and_undo;
103815
103816+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
103817 if (th->syn) {
103818 /* We see SYN without ACK. It is attempt of
103819 * simultaneous connect with crossed SYNs.
103820@@ -5557,6 +5560,7 @@ discard:
103821 goto discard;
103822 #endif
103823 }
103824+#endif
103825 /* "fifth, if neither of the SYN or RST bits is set then
103826 * drop the segment and return."
103827 */
103828@@ -5603,7 +5607,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
103829 goto discard;
103830
103831 if (th->syn) {
103832- if (th->fin)
103833+ if (th->fin || th->urg || th->psh)
103834 goto discard;
103835 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
103836 return 1;
103837diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
103838index 982347e..aba8ca8 100644
103839--- a/net/ipv4/tcp_ipv4.c
103840+++ b/net/ipv4/tcp_ipv4.c
103841@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
103842 int sysctl_tcp_low_latency __read_mostly;
103843 EXPORT_SYMBOL(sysctl_tcp_low_latency);
103844
103845+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103846+extern int grsec_enable_blackhole;
103847+#endif
103848+
103849 #ifdef CONFIG_TCP_MD5SIG
103850 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
103851 __be32 daddr, __be32 saddr, const struct tcphdr *th);
103852@@ -1473,6 +1477,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
103853 return 0;
103854
103855 reset:
103856+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103857+ if (!grsec_enable_blackhole)
103858+#endif
103859 tcp_v4_send_reset(rsk, skb);
103860 discard:
103861 kfree_skb(skb);
103862@@ -1637,12 +1644,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
103863 TCP_SKB_CB(skb)->sacked = 0;
103864
103865 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
103866- if (!sk)
103867+ if (!sk) {
103868+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103869+ ret = 1;
103870+#endif
103871 goto no_tcp_socket;
103872-
103873+ }
103874 process:
103875- if (sk->sk_state == TCP_TIME_WAIT)
103876+ if (sk->sk_state == TCP_TIME_WAIT) {
103877+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103878+ ret = 2;
103879+#endif
103880 goto do_time_wait;
103881+ }
103882
103883 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
103884 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103885@@ -1698,6 +1712,10 @@ csum_error:
103886 bad_packet:
103887 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103888 } else {
103889+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103890+ if (!grsec_enable_blackhole || (ret == 1 &&
103891+ (skb->dev->flags & IFF_LOOPBACK)))
103892+#endif
103893 tcp_v4_send_reset(NULL, skb);
103894 }
103895
103896diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
103897index 63d2680..2db9d6b 100644
103898--- a/net/ipv4/tcp_minisocks.c
103899+++ b/net/ipv4/tcp_minisocks.c
103900@@ -27,6 +27,10 @@
103901 #include <net/inet_common.h>
103902 #include <net/xfrm.h>
103903
103904+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103905+extern int grsec_enable_blackhole;
103906+#endif
103907+
103908 int sysctl_tcp_syncookies __read_mostly = 1;
103909 EXPORT_SYMBOL(sysctl_tcp_syncookies);
103910
103911@@ -739,7 +743,10 @@ embryonic_reset:
103912 * avoid becoming vulnerable to outside attack aiming at
103913 * resetting legit local connections.
103914 */
103915- req->rsk_ops->send_reset(sk, skb);
103916+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103917+ if (!grsec_enable_blackhole)
103918+#endif
103919+ req->rsk_ops->send_reset(sk, skb);
103920 } else if (fastopen) { /* received a valid RST pkt */
103921 reqsk_fastopen_remove(sk, req, true);
103922 tcp_reset(sk);
103923diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
103924index ebf5ff5..4d1ff32 100644
103925--- a/net/ipv4/tcp_probe.c
103926+++ b/net/ipv4/tcp_probe.c
103927@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
103928 if (cnt + width >= len)
103929 break;
103930
103931- if (copy_to_user(buf + cnt, tbuf, width))
103932+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
103933 return -EFAULT;
103934 cnt += width;
103935 }
103936diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
103937index 1829c7f..c0b3d52 100644
103938--- a/net/ipv4/tcp_timer.c
103939+++ b/net/ipv4/tcp_timer.c
103940@@ -22,6 +22,10 @@
103941 #include <linux/gfp.h>
103942 #include <net/tcp.h>
103943
103944+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103945+extern int grsec_lastack_retries;
103946+#endif
103947+
103948 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
103949 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
103950 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
103951@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
103952 }
103953 }
103954
103955+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103956+ if ((sk->sk_state == TCP_LAST_ACK) &&
103957+ (grsec_lastack_retries > 0) &&
103958+ (grsec_lastack_retries < retry_until))
103959+ retry_until = grsec_lastack_retries;
103960+#endif
103961+
103962 if (retransmits_timed_out(sk, retry_until,
103963 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
103964 /* Has it gone just too far? */
103965diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
103966index 13b4dcf..b866a2a 100644
103967--- a/net/ipv4/udp.c
103968+++ b/net/ipv4/udp.c
103969@@ -87,6 +87,7 @@
103970 #include <linux/types.h>
103971 #include <linux/fcntl.h>
103972 #include <linux/module.h>
103973+#include <linux/security.h>
103974 #include <linux/socket.h>
103975 #include <linux/sockios.h>
103976 #include <linux/igmp.h>
103977@@ -114,6 +115,10 @@
103978 #include <net/busy_poll.h>
103979 #include "udp_impl.h"
103980
103981+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103982+extern int grsec_enable_blackhole;
103983+#endif
103984+
103985 struct udp_table udp_table __read_mostly;
103986 EXPORT_SYMBOL(udp_table);
103987
103988@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
103989 return true;
103990 }
103991
103992+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
103993+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
103994+
103995 /*
103996 * This routine is called by the ICMP module when it gets some
103997 * sort of error condition. If err < 0 then the socket should
103998@@ -945,9 +953,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
103999 dport = usin->sin_port;
104000 if (dport == 0)
104001 return -EINVAL;
104002+
104003+ err = gr_search_udp_sendmsg(sk, usin);
104004+ if (err)
104005+ return err;
104006 } else {
104007 if (sk->sk_state != TCP_ESTABLISHED)
104008 return -EDESTADDRREQ;
104009+
104010+ err = gr_search_udp_sendmsg(sk, NULL);
104011+ if (err)
104012+ return err;
104013+
104014 daddr = inet->inet_daddr;
104015 dport = inet->inet_dport;
104016 /* Open fast path for connected socket.
104017@@ -1195,7 +1212,7 @@ static unsigned int first_packet_length(struct sock *sk)
104018 IS_UDPLITE(sk));
104019 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104020 IS_UDPLITE(sk));
104021- atomic_inc(&sk->sk_drops);
104022+ atomic_inc_unchecked(&sk->sk_drops);
104023 __skb_unlink(skb, rcvq);
104024 __skb_queue_tail(&list_kill, skb);
104025 }
104026@@ -1275,6 +1292,10 @@ try_again:
104027 if (!skb)
104028 goto out;
104029
104030+ err = gr_search_udp_recvmsg(sk, skb);
104031+ if (err)
104032+ goto out_free;
104033+
104034 ulen = skb->len - sizeof(struct udphdr);
104035 copied = len;
104036 if (copied > ulen)
104037@@ -1307,7 +1328,7 @@ try_again:
104038 if (unlikely(err)) {
104039 trace_kfree_skb(skb, udp_recvmsg);
104040 if (!peeked) {
104041- atomic_inc(&sk->sk_drops);
104042+ atomic_inc_unchecked(&sk->sk_drops);
104043 UDP_INC_STATS_USER(sock_net(sk),
104044 UDP_MIB_INERRORS, is_udplite);
104045 }
104046@@ -1605,7 +1626,7 @@ csum_error:
104047 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104048 drop:
104049 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104050- atomic_inc(&sk->sk_drops);
104051+ atomic_inc_unchecked(&sk->sk_drops);
104052 kfree_skb(skb);
104053 return -1;
104054 }
104055@@ -1624,7 +1645,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104056 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104057
104058 if (!skb1) {
104059- atomic_inc(&sk->sk_drops);
104060+ atomic_inc_unchecked(&sk->sk_drops);
104061 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104062 IS_UDPLITE(sk));
104063 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104064@@ -1830,6 +1851,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104065 goto csum_error;
104066
104067 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104068+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104069+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104070+#endif
104071 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
104072
104073 /*
104074@@ -2416,7 +2440,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
104075 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
104076 0, sock_i_ino(sp),
104077 atomic_read(&sp->sk_refcnt), sp,
104078- atomic_read(&sp->sk_drops));
104079+ atomic_read_unchecked(&sp->sk_drops));
104080 }
104081
104082 int udp4_seq_show(struct seq_file *seq, void *v)
104083diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
104084index 6156f68..d6ab46d 100644
104085--- a/net/ipv4/xfrm4_policy.c
104086+++ b/net/ipv4/xfrm4_policy.c
104087@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
104088 fl4->flowi4_tos = iph->tos;
104089 }
104090
104091-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
104092+static int xfrm4_garbage_collect(struct dst_ops *ops)
104093 {
104094 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
104095
104096- xfrm4_policy_afinfo.garbage_collect(net);
104097+ xfrm_garbage_collect_deferred(net);
104098 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
104099 }
104100
104101@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
104102
104103 static int __net_init xfrm4_net_init(struct net *net)
104104 {
104105- struct ctl_table *table;
104106+ ctl_table_no_const *table = NULL;
104107 struct ctl_table_header *hdr;
104108
104109- table = xfrm4_policy_table;
104110 if (!net_eq(net, &init_net)) {
104111- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104112+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104113 if (!table)
104114 goto err_alloc;
104115
104116 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
104117- }
104118-
104119- hdr = register_net_sysctl(net, "net/ipv4", table);
104120+ hdr = register_net_sysctl(net, "net/ipv4", table);
104121+ } else
104122+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
104123 if (!hdr)
104124 goto err_reg;
104125
104126@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
104127 return 0;
104128
104129 err_reg:
104130- if (!net_eq(net, &init_net))
104131- kfree(table);
104132+ kfree(table);
104133 err_alloc:
104134 return -ENOMEM;
104135 }
104136diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104137index dac9419..534fa31 100644
104138--- a/net/ipv6/addrconf.c
104139+++ b/net/ipv6/addrconf.c
104140@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
104141 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
104142 .mtu6 = IPV6_MIN_MTU,
104143 .accept_ra = 1,
104144- .accept_redirects = 1,
104145+ .accept_redirects = 0,
104146 .autoconf = 1,
104147 .force_mld_version = 0,
104148 .mldv1_unsolicited_report_interval = 10 * HZ,
104149@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __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@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
104159 idx = 0;
104160 head = &net->dev_index_head[h];
104161 rcu_read_lock();
104162- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
104163+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
104164 net->dev_base_seq;
104165 hlist_for_each_entry_rcu(dev, head, index_hlist) {
104166 if (idx < s_idx)
104167@@ -2420,7 +2420,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
104168 p.iph.ihl = 5;
104169 p.iph.protocol = IPPROTO_IPV6;
104170 p.iph.ttl = 64;
104171- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
104172+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
104173
104174 if (ops->ndo_do_ioctl) {
104175 mm_segment_t oldfs = get_fs();
104176@@ -3569,16 +3569,23 @@ static const struct file_operations if6_fops = {
104177 .release = seq_release_net,
104178 };
104179
104180+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
104181+extern void unregister_ipv6_seq_ops_addr(void);
104182+
104183 static int __net_init if6_proc_net_init(struct net *net)
104184 {
104185- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
104186+ register_ipv6_seq_ops_addr(&if6_seq_ops);
104187+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
104188+ unregister_ipv6_seq_ops_addr();
104189 return -ENOMEM;
104190+ }
104191 return 0;
104192 }
104193
104194 static void __net_exit if6_proc_net_exit(struct net *net)
104195 {
104196 remove_proc_entry("if_inet6", net->proc_net);
104197+ unregister_ipv6_seq_ops_addr();
104198 }
104199
104200 static struct pernet_operations if6_proc_net_ops = {
104201@@ -4194,7 +4201,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
104202 s_ip_idx = ip_idx = cb->args[2];
104203
104204 rcu_read_lock();
104205- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104206+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104207 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
104208 idx = 0;
104209 head = &net->dev_index_head[h];
104210@@ -4840,7 +4847,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104211 rt_genid_bump_ipv6(net);
104212 break;
104213 }
104214- atomic_inc(&net->ipv6.dev_addr_genid);
104215+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
104216 }
104217
104218 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104219@@ -4860,7 +4867,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
104220 int *valp = ctl->data;
104221 int val = *valp;
104222 loff_t pos = *ppos;
104223- struct ctl_table lctl;
104224+ ctl_table_no_const lctl;
104225 int ret;
104226
104227 /*
104228@@ -4945,7 +4952,7 @@ int addrconf_sysctl_disable(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 /*
104237diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
104238index e8c4400..a4cd5da 100644
104239--- a/net/ipv6/af_inet6.c
104240+++ b/net/ipv6/af_inet6.c
104241@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
104242 net->ipv6.sysctl.icmpv6_time = 1*HZ;
104243 net->ipv6.sysctl.flowlabel_consistency = 1;
104244 net->ipv6.sysctl.auto_flowlabels = 0;
104245- atomic_set(&net->ipv6.fib6_sernum, 1);
104246+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
104247
104248 err = ipv6_init_mibs(net);
104249 if (err)
104250diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
104251index 49f5e73..ae02d54 100644
104252--- a/net/ipv6/datagram.c
104253+++ b/net/ipv6/datagram.c
104254@@ -941,5 +941,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
104255 0,
104256 sock_i_ino(sp),
104257 atomic_read(&sp->sk_refcnt), sp,
104258- atomic_read(&sp->sk_drops));
104259+ atomic_read_unchecked(&sp->sk_drops));
104260 }
104261diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
104262index d674152..fb5a01d 100644
104263--- a/net/ipv6/icmp.c
104264+++ b/net/ipv6/icmp.c
104265@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
104266
104267 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
104268 {
104269- struct ctl_table *table;
104270+ ctl_table_no_const *table;
104271
104272 table = kmemdup(ipv6_icmp_table_template,
104273 sizeof(ipv6_icmp_table_template),
104274diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
104275index f1c6d5e..faabef6 100644
104276--- a/net/ipv6/ip6_fib.c
104277+++ b/net/ipv6/ip6_fib.c
104278@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
104279 int new, old;
104280
104281 do {
104282- old = atomic_read(&net->ipv6.fib6_sernum);
104283+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
104284 new = old < INT_MAX ? old + 1 : 1;
104285- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
104286+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
104287 old, new) != old);
104288 return new;
104289 }
104290diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
104291index 01ccc28..66861c7 100644
104292--- a/net/ipv6/ip6_gre.c
104293+++ b/net/ipv6/ip6_gre.c
104294@@ -71,8 +71,8 @@ struct ip6gre_net {
104295 struct net_device *fb_tunnel_dev;
104296 };
104297
104298-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
104299-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
104300+static struct rtnl_link_ops ip6gre_link_ops;
104301+static struct rtnl_link_ops ip6gre_tap_ops;
104302 static int ip6gre_tunnel_init(struct net_device *dev);
104303 static void ip6gre_tunnel_setup(struct net_device *dev);
104304 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
104305@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
104306 }
104307
104308
104309-static struct inet6_protocol ip6gre_protocol __read_mostly = {
104310+static struct inet6_protocol ip6gre_protocol = {
104311 .handler = ip6gre_rcv,
104312 .err_handler = ip6gre_err,
104313 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
104314@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
104315 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
104316 };
104317
104318-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
104319+static struct rtnl_link_ops ip6gre_link_ops = {
104320 .kind = "ip6gre",
104321 .maxtype = IFLA_GRE_MAX,
104322 .policy = ip6gre_policy,
104323@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
104324 .fill_info = ip6gre_fill_info,
104325 };
104326
104327-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
104328+static struct rtnl_link_ops ip6gre_tap_ops = {
104329 .kind = "ip6gretap",
104330 .maxtype = IFLA_GRE_MAX,
104331 .policy = ip6gre_policy,
104332diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
104333index 92b3da5..77837b8 100644
104334--- a/net/ipv6/ip6_tunnel.c
104335+++ b/net/ipv6/ip6_tunnel.c
104336@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
104337
104338 static int ip6_tnl_dev_init(struct net_device *dev);
104339 static void ip6_tnl_dev_setup(struct net_device *dev);
104340-static struct rtnl_link_ops ip6_link_ops __read_mostly;
104341+static struct rtnl_link_ops ip6_link_ops;
104342
104343 static int ip6_tnl_net_id __read_mostly;
104344 struct ip6_tnl_net {
104345@@ -1771,7 +1771,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
104346 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
104347 };
104348
104349-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
104350+static struct rtnl_link_ops ip6_link_ops = {
104351 .kind = "ip6tnl",
104352 .maxtype = IFLA_IPTUN_MAX,
104353 .policy = ip6_tnl_policy,
104354diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
104355index ace10d0..97a8b49 100644
104356--- a/net/ipv6/ip6_vti.c
104357+++ b/net/ipv6/ip6_vti.c
104358@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
104359
104360 static int vti6_dev_init(struct net_device *dev);
104361 static void vti6_dev_setup(struct net_device *dev);
104362-static struct rtnl_link_ops vti6_link_ops __read_mostly;
104363+static struct rtnl_link_ops vti6_link_ops;
104364
104365 static int vti6_net_id __read_mostly;
104366 struct vti6_net {
104367@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
104368 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
104369 };
104370
104371-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
104372+static struct rtnl_link_ops vti6_link_ops = {
104373 .kind = "vti6",
104374 .maxtype = IFLA_VTI_MAX,
104375 .policy = vti6_policy,
104376diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
104377index 66980d8d..8aef0d1 100644
104378--- a/net/ipv6/ipv6_sockglue.c
104379+++ b/net/ipv6/ipv6_sockglue.c
104380@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
104381 if (sk->sk_type != SOCK_STREAM)
104382 return -ENOPROTOOPT;
104383
104384- msg.msg_control = optval;
104385+ msg.msg_control = (void __force_kernel *)optval;
104386 msg.msg_controllen = len;
104387 msg.msg_flags = flags;
104388
104389diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
104390index e080fbb..412b3cf 100644
104391--- a/net/ipv6/netfilter/ip6_tables.c
104392+++ b/net/ipv6/netfilter/ip6_tables.c
104393@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
104394 #endif
104395
104396 static int get_info(struct net *net, void __user *user,
104397- const int *len, int compat)
104398+ int len, int compat)
104399 {
104400 char name[XT_TABLE_MAXNAMELEN];
104401 struct xt_table *t;
104402 int ret;
104403
104404- if (*len != sizeof(struct ip6t_getinfo)) {
104405- duprintf("length %u != %zu\n", *len,
104406+ if (len != sizeof(struct ip6t_getinfo)) {
104407+ duprintf("length %u != %zu\n", len,
104408 sizeof(struct ip6t_getinfo));
104409 return -EINVAL;
104410 }
104411@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
104412 info.size = private->size;
104413 strcpy(info.name, name);
104414
104415- if (copy_to_user(user, &info, *len) != 0)
104416+ if (copy_to_user(user, &info, len) != 0)
104417 ret = -EFAULT;
104418 else
104419 ret = 0;
104420@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
104421
104422 switch (cmd) {
104423 case IP6T_SO_GET_INFO:
104424- ret = get_info(sock_net(sk), user, len, 1);
104425+ ret = get_info(sock_net(sk), user, *len, 1);
104426 break;
104427 case IP6T_SO_GET_ENTRIES:
104428 ret = compat_get_entries(sock_net(sk), user, len);
104429@@ -2030,7 +2030,7 @@ 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, 0);
104434+ ret = get_info(sock_net(sk), user, *len, 0);
104435 break;
104436
104437 case IP6T_SO_GET_ENTRIES:
104438diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
104439index 6f187c8..34b367f 100644
104440--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
104441+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
104442@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
104443
104444 static int nf_ct_frag6_sysctl_register(struct net *net)
104445 {
104446- struct ctl_table *table;
104447+ ctl_table_no_const *table = NULL;
104448 struct ctl_table_header *hdr;
104449
104450- table = nf_ct_frag6_sysctl_table;
104451 if (!net_eq(net, &init_net)) {
104452- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
104453+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
104454 GFP_KERNEL);
104455 if (table == NULL)
104456 goto err_alloc;
104457@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
104458 table[2].data = &net->nf_frag.frags.high_thresh;
104459 table[2].extra1 = &net->nf_frag.frags.low_thresh;
104460 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
104461- }
104462-
104463- hdr = register_net_sysctl(net, "net/netfilter", table);
104464+ hdr = register_net_sysctl(net, "net/netfilter", table);
104465+ } else
104466+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
104467 if (hdr == NULL)
104468 goto err_reg;
104469
104470@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
104471 return 0;
104472
104473 err_reg:
104474- if (!net_eq(net, &init_net))
104475- kfree(table);
104476+ kfree(table);
104477 err_alloc:
104478 return -ENOMEM;
104479 }
104480diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
104481index fe7e3e4..47aba96 100644
104482--- a/net/ipv6/ping.c
104483+++ b/net/ipv6/ping.c
104484@@ -242,6 +242,24 @@ static struct pernet_operations ping_v6_net_ops = {
104485 };
104486 #endif
104487
104488+static struct pingv6_ops real_pingv6_ops = {
104489+ .ipv6_recv_error = ipv6_recv_error,
104490+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
104491+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
104492+ .icmpv6_err_convert = icmpv6_err_convert,
104493+ .ipv6_icmp_error = ipv6_icmp_error,
104494+ .ipv6_chk_addr = ipv6_chk_addr,
104495+};
104496+
104497+static struct pingv6_ops dummy_pingv6_ops = {
104498+ .ipv6_recv_error = dummy_ipv6_recv_error,
104499+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
104500+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
104501+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
104502+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
104503+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
104504+};
104505+
104506 int __init pingv6_init(void)
104507 {
104508 #ifdef CONFIG_PROC_FS
104509@@ -249,13 +267,7 @@ int __init pingv6_init(void)
104510 if (ret)
104511 return ret;
104512 #endif
104513- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
104514- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
104515- pingv6_ops.ip6_datagram_recv_specific_ctl =
104516- ip6_datagram_recv_specific_ctl;
104517- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
104518- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
104519- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
104520+ pingv6_ops = &real_pingv6_ops;
104521 return inet6_register_protosw(&pingv6_protosw);
104522 }
104523
104524@@ -264,14 +276,9 @@ int __init pingv6_init(void)
104525 */
104526 void pingv6_exit(void)
104527 {
104528- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
104529- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
104530- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
104531- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
104532- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
104533- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
104534 #ifdef CONFIG_PROC_FS
104535 unregister_pernet_subsys(&ping_v6_net_ops);
104536 #endif
104537+ pingv6_ops = &dummy_pingv6_ops;
104538 inet6_unregister_protosw(&pingv6_protosw);
104539 }
104540diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
104541index 679253d0..70b653c 100644
104542--- a/net/ipv6/proc.c
104543+++ b/net/ipv6/proc.c
104544@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
104545 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
104546 goto proc_snmp6_fail;
104547
104548- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
104549+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
104550 if (!net->mib.proc_net_devsnmp6)
104551 goto proc_dev_snmp6_fail;
104552 return 0;
104553diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
104554index ee25631..3c3ac5d 100644
104555--- a/net/ipv6/raw.c
104556+++ b/net/ipv6/raw.c
104557@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
104558 {
104559 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
104560 skb_checksum_complete(skb)) {
104561- atomic_inc(&sk->sk_drops);
104562+ atomic_inc_unchecked(&sk->sk_drops);
104563 kfree_skb(skb);
104564 return NET_RX_DROP;
104565 }
104566@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
104567 struct raw6_sock *rp = raw6_sk(sk);
104568
104569 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, 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@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
104576
104577 if (inet->hdrincl) {
104578 if (skb_checksum_complete(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@@ -609,7 +609,7 @@ out:
104585 return err;
104586 }
104587
104588-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
104589+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
104590 struct flowi6 *fl6, struct dst_entry **dstp,
104591 unsigned int flags)
104592 {
104593@@ -916,12 +916,15 @@ do_confirm:
104594 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
104595 char __user *optval, int optlen)
104596 {
104597+ struct icmp6_filter filter;
104598+
104599 switch (optname) {
104600 case ICMPV6_FILTER:
104601 if (optlen > sizeof(struct icmp6_filter))
104602 optlen = sizeof(struct icmp6_filter);
104603- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
104604+ if (copy_from_user(&filter, optval, optlen))
104605 return -EFAULT;
104606+ raw6_sk(sk)->filter = filter;
104607 return 0;
104608 default:
104609 return -ENOPROTOOPT;
104610@@ -934,6 +937,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
104611 char __user *optval, int __user *optlen)
104612 {
104613 int len;
104614+ struct icmp6_filter filter;
104615
104616 switch (optname) {
104617 case ICMPV6_FILTER:
104618@@ -945,7 +949,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
104619 len = sizeof(struct icmp6_filter);
104620 if (put_user(len, optlen))
104621 return -EFAULT;
104622- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
104623+ filter = raw6_sk(sk)->filter;
104624+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
104625 return -EFAULT;
104626 return 0;
104627 default:
104628diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
104629index d7d70e6..bd5e9fc 100644
104630--- a/net/ipv6/reassembly.c
104631+++ b/net/ipv6/reassembly.c
104632@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
104633
104634 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104635 {
104636- struct ctl_table *table;
104637+ ctl_table_no_const *table = NULL;
104638 struct ctl_table_header *hdr;
104639
104640- table = ip6_frags_ns_ctl_table;
104641 if (!net_eq(net, &init_net)) {
104642- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
104643+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
104644 if (table == NULL)
104645 goto err_alloc;
104646
104647@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104648 /* Don't export sysctls to unprivileged users */
104649 if (net->user_ns != &init_user_ns)
104650 table[0].procname = NULL;
104651- }
104652+ hdr = register_net_sysctl(net, "net/ipv6", table);
104653+ } else
104654+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
104655
104656- hdr = register_net_sysctl(net, "net/ipv6", table);
104657 if (hdr == NULL)
104658 goto err_reg;
104659
104660@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
104661 return 0;
104662
104663 err_reg:
104664- if (!net_eq(net, &init_net))
104665- kfree(table);
104666+ kfree(table);
104667 err_alloc:
104668 return -ENOMEM;
104669 }
104670diff --git a/net/ipv6/route.c b/net/ipv6/route.c
104671index 1528d84..f393960 100644
104672--- a/net/ipv6/route.c
104673+++ b/net/ipv6/route.c
104674@@ -2978,7 +2978,7 @@ struct ctl_table ipv6_route_table_template[] = {
104675
104676 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
104677 {
104678- struct ctl_table *table;
104679+ ctl_table_no_const *table;
104680
104681 table = kmemdup(ipv6_route_table_template,
104682 sizeof(ipv6_route_table_template),
104683diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
104684index cdbfe5a..e13eb31 100644
104685--- a/net/ipv6/sit.c
104686+++ b/net/ipv6/sit.c
104687@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
104688 static void ipip6_dev_free(struct net_device *dev);
104689 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
104690 __be32 *v4dst);
104691-static struct rtnl_link_ops sit_link_ops __read_mostly;
104692+static struct rtnl_link_ops sit_link_ops;
104693
104694 static int sit_net_id __read_mostly;
104695 struct sit_net {
104696@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
104697 unregister_netdevice_queue(dev, head);
104698 }
104699
104700-static struct rtnl_link_ops sit_link_ops __read_mostly = {
104701+static struct rtnl_link_ops sit_link_ops = {
104702 .kind = "sit",
104703 .maxtype = IFLA_IPTUN_MAX,
104704 .policy = ipip6_policy,
104705diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
104706index c5c10fa..2577d51 100644
104707--- a/net/ipv6/sysctl_net_ipv6.c
104708+++ b/net/ipv6/sysctl_net_ipv6.c
104709@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
104710
104711 static int __net_init ipv6_sysctl_net_init(struct net *net)
104712 {
104713- struct ctl_table *ipv6_table;
104714+ ctl_table_no_const *ipv6_table;
104715 struct ctl_table *ipv6_route_table;
104716 struct ctl_table *ipv6_icmp_table;
104717 int err;
104718diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
104719index b899793..b783604 100644
104720--- a/net/ipv6/tcp_ipv6.c
104721+++ b/net/ipv6/tcp_ipv6.c
104722@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
104723 }
104724 }
104725
104726+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104727+extern int grsec_enable_blackhole;
104728+#endif
104729+
104730 static void tcp_v6_hash(struct sock *sk)
104731 {
104732 if (sk->sk_state != TCP_CLOSE) {
104733@@ -1343,6 +1347,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
104734 return 0;
104735
104736 reset:
104737+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104738+ if (!grsec_enable_blackhole)
104739+#endif
104740 tcp_v6_send_reset(sk, skb);
104741 discard:
104742 if (opt_skb)
104743@@ -1452,12 +1459,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
104744
104745 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
104746 inet6_iif(skb));
104747- if (!sk)
104748+ if (!sk) {
104749+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104750+ ret = 1;
104751+#endif
104752 goto no_tcp_socket;
104753+ }
104754
104755 process:
104756- if (sk->sk_state == TCP_TIME_WAIT)
104757+ if (sk->sk_state == TCP_TIME_WAIT) {
104758+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104759+ ret = 2;
104760+#endif
104761 goto do_time_wait;
104762+ }
104763
104764 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
104765 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
104766@@ -1508,6 +1523,10 @@ csum_error:
104767 bad_packet:
104768 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
104769 } else {
104770+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104771+ if (!grsec_enable_blackhole || (ret == 1 &&
104772+ (skb->dev->flags & IFF_LOOPBACK)))
104773+#endif
104774 tcp_v6_send_reset(NULL, skb);
104775 }
104776
104777diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
104778index 189dc4a..458bec0 100644
104779--- a/net/ipv6/udp.c
104780+++ b/net/ipv6/udp.c
104781@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
104782 udp_ipv6_hash_secret + net_hash_mix(net));
104783 }
104784
104785+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104786+extern int grsec_enable_blackhole;
104787+#endif
104788+
104789 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
104790 {
104791 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
104792@@ -448,7 +452,7 @@ try_again:
104793 if (unlikely(err)) {
104794 trace_kfree_skb(skb, udpv6_recvmsg);
104795 if (!peeked) {
104796- atomic_inc(&sk->sk_drops);
104797+ atomic_inc_unchecked(&sk->sk_drops);
104798 if (is_udp4)
104799 UDP_INC_STATS_USER(sock_net(sk),
104800 UDP_MIB_INERRORS,
104801@@ -714,7 +718,7 @@ csum_error:
104802 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104803 drop:
104804 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104805- atomic_inc(&sk->sk_drops);
104806+ atomic_inc_unchecked(&sk->sk_drops);
104807 kfree_skb(skb);
104808 return -1;
104809 }
104810@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104811 if (likely(skb1 == NULL))
104812 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104813 if (!skb1) {
104814- atomic_inc(&sk->sk_drops);
104815+ atomic_inc_unchecked(&sk->sk_drops);
104816 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104817 IS_UDPLITE(sk));
104818 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104819@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104820 goto csum_error;
104821
104822 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104823+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104824+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104825+#endif
104826 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
104827
104828 kfree_skb(skb);
104829diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
104830index 48bf5a0..691985a 100644
104831--- a/net/ipv6/xfrm6_policy.c
104832+++ b/net/ipv6/xfrm6_policy.c
104833@@ -223,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
104834 }
104835 }
104836
104837-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
104838+static int xfrm6_garbage_collect(struct dst_ops *ops)
104839 {
104840 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
104841
104842- xfrm6_policy_afinfo.garbage_collect(net);
104843+ xfrm_garbage_collect_deferred(net);
104844 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
104845 }
104846
104847@@ -340,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
104848
104849 static int __net_init xfrm6_net_init(struct net *net)
104850 {
104851- struct ctl_table *table;
104852+ ctl_table_no_const *table = NULL;
104853 struct ctl_table_header *hdr;
104854
104855- table = xfrm6_policy_table;
104856 if (!net_eq(net, &init_net)) {
104857- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104858+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104859 if (!table)
104860 goto err_alloc;
104861
104862 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
104863- }
104864+ hdr = register_net_sysctl(net, "net/ipv6", table);
104865+ } else
104866+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
104867
104868- hdr = register_net_sysctl(net, "net/ipv6", table);
104869 if (!hdr)
104870 goto err_reg;
104871
104872@@ -360,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
104873 return 0;
104874
104875 err_reg:
104876- if (!net_eq(net, &init_net))
104877- kfree(table);
104878+ kfree(table);
104879 err_alloc:
104880 return -ENOMEM;
104881 }
104882diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
104883index c1d247e..9e5949d 100644
104884--- a/net/ipx/ipx_proc.c
104885+++ b/net/ipx/ipx_proc.c
104886@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
104887 struct proc_dir_entry *p;
104888 int rc = -ENOMEM;
104889
104890- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
104891+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
104892
104893 if (!ipx_proc_dir)
104894 goto out;
104895diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
104896index 4efe486..dee966e 100644
104897--- a/net/irda/ircomm/ircomm_tty.c
104898+++ b/net/irda/ircomm/ircomm_tty.c
104899@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104900 add_wait_queue(&port->open_wait, &wait);
104901
104902 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
104903- __FILE__, __LINE__, tty->driver->name, port->count);
104904+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104905
104906 spin_lock_irqsave(&port->lock, flags);
104907- port->count--;
104908+ atomic_dec(&port->count);
104909 port->blocked_open++;
104910 spin_unlock_irqrestore(&port->lock, flags);
104911
104912@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104913 }
104914
104915 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
104916- __FILE__, __LINE__, tty->driver->name, port->count);
104917+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104918
104919 schedule();
104920 }
104921@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104922
104923 spin_lock_irqsave(&port->lock, flags);
104924 if (!tty_hung_up_p(filp))
104925- port->count++;
104926+ atomic_inc(&port->count);
104927 port->blocked_open--;
104928 spin_unlock_irqrestore(&port->lock, flags);
104929
104930 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
104931- __FILE__, __LINE__, tty->driver->name, port->count);
104932+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104933
104934 if (!retval)
104935 port->flags |= ASYNC_NORMAL_ACTIVE;
104936@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
104937
104938 /* ++ is not atomic, so this should be protected - Jean II */
104939 spin_lock_irqsave(&self->port.lock, flags);
104940- self->port.count++;
104941+ atomic_inc(&self->port.count);
104942 spin_unlock_irqrestore(&self->port.lock, flags);
104943 tty_port_tty_set(&self->port, tty);
104944
104945 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
104946- self->line, self->port.count);
104947+ self->line, atomic_read(&self->port.count));
104948
104949 /* Not really used by us, but lets do it anyway */
104950 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
104951@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
104952 tty_kref_put(port->tty);
104953 }
104954 port->tty = NULL;
104955- port->count = 0;
104956+ atomic_set(&port->count, 0);
104957 spin_unlock_irqrestore(&port->lock, flags);
104958
104959 wake_up_interruptible(&port->open_wait);
104960@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
104961 seq_putc(m, '\n');
104962
104963 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
104964- seq_printf(m, "Open count: %d\n", self->port.count);
104965+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
104966 seq_printf(m, "Max data size: %d\n", self->max_data_size);
104967 seq_printf(m, "Max header size: %d\n", self->max_header_size);
104968
104969diff --git a/net/irda/irproc.c b/net/irda/irproc.c
104970index b9ac598..f88cc56 100644
104971--- a/net/irda/irproc.c
104972+++ b/net/irda/irproc.c
104973@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
104974 {
104975 int i;
104976
104977- proc_irda = proc_mkdir("irda", init_net.proc_net);
104978+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
104979 if (proc_irda == NULL)
104980 return;
104981
104982diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
104983index 2e9953b..ed06350 100644
104984--- a/net/iucv/af_iucv.c
104985+++ b/net/iucv/af_iucv.c
104986@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
104987 {
104988 char name[12];
104989
104990- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
104991+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
104992 while (__iucv_get_sock_by_name(name)) {
104993 sprintf(name, "%08x",
104994- atomic_inc_return(&iucv_sk_list.autobind_name));
104995+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
104996 }
104997 memcpy(iucv->src_name, name, 8);
104998 }
104999diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
105000index 2a6a1fd..6c112b0 100644
105001--- a/net/iucv/iucv.c
105002+++ b/net/iucv/iucv.c
105003@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
105004 return NOTIFY_OK;
105005 }
105006
105007-static struct notifier_block __refdata iucv_cpu_notifier = {
105008+static struct notifier_block iucv_cpu_notifier = {
105009 .notifier_call = iucv_cpu_notify,
105010 };
105011
105012diff --git a/net/key/af_key.c b/net/key/af_key.c
105013index f8ac939..1e189bf 100644
105014--- a/net/key/af_key.c
105015+++ b/net/key/af_key.c
105016@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
105017 static u32 get_acqseq(void)
105018 {
105019 u32 res;
105020- static atomic_t acqseq;
105021+ static atomic_unchecked_t acqseq;
105022
105023 do {
105024- res = atomic_inc_return(&acqseq);
105025+ res = atomic_inc_return_unchecked(&acqseq);
105026 } while (!res);
105027 return res;
105028 }
105029diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
105030index 781b3a2..73a7434 100644
105031--- a/net/l2tp/l2tp_eth.c
105032+++ b/net/l2tp/l2tp_eth.c
105033@@ -42,12 +42,12 @@ struct l2tp_eth {
105034 struct sock *tunnel_sock;
105035 struct l2tp_session *session;
105036 struct list_head list;
105037- atomic_long_t tx_bytes;
105038- atomic_long_t tx_packets;
105039- atomic_long_t tx_dropped;
105040- atomic_long_t rx_bytes;
105041- atomic_long_t rx_packets;
105042- atomic_long_t rx_errors;
105043+ atomic_long_unchecked_t tx_bytes;
105044+ atomic_long_unchecked_t tx_packets;
105045+ atomic_long_unchecked_t tx_dropped;
105046+ atomic_long_unchecked_t rx_bytes;
105047+ atomic_long_unchecked_t rx_packets;
105048+ atomic_long_unchecked_t rx_errors;
105049 };
105050
105051 /* via l2tp_session_priv() */
105052@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
105053 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
105054
105055 if (likely(ret == NET_XMIT_SUCCESS)) {
105056- atomic_long_add(len, &priv->tx_bytes);
105057- atomic_long_inc(&priv->tx_packets);
105058+ atomic_long_add_unchecked(len, &priv->tx_bytes);
105059+ atomic_long_inc_unchecked(&priv->tx_packets);
105060 } else {
105061- atomic_long_inc(&priv->tx_dropped);
105062+ atomic_long_inc_unchecked(&priv->tx_dropped);
105063 }
105064 return NETDEV_TX_OK;
105065 }
105066@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
105067 {
105068 struct l2tp_eth *priv = netdev_priv(dev);
105069
105070- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
105071- stats->tx_packets = atomic_long_read(&priv->tx_packets);
105072- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
105073- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
105074- stats->rx_packets = atomic_long_read(&priv->rx_packets);
105075- stats->rx_errors = atomic_long_read(&priv->rx_errors);
105076+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
105077+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
105078+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
105079+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
105080+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
105081+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
105082 return stats;
105083 }
105084
105085@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
105086 nf_reset(skb);
105087
105088 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
105089- atomic_long_inc(&priv->rx_packets);
105090- atomic_long_add(data_len, &priv->rx_bytes);
105091+ atomic_long_inc_unchecked(&priv->rx_packets);
105092+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
105093 } else {
105094- atomic_long_inc(&priv->rx_errors);
105095+ atomic_long_inc_unchecked(&priv->rx_errors);
105096 }
105097 return;
105098
105099 error:
105100- atomic_long_inc(&priv->rx_errors);
105101+ atomic_long_inc_unchecked(&priv->rx_errors);
105102 kfree_skb(skb);
105103 }
105104
105105diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
105106index 05dfc8aa..df6cfd7 100644
105107--- a/net/l2tp/l2tp_ip.c
105108+++ b/net/l2tp/l2tp_ip.c
105109@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
105110 .ops = &l2tp_ip_ops,
105111 };
105112
105113-static struct net_protocol l2tp_ip_protocol __read_mostly = {
105114+static const struct net_protocol l2tp_ip_protocol = {
105115 .handler = l2tp_ip_recv,
105116 .netns_ok = 1,
105117 };
105118diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
105119index 8611f1b..bc60a2d 100644
105120--- a/net/l2tp/l2tp_ip6.c
105121+++ b/net/l2tp/l2tp_ip6.c
105122@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
105123 .ops = &l2tp_ip6_ops,
105124 };
105125
105126-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
105127+static const struct inet6_protocol l2tp_ip6_protocol = {
105128 .handler = l2tp_ip6_recv,
105129 };
105130
105131diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
105132index 1a3c7e0..80f8b0c 100644
105133--- a/net/llc/llc_proc.c
105134+++ b/net/llc/llc_proc.c
105135@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
105136 int rc = -ENOMEM;
105137 struct proc_dir_entry *p;
105138
105139- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
105140+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
105141 if (!llc_proc_dir)
105142 goto out;
105143
105144diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
105145index e75d5c5..429fc95 100644
105146--- a/net/mac80211/cfg.c
105147+++ b/net/mac80211/cfg.c
105148@@ -543,7 +543,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
105149 ret = ieee80211_vif_use_channel(sdata, chandef,
105150 IEEE80211_CHANCTX_EXCLUSIVE);
105151 }
105152- } else if (local->open_count == local->monitors) {
105153+ } else if (local_read(&local->open_count) == local->monitors) {
105154 local->_oper_chandef = *chandef;
105155 ieee80211_hw_config(local, 0);
105156 }
105157@@ -3416,7 +3416,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
105158 else
105159 local->probe_req_reg--;
105160
105161- if (!local->open_count)
105162+ if (!local_read(&local->open_count))
105163 break;
105164
105165 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
105166@@ -3551,8 +3551,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
105167 if (chanctx_conf) {
105168 *chandef = sdata->vif.bss_conf.chandef;
105169 ret = 0;
105170- } else if (local->open_count > 0 &&
105171- local->open_count == local->monitors &&
105172+ } else if (local_read(&local->open_count) > 0 &&
105173+ local_read(&local->open_count) == local->monitors &&
105174 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
105175 if (local->use_chanctx)
105176 *chandef = local->monitor_chandef;
105177diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
105178index fa7568c..74c815c 100644
105179--- a/net/mac80211/ieee80211_i.h
105180+++ b/net/mac80211/ieee80211_i.h
105181@@ -29,6 +29,7 @@
105182 #include <net/ieee80211_radiotap.h>
105183 #include <net/cfg80211.h>
105184 #include <net/mac80211.h>
105185+#include <asm/local.h>
105186 #include "key.h"
105187 #include "sta_info.h"
105188 #include "debug.h"
105189@@ -1125,7 +1126,7 @@ struct ieee80211_local {
105190 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
105191 spinlock_t queue_stop_reason_lock;
105192
105193- int open_count;
105194+ local_t open_count;
105195 int monitors, cooked_mntrs;
105196 /* number of interfaces with corresponding FIF_ flags */
105197 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
105198diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
105199index 4173553..e3b5a3f 100644
105200--- a/net/mac80211/iface.c
105201+++ b/net/mac80211/iface.c
105202@@ -543,7 +543,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105203 break;
105204 }
105205
105206- if (local->open_count == 0) {
105207+ if (local_read(&local->open_count) == 0) {
105208 res = drv_start(local);
105209 if (res)
105210 goto err_del_bss;
105211@@ -590,7 +590,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105212 res = drv_add_interface(local, sdata);
105213 if (res)
105214 goto err_stop;
105215- } else if (local->monitors == 0 && local->open_count == 0) {
105216+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
105217 res = ieee80211_add_virtual_monitor(local);
105218 if (res)
105219 goto err_stop;
105220@@ -700,7 +700,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105221 atomic_inc(&local->iff_promiscs);
105222
105223 if (coming_up)
105224- local->open_count++;
105225+ local_inc(&local->open_count);
105226
105227 if (hw_reconf_flags)
105228 ieee80211_hw_config(local, hw_reconf_flags);
105229@@ -738,7 +738,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105230 err_del_interface:
105231 drv_remove_interface(local, sdata);
105232 err_stop:
105233- if (!local->open_count)
105234+ if (!local_read(&local->open_count))
105235 drv_stop(local);
105236 err_del_bss:
105237 sdata->bss = NULL;
105238@@ -906,7 +906,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105239 }
105240
105241 if (going_down)
105242- local->open_count--;
105243+ local_dec(&local->open_count);
105244
105245 switch (sdata->vif.type) {
105246 case NL80211_IFTYPE_AP_VLAN:
105247@@ -968,7 +968,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105248 }
105249 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
105250
105251- if (local->open_count == 0)
105252+ if (local_read(&local->open_count) == 0)
105253 ieee80211_clear_tx_pending(local);
105254
105255 /*
105256@@ -1011,7 +1011,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105257 if (cancel_scan)
105258 flush_delayed_work(&local->scan_work);
105259
105260- if (local->open_count == 0) {
105261+ if (local_read(&local->open_count) == 0) {
105262 ieee80211_stop_device(local);
105263
105264 /* no reconfiguring after stop! */
105265@@ -1022,7 +1022,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
105266 ieee80211_configure_filter(local);
105267 ieee80211_hw_config(local, hw_reconf_flags);
105268
105269- if (local->monitors == local->open_count)
105270+ if (local->monitors == local_read(&local->open_count))
105271 ieee80211_add_virtual_monitor(local);
105272 }
105273
105274diff --git a/net/mac80211/main.c b/net/mac80211/main.c
105275index 6ab99da..f9502d4 100644
105276--- a/net/mac80211/main.c
105277+++ b/net/mac80211/main.c
105278@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
105279 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
105280 IEEE80211_CONF_CHANGE_POWER);
105281
105282- if (changed && local->open_count) {
105283+ if (changed && local_read(&local->open_count)) {
105284 ret = drv_config(local, changed);
105285 /*
105286 * Goal:
105287diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
105288index 4a95fe3..0bfd713 100644
105289--- a/net/mac80211/pm.c
105290+++ b/net/mac80211/pm.c
105291@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105292 struct ieee80211_sub_if_data *sdata;
105293 struct sta_info *sta;
105294
105295- if (!local->open_count)
105296+ if (!local_read(&local->open_count))
105297 goto suspend;
105298
105299 ieee80211_scan_cancel(local);
105300@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105301 cancel_work_sync(&local->dynamic_ps_enable_work);
105302 del_timer_sync(&local->dynamic_ps_timer);
105303
105304- local->wowlan = wowlan && local->open_count;
105305+ local->wowlan = wowlan && local_read(&local->open_count);
105306 if (local->wowlan) {
105307 int err = drv_suspend(local, wowlan);
105308 if (err < 0) {
105309@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
105310 WARN_ON(!list_empty(&local->chanctx_list));
105311
105312 /* stop hardware - this must stop RX */
105313- if (local->open_count)
105314+ if (local_read(&local->open_count))
105315 ieee80211_stop_device(local);
105316
105317 suspend:
105318diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
105319index d53355b..21f583a 100644
105320--- a/net/mac80211/rate.c
105321+++ b/net/mac80211/rate.c
105322@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
105323
105324 ASSERT_RTNL();
105325
105326- if (local->open_count)
105327+ if (local_read(&local->open_count))
105328 return -EBUSY;
105329
105330 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
105331diff --git a/net/mac80211/util.c b/net/mac80211/util.c
105332index 1ce38e7..77267ad 100644
105333--- a/net/mac80211/util.c
105334+++ b/net/mac80211/util.c
105335@@ -1757,7 +1757,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
105336 }
105337 #endif
105338 /* everything else happens only if HW was up & running */
105339- if (!local->open_count)
105340+ if (!local_read(&local->open_count))
105341 goto wake_up;
105342
105343 /*
105344@@ -1987,7 +1987,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
105345 local->in_reconfig = false;
105346 barrier();
105347
105348- if (local->monitors == local->open_count && local->monitors > 0)
105349+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
105350 ieee80211_add_virtual_monitor(local);
105351
105352 /*
105353diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
105354index b02660f..c0f791c 100644
105355--- a/net/netfilter/Kconfig
105356+++ b/net/netfilter/Kconfig
105357@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
105358
105359 To compile it as a module, choose M here. If unsure, say N.
105360
105361+config NETFILTER_XT_MATCH_GRADM
105362+ tristate '"gradm" match support'
105363+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
105364+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
105365+ ---help---
105366+ The gradm match allows to match on grsecurity RBAC being enabled.
105367+ It is useful when iptables rules are applied early on bootup to
105368+ prevent connections to the machine (except from a trusted host)
105369+ while the RBAC system is disabled.
105370+
105371 config NETFILTER_XT_MATCH_HASHLIMIT
105372 tristate '"hashlimit" match support'
105373 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
105374diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
105375index 89f73a9..e4e5bd9 100644
105376--- a/net/netfilter/Makefile
105377+++ b/net/netfilter/Makefile
105378@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
105379 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
105380 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
105381 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
105382+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
105383 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
105384 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
105385 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
105386diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
105387index d259da3..6a32b2c 100644
105388--- a/net/netfilter/ipset/ip_set_core.c
105389+++ b/net/netfilter/ipset/ip_set_core.c
105390@@ -1952,7 +1952,7 @@ done:
105391 return ret;
105392 }
105393
105394-static struct nf_sockopt_ops so_set __read_mostly = {
105395+static struct nf_sockopt_ops so_set = {
105396 .pf = PF_INET,
105397 .get_optmin = SO_IP_SET,
105398 .get_optmax = SO_IP_SET + 1,
105399diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
105400index b0f7b62..0541842 100644
105401--- a/net/netfilter/ipvs/ip_vs_conn.c
105402+++ b/net/netfilter/ipvs/ip_vs_conn.c
105403@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
105404 /* Increase the refcnt counter of the dest */
105405 ip_vs_dest_hold(dest);
105406
105407- conn_flags = atomic_read(&dest->conn_flags);
105408+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
105409 if (cp->protocol != IPPROTO_UDP)
105410 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
105411 flags = cp->flags;
105412@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
105413
105414 cp->control = NULL;
105415 atomic_set(&cp->n_control, 0);
105416- atomic_set(&cp->in_pkts, 0);
105417+ atomic_set_unchecked(&cp->in_pkts, 0);
105418
105419 cp->packet_xmit = NULL;
105420 cp->app = NULL;
105421@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
105422
105423 /* Don't drop the entry if its number of incoming packets is not
105424 located in [0, 8] */
105425- i = atomic_read(&cp->in_pkts);
105426+ i = atomic_read_unchecked(&cp->in_pkts);
105427 if (i > 8 || i < 0) return 0;
105428
105429 if (!todrop_rate[i]) return 0;
105430diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
105431index b87ca32..76c7799 100644
105432--- a/net/netfilter/ipvs/ip_vs_core.c
105433+++ b/net/netfilter/ipvs/ip_vs_core.c
105434@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
105435 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
105436 /* do not touch skb anymore */
105437
105438- atomic_inc(&cp->in_pkts);
105439+ atomic_inc_unchecked(&cp->in_pkts);
105440 ip_vs_conn_put(cp);
105441 return ret;
105442 }
105443@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
105444 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
105445 pkts = sysctl_sync_threshold(ipvs);
105446 else
105447- pkts = atomic_add_return(1, &cp->in_pkts);
105448+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
105449
105450 if (ipvs->sync_state & IP_VS_STATE_MASTER)
105451 ip_vs_sync_conn(net, cp, pkts);
105452diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
105453index fdcda8b..dbc1979 100644
105454--- a/net/netfilter/ipvs/ip_vs_ctl.c
105455+++ b/net/netfilter/ipvs/ip_vs_ctl.c
105456@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
105457 */
105458 ip_vs_rs_hash(ipvs, dest);
105459 }
105460- atomic_set(&dest->conn_flags, conn_flags);
105461+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
105462
105463 /* bind the service */
105464 old_svc = rcu_dereference_protected(dest->svc, 1);
105465@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
105466 * align with netns init in ip_vs_control_net_init()
105467 */
105468
105469-static struct ctl_table vs_vars[] = {
105470+static ctl_table_no_const vs_vars[] __read_only = {
105471 {
105472 .procname = "amemthresh",
105473 .maxlen = sizeof(int),
105474@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
105475 " %-7s %-6d %-10d %-10d\n",
105476 &dest->addr.in6,
105477 ntohs(dest->port),
105478- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
105479+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
105480 atomic_read(&dest->weight),
105481 atomic_read(&dest->activeconns),
105482 atomic_read(&dest->inactconns));
105483@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
105484 "%-7s %-6d %-10d %-10d\n",
105485 ntohl(dest->addr.ip),
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@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
105493
105494 entry.addr = dest->addr.ip;
105495 entry.port = dest->port;
105496- entry.conn_flags = atomic_read(&dest->conn_flags);
105497+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
105498 entry.weight = atomic_read(&dest->weight);
105499 entry.u_threshold = dest->u_threshold;
105500 entry.l_threshold = dest->l_threshold;
105501@@ -3039,7 +3039,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
105502 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
105503 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
105504 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
105505- (atomic_read(&dest->conn_flags) &
105506+ (atomic_read_unchecked(&dest->conn_flags) &
105507 IP_VS_CONN_F_FWD_MASK)) ||
105508 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
105509 atomic_read(&dest->weight)) ||
105510@@ -3672,7 +3672,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
105511 {
105512 int idx;
105513 struct netns_ipvs *ipvs = net_ipvs(net);
105514- struct ctl_table *tbl;
105515+ ctl_table_no_const *tbl;
105516
105517 atomic_set(&ipvs->dropentry, 0);
105518 spin_lock_init(&ipvs->dropentry_lock);
105519diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
105520index 127f140..553d652 100644
105521--- a/net/netfilter/ipvs/ip_vs_lblc.c
105522+++ b/net/netfilter/ipvs/ip_vs_lblc.c
105523@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
105524 * IPVS LBLC sysctl table
105525 */
105526 #ifdef CONFIG_SYSCTL
105527-static struct ctl_table vs_vars_table[] = {
105528+static ctl_table_no_const vs_vars_table[] __read_only = {
105529 {
105530 .procname = "lblc_expiration",
105531 .data = NULL,
105532diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
105533index 2229d2d..b32b785 100644
105534--- a/net/netfilter/ipvs/ip_vs_lblcr.c
105535+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
105536@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
105537 * IPVS LBLCR sysctl table
105538 */
105539
105540-static struct ctl_table vs_vars_table[] = {
105541+static ctl_table_no_const vs_vars_table[] __read_only = {
105542 {
105543 .procname = "lblcr_expiration",
105544 .data = NULL,
105545diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
105546index d93ceeb..4556144 100644
105547--- a/net/netfilter/ipvs/ip_vs_sync.c
105548+++ b/net/netfilter/ipvs/ip_vs_sync.c
105549@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
105550 cp = cp->control;
105551 if (cp) {
105552 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
105553- pkts = atomic_add_return(1, &cp->in_pkts);
105554+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
105555 else
105556 pkts = sysctl_sync_threshold(ipvs);
105557 ip_vs_sync_conn(net, cp->control, pkts);
105558@@ -771,7 +771,7 @@ control:
105559 if (!cp)
105560 return;
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 goto sloop;
105567@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
105568
105569 if (opt)
105570 memcpy(&cp->in_seq, opt, sizeof(*opt));
105571- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
105572+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
105573 cp->state = state;
105574 cp->old_state = cp->state;
105575 /*
105576diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
105577index 3aedbda..6a63567 100644
105578--- a/net/netfilter/ipvs/ip_vs_xmit.c
105579+++ b/net/netfilter/ipvs/ip_vs_xmit.c
105580@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
105581 else
105582 rc = NF_ACCEPT;
105583 /* do not touch skb anymore */
105584- atomic_inc(&cp->in_pkts);
105585+ atomic_inc_unchecked(&cp->in_pkts);
105586 goto out;
105587 }
105588
105589@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(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
105598diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
105599index a4b5e2a..13b1de3 100644
105600--- a/net/netfilter/nf_conntrack_acct.c
105601+++ b/net/netfilter/nf_conntrack_acct.c
105602@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
105603 #ifdef CONFIG_SYSCTL
105604 static int nf_conntrack_acct_init_sysctl(struct net *net)
105605 {
105606- struct ctl_table *table;
105607+ ctl_table_no_const *table;
105608
105609 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
105610 GFP_KERNEL);
105611diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
105612index 46d1b26..b7f3b76 100644
105613--- a/net/netfilter/nf_conntrack_core.c
105614+++ b/net/netfilter/nf_conntrack_core.c
105615@@ -1734,6 +1734,10 @@ void nf_conntrack_init_end(void)
105616 #define DYING_NULLS_VAL ((1<<30)+1)
105617 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
105618
105619+#ifdef CONFIG_GRKERNSEC_HIDESYM
105620+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
105621+#endif
105622+
105623 int nf_conntrack_init_net(struct net *net)
105624 {
105625 int ret = -ENOMEM;
105626@@ -1759,7 +1763,11 @@ int nf_conntrack_init_net(struct net *net)
105627 if (!net->ct.stat)
105628 goto err_pcpu_lists;
105629
105630+#ifdef CONFIG_GRKERNSEC_HIDESYM
105631+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
105632+#else
105633 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
105634+#endif
105635 if (!net->ct.slabname)
105636 goto err_slabname;
105637
105638diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
105639index 4e78c57..ec8fb74 100644
105640--- a/net/netfilter/nf_conntrack_ecache.c
105641+++ b/net/netfilter/nf_conntrack_ecache.c
105642@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
105643 #ifdef CONFIG_SYSCTL
105644 static int nf_conntrack_event_init_sysctl(struct net *net)
105645 {
105646- struct ctl_table *table;
105647+ ctl_table_no_const *table;
105648
105649 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
105650 GFP_KERNEL);
105651diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
105652index bd9d315..989947e 100644
105653--- a/net/netfilter/nf_conntrack_helper.c
105654+++ b/net/netfilter/nf_conntrack_helper.c
105655@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
105656
105657 static int nf_conntrack_helper_init_sysctl(struct net *net)
105658 {
105659- struct ctl_table *table;
105660+ ctl_table_no_const *table;
105661
105662 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
105663 GFP_KERNEL);
105664diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
105665index b65d586..beec902 100644
105666--- a/net/netfilter/nf_conntrack_proto.c
105667+++ b/net/netfilter/nf_conntrack_proto.c
105668@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
105669
105670 static void
105671 nf_ct_unregister_sysctl(struct ctl_table_header **header,
105672- struct ctl_table **table,
105673+ ctl_table_no_const **table,
105674 unsigned int users)
105675 {
105676 if (users > 0)
105677diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
105678index fc823fa..8311af3 100644
105679--- a/net/netfilter/nf_conntrack_standalone.c
105680+++ b/net/netfilter/nf_conntrack_standalone.c
105681@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
105682
105683 static int nf_conntrack_standalone_init_sysctl(struct net *net)
105684 {
105685- struct ctl_table *table;
105686+ ctl_table_no_const *table;
105687
105688 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
105689 GFP_KERNEL);
105690diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
105691index 7a394df..bd91a8a 100644
105692--- a/net/netfilter/nf_conntrack_timestamp.c
105693+++ b/net/netfilter/nf_conntrack_timestamp.c
105694@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
105695 #ifdef CONFIG_SYSCTL
105696 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
105697 {
105698- struct ctl_table *table;
105699+ ctl_table_no_const *table;
105700
105701 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
105702 GFP_KERNEL);
105703diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
105704index 43c926c..a5731d8 100644
105705--- a/net/netfilter/nf_log.c
105706+++ b/net/netfilter/nf_log.c
105707@@ -362,7 +362,7 @@ static const struct file_operations nflog_file_ops = {
105708
105709 #ifdef CONFIG_SYSCTL
105710 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
105711-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
105712+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
105713
105714 static int nf_log_proc_dostring(struct ctl_table *table, int write,
105715 void __user *buffer, size_t *lenp, loff_t *ppos)
105716@@ -393,13 +393,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
105717 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
105718 mutex_unlock(&nf_log_mutex);
105719 } else {
105720+ ctl_table_no_const nf_log_table = *table;
105721+
105722 mutex_lock(&nf_log_mutex);
105723 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
105724 if (!logger)
105725- table->data = "NONE";
105726+ nf_log_table.data = "NONE";
105727 else
105728- table->data = logger->name;
105729- r = proc_dostring(table, write, buffer, lenp, ppos);
105730+ nf_log_table.data = logger->name;
105731+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
105732 mutex_unlock(&nf_log_mutex);
105733 }
105734
105735diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
105736index c68c1e5..8b5d670 100644
105737--- a/net/netfilter/nf_sockopt.c
105738+++ b/net/netfilter/nf_sockopt.c
105739@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
105740 }
105741 }
105742
105743- list_add(&reg->list, &nf_sockopts);
105744+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
105745 out:
105746 mutex_unlock(&nf_sockopt_mutex);
105747 return ret;
105748@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
105749 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
105750 {
105751 mutex_lock(&nf_sockopt_mutex);
105752- list_del(&reg->list);
105753+ pax_list_del((struct list_head *)&reg->list);
105754 mutex_unlock(&nf_sockopt_mutex);
105755 }
105756 EXPORT_SYMBOL(nf_unregister_sockopt);
105757diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
105758index 11d85b3..7fcc420 100644
105759--- a/net/netfilter/nfnetlink_log.c
105760+++ b/net/netfilter/nfnetlink_log.c
105761@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
105762 struct nfnl_log_net {
105763 spinlock_t instances_lock;
105764 struct hlist_head instance_table[INSTANCE_BUCKETS];
105765- atomic_t global_seq;
105766+ atomic_unchecked_t global_seq;
105767 };
105768
105769 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
105770@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
105771 /* global sequence number */
105772 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
105773 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
105774- htonl(atomic_inc_return(&log->global_seq))))
105775+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
105776 goto nla_put_failure;
105777
105778 if (data_len) {
105779diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
105780index b636486..9898807 100644
105781--- a/net/netfilter/nft_compat.c
105782+++ b/net/netfilter/nft_compat.c
105783@@ -274,14 +274,7 @@ static void nft_match_eval(const struct nft_expr *expr,
105784 return;
105785 }
105786
105787- switch(ret) {
105788- case true:
105789- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
105790- break;
105791- case false:
105792- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
105793- break;
105794- }
105795+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
105796 }
105797
105798 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
105799diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
105800new file mode 100644
105801index 0000000..c566332
105802--- /dev/null
105803+++ b/net/netfilter/xt_gradm.c
105804@@ -0,0 +1,51 @@
105805+/*
105806+ * gradm match for netfilter
105807